Skip to content

Commit

Permalink
Merge pull request #16 from moevm/kharitonov_for_docker_first_change
Browse files Browse the repository at this point in the history 
Add connection frontend <=> backend
  • Loading branch information
@necitboss
necitboss authored Nov 11, 2024
2 parents 638cc17 + 7510471 commit 81f19c8
Show file tree
Hide file tree
Showing 24 changed files with 787 additions and 327 deletions.
26 changes: 12 additions & 14 deletions main/_front/dist/add-edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<h2 class="header__title">Пора Cобрать ПК</h2>
</div>
<div class="header__nav">
<a href="#!" class="header__link active">Комплектующие</a>
<a href="/" class="header__link active">Комплектующие</a>
<a href="#!" class="header__link">Конфигуратор</a>
<a href="#!" class="header__link">Готовые сборки</a>
<a href="#!" class="header__link">
Expand All @@ -41,7 +41,7 @@ <h2 class="header__title">Пора Cобрать ПК</h2>
</g>
</svg>
</a>
<a href="login.html" class="header__link">
<a href="login" class="header__link">
<svg viewBox="0 0 40 40" width="40.000000" height="40.000000">
<g clip-path="url(#clip2_8)">
<path id="path"
Expand All @@ -67,7 +67,7 @@ <h1 class="title__text">Добавление/Редактирование</h1>
<div class="add-edit__inner">
<div class="add-edit__choice grey_background">
<h4 class="add-edit__choice-subtitle subtitle">Выберите<br/>тип продукта</h4>
<div class="choice choice-grid">
<div class="choice choice-grid" id="type">
<button class="choice__elem choice__elem-with_img active" data-value="cpu">
<svg width="40.000000" height="40.000000" viewBox="0 0 40 40" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip2_90)">
Expand Down Expand Up @@ -204,18 +204,18 @@ <h4 class="add-edit__choice-subtitle subtitle">Выберите<br/>тип пр
<div class="add-center grey_background">

<div class="subtitle">Введите название продукта</div>
<div class="add-center__input input">
<div class="add-center__input input" id="name">
<input class="input__text" type="text" placeholder="">
<span>Название</span>
</div>
<div class="add-center__price">
<div class="subtitle">Введите цену:</div>
<div class="input">
<div class="input" id="price">
<input class="input__text" type="number" placeholder="" min="1" max="9999999">
<span>Цена</span>
</div>
</div>
<div class="add-center__count">
<div class="add-center__count" id="count">
<h4 class="subtitle add-center__subtitle">Количество:</h4>
<div class="stepper" data-max="10">
<button class="stepper__minus">
Expand All @@ -241,13 +241,13 @@ <h4 class="subtitle add-center__subtitle">Количество:</h4>

</div>
</div>
<button class="btn btn-big">Добавить товар</button>
<button class="btn btn-big" id="submit">Добавить товар</button>
</div>
<!-- -->
<div class="add-edit__right add-right grey_background">
<div class="subtitle">Выберите обязательные поля</div>
<div class="add-right__choices">
<div class="add-right__choice">
<div class="subtitle" id="main_properties_title">Выберите обязательные поля</div>
<div class="add-right__choices" id="main_properties">
<div class="add-right__choice" id="socket">
<div class="add-right__choice-title">Сокет (разъем на плате)</div>
<div class="choice choice-grid">
<button class="choice__elem active" data-value="LGA 1151">LGA 1151</button>
Expand All @@ -258,16 +258,14 @@ <h4 class="subtitle add-center__subtitle">Количество:</h4>
<button class="choice__elem" data-value="AM5">AM5</button>
</div>
</div>
<div class="add-right__choice">
<div class="add-right__choice" id="ram_count">
<div class="add-right__choice-title">Количество слотов ОЗУ</div>
<div class="choice choice-grid">
<button class="choice__elem active" data-value="2">2 слота</button>
<button class="choice__elem" data-value="4">4 слота</button>
</div>
</div>


<div class="add-right__choice">
<div class="add-right__choice" id="ram_type">
<div class="add-right__choice-title">Тип памяти</div>
<div class="choice choice-grid">
<button class="choice__elem active" data-value="DDR4">DDR4</button>
Expand Down
4 changes: 2 additions & 2 deletions main/_front/dist/components-admin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<h2 class="header__title">Пора Cобрать ПК</h2>
</div>
<div class="header__nav">
<a href="#!" class="header__link active">Комплектующие</a>
<a href="/" class="header__link active">Комплектующие</a>
<a href="#!" class="header__link">Конфигуратор</a>
<a href="#!" class="header__link">Готовые сборки</a>
<a href="#!" class="header__link">
Expand All @@ -42,7 +42,7 @@ <h2 class="header__title">Пора Cобрать ПК</h2>
</g>
</svg>
</a>
<a href="login.html" class="header__link">
<a href="login" class="header__link">
<svg viewBox="0 0 40 40" width="40.000000" height="40.000000">
<g clip-path="url(#clip2_8)">
<path id="path"
Expand Down
10 changes: 7 additions & 3 deletions main/_front/dist/components.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

</head>
<body>

<header class="header">
<div class="container">
<div class="header__inner">
Expand All @@ -21,7 +21,7 @@
<h2 class="header__title">Пора Cобрать ПК</h2>
</div>
<div class="header__nav">
<a href="#!" class="header__link active">Комплектующие</a>
<a href="/" class="header__link active">Комплектующие</a>
<a href="#!" class="header__link">Конфигуратор</a>
<a href="#!" class="header__link">Готовые сборки</a>
<a href="#!" class="header__link">
Expand All @@ -42,7 +42,7 @@ <h2 class="header__title">Пора Cобрать ПК</h2>
</g>
</svg>
</a>
<a href="login.html" class="header__link">
<a href="login" class="header__link">
<svg viewBox="0 0 40 40" width="40.000000" height="40.000000">
<g clip-path="url(#clip2_8)">
<path id="path"
Expand Down Expand Up @@ -238,6 +238,10 @@ <h4 class="checkbox-group__title">Cокет</h4>
</label>
</div>
</div>
<div style="display: flex;justify-content: center;" class="hide">
<a href="add-edit" class="btn" id="add">Добавить товар</a>

</div>
</div>
<div class="components__main">
<div class="components__sort sort grey_background">
Expand Down
27 changes: 25 additions & 2 deletions main/_front/dist/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,23 @@ body {
border-radius: 10px;
}

.hide {
display: none !important;
}

.btn {
display: inline-block;
background: #712CF9;
font-size: 18px;
line-height: 21px;
color: white;
color: #fff;
font-weight: bold;
text-decoration: none;
border-radius: 8px;
min-width: 190px;
border: 1px solid #712CF9;
padding: 12px;
text-align: center;
transition: background-color 0.2s ease, color 0.2s ease, opacity 0.2s ease;
}
.btn-big {
Expand All @@ -128,10 +133,22 @@ body {
}
.btn:disabled {
background: #712CF9;
color: white;
color: #fff;
opacity: 0.4;
cursor: not-allowed;
}
.btn-red {
background-color: #DC3545;
border: 1px solid #DC3545;
}
.btn-red:hover {
background-color: #fff;
color: #DC3545;
}
.btn-red:disabled {
background-color: #DC3545;
color: #fff;
}

.checkbox-group {
display: flex;
Expand Down Expand Up @@ -643,6 +660,12 @@ body {
width: 100%;
}

.form__not_true {
color: #DC3545;
font-size: 18px;
font-weight: 500;
}

.section {
margin-top: 30px;
}
Expand Down
15 changes: 0 additions & 15 deletions main/_front/dist/index.html
View file

This file was deleted.

Loading

0 comments on commit 81f19c8

Please sign in to comment.