From ef98c892d3a683913d3ce156789118f71bb733db Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Mon, 31 Mar 2025 21:22:11 +0300 Subject: [PATCH 01/30] DZ --- frontend/src/App.vue | 18 +- frontend/src/layouts/AppHeader.vue | 15 ++ frontend/src/layouts/AppLayout.vue | 11 ++ frontend/src/views/HomeView.vue | 304 +++++++++++++++++++++++++++++ 4 files changed, 338 insertions(+), 10 deletions(-) create mode 100644 frontend/src/layouts/AppHeader.vue create mode 100644 frontend/src/layouts/AppLayout.vue create mode 100644 frontend/src/views/HomeView.vue diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 2f88d12a..18376f1d 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,16 +1,14 @@ + + \ No newline at end of file From 2ddd22e97d26703ee48ead66eefb4e9ba22faf06 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Sun, 6 Apr 2025 12:39:24 +0300 Subject: [PATCH 04/30] DZ1.40 --- frontend/src/layouts/AppHeader.vue | 137 ++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/frontend/src/layouts/AppHeader.vue b/frontend/src/layouts/AppHeader.vue index 1f6c8d94..d5c270e5 100644 --- a/frontend/src/layouts/AppHeader.vue +++ b/frontend/src/layouts/AppHeader.vue @@ -12,4 +12,139 @@ - \ No newline at end of file + + \ No newline at end of file From bf7225ddf8e0ee8f405b41c20fedc785ec727583 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Sun, 6 Apr 2025 16:44:57 +0300 Subject: [PATCH 05/30] DZ2.6 --- frontend/src/common/components/AppDrag.vue | 30 ++++++++++++++++++++++ frontend/src/common/components/AppDrop.vue | 25 ++++++++++++++++++ frontend/src/common/constants/index.js | 1 + 3 files changed, 56 insertions(+) create mode 100644 frontend/src/common/components/AppDrag.vue create mode 100644 frontend/src/common/components/AppDrop.vue create mode 100644 frontend/src/common/constants/index.js diff --git a/frontend/src/common/components/AppDrag.vue b/frontend/src/common/components/AppDrag.vue new file mode 100644 index 00000000..193b1919 --- /dev/null +++ b/frontend/src/common/components/AppDrag.vue @@ -0,0 +1,30 @@ + + + \ No newline at end of file diff --git a/frontend/src/common/components/AppDrop.vue b/frontend/src/common/components/AppDrop.vue new file mode 100644 index 00000000..2ef19b67 --- /dev/null +++ b/frontend/src/common/components/AppDrop.vue @@ -0,0 +1,25 @@ + + + \ No newline at end of file diff --git a/frontend/src/common/constants/index.js b/frontend/src/common/constants/index.js new file mode 100644 index 00000000..7ff73a0c --- /dev/null +++ b/frontend/src/common/constants/index.js @@ -0,0 +1 @@ +export const DATA_TRANSFER_PAYLOAD = "payload"; From aff85dd8ef4e84dad4a7aff81ca2398f678fb540 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Sun, 6 Apr 2025 17:04:27 +0300 Subject: [PATCH 06/30] DZ2.13 --- .../modules/constructor/DiameterSelector.vue | 113 ++++++++ .../src/modules/constructor/DoughSelector.vue | 95 ++++++ .../constructor/IngredientsSelector.vue | 270 ++++++++++++++++++ .../modules/constructor/PizzaConstructor.vue | 235 +++++++++++++++ .../src/modules/constructor/SauceSelector.vue | 59 ++++ 5 files changed, 772 insertions(+) create mode 100644 frontend/src/modules/constructor/DiameterSelector.vue create mode 100644 frontend/src/modules/constructor/DoughSelector.vue create mode 100644 frontend/src/modules/constructor/IngredientsSelector.vue create mode 100644 frontend/src/modules/constructor/PizzaConstructor.vue create mode 100644 frontend/src/modules/constructor/SauceSelector.vue diff --git a/frontend/src/modules/constructor/DiameterSelector.vue b/frontend/src/modules/constructor/DiameterSelector.vue new file mode 100644 index 00000000..a6451230 --- /dev/null +++ b/frontend/src/modules/constructor/DiameterSelector.vue @@ -0,0 +1,113 @@ + + + + + + \ No newline at end of file diff --git a/frontend/src/modules/constructor/DoughSelector.vue b/frontend/src/modules/constructor/DoughSelector.vue new file mode 100644 index 00000000..5281e6f9 --- /dev/null +++ b/frontend/src/modules/constructor/DoughSelector.vue @@ -0,0 +1,95 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/modules/constructor/IngredientsSelector.vue b/frontend/src/modules/constructor/IngredientsSelector.vue new file mode 100644 index 00000000..6e0d1ae9 --- /dev/null +++ b/frontend/src/modules/constructor/IngredientsSelector.vue @@ -0,0 +1,270 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/modules/constructor/PizzaConstructor.vue b/frontend/src/modules/constructor/PizzaConstructor.vue new file mode 100644 index 00000000..5193a99f --- /dev/null +++ b/frontend/src/modules/constructor/PizzaConstructor.vue @@ -0,0 +1,235 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/modules/constructor/SauceSelector.vue b/frontend/src/modules/constructor/SauceSelector.vue new file mode 100644 index 00000000..4c6a3f95 --- /dev/null +++ b/frontend/src/modules/constructor/SauceSelector.vue @@ -0,0 +1,59 @@ + + + + + \ No newline at end of file From 70176205db397401ed33fafe6787ced19dedc2cd Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Sun, 6 Apr 2025 17:11:43 +0300 Subject: [PATCH 07/30] DZ2.15 --- frontend/src/views/HomeView.vue | 727 ++++---------------------------- 1 file changed, 81 insertions(+), 646 deletions(-) diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue index dbe102a6..7b716576 100644 --- a/frontend/src/views/HomeView.vue +++ b/frontend/src/views/HomeView.vue @@ -1,110 +1,27 @@ + \ No newline at end of file diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue index 7b716576..ff0643a0 100644 --- a/frontend/src/views/HomeView.vue +++ b/frontend/src/views/HomeView.vue @@ -128,24 +128,6 @@ const updateIngredientAmount = (ingredient, count) => { \ No newline at end of file From 34b6849044fef2bbb1cbf875a46025b732fadd88 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Mon, 7 Apr 2025 19:51:41 +0300 Subject: [PATCH 11/30] DZ3.5 --- frontend/src/common/components/AppCounter.vue | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/frontend/src/common/components/AppCounter.vue b/frontend/src/common/components/AppCounter.vue index 99d385f3..48861838 100644 --- a/frontend/src/common/components/AppCounter.vue +++ b/frontend/src/common/components/AppCounter.vue @@ -63,19 +63,19 @@ .counter__button { $el: &; $size_icon: 50%; - + position: relative; - + display: block; - + width: 16px; height: 16px; margin: 0; padding: 0; - + cursor: pointer; transition: 0.3s; - + border: none; border-radius: 50%; outline: none; @@ -85,12 +85,12 @@ &::before { @include p_center-all; - + width: $size_icon; height: 2px; - + content: ""; - + border-radius: 2px; background-color: $black; } @@ -121,44 +121,44 @@ &::before { @include p_center-all; - + width: $size_icon; height: 2px; - + content: ""; - + border-radius: 2px; background-color: $white; } - + &::after { @include p_center-all; - + width: $size_icon; height: 2px; - + content: ""; transform: translate(-50%, -50%) rotate(90deg); - + border-radius: 2px; background-color: $white; } - + &:hover:not(:active):not(:disabled) { background-color: $green-400; } - + &:active:not(:disabled) { background-color: $green-600; } - + &:focus:not(:disabled) { box-shadow: $shadow-regular; } - + &:disabled { cursor: default; - + opacity: 0.3; } } From 31a91eb9a56458bc12503c6c3aefe368fe547485 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Mon, 7 Apr 2025 19:57:33 +0300 Subject: [PATCH 12/30] DZ3.5 --- frontend/src/assets/scss/app.scss | 6 +- frontend/src/assets/scss/common.scss | 504 +++++++++++++-------------- 2 files changed, 254 insertions(+), 256 deletions(-) diff --git a/frontend/src/assets/scss/app.scss b/frontend/src/assets/scss/app.scss index 9d86ab36..e13cadf9 100644 --- a/frontend/src/assets/scss/app.scss +++ b/frontend/src/assets/scss/app.scss @@ -1,7 +1,5 @@ -// general @import "libs/normalize.scss"; +@import "common.scss"; @import "fonts.scss"; -@import "ds-system/ds.scss"; -@import "visually-hidden.scss"; @import "scaffolding.scss"; -@import "mixins/mixins"; +@import "visually-hidden.scss"; \ No newline at end of file diff --git a/frontend/src/assets/scss/common.scss b/frontend/src/assets/scss/common.scss index 498aa595..5d06db4d 100644 --- a/frontend/src/assets/scss/common.scss +++ b/frontend/src/assets/scss/common.scss @@ -1,289 +1,289 @@ +@import "ds-system/ds.scss"; +@import "mixins/mixins.scss"; + .content { - padding-top: 20px; - } - - .content__wrapper { - display: flex; - align-items: flex-start; - flex-wrap: wrap; - - width: 920px; - margin: 0 auto; - padding-right: 2.12%; - padding-bottom: 30px; - padding-left: 2.12%; - } - - .sheet { - padding-top: 15px; - - border-radius: 8px; - background-color: $white; - box-shadow: $shadow-light; + padding-top: 20px; +} + +.content__wrapper { + display: flex; + align-items: flex-start; + flex-wrap: wrap; + + width: 920px; + margin: 0 auto; + padding-right: 2.12%; + padding-bottom: 30px; + padding-left: 2.12%; +} + +.sheet { + padding-top: 15px; + + border-radius: 8px; + background-color: $white; + box-shadow: $shadow-light; +} + +.sheet__title { + padding-right: 18px; + padding-left: 18px; +} + +.sheet__content { + display: flex; + align-items: center; + flex-wrap: wrap; + + margin-top: 8px; + padding-top: 18px; + padding-right: 18px; + padding-left: 18px; + + border-top: 1px solid rgba($green-500, 0.1); +} + +.title { + box-sizing: border-box; + width: 100%; + margin: 0; + + color: $black; + + &--big { + @include b-s36-h42; } - - .sheet__title { - padding-right: 18px; - padding-left: 18px; - } - - .sheet__content { - display: flex; - align-items: center; - flex-wrap: wrap; - - margin-top: 8px; - padding-top: 18px; - padding-right: 18px; - padding-left: 18px; - - border-top: 1px solid rgba($green-500, 0.1); + + &--small { + @include b-s18-h21; } - - .title { - box-sizing: border-box; - width: 100%; - margin: 0; - - color: $black; - - &--big { - @include b-s36-h42; +} + +.radio { + cursor: pointer; + + span { + @include r-s16-h19; + + position: relative; + + padding-left: 28px; + + &:before { + @include p_center-v; + + display: block; + + box-sizing: border-box; + width: 20px; + height: 20px; + + content: ""; + transition: 0.3s; + + border: 1px solid $purple-400; + border-radius: 50%; + background-color: $white; } - - &--small { - @include b-s18-h21; + } + + &:hover { + input:not(:checked):not(:disabled) + span { + &:before { + border-color: $purple-800; + } } } - - .radio { - cursor: pointer; - - span { - @include r-s16-h19; - - position: relative; - - padding-left: 28px; - + + input { + display: none; + + &:checked + span { &:before { - @include p_center-v; - - display: block; - - box-sizing: border-box; - width: 20px; - height: 20px; - - content: ""; - transition: 0.3s; - - border: 1px solid $purple-400; - border-radius: 50%; - background-color: $white; + border: 6px solid $green-500; } } - - &:hover { - input:not(:checked):not(:disabled) + span { + + &:disabled { + & + span { &:before { - border-color: $purple-800; + border-color: $purple-400; + background-color: $silver-200; } } - } - - input { - display: none; - + &:checked + span { &:before { - border: 6px solid $green-500; - } - } - - &:disabled { - & + span { - &:before { - border-color: $purple-400; - background-color: $silver-200; - } - } - - &:checked + span { - &:before { - border: 6px solid $purple-400; - } + border: 6px solid $purple-400; } } } } - - .button { - $bl: &; - - @include b-s18-h21; - font-family: inherit; - display: block; - - box-sizing: border-box; - margin: 0; - padding: 0; - - cursor: pointer; - transition: 0.3s; - text-align: center; - - color: $white; - border: none; - border-radius: 8px; - outline: none; - box-shadow: $shadow-medium; - - background-color: $green-500; - +} + +.button { + $bl: &; + + @include b-s18-h21; + font-family: inherit; + display: block; + + box-sizing: border-box; + margin: 0; + padding: 0; + + cursor: pointer; + transition: 0.3s; + text-align: center; + + color: $white; + border: none; + border-radius: 8px; + outline: none; + box-shadow: $shadow-medium; + + background-color: $green-500; + + &:hover:not(:active):not(:disabled) { + background-color: $green-400; + } + + &:active:not(:disabled) { + background-color: $green-600; + } + + &:focus:not(:disabled) { + opacity: 0.5; + } + + &:disabled { + background-color: $green-300; + color: rgba($white, 0.2); + cursor: default; + } + + &--border { + background-color: transparent; + border: 1px solid $green-500; + color: $black; + box-shadow: none; + &:hover:not(:active):not(:disabled) { - background-color: $green-400; + color: $green-500; + border-color: $green-500; + background-color: transparent; } - + &:active:not(:disabled) { - background-color: $green-600; - } - - &:focus:not(:disabled) { - opacity: 0.5; + color: $green-600; + border-color: $green-600; + background-color: transparent; } - + &:disabled { - background-color: $green-300; - color: rgba($white, 0.2); - cursor: default; + opacity: 0.5; } - - &--border { + } + + &--transparent { + @include b-s14-h16; + background-color: transparent; + box-shadow: none; + color: $black; + + &:hover:not(:active):not(:disabled) { + color: $red-800; background-color: transparent; - border: 1px solid $green-500; - color: $black; - box-shadow: none; - - &:hover:not(:active):not(:disabled) { - color: $green-500; - border-color: $green-500; - background-color: transparent; - } - - &:active:not(:disabled) { - color: $green-600; - border-color: $green-600; - background-color: transparent; - } - - &:disabled { - opacity: 0.5; - } } - - &--transparent { - @include b-s14-h16; + + &:active:not(:disabled) { + color: $red-900; background-color: transparent; - box-shadow: none; - color: $black; - - &:hover:not(:active):not(:disabled) { - color: $red-800; - background-color: transparent; - } - - &:active:not(:disabled) { - color: $red-900; - background-color: transparent; - } - - &:disabled { - opacity: 0.25; - } } - - &--arrow { - &::before { - content: ""; - background-image: url("@/assets/img/button-arrow.svg"); - background-position: center; - background-repeat: no-repeat; - margin-right: 16px; - width: 18px; - height: 18px; - display: inline-block; - vertical-align: middle; - transform: translateY(-1px); - } + + &:disabled { + opacity: 0.25; } - - &--white { - background-color: $white; - color: $green-500; + } + + &--arrow { + &::before { + content: ""; + background-image: url("@/assets/img/button-arrow.svg"); + background-position: center; + background-repeat: no-repeat; + margin-right: 16px; + width: 18px; + height: 18px; + display: inline-block; + vertical-align: middle; + transform: translateY(-1px); } } - - .input { + + &--white { + background-color: $white; + color: $green-500; + } +} + +.input { + display: block; + + span { + @include r-s14-h16; + display: block; - - span { - @include r-s14-h16; - - display: block; - - margin-bottom: 4px; + + margin-bottom: 4px; + } + + input { + @include r-s16-h19; + + display: block; + + box-sizing: border-box; + width: 100%; + margin: 0; + padding: 8px 16px; + + transition: 0.3s; + + color: $black; + border: 1px solid $purple-400; + border-radius: 8px; + outline: none; + background-color: $white; + + font-family: inherit; + + &:focus { + border-color: $green-500; } - + } + + &:hover { input { - @include r-s16-h19; - - display: block; - - box-sizing: border-box; - width: 100%; - margin: 0; - padding: 8px 16px; - - transition: 0.3s; - - color: $black; - border: 1px solid $purple-400; - border-radius: 8px; - outline: none; - background-color: $white; - - font-family: inherit; - - &:focus { - border-color: $green-500; - } - } - - &:hover { - input { - border-color: $black; - } - } - - &--big-label { - display: flex; - align-items: center; - - span { - @include b-s16-h19; - - margin-right: 16px; - - white-space: nowrap; - } + border-color: $black; } } - - .container { - width: 770px; - margin: 0 auto; + + &--big-label { + display: flex; + align-items: center; + + span { + @include b-s16-h19; + + margin-right: 16px; + + white-space: nowrap; + } } - -@import "ds-system/ds.scss"; -@import "mixins/mixins.scss"; \ No newline at end of file +} + +.container { + width: 770px; + margin: 0 auto; +} \ No newline at end of file From b1b3b515274268ed0360fa854d330a0d675a3b48 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Mon, 7 Apr 2025 20:00:45 +0300 Subject: [PATCH 13/30] DZ3.5 --- frontend/src/views/HomeView.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue index ff0643a0..8d4ee2e9 100644 --- a/frontend/src/views/HomeView.vue +++ b/frontend/src/views/HomeView.vue @@ -128,6 +128,8 @@ const updateIngredientAmount = (ingredient, count) => { \ No newline at end of file From 89d3f59441ba06ee92667e2bcd4d5f9c75f688f9 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Mon, 7 Apr 2025 20:26:19 +0300 Subject: [PATCH 14/30] DZ3.5 --- frontend/src/App.vue | 49 +------------------ frontend/src/layouts/AppLayout.vue | 34 ++++++++++--- .../{AppHeader.vue => DefaultHeader.vue} | 0 frontend/src/layouts/DefaultLayout.vue | 19 +++++++ frontend/src/layouts/SimpleLayout.vue | 4 ++ frontend/src/main.js | 4 +- frontend/src/router/index.js | 5 +- frontend/src/router/routes.js | 38 ++++++++++++++ frontend/src/views/CartView.vue | 0 frontend/src/views/LoginView.vue | 0 frontend/src/views/OrderView.vue | 0 frontend/src/views/ProfileView.vue | 0 frontend/src/views/UserView.vue | 0 13 files changed, 95 insertions(+), 58 deletions(-) rename frontend/src/layouts/{AppHeader.vue => DefaultHeader.vue} (100%) create mode 100644 frontend/src/layouts/DefaultLayout.vue create mode 100644 frontend/src/layouts/SimpleLayout.vue create mode 100644 frontend/src/router/routes.js create mode 100644 frontend/src/views/CartView.vue create mode 100644 frontend/src/views/LoginView.vue create mode 100644 frontend/src/views/OrderView.vue create mode 100644 frontend/src/views/ProfileView.vue create mode 100644 frontend/src/views/UserView.vue diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 18376f1d..98cb52b9 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,60 +1,13 @@ diff --git a/frontend/src/layouts/AppLayout.vue b/frontend/src/layouts/AppLayout.vue index 628f8fbf..db941318 100644 --- a/frontend/src/layouts/AppLayout.vue +++ b/frontend/src/layouts/AppLayout.vue @@ -1,11 +1,33 @@ - \ No newline at end of file + import { shallowRef, watch } from "vue"; + import { useRoute } from "vue-router"; + import AppLayoutDefault from "@/layouts/DefaultLayout.vue"; + + const route = useRoute(); + const layout = shallowRef(null); + + // Наблюдаем за изменением маршрута + watch( + () => route.meta, + async (meta) => { + try { + if (meta.layout) { + // Пробуем найти компонент из свойства meta и динамически импортировать его + const component = await import(`./${meta.layout}.vue`) + layout.value = component?.default || AppLayoutDefault + } else { + layout.value = AppLayoutDefault + } + } catch (e) { + console.error('Динамический шаблон не найден. Установлен шаблон по-умолчанию.', e) + layout.value = AppLayoutDefault + } + } + ); + \ No newline at end of file diff --git a/frontend/src/layouts/AppHeader.vue b/frontend/src/layouts/DefaultHeader.vue similarity index 100% rename from frontend/src/layouts/AppHeader.vue rename to frontend/src/layouts/DefaultHeader.vue diff --git a/frontend/src/layouts/DefaultLayout.vue b/frontend/src/layouts/DefaultLayout.vue new file mode 100644 index 00000000..a34242a2 --- /dev/null +++ b/frontend/src/layouts/DefaultLayout.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/frontend/src/layouts/SimpleLayout.vue b/frontend/src/layouts/SimpleLayout.vue new file mode 100644 index 00000000..a3bf3994 --- /dev/null +++ b/frontend/src/layouts/SimpleLayout.vue @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/frontend/src/main.js b/frontend/src/main.js index 786af441..833defb2 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -1,12 +1,12 @@ import { createApp } from "vue"; import { createPinia } from "pinia"; +import { router } from "@/router"; import App from "./App.vue"; -import router from "./router"; const app = createApp(App); -app.use(createPinia()); +/* Подключаем маршрутизатор */ app.use(router); app.mount("#app"); diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 6c13dc55..4dcff1ff 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,8 +1,9 @@ import { createRouter, createWebHistory } from "vue-router"; +import { routes } from "@/router/routes"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), - routes: [], + routes, }); -export default router; +export default router; \ No newline at end of file diff --git a/frontend/src/router/routes.js b/frontend/src/router/routes.js new file mode 100644 index 00000000..fbf545ff --- /dev/null +++ b/frontend/src/router/routes.js @@ -0,0 +1,38 @@ +export const routes = [ + { + path: "/", + name: "home", + component: () => import("@/views/HomeView.vue"), + meta: { layout: "DefaultLayout" }, + }, + { + path: "/login", + name: "login", + component: () => import("@/views/LoginView.vue"), + meta: { layout: "SimpleLayout" }, + }, + { + path: "/cart", + name: "cart", + component: () => import("@/views/CartView.vue"), + meta: { layout: "DefaultLayout" }, + }, + { + path: "/user", + name: "user", + component: () => import("@/views/UserView.vue"), + meta: { layout: "DefaultLayout" }, + children: [ + { + path: "orders", + name: "orders", + component: () => import("@/views/OrdersView.vue"), + }, + { + path: "profile", + name: "profile", + component: () => import("@/views/ProfileView.vue"), + }, + ], + }, + ]; \ No newline at end of file diff --git a/frontend/src/views/CartView.vue b/frontend/src/views/CartView.vue new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/views/LoginView.vue b/frontend/src/views/LoginView.vue new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/views/OrderView.vue b/frontend/src/views/OrderView.vue new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/views/ProfileView.vue b/frontend/src/views/ProfileView.vue new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/views/UserView.vue b/frontend/src/views/UserView.vue new file mode 100644 index 00000000..e69de29b From f59b4818e4575ebf96054d3a882d34012ad4df36 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Mon, 7 Apr 2025 20:33:00 +0300 Subject: [PATCH 15/30] DZ3.14 --- frontend/src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 4dcff1ff..74cb1342 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; -import { routes } from "@/router/routes"; +import { routes } from "@/router/routes.js"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), From 4b98f9356268d9d3a01a749882512b090b9230b2 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Mon, 7 Apr 2025 20:36:13 +0300 Subject: [PATCH 16/30] DZ3.14 --- frontend/src/router/index.js | 2 +- frontend/src/views/{OrderView.vue => OrdersView.vue} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename frontend/src/views/{OrderView.vue => OrdersView.vue} (100%) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 74cb1342..4dcff1ff 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; -import { routes } from "@/router/routes.js"; +import { routes } from "@/router/routes"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), diff --git a/frontend/src/views/OrderView.vue b/frontend/src/views/OrdersView.vue similarity index 100% rename from frontend/src/views/OrderView.vue rename to frontend/src/views/OrdersView.vue From 3344c3a358dbba467af54cad9a08f6d026ac1ecf Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Mon, 7 Apr 2025 20:39:38 +0300 Subject: [PATCH 17/30] DZ3.14 --- frontend/src/main.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/main.js b/frontend/src/main.js index 833defb2..caacbb9d 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -6,7 +6,8 @@ import App from "./App.vue"; const app = createApp(App); -/* Подключаем маршрутизатор */ +app.use(createPinia()); + app.use(router); -app.mount("#app"); +app.mount("#app"); \ No newline at end of file From 7fc8a8a4320e90d070b473962c6b9c55498336ac Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 20:33:12 +0300 Subject: [PATCH 18/30] DZ3.14 --- frontend/src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 4dcff1ff..8ec9d8fb 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; -import { routes } from "@/router/routes"; +import routes from "@/router/routes"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), From 843238e5621232957355bdc348d6b6fc9954de37 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 20:46:41 +0300 Subject: [PATCH 19/30] DZ3.14 --- frontend/src/main.js | 2 +- frontend/src/router/index.js | 4 +- frontend/src/router/routes.js | 74 ++++++++++++++++----------------- frontend/src/views/HomeView.vue | 17 ++------ 4 files changed, 44 insertions(+), 53 deletions(-) diff --git a/frontend/src/main.js b/frontend/src/main.js index caacbb9d..b45fb670 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -10,4 +10,4 @@ app.use(createPinia()); app.use(router); -app.mount("#app"); \ No newline at end of file +app.mount("#app"); diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 8ec9d8fb..c77863e3 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,9 +1,9 @@ import { createRouter, createWebHistory } from "vue-router"; -import routes from "@/router/routes"; +import { routes } from "@/router/routes"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), routes, }); -export default router; \ No newline at end of file +export default router; diff --git a/frontend/src/router/routes.js b/frontend/src/router/routes.js index fbf545ff..b57c4236 100644 --- a/frontend/src/router/routes.js +++ b/frontend/src/router/routes.js @@ -1,38 +1,38 @@ export const routes = [ - { - path: "/", - name: "home", - component: () => import("@/views/HomeView.vue"), - meta: { layout: "DefaultLayout" }, - }, - { - path: "/login", - name: "login", - component: () => import("@/views/LoginView.vue"), - meta: { layout: "SimpleLayout" }, - }, - { - path: "/cart", - name: "cart", - component: () => import("@/views/CartView.vue"), - meta: { layout: "DefaultLayout" }, - }, - { - path: "/user", - name: "user", - component: () => import("@/views/UserView.vue"), - meta: { layout: "DefaultLayout" }, - children: [ - { - path: "orders", - name: "orders", - component: () => import("@/views/OrdersView.vue"), - }, - { - path: "profile", - name: "profile", - component: () => import("@/views/ProfileView.vue"), - }, - ], - }, - ]; \ No newline at end of file + { + path: "/", + name: "home", + component: () => import("@/views/HomeView.vue"), + meta: { layout: "DefaultLayout" }, + }, + { + path: "/login", + name: "login", + component: () => import("@/views/LoginView.vue"), + meta: { layout: "SimpleLayout" }, + }, + { + path: "/cart", + name: "cart", + component: () => import("@/views/CartView.vue"), + meta: { layout: "DefaultLayout" }, + }, + { + path: "/user", + name: "user", + component: () => import("@/views/UserView.vue"), + meta: { layout: "DefaultLayout" }, + children: [ + { + path: "orders", + name: "orders", + component: () => import("@/views/OrdersView.vue"), + }, + { + path: "profile", + name: "profile", + component: () => import("@/views/ProfileView.vue"), + }, + ], + }, +]; diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue index 8d4ee2e9..90c0c423 100644 --- a/frontend/src/views/HomeView.vue +++ b/frontend/src/views/HomeView.vue @@ -17,11 +17,8 @@
- +
@@ -29,20 +26,14 @@
+ @drop="addIngredient" />

Итого: {{ price }} ₽

From d6cd9d90dea05742d4f7e3ca7aeb1645d080d87b Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 20:56:13 +0300 Subject: [PATCH 20/30] DZ3.14 --- frontend/src/router/index.js | 2 +- frontend/src/views/HomeView.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index c77863e3..9effceea 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; -import { routes } from "@/router/routes"; +import { routes } from "@/routes"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue index 90c0c423..d5ca267e 100644 --- a/frontend/src/views/HomeView.vue +++ b/frontend/src/views/HomeView.vue @@ -153,4 +153,4 @@ const updateIngredientAmount = (ingredient, count) => { padding: 16px 45px; } } - \ No newline at end of file + From 3f161d236df5af7efd76535be4d40d91164743e1 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 21:01:26 +0300 Subject: [PATCH 21/30] DZ3.14 --- frontend/src/layouts/AppLayout.vue | 63 ++++++++++++++++-------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/frontend/src/layouts/AppLayout.vue b/frontend/src/layouts/AppLayout.vue index db941318..798bcd83 100644 --- a/frontend/src/layouts/AppLayout.vue +++ b/frontend/src/layouts/AppLayout.vue @@ -1,33 +1,36 @@ - - \ No newline at end of file + }, +); + From e5418b976da15e592da72dbe64d1bdb46bc01389 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 21:06:07 +0300 Subject: [PATCH 22/30] DZ3.14 --- frontend/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/vite.config.js b/frontend/vite.config.js index be796387..dfd97ac8 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig({ }, resolve: { alias: { - "@": fileURLToPath(new URL("./src", import.meta.url)), + "@": fileURLToPath(new URL("src", import.meta.url)), }, }, server: { From a322f022b56eb926fc497c663b75b87987601a40 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 21:15:03 +0300 Subject: [PATCH 23/30] DZ3.14 --- frontend/src/layouts/DefaultHeader.vue | 38 ++++++++++++++++++++++---- frontend/src/layouts/DefaultLayout.vue | 12 ++++---- frontend/src/layouts/SimpleLayout.vue | 5 ++-- 3 files changed, 40 insertions(+), 15 deletions(-) diff --git a/frontend/src/layouts/DefaultHeader.vue b/frontend/src/layouts/DefaultHeader.vue index d5c270e5..e9524cb7 100644 --- a/frontend/src/layouts/DefaultHeader.vue +++ b/frontend/src/layouts/DefaultHeader.vue @@ -1,15 +1,41 @@ diff --git a/frontend/src/layouts/DefaultLayout.vue b/frontend/src/layouts/DefaultLayout.vue index a34242a2..94b51013 100644 --- a/frontend/src/layouts/DefaultLayout.vue +++ b/frontend/src/layouts/DefaultLayout.vue @@ -10,10 +10,10 @@ import DefaultHeader from "./DefaultHeader.vue"; diff --git a/frontend/src/layouts/SimpleLayout.vue b/frontend/src/layouts/SimpleLayout.vue index a3bf3994..ba4672f5 100644 --- a/frontend/src/layouts/SimpleLayout.vue +++ b/frontend/src/layouts/SimpleLayout.vue @@ -1,4 +1,3 @@ - \ No newline at end of file + + From adb27263af1e8a184af6827e14949d5c2ffabed2 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 21:18:22 +0300 Subject: [PATCH 24/30] DZ3.14 --- frontend/vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/vite.config.js b/frontend/vite.config.js index dfd97ac8..be796387 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -11,7 +11,7 @@ export default defineConfig({ }, resolve: { alias: { - "@": fileURLToPath(new URL("src", import.meta.url)), + "@": fileURLToPath(new URL("./src", import.meta.url)), }, }, server: { From 581fe4646931ec9a26397eb57f95558ee28f7eaa Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 21:20:06 +0300 Subject: [PATCH 25/30] DZ3.14 --- frontend/src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 9effceea..ccb90a0e 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; -import { routes } from "@/routes"; +import { routes } from "@/router"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), From bc89106383722604e7d9ffe2e1e67159d2af9d1a Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 21:21:23 +0300 Subject: [PATCH 26/30] DZ3.14 --- frontend/src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index ccb90a0e..c77863e3 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; -import { routes } from "@/router"; +import { routes } from "@/router/routes"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), From 1c367e5b3095db64890b52df994827b623c7a04d Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 21:39:44 +0300 Subject: [PATCH 27/30] DZ3.14 --- frontend/src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index c77863e3..ea8ac63e 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; -import { routes } from "@/router/routes"; +import routes from './routes' const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), From 515847803e4e723dbee2a81542ce23dc65fe62fb Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 21:48:18 +0300 Subject: [PATCH 28/30] DZ3.14 --- frontend/src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index ea8ac63e..067dad1d 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; -import routes from './routes' +import [routes} from './routes'; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), From 23e6e187213da5a96fa876da5b53b2dda7a2477f Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 21:50:18 +0300 Subject: [PATCH 29/30] DZ3.14 --- frontend/src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 067dad1d..26c56f0b 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; -import [routes} from './routes'; +import {routes} from './routes'; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), From 66e3921591a57f02ecbc30ff532b611bec92e3d5 Mon Sep 17 00:00:00 2001 From: Nick Gorbunov Date: Wed, 9 Apr 2025 22:01:49 +0300 Subject: [PATCH 30/30] DZ3.14 --- frontend/src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/main.js b/frontend/src/main.js index b45fb670..a090886d 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -1,6 +1,6 @@ import { createApp } from "vue"; import { createPinia } from "pinia"; -import { router } from "@/router"; +import router from "@/router"; import App from "./App.vue";