From dc1f75b5e90b8579a163ca70326a9f48d3d5539e Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Mon, 28 Mar 2022 09:06:36 +0200
Subject: [PATCH] Proper component names

---
 src/components/LeftMenu.vue                   | 26 ++------
 src/composables/useRole.js                    |  5 +-
 .../{BasicData.vue => CustomerBasicData.vue}  |  0
 .../Customer/{List.vue => CustomerList.vue}   |  0
 .../Ticket/{Ticket.vue => TicketLayout.vue}   |  0
 src/pages/Ticket/{List.vue => TicketList.vue} |  0
 src/router/index.js                           | 66 ++++++++++++++++++-
 .../modules/{customer.ts => customer.js}      |  8 +--
 src/router/modules/{ticket.ts => ticket.js}   | 10 +--
 9 files changed, 81 insertions(+), 34 deletions(-)
 rename src/pages/Customer/Card/{BasicData.vue => CustomerBasicData.vue} (100%)
 rename src/pages/Customer/{List.vue => CustomerList.vue} (100%)
 rename src/pages/Ticket/{Ticket.vue => TicketLayout.vue} (100%)
 rename src/pages/Ticket/{List.vue => TicketList.vue} (100%)
 rename src/router/modules/{customer.ts => customer.js} (73%)
 rename src/router/modules/{ticket.ts => ticket.js} (50%)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index f67927e94..0f97a1810 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -1,6 +1,5 @@
-<script lang="ts" setup>
-import { ref, Ref } from 'vue';
-import { RouteRecordRaw } from 'vue-router';
+<script setup>
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRole } from 'src/composables/useRole';
 import routes from 'src/router/routes';
@@ -9,30 +8,17 @@ const { t } = useI18n();
 const { hasAny } = useRole();
 
 const mainRoute = routes.find(route => route.path === '/');
-const modules: RouteRecordRaw[] = mainRoute && mainRoute.children || []
+const modules = mainRoute && mainRoute.children || []
 
-interface MenuItem {
-    path: string;
-    title?: string;
-    icon?: string;
-    roles: string[];
-}
-
-interface ItemMeta {
-    title?: string;
-    icon?: string;
-    roles?: string[];
-}
-
-const items: Ref<MenuItem[]> = ref([]);
+const items = ref([]);
 for (const module of modules) {
-    const item: MenuItem = {
+    const item = {
         path: module.path,
         roles: []
     };
 
     if (module.meta) {
-        const meta: ItemMeta = module.meta;
+        const meta = module.meta;
         item.title = meta.title;
         item.icon = meta.icon;
         item.roles = meta.roles || [];
diff --git a/src/composables/useRole.js b/src/composables/useRole.js
index 1da8bc17a..8d9ae8b8d 100644
--- a/src/composables/useRole.js
+++ b/src/composables/useRole.js
@@ -1,10 +1,9 @@
-import { ComputedRef } from 'vue';
 import { useState } from './useState';
 
 export function useRole() {
-    function hasAny(roles: string[]): boolean {
+    function hasAny(roles) {
         const { getRoles } = useState();
-        const roleStore: ComputedRef<string[]> = getRoles();
+        const roleStore = getRoles();
 
         for (const role of roles) {
             if (roleStore.value.indexOf(role) !== -1) return true;
diff --git a/src/pages/Customer/Card/BasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
similarity index 100%
rename from src/pages/Customer/Card/BasicData.vue
rename to src/pages/Customer/Card/CustomerBasicData.vue
diff --git a/src/pages/Customer/List.vue b/src/pages/Customer/CustomerList.vue
similarity index 100%
rename from src/pages/Customer/List.vue
rename to src/pages/Customer/CustomerList.vue
diff --git a/src/pages/Ticket/Ticket.vue b/src/pages/Ticket/TicketLayout.vue
similarity index 100%
rename from src/pages/Ticket/Ticket.vue
rename to src/pages/Ticket/TicketLayout.vue
diff --git a/src/pages/Ticket/List.vue b/src/pages/Ticket/TicketList.vue
similarity index 100%
rename from src/pages/Ticket/List.vue
rename to src/pages/Ticket/TicketList.vue
diff --git a/src/router/index.js b/src/router/index.js
index 353d5ed57..433cef491 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,11 @@
 import { route } from 'quasar/wrappers';
 import { createRouter, createMemoryHistory, createWebHistory, createWebHashHistory } from 'vue-router';
 import routes from './routes';
+import { i18n } from 'src/boot/i18n';
+import { useSession } from 'src/composables/useSession';
+import { useRole } from 'src/composables/useRole';
+const session = useSession();
+const role = useRole();
 
 /*
  * If not building with SSR mode, you can
@@ -15,8 +20,8 @@ export default route(function (/* { store, ssrContext } */) {
     const createHistory = process.env.SERVER
         ? createMemoryHistory
         : process.env.VUE_ROUTER_MODE === 'history'
-        ? createWebHistory
-        : createWebHashHistory;
+            ? createWebHistory
+            : createWebHashHistory;
 
     const Router = createRouter({
         scrollBehavior: () => ({ left: 0, top: 0 }),
@@ -28,5 +33,62 @@ export default route(function (/* { store, ssrContext } */) {
         history: createHistory(process.env.MODE === 'ssr' ? void 0 : process.env.VUE_ROUTER_BASE),
     });
 
+    Router.beforeEach((to, from, next) => {
+        const { isLoggedIn } = session;
+
+        if (!isLoggedIn && to.name !== 'Login') {
+            next({ path: '/login', query: { redirect: to.fullPath } });
+        } else {
+
+            const pathRoutes = to.matched;
+            const droles = pathRoutes.every(route => {
+                const meta = route.meta;
+                if (meta.roles)
+                    return role.hasAny(meta.roles)
+                return true;
+            });
+
+            if (droles) {
+                next();
+            } else {
+                next({ path: '/' });
+            }
+        }
+    });
+
+    Router.afterEach((to) => {
+        const { t } = i18n.global;
+        let title = '';
+
+        if (to.matched && to.matched.length > 2) {
+
+            const parent = to.matched[1];
+            const parentMeta = parent.meta;
+            if (parentMeta && parentMeta.title) {
+                title += t(`pages.${parentMeta.title}`);
+            }
+        }
+
+        const childMeta = to.meta;
+        if (childMeta && childMeta.title) {
+            if (title != '') title += ': ';
+
+            const childTitle = t(`pages.${childMeta.title}`);
+
+            if (to.params && to.params.id) {
+                const idParam = to.params.id;
+                if (idParam instanceof Array) {
+                    title += `${idParam[0]} - ${childTitle}`
+                } else {
+                    title += `${idParam} - ${childTitle}`;
+                }
+            } else {
+                title += t(`pages.${childMeta.title}`);
+            }
+        }
+
+        document.title = title;
+    });
+
     return Router;
 });
diff --git a/src/router/modules/customer.ts b/src/router/modules/customer.js
similarity index 73%
rename from src/router/modules/customer.ts
rename to src/router/modules/customer.js
index a60a81c29..a4e604497 100644
--- a/src/router/modules/customer.ts
+++ b/src/router/modules/customer.js
@@ -5,7 +5,7 @@ export default {
         title: 'customers',
         icon: 'vn:client'
     },
-    component: () => import('src/pages/Customer/Customer.vue'),
+    component: () => import('src/pages/Customer/CustomerLayout.vue'),
     redirect: { path: '/customer/list' },
     children: [
         {
@@ -13,11 +13,11 @@ export default {
             meta: {
                 title: 'list'
             },
-            component: () => import('src/pages/Customer/List.vue'),
+            component: () => import('src/pages/Customer/CustomerList.vue'),
         },
         {
             path: '/customer/:id',
-            component: () => import('src/pages/Customer/Card/Card.vue'),
+            component: () => import('src/pages/Customer/Card/CustomerCard.vue'),
             redirect: { name: 'BasicData' },
             children: [
                 {
@@ -26,7 +26,7 @@ export default {
                     meta: {
                         title: 'basicData'
                     },
-                    component: () => import('src/pages/Customer/Card/BasicData.vue'),
+                    component: () => import('src/pages/Customer/Card/CustomerBasicData.vue'),
                 }
             ]
         },
diff --git a/src/router/modules/ticket.ts b/src/router/modules/ticket.js
similarity index 50%
rename from src/router/modules/ticket.ts
rename to src/router/modules/ticket.js
index ec5f1b919..6e22a0ecc 100644
--- a/src/router/modules/ticket.ts
+++ b/src/router/modules/ticket.js
@@ -1,18 +1,18 @@
 export default {
     path: '/ticket',
     name: 'Ticket',
-    meta: { 
+    meta: {
         title: 'tickets',
         icon: 'vn:ticket',
     },
-    component: () => import('src/pages/Ticket/Ticket.vue'),
-    redirect: { path: '/ticket/list'},
+    component: () => import('src/pages/Ticket/TicketLayout.vue'),
+    redirect: { path: '/ticket/list' },
     children: [
         {
             path: 'list',
-            name: 'List',
+            name: 'TicketList',
             meta: { title: 'list' },
-            component: () => import('src/pages/Ticket/List.vue'),
+            component: () => import('src/pages/Ticket/TicketList.vue'),
         }
     ],
 };
\ No newline at end of file