From bb58dd0e2d431cd7a656f7e62bc9e4f5e9b7e8ea Mon Sep 17 00:00:00 2001
From: opbnq-q <cko.vladislav@gmai.com>
Date: Thu, 13 Mar 2025 15:22:53 +0700
Subject: [PATCH] feat: navigation

---
 frontend/src/App.vue                        |  2 +-
 frontend/src/components/cards/NavCard.vue   |  7 +---
 frontend/src/components/headers/VHeader.vue | 16 ++++-----
 frontend/src/components/modals/NavModal.vue | 40 +++++++++++++++++++++
 frontend/src/main.ts                        |  1 +
 frontend/src/pages/pages/GrebenPage.vue     |  3 ++
 frontend/src/pages/pages/UserPage.vue       | 14 ++++++++
 frontend/src/pages/user/UserPage.vue        |  9 -----
 frontend/src/router/router.ts               |  9 +++--
 frontend/src/stores/nav-modal.store.ts      | 16 +++++++++
 10 files changed, 90 insertions(+), 27 deletions(-)
 create mode 100644 frontend/src/components/modals/NavModal.vue
 create mode 100644 frontend/src/pages/pages/GrebenPage.vue
 create mode 100644 frontend/src/pages/pages/UserPage.vue
 delete mode 100644 frontend/src/pages/user/UserPage.vue
 create mode 100644 frontend/src/stores/nav-modal.store.ts

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 46da5b0..c86993e 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -16,7 +16,7 @@ const errorStore = useErrorStore();
         <template #header> Ошибка </template>
         <h1 class="text-red-500 text-2xl">{{ errorStore.message }}</h1>
     </Dialog>
-    <VHeader v-if="$route?.matched?.length > 1" />
+    <VHeader v-if="$route?.matched?.length > 1"  />
     <main>
        <RouterView />
     </main>
diff --git a/frontend/src/components/cards/NavCard.vue b/frontend/src/components/cards/NavCard.vue
index 65ec6ae..86531a7 100644
--- a/frontend/src/components/cards/NavCard.vue
+++ b/frontend/src/components/cards/NavCard.vue
@@ -4,11 +4,6 @@ import { useRouter } from 'vue-router';
 
 const router = useRouter()
 
-const navigateTo = (path: string) => {
-  localStorage.setItem('app-selection', path)
-  router.push(path)
-}
-
 defineProps<{
     to: string
     title: string
@@ -25,7 +20,7 @@ defineProps<{
         <p class="w-56">{{ content }}</p>
       </template>
       <template #footer>
-        <Button @click="navigateTo(to)" severity="contrast" size="small">Перейти</Button>
+        <Button @click="router.push(to)" severity="contrast" size="small">Перейти</Button>
       </template>
     </Card>
 </template>
\ No newline at end of file
diff --git a/frontend/src/components/headers/VHeader.vue b/frontend/src/components/headers/VHeader.vue
index 8f2dcaf..e63b70e 100644
--- a/frontend/src/components/headers/VHeader.vue
+++ b/frontend/src/components/headers/VHeader.vue
@@ -1,25 +1,23 @@
 <script lang="ts" setup>
 import { Button, Toolbar } from 'primevue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
+import { useNavModalStore } from '../../stores/nav-modal.store';
 
 const route = useRoute()
-const router = useRouter()
-
-const logout = () => {
-    localStorage.removeItem('app-selection')
-    router.replace('/')
-}
 
+const navModalStore = useNavModalStore()
 </script>
 
 <template>
     <header >
-        <Toolbar>
+        <Toolbar style="border-radius: 0; border-top: none; border-left: none; border-right: none">
             <template #start>
                 <p class="font-bold">{{ $route.matched?.[$route.matched.length - 2]?.name }} / {{ route.name }}</p>
             </template>
             <template #end>
-                <Button severity="danger" :size="'small'" @click="logout">Выйти</Button>
+                <Button severity="secondary" size="small" @click="navModalStore.changeVisibility">
+                    <span class="pi pi-list"></span>
+                </Button>
             </template>
         </Toolbar>
     </header>
diff --git a/frontend/src/components/modals/NavModal.vue b/frontend/src/components/modals/NavModal.vue
new file mode 100644
index 0000000..952d279
--- /dev/null
+++ b/frontend/src/components/modals/NavModal.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+import { Button, Drawer } from 'primevue';
+import { useNavModalStore } from '../../stores/nav-modal.store';
+import { useRoute, useRouter } from 'vue-router';
+
+const navModalStore = useNavModalStore()
+
+const router = useRouter()
+
+const logout = () => {
+    navModalStore.changeVisibility()
+    router.replace('/')
+}
+
+export interface Route {
+    name: string
+    path: string
+}
+
+defineProps<{
+    routes: Route[]
+}>()
+
+const route = useRoute()
+
+</script>
+
+<template>
+    <Drawer v-model:visible="navModalStore.visible">
+        <div class="flex flex-col gap-2">
+            <RouterLink :style="{ color: route.fullPath.endsWith(r.path) && 'var(--p-primary-color)' }" @click="() => {
+                navModalStore.changeVisibility()
+            }" v-for="r in routes" :to="r.path">{{ r.name }}
+            </RouterLink>
+        </div>
+        <template #footer>
+            <Button severity="danger" :size="'small'" class="w-full" @click="logout">Выйти</Button>
+        </template>
+    </Drawer>
+</template>
\ No newline at end of file
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index cf13eed..cd9de39 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -9,6 +9,7 @@ import { createPinia } from 'pinia'
 import { router } from './router/router'
 import Tooltip from 'primevue/tooltip'
 
+
 createApp(App).directive('tooltip', Tooltip).use(router).use(createPinia()).use(Config, {
     theme: {
         preset: Aura,
diff --git a/frontend/src/pages/pages/GrebenPage.vue b/frontend/src/pages/pages/GrebenPage.vue
new file mode 100644
index 0000000..8ae9ca0
--- /dev/null
+++ b/frontend/src/pages/pages/GrebenPage.vue
@@ -0,0 +1,3 @@
+<template>
+    <h1>GREBEN</h1>
+</template>
\ No newline at end of file
diff --git a/frontend/src/pages/pages/UserPage.vue b/frontend/src/pages/pages/UserPage.vue
new file mode 100644
index 0000000..7b541d3
--- /dev/null
+++ b/frontend/src/pages/pages/UserPage.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { RouterView, useRoute, type RouteRecordRaw } from 'vue-router';
+import NavModal, { type Route } from '../../components/modals/NavModal.vue';
+import { routes } from '../../router/router';
+
+const route = useRoute()
+
+const lastRouteName = route.matched[route.matched.length - 2].path
+</script>
+
+<template>
+    <NavModal :routes="<Route[]>routes[routes.findIndex(r => r.path == lastRouteName)].children" />
+    <RouterView />
+</template>
\ No newline at end of file
diff --git a/frontend/src/pages/user/UserPage.vue b/frontend/src/pages/user/UserPage.vue
deleted file mode 100644
index b7766a1..0000000
--- a/frontend/src/pages/user/UserPage.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<script setup lang="ts">
-import { RouterView } from 'vue-router';
-
-
-</script>
-
-<template>
-    <RouterView />
-</template>
\ No newline at end of file
diff --git a/frontend/src/router/router.ts b/frontend/src/router/router.ts
index 57624df..99135c6 100644
--- a/frontend/src/router/router.ts
+++ b/frontend/src/router/router.ts
@@ -1,7 +1,8 @@
 import { createRouter, createWebHistory, type RouteRecordRaw } from "vue-router";
 import Index from "../pages/Index.vue";
-import UserPage from "../pages/user/UserPage.vue";
+import UserPage from "../pages/pages/UserPage.vue";
 import PostTablePage from "../pages/tables/PostTablePage.vue";
+import GrebenPage from "../pages/pages/GrebenPage.vue";
 
 export const routes: RouteRecordRaw[] = [{
     path: "/",
@@ -17,9 +18,13 @@ export const routes: RouteRecordRaw[] = [{
             component: PostTablePage,
             path: '/user/post',
             name: 'Новости'
+        }, {
+            component: GrebenPage,
+            path: '/user/greben',
+            name: 'Страница гребня'
         }
     ]
-}]
+}] as const
 
 export const router = createRouter({
     history: createWebHistory(),
diff --git a/frontend/src/stores/nav-modal.store.ts b/frontend/src/stores/nav-modal.store.ts
new file mode 100644
index 0000000..4b70f3f
--- /dev/null
+++ b/frontend/src/stores/nav-modal.store.ts
@@ -0,0 +1,16 @@
+import { defineStore } from "pinia";
+
+export interface NavModalState {
+    visible: boolean
+}
+
+export const useNavModalStore = defineStore('nav-modal', {
+    state: (): NavModalState => ({
+        visible: false
+    }),
+    actions: {
+        changeVisibility() {
+            this.visible = !this.visible
+        }
+    }
+})
\ No newline at end of file