Skip to content

Матвей Мехряков #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dark7py wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Матвей Мехряков #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

6. Сделай в модальном окне, ниже надписи про количество напитков, таблицу такого вида:



| Напиток | Молоко | Дополнительно |
| -------- | ------- | ---------------- |
| Капучино | обычное |
Expand Down
Binary file added delete.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
126 changes: 78 additions & 48 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,63 +7,93 @@
</head>
<body>
<form>
<fieldset class="beverage">
<h4 class="beverage-count">Напиток №1</h4>
<label class="field">
<span class="label-text">Я буду</span>
<select>
<option value="espresso">Эспрессо</option>
<option value="capuccino" selected>Капучино</option>
<option value="cacao">Какао</option>
</select>
</label>
<div class="field">
<span class="checkbox-label">Сделайте напиток на</span>
<label class="checkbox-field">
<input type="radio" name="milk" value="usual" checked />
<span>обычном молоке</span>
<div class='beverages'>
<fieldset class="beverage">
<button class="delete-drink" type="button" onclick="deleteDrink(this.parentNode)"></button>
<h4 class="beverage-count">Напиток №1</h4>

<label class="field">
<span class="label-text">Я буду</span>
<select name="drink">
<option value="espresso">Эспрессо</option>
<option value="capuccino" selected>Капучино</option>
<option value="cacao">Какао</option>
</select>
</label>
<label class="checkbox-field">
<input type="radio" name="milk" value="no-fat" />
<span>обезжиренном молоке</span>
</label>
<label class="checkbox-field">
<input type="radio" name="milk" value="soy" />
<span>соевом молоке</span>
</label>
<label class="checkbox-field">
<input type="radio" name="milk" value="coconut" />
<span>кокосовом молоке</span>
</label>
</div>
<div class="field">
<span class="checkbox-label">Добавьте к напитку:</span>
<label class="checkbox-field">
<input type="checkbox" name="options" value="whipped cream" />
<span>взбитых сливок</span>
</label>
<label class="checkbox-field">
<input type="checkbox" name="options" value="marshmallow" />
<span>зефирок</span>
</label>
<label class="checkbox-field">
<input type="checkbox" name="options" value="chocolate" />
<span>шоколад</span>
</label>
<label class="checkbox-field">
<input type="checkbox" name="options" value="cinnamon" />
<span>корицу</span>
</label>
</div>
</fieldset>
<div class="field">
<span class="checkbox-label">Сделайте напиток на</span>
<label class="checkbox-field">
<input type="radio" name="milk1" value="usual" checked />
<span>обычном молоке</span>
</label>
<label class="checkbox-field">
<input type="radio" name="milk1" value="no-fat" />
<span>обезжиренном молоке</span>
</label>
<label class="checkbox-field">
<input type="radio" name="milk1" value="soy" />
<span>соевом молоке</span>
</label>
<label class="checkbox-field">
<input type="radio" name="milk1" value="coconut" />
<span>кокосовом молоке</span>
</label>
</div>
<div class="field">
<span class="checkbox-label">Добавьте к напитку:</span>
<label class="checkbox-field">
<input type="checkbox" name="options" value="whipped cream" />
<span>взбитых сливок</span>
</label>
<label class="checkbox-field">
<input type="checkbox" name="options" value="marshmallow" />
<span>зефирок</span>
</label>
<label class="checkbox-field">
<input type="checkbox" name="options" value="chocolate" />
<span>шоколад</span>
</label>
<label class="checkbox-field">
<input type="checkbox" name="options" value="cinnamon" />
<span>корицу</span>
</label>
</div>
<div class="field">
<span class="checkbox-label">И ещё вот что:</span>
<textarea placeholder="пожелания" name="somethingElse"></textarea>
</div>
</fieldset>
</div>

<div>
<button type="button" class="add-button">+ Добавить напиток</button>
</div>
<div style="margin-top: 30px">
<button type="submit" class="submit-button">Готово</button>
</div>

<section class="modal">
<div class="modal-content">
<button class="delete-drink close" type="button"></button>
<h2>Заказ принят!</h2>
<p class="drinks-count">Вы заказали 1 напиток</p>
<table class="table-form">
<tr>
<th>Напиток</th>
<th>Молоко</th>
<th>Дополнительно</th>
<th>Пожелания</th>
</tr>
</table>
<p>Выберите время заказа</p>
<input type="time" class="order-time">
<button type="submit" class="checkout">оформить</button>
</div>
</section>
</form>

<script src="index.js"></script>
</body>
</html>


130 changes: 130 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
let form = document.querySelector('.beverage');
let addDrink = document.querySelector('.add-button');
let forms = document.querySelector('.beverages');
let count = 1;

addDrink.addEventListener('click', (e) => {
let newForm = form.cloneNode(true);
count += 1;
newForm.querySelector('.beverage-count').innerHTML = 'Напиток №' + count;

forms.append(newForm);
});


function deleteDrink (form) {
if (count != 1){
form.remove();
count -= 1;
}
}

let submitButton = document.querySelector('.submit-button');
let modalWindow = document.querySelector('.modal');
let closeBtn = document.querySelector('.close')

submitButton.addEventListener('click', function (evt) {
evt.preventDefault();
modalWindow.querySelector('.drinks-count').innerHTML = `Вы заказали ${count} ${inclineWord(count)}`;
addItemsInTable(getData());

let orderTime = document.querySelector('.order-time');
orderTime.onchange = (e) => {
let dateNow = new Date();
let [hours, minutes] = e.target.value.split(':');
let inputTime = new Date();
inputTime.setHours(hours);
inputTime.setMinutes(minutes);
if (dateNow > inputTime) {
alert("Мы не умеем перемещаться во времени. Выберите время позже, чем текущее");
orderTime.classList.add('error');
} else {
orderTime.classList.remove('error');
}
}

modalWindow.classList.add('modal--show');
});

function inclineWord (count) {
if (count % 10 == 1 && count % 100 != 11)
return 'напиток';
else if ((2 <= count && count % 10 <= 4) && count % 100 != 12 && count % 100 != 13 && count % 100 != 14)
return 'напитка';
else
return 'напитков';
}

closeBtn.addEventListener('click', function () {
modalWindow.classList.remove('modal--show');
})


function getData() {
let orders = document.querySelectorAll('fieldset');
let result = {
count: orders.length,
drinks: []
};

let j = 1;
for (let order of orders) {
let additionally = "";
for (let i of order.querySelectorAll('[name="options"]')) {
if (i.checked)
additionally += i.value + ", ";
}
let milk = "";
for (let i of order.querySelectorAll(`[name="milk${j}"]`)) {
if (i.checked) {
milk = i.value;
break;
}
}
result.drinks.push({
drink: order.querySelector('[name="drink"]').value,
milk: milk,
additionally: additionally,
somethingElse: order.querySelector('[name="somethingElse"]').value
});
j++;
}

return result;
}

function addItemsInTable(data) {
let table = document.querySelector(".table-form")
console.log(data)
for (let i of data.drinks) {
let tr = document.createElement('tr');
let td = document.createElement('td');
td.textContent = i.drink;
tr.append(td);
td = document.createElement('td');
td.textContent = i.milk;
tr.append(td);
td = document.createElement('td');
td.textContent = i.additionally;
tr.append(td);
td = document.createElement('td');
td.textContent = i.somethingElse;
tr.append(td);

table.append(tr)
}
return table;
}

let arr = ["срочно", "быстрее","побыстрее","скорее","поскорее","очень нужно"];
let textarea = document.querySelector('textarea');

const textareaFunc = (e) => {
let text = e.target;
for (let i of arr) {
if (text.value.includes(i) && !text.value.includes(`<b>${i}</b>`)) {
text.value = text.value.replace(i, `<b>${i}</b>`);
}
}
};
textarea.oninput = textareaFunc;
74 changes: 72 additions & 2 deletions styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@
border: none;
background: none;
padding: 10px;
color: rgba(0, 27, 255, 0.82);
color: rgba(0, 26, 255, 0.82);
font-size: 14px;
text-decoration: underline dashed;
text-decoration: none;
border:rgba(0, 26, 255, 0.82) 1px solid;
cursor: pointer;
}

Expand All @@ -45,3 +46,72 @@
border-radius: 5px;
}



.delete-drink {
float: right;
width: 25px;
height: 25px;
border-radius: 50%;
background-color: white;
border-style: none;
background-image: url("https://cdn-icons-png.flaticon.com/512/1617/1617543.png");
background-size: contain;
}

.modal {
display: none;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}

.modal--show {
display: flex;
align-items: center;
}

.modal::after {
content: "";
position: fixed;
top: 0;
left: 0;
height: 100%;
width: 100%;
background-color: rgba(0, 0, 0, 0.5);
z-index: 1;
}

.modal-content {
position: relative;
width: 500px;
margin: 100px auto;
padding: 15px 15px 15px 30px;
background-color: #ffef95;
border-radius: 10px;
box-shadow: -1px 5px 12px 0 rgba(89, 90, 90, 0.3);
z-index: 2;
}

table {
border: black 2px solid;
border-collapse: collapse;
padding: 5px;
margin: 10px;
}

td, th {
border: 1px solid #333;
padding: 5px;
}

textarea {
margin: 0;
display: block;
}

.error {
border: red 2px solid;
}