From fc0e8d493910ecd7ed0df092da46f44b50ef7246 Mon Sep 17 00:00:00 2001
From: Sergey Krylov <ksv741@mail.ru>
Date: Fri, 7 Feb 2025 07:41:31 +0300
Subject: [PATCH] little router refactor

---
 src/components/TheNavbar.vue        |  5 +----
 src/hooks/useLoginForm.ts           |  2 +-
 src/layout/MainLayout.vue           |  2 +-
 src/router/index.ts                 | 13 ++++++++-----
 src/store/modules/request.module.ts | 20 ++++++++++++++++++++
 src/views/RequestPage.vue           | 25 +++++++++++++++++++++++--
 6 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/src/components/TheNavbar.vue b/src/components/TheNavbar.vue
index 658be01..1ece339 100644
--- a/src/components/TheNavbar.vue
+++ b/src/components/TheNavbar.vue
@@ -4,7 +4,7 @@
 
     <ul class="navbar-menu">
       <li>
-        <router-link to="/">
+        <router-link :to="{name: PAGE.REQUESTS}">
           Заявки
         </router-link>
       </li>
@@ -13,9 +13,6 @@
           Помощь
         </router-link>
       </li>
-      <li>
-        <a href="#">Сообщения</a>
-      </li>
       <li>
         <a
           href="#"
diff --git a/src/hooks/useLoginForm.ts b/src/hooks/useLoginForm.ts
index 8016870..c092fbb 100644
--- a/src/hooks/useLoginForm.ts
+++ b/src/hooks/useLoginForm.ts
@@ -29,7 +29,7 @@ const useLoginForm = () => {
   const onSubmit = handleSubmit(async (values) => {
     try {
       await store.dispatch('auth/login', values);
-      await router.push({name: PAGE.HOME});
+      await router.push({name: PAGE.REQUESTS});
     } catch (e) {}
   })
 
diff --git a/src/layout/MainLayout.vue b/src/layout/MainLayout.vue
index 0779148..6d62af9 100644
--- a/src/layout/MainLayout.vue
+++ b/src/layout/MainLayout.vue
@@ -1,7 +1,7 @@
 <template>
   <the-navbar />
   <div class="container with-nav">
-    <router-link v-if="back" :to="{name: PAGE.HOME}">
+    <router-link v-if="back" :to="{name: PAGE.REQUESTS}">
       <div class="breadcrumbs text-white">
         <- К списку заявок
       </div>
diff --git a/src/router/index.ts b/src/router/index.ts
index b9a555b..1535481 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,24 +1,27 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHistory, type RouteRecordRaw } from 'vue-router'
 import store from '../store';
 
 export enum PAGE {
   HOME= 'Home',
   AUTH = 'Auth',
   HELP = 'Help',
+  REQUESTS = 'Requests',
   REQUEST = 'Request'
 }
 
 export const PAGE_URL: Record<PAGE, string> = {
   [PAGE.HOME]: '/',
-  [PAGE.REQUEST]: '/request/:id',
+  [PAGE.REQUEST]: '/requests/:id',
+  [PAGE.REQUESTS]: '/requests',
   [PAGE.AUTH]: '/auth',
   [PAGE.HELP]: '/help'
 }
 
-const routes = [
+const routes: Readonly<RouteRecordRaw[]> = [
   {
-    path: PAGE_URL[PAGE.HOME],
-    name: PAGE.HOME,
+    path: PAGE_URL[PAGE.REQUESTS],
+    alias: PAGE_URL[PAGE.HOME],
+    name: PAGE.REQUESTS,
     component: () => import('../views/HomePage.vue'),
     meta: {
       layout: 'main',
diff --git a/src/store/modules/request.module.ts b/src/store/modules/request.module.ts
index d3460fe..5008f7a 100644
--- a/src/store/modules/request.module.ts
+++ b/src/store/modules/request.module.ts
@@ -15,6 +15,10 @@ type AddRequestsPayload = {
   request: AppRequest
 }
 
+type RemoveRequestsPayload = {
+  id: AppRequest['id']
+}
+
 type CreateRequestPayload = Omit<AppRequest, 'id'>
 
 const requestModule: Module<State, any> = {
@@ -31,6 +35,11 @@ const requestModule: Module<State, any> = {
     addRequest: (state, payload: AddRequestsPayload) => {
       const { request } = payload;
       state.requests.push(request)
+    },
+
+    removeRequest: (state, payload: RemoveRequestsPayload) => {
+      const { id } = payload;
+      state.requests = state.requests.filter(item => item.id !== id)
     }
   },
   actions:{
@@ -56,6 +65,17 @@ const requestModule: Module<State, any> = {
         await dispatch('alert/setAlert', {message: 'Ошибка при попытке получить заявку', type: 'danger', title: 'Ошибка', time: 5000}, {root: true})
       }
     },
+    removeRequestById: async (injectee, payload) => {
+      const { dispatch } = injectee;
+      const {id} = payload;
+      try {
+        const token = authModule.state.token;
+        const { data } = await requestApi.delete(`/requests/${id}.json?auth=${token}`);
+        return data;
+      } catch (e) {
+        await dispatch('alert/setAlert', {message: 'Ошибка при попытке удалить заявку', type: 'danger', title: 'Ошибка', time: 5000}, {root: true})
+      }
+    },
     create: async (injectee, payload: CreateRequestPayload) => {
       const { dispatch, commit } = injectee;
 
diff --git a/src/views/RequestPage.vue b/src/views/RequestPage.vue
index 06f0300..b3dba70 100644
--- a/src/views/RequestPage.vue
+++ b/src/views/RequestPage.vue
@@ -44,8 +44,19 @@
           <app-status :status="request.status" />
         </td>
       </tr>
+      <tr>
+        <td />
+        <td />
+      </tr>
     </tbody>
   </table>
+  <button
+    class="btn danger removeBtn"
+    @click="onRemoveClick"
+    v-if="request"
+  >
+    Удалить
+  </button>
 </template>
 
 <script setup>
@@ -55,6 +66,7 @@
   import AppSpinner from '@/components/ui/AppSpinner.vue';
   import { currencyFormatter } from 'src/utils/helpers';
   import AppStatus from '@/components/ui/AppStatus.vue';
+  import router, { PAGE } from '@/router';
 
 
   const { params } = useRoute();
@@ -70,8 +82,17 @@
     request.value = await store.dispatch('request/loadRequestById', { id });
     loading.value = false;
   })
+
+  const onRemoveClick = async () => {
+    await store.dispatch('request/removeRequestById', { id });
+    await router.push({name: PAGE.REQUESTS})
+  }
 </script>
 
-<style lang="scss" scoped>
-
+<style scoped>
+  .removeBtn {
+    margin-right: 0;
+    margin-left: auto;
+    display: block;
+  }
 </style>