Merge branch 'dev' into 8322-route

.eslintrc.cjs

@@ -1,4 +1,4 @@
-export default {
+module.exports = {
     // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
     // This option interrupts the configuration hierarchy at this file
     // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
@@ -58,7 +58,7 @@ export default {
     rules: {
         'prefer-promise-reject-errors': 'off',
         'no-unused-vars': 'warn',
-        'vue/no-multiple-template-root': 'off',
+        "vue/no-multiple-template-root": "off" ,
         // allow debugger during development only
         'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     },

.husky/addReferenceTag.js

@@ -1,24 +1,23 @@
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { join, resolve } from 'path';
+const fs = require('fs');
+const path = require('path');
 
 function getCurrentBranchName(p = process.cwd()) {
-    if (!existsSync(p)) return false;
+    if (!fs.existsSync(p)) return false;
 
-    const gitHeadPath = join(p, '.git', 'HEAD');
+    const gitHeadPath = path.join(p, '.git', 'HEAD');
 
-    if (!existsSync(gitHeadPath)) {
-        return getCurrentBranchName(resolve(p, '..'));
-    }
+    if (!fs.existsSync(gitHeadPath))
+        return getCurrentBranchName(path.resolve(p, '..'));
 
-    const headContent = readFileSync(gitHeadPath, 'utf-8');
+    const headContent = fs.readFileSync(gitHeadPath, 'utf-8');
     return headContent.trim().split('/')[2];
 }
 
 const branchName = getCurrentBranchName();
 
 if (branchName) {
-    const msgPath = '.git/COMMIT_EDITMSG';
-    const msg = readFileSync(msgPath, 'utf-8');
+    const msgPath = `.git/COMMIT_EDITMSG`;
+    const msg = fs.readFileSync(msgPath, 'utf-8');
     const reference = branchName.match(/^\d+/);
 
     const referenceTag = `refs #${reference}`;
@@ -27,7 +26,8 @@ if (branchName) {
 
         if (splitedMsg.length > 1) {
             const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
-            writeFileSync(msgPath, finalMsg);
+            fs.writeFileSync(msgPath, finalMsg);
         }
     }
 }
+

.prettierrc.js

@@ -1,4 +1,4 @@
-export default {
+module.exports = {
     singleQuote: true,
     printWidth: 90,
     tabWidth: 4,

commitlint.config.js

@@ -1 +1 @@
-export default { extends: ['@commitlint/config-conventional'] };
+module.exports = { extends: ['@commitlint/config-conventional'] };

cypress.config.js

@@ -1,9 +1,9 @@
-import { defineConfig } from 'cypress';
+const { defineConfig } = require('cypress');
 // https://docs.cypress.io/app/tooling/reporters
 // https://docs.cypress.io/app/references/configuration
 // https://www.npmjs.com/package/cypress-mochawesome-reporter
 
-export default defineConfig({
+module.exports = defineConfig({
     e2e: {
         baseUrl: 'http://localhost:9000/',
         experimentalStudio: true,
@@ -31,7 +31,7 @@ export default defineConfig({
             supportFile: 'test/cypress/support/unit.js',
         },
         setupNodeEvents(on, config) {
-            import('cypress-mochawesome-reporter/plugin').then((plugin) => plugin.default(on));
+            require('cypress-mochawesome-reporter/plugin')(on);
             // implement node event listeners here
         },
         viewportWidth: 1280,

package.json

@@ -6,7 +6,6 @@
     "author": "Verdnatura",
     "private": true,
     "packageManager": "pnpm@8.15.1",
-    "type": "module",
     "scripts": {
         "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
@@ -21,40 +20,39 @@
         "addReferenceTag": "node .husky/addReferenceTag.js"
     },
     "dependencies": {
-        "@quasar/cli": "^2.4.1",
-        "@quasar/extras": "^1.16.16",
+        "@quasar/cli": "^2.3.0",
+        "@quasar/extras": "^1.16.9",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
         "moment": "^2.30.1",
         "pinia": "^2.1.3",
-        "quasar": "^2.17.7",
+        "quasar": "^2.14.5",
         "validator": "^13.9.0",
-        "vue": "^3.5.13",
-        "vue-i18n": "^9.3.0",
-        "vue-router": "^4.2.5"
+        "vue": "^3.3.4",
+        "vue-i18n": "^9.2.2",
+        "vue-router": "^4.2.1"
     },
     "devDependencies": {
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
-        "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@intlify/unplugin-vue-i18n": "^0.8.1",
         "@pinia/testing": "^0.1.2",
-        "@quasar/app-vite": "^2.0.8",
-        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+        "@quasar/app-vite": "^1.7.3",
+        "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
         "cypress": "^13.6.6",
         "cypress-mochawesome-reporter": "^3.8.2",
-        "eslint": "^9.18.0",
-        "eslint-config-prettier": "^10.0.1",
-        "eslint-plugin-cypress": "^4.1.0",
-        "eslint-plugin-vue": "^9.32.0",
+        "eslint": "^8.41.0",
+        "eslint-config-prettier": "^8.8.0",
+        "eslint-plugin-cypress": "^2.13.3",
+        "eslint-plugin-vue": "^9.14.1",
         "husky": "^8.0.0",
         "postcss": "^8.4.23",
-        "prettier": "^3.4.2",
-        "sass": "^1.83.4",
-        "vitest": "^0.34.0"
+        "prettier": "^2.8.8",
+        "vitest": "^0.31.1"
     },
     "engines": {
         "node": "^20 || ^18 || ^16",
@@ -63,8 +61,8 @@
         "bun": ">= 1.0.25"
     },
     "overrides": {
-        "@vitejs/plugin-vue": "^5.2.1",
-        "vite": "^6.0.11",
+        "@vitejs/plugin-vue": "^5.0.4",
+        "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
 }

postcss.config.js

@@ -1,14 +1,10 @@
 /* eslint-disable */
 // https://github.com/michael-ciniawsky/postcss-load-config
 
-import autoprefixer from 'autoprefixer';
-// Uncomment the following line if you want to support RTL CSS
-// import rtlcss from 'postcss-rtlcss';
-
-export default {
+module.exports = {
     plugins: [
         // https://github.com/postcss/autoprefixer
-        autoprefixer({
+        require('autoprefixer')({
             overrideBrowserslist: [
                 'last 4 Chrome versions',
                 'last 4 Firefox versions',
@@ -22,7 +18,10 @@ export default {
         }),
 
         // https://github.com/elchininet/postcss-rtlcss
-        // If you want to support RTL CSS, uncomment the following line:
-        // rtlcss(),
+        // If you want to support RTL css, then
+        // 1. yarn/npm install postcss-rtlcss
+        // 2. optionally set quasar.config.js > framework > lang to an RTL language
+        // 3. uncomment the following line:
+        // require('postcss-rtlcss')
     ],
 };

quasar.config.js

@@ -8,11 +8,11 @@
 // Configuration for your app
 // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
 
-import { configure } from 'quasar/wrappers';
-import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
-import path from 'path';
+const { configure } = require('quasar/wrappers');
+const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
+const path = require('path');
 
-export default configure(function (/* ctx */) {
+module.exports = configure(function (/* ctx */) {
     return {
         eslint: {
             // fix: true,

quasar.extensions.json

@@ -1,8 +1,6 @@
 {
     "@quasar/testing-unit-vitest": {
-        "options": [
-            "scripts"
-        ]
+        "options": ["scripts"]
     },
     "@quasar/qcalendar": {}
 }

src/boot/__tests__/axios.spec.js

@@ -20,7 +20,7 @@ describe('Axios boot', () => {
     describe('onRequest()', async () => {
         it('should set the "Authorization" property on the headers', async () => {
             const config = { headers: {} };
-            localStorage.setItem('token', 'DEFAULT_TOKEN');
+
             const resultConfig = onRequest(config);
 
             expect(resultConfig).toEqual(

src/boot/axios.js

@@ -3,9 +3,9 @@ import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
 import { useStateQueryStore } from 'src/stores/useStateQueryStore';
-import { getToken, isLoggedIn } from 'src/utils/session';
 import { i18n } from 'src/boot/i18n';
 
+const session = useSession();
 const { notify } = useNotify();
 const stateQuery = useStateQueryStore();
 const baseUrl = '/api/';
@@ -13,7 +13,7 @@ axios.defaults.baseURL = baseUrl;
 const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
-    const token = getToken();
+    const token = session.getToken();
     if (token.length && !config.headers.Authorization) {
         config.headers.Authorization = token;
         config.headers['Accept-Language'] = i18n.global.locale.value;
@@ -37,15 +37,15 @@ const onResponse = (response) => {
     return response;
 };
 
-const onResponseError = async (error) => {
+const onResponseError = (error) => {
     stateQuery.remove(error.config);
 
-    if (isLoggedIn() && error.response?.status === 401) {
-        await useSession().destroy(false);
+    if (session.isLoggedIn() && error.response?.status === 401) {
+        session.destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
         Router.push(`/login?redirect=${url}`);
-    } else if (!isLoggedIn()) {
+    } else if (!session.isLoggedIn()) {
         return Promise.reject(error);
     }
 

src/components/UserPanel.vue

@@ -1,9 +1,6 @@
 <script setup>
-import quasarLang from 'src/utils/quasarLang';
-
 import { onMounted, computed, ref } from 'vue';
-
-import { Dark } from 'quasar';
+import { Dark, Quasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
@@ -34,7 +31,14 @@ const userLocale = computed({
 
         value = localeEquivalence[value] ?? value;
 
-        quasarLang(value);
+        try {
+            /* @vite-ignore */
+            import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
+                Quasar.lang.set(lang.default);
+            });
+        } catch (error) {
+            //
+        }
     },
 });
 

src/components/VnTable/VnTable.vue

@@ -314,19 +314,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <VnTableFilter
-                :data-key="$attrs['data-key']"
-                :columns="columns"
-                :redirect="redirect"
-            >
-                <template
-                    v-for="(_, slotName) in $slots"
-                    #[slotName]="slotData"
-                    :key="slotName"
-                >
-                    <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-                </template>
-            </VnTableFilter>
+            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" :redirect="redirect" />
         </QScrollArea>
     </QDrawer>
     <CrudModel

src/components/VnTable/VnTableFilter.vue

@@ -62,8 +62,5 @@ function columnName(col) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
-            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-        </template>
     </VnFilterPanel>
 </template>

src/components/VnTable/__tests__/VnVisibleColumns.spec.js

@@ -1,121 +0,0 @@
-import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnVisibleColumn from '../VnVisibleColumn.vue';
-import { axios } from 'app/test/vitest/helper';
-
-describe('VnVisibleColumns', () => {
-    let wrapper;
-    let vm;
-
-    beforeEach(() => {
-        wrapper = createWrapper(VnVisibleColumn, {
-            propsData: {
-                tableCode: 'testTable',
-                skip: ['skippedColumn'],
-            },
-        });
-        vm = wrapper.vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('setUserConfigViewData()', () => {
-        it('should initialize localColumns with visible configuration', () => {
-            vm.columns = [
-                { name: 'columnMockName', label: undefined },
-                { name: 'columnMockAddress', label: undefined },
-                { name: 'columnMockId', label: undefined },
-            ];
-            const configuration = {
-                columnMockName: true,
-                columnMockAddress: false,
-                columnMockId: true,
-            };
-            const expectedColumns = [
-                { name: 'columnMockName', label: undefined, visible: true },
-                { name: 'columnMockAddress', label: undefined, visible: false },
-                { name: 'columnMockId', label: undefined, visible: true },
-            ];
-
-            vm.setUserConfigViewData(configuration, false);
-
-            expect(vm.localColumns).toEqual(expectedColumns);
-        });
-
-        it('should skip columns based on props', () => {
-            vm.columns = [
-                { name: 'columnMockName', label: undefined },
-                { name: 'columnMockId', label: undefined },
-                { name: 'skippedColumn', label: 'Skipped Column' },
-            ];
-            const configuration = {
-                columnMockName: true,
-                skippedColumn: false,
-                columnMockId: true,
-            };
-            const expectedColumns = [
-                { name: 'columnMockName', label: undefined, visible: true },
-                { name: 'columnMockId', label: undefined, visible: true },
-            ];
-
-            vm.setUserConfigViewData(configuration, false);
-
-            expect(vm.localColumns).toEqual(expectedColumns);
-        });
-    });
-
-    describe('toggleMarkAll()', () => {
-        it('should set all localColumns to visible=true', () => {
-            vm.localColumns = [
-                { name: 'columnMockName', visible: false },
-                { name: 'columnMockId', visible: false },
-            ];
-
-            vm.toggleMarkAll(true);
-
-            expect(vm.localColumns.every((col) => col.visible)).toBe(true);
-        });
-
-        it('should set all localColumns to visible=false', () => {
-            vm.localColumns = [
-                { name: 'columnMockName', visible: true },
-                { name: 'columnMockId', visible: true },
-            ];
-
-            vm.toggleMarkAll(false);
-
-            expect(vm.localColumns.every((col) => col.visible)).toBe(false);
-        });
-    });
-
-    describe('saveConfig()', () => {
-        it('should call setUserConfigViewData and axios.post with correct params', async () => {
-            const mockAxiosPost = vi.spyOn(axios, 'post').mockResolvedValue({
-                data: [{ id: 1 }],
-            });
-
-            vm.localColumns = [
-                { name: 'columnMockName', visible: true },
-                { name: 'columnMockId', visible: false },
-            ];
-
-            await vm.saveConfig();
-
-            expect(mockAxiosPost).toHaveBeenCalledWith('UserConfigViews/crud', {
-                creates: [
-                    {
-                        userFk: vm.user.id,
-                        tableCode: vm.tableCode,
-                        tableConfig: vm.tableCode,
-                        configuration: {
-                            columnMockName: true,
-                            columnMockId: false,
-                        },
-                    },
-                ],
-            });
-        });
-    });
-});

src/components/common/VnDmsList.vue

@@ -102,7 +102,7 @@ const columns = computed(() => [
                 storage: 'dms',
                 collection: null,
                 resolution: null,
-                id: Number(prop.row.file.split('.')[0]),
+                id: prop.row.file.split('.')[0],
                 token: token,
                 class: 'rounded',
                 ratio: 1,
@@ -299,12 +299,11 @@ defineExpose({
         :url="$props.model"
         :user-filter="dmsFilter"
         :order="['dmsFk DESC']"
-        auto-load
+        :auto-load="true"
         @on-fetch="setData"
     >
         <template #body>
             <QTable
-                v-if="rows"
                 :columns="columns"
                 :rows="rows"
                 class="full-width q-mt-md"

src/components/common/VnSection.vue

@@ -2,9 +2,9 @@
 import RightMenu from './RightMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
+import { onBeforeMount, computed, ref } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useHasContent } from 'src/composables/useHasContent';
 
 const $props = defineProps({
@@ -47,12 +47,16 @@ const $props = defineProps({
 });
 
 const route = useRoute();
-const router = useRouter();
-
 let arrayData;
 const sectionValue = computed(() => $props.section ?? $props.dataKey);
-const isMainSection = ref(false);
-
+const isMainSection = computed(() => {
+    const isSame = sectionValue.value == route.name;
+    if (!isSame && arrayData) {
+        arrayData.reset(['userParams', 'filter']);
+        arrayData.setCurrentFilter();
+    }
+    return isSame;
+});
 const searchbarId = 'section-searchbar';
 const hasContent = useHasContent(`#${searchbarId}`);
 
@@ -64,23 +68,7 @@ onBeforeMount(() => {
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });
-    checkIsMain();
 });
-
-onMounted(() => {
-    const unsubscribe = router.afterEach(() => {
-        checkIsMain();
-    });
-    onUnmounted(unsubscribe);
-});
-
-function checkIsMain() {
-    isMainSection.value = sectionValue.value == route.name;
-    if (!isMainSection.value && arrayData) {
-        arrayData.reset(['userParams', 'filter']);
-        arrayData.setCurrentFilter();
-    }
-}
 </script>
 <template>
     <slot name="searchbar">

src/components/common/VnSelect.vue

@@ -27,7 +27,7 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: [String, Function],
+        type: [String],
         default: 'name',
     },
     optionValue: {

src/components/common/VnSelectWorker.vue

@@ -55,7 +55,7 @@ const url = computed(() => {
         sort-by="nickname ASC"
     >
         <template #prepend v-if="$props.hasAvatar">
-            <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
+            <VnAvatar :worker-id="value" color="primary" :title="title" />
         </template>
         <template #append v-if="$props.hasInfo">
             <QIcon name="info" class="cursor-pointer">
@@ -72,8 +72,7 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        #{{ scope.opt.id }}, {{ scope.opt.nickname }},
-                        {{ scope.opt.code }}
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

src/components/common/__tests__/VnInput.spec.js

@@ -1,91 +0,0 @@
-import { createWrapper } from 'app/test/vitest/helper';
-import { vi, describe, expect, it } from 'vitest';
-import VnInput from 'src/components/common/VnInput.vue';
-
-
-describe('VnInput', () => {
-    let vm;
-    let wrapper;
-    let input;
-
-    function generateWrapper(value, isOutlined, emptyToNull, insertable) {
-        wrapper = createWrapper(VnInput, {
-            props: {
-                modelValue: value,                
-                isOutlined,  emptyToNull,  insertable,
-                maxlength: 101
-            },
-            attrs: {
-                label: 'test',
-                required: true,
-                maxlength: 101,
-                maxLength: 10,
-                'max-length':20
-            },
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
-        input = wrapper.find('[data-cy="test_input"]');
-    };
-
-    describe('value', () => {
-        it('should emit update:modelValue when value changes', async () => {
-            generateWrapper('12345', false, false, true)
-            await input.setValue('123');
-            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
-            expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
-        });
-
-        it('should emit update:modelValue with null when input is empty', async () => {
-            generateWrapper('12345', false, true, true);
-            await input.setValue('');
-            expect(wrapper.emitted('update:modelValue')[0]).toEqual([null]);
-        });
-    });
-
-    describe('styleAttrs', () => {
-        it('should return empty styleAttrs when isOutlined is false', async () => {
-            generateWrapper('123', false, false, false);
-            expect(vm.styleAttrs).toEqual({}); 
-        });
-
-        it('should set styleAttrs when isOutlined is true', async () => {        
-            generateWrapper('123', true, false, false);
-            expect(vm.styleAttrs.outlined).toBe(true);
-        });
-    });
-
-    describe('handleKeydown', () => { 
-        it('should do nothing when "Backspace" key is pressed', async () => {
-            generateWrapper('12345', false, false, true);
-            await input.trigger('keydown', { key: 'Backspace' });
-            expect(wrapper.emitted('update:modelValue')).toBeUndefined();
-            const spyhandler = vi.spyOn(vm, 'handleInsertMode');
-            expect(spyhandler).not.toHaveBeenCalled();
-            
-        });
-        
-        /*
-        TODO: #8399 REDMINE
-        */
-        it.skip('handleKeydown respects insertable behavior', async () => {
-            const expectedValue = '12345';
-            generateWrapper('1234', false, false, true);
-            vm.focus()
-            await input.trigger('keydown', { key: '5' });
-            await vm.$nextTick();
-            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
-            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
-            expect(vm.value).toBe( expectedValue);
-        });
-    });
-
-    describe('focus', () => {
-        it('should call focus method when input is focused', async () => {
-            generateWrapper('123', false, false, true);
-            const focusSpy = vi.spyOn(input.element, 'focus');
-            vm.focus();
-            expect(focusSpy).toHaveBeenCalled();
-        }); 
-    });
-});

src/components/ui/CardSummary.vue

@@ -175,7 +175,7 @@ async function fetch() {
                 display: inline-block;
             }
             .header.link:hover {
-                color: rgba(var(--q-primary), 0.8);
+                color: lighten($primary, 20%);
             }
             .q-checkbox {
                 & .q-checkbox__label {

src/components/ui/QCalendarMonthWrapper.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useQuasar } from 'quasar';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
 
 const $props = defineProps({
     bordered: {

src/components/ui/__tests__/VnImg.spec.js

@@ -1,89 +0,0 @@
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnImg from 'src/components/ui/VnImg.vue';
-
-let wrapper;
-let vm;
-const isEmployeeMock = vi.fn();
-
-function generateWrapper(storage = 'images') {
-    wrapper = createWrapper(VnImg, {
-        props: {
-            id: 123, 
-            zoomResolution: '400x400',
-            storage, 
-        }
-    });
-    wrapper = wrapper.wrapper;
-    vm = wrapper.vm; 
-    vm.timeStamp = 'timestamp';   
-};
-
-vi.mock('src/composables/useSession', () => ({
-    useSession: () => ({
-      getTokenMultimedia: () => 'token',
-    }),
-}));
-  
-vi.mock('src/composables/useRole', () => ({
-    useRole: () => ({
-        isEmployee: isEmployeeMock,
-    }),
-}));
-
-
-describe('VnImg', () => {    
-    beforeEach(() => {
-        isEmployeeMock.mockReset();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('getUrl', () => {
-        it('should return /api/{storage}/{id}/downloadFile?access_token={token} when storage is dms', async () => {
-            isEmployeeMock.mockReturnValue(false);
-            generateWrapper('dms');
-            await vm.$nextTick();
-            const url = vm.getUrl();
-            expect(url).toBe('/api/dms/123/downloadFile?access_token=token');    
-        });
-
-        it('should return /no-user.png when role is not employee and storage is not dms', async () => {
-            isEmployeeMock.mockReturnValue(false);
-            generateWrapper();
-            await vm.$nextTick();   
-            const url = vm.getUrl();
-            expect(url).toBe('/no-user.png');
-        });
-
-        it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is false and role is employee and storage is not dms', async () => {
-            isEmployeeMock.mockReturnValue(true);
-            generateWrapper();
-            await vm.$nextTick();
-            const url = vm.getUrl();
-            expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token&timestamp');
-        });
-
-        it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
-            isEmployeeMock.mockReturnValue(true);
-            generateWrapper();
-            await vm.$nextTick();
-            const url = vm.getUrl(true);
-            expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token&timestamp');
-        });
-    });
-
-    describe('reload', () => {
-        it('should update the timestamp', async () => {
-            generateWrapper();
-            const initialTimestamp = wrapper.vm.timeStamp;
-
-            wrapper.vm.reload();
-            const newTimestamp = wrapper.vm.timeStamp;
-       
-            expect(initialTimestamp).not.toEqual(newTimestamp);
-        });
-    });
-});

src/components/ui/__tests__/VnSearchbar.spec.js

@@ -1,71 +0,0 @@
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
-describe('VnSearchbar', () => {
-    let vm;
-    let wrapper;
-    let applyFilterSpy;
-    const searchText = 'Bolas de madera';
-    const userParams = {staticKey: 'staticValue'};
-
-    beforeEach(async () => {
-        wrapper = createWrapper(VnSearchbar, {
-            propsData: {
-                dataKey: 'testKey',
-                filter: null,
-                whereFilter: null,
-                searchRemoveParams: true,
-            },
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
-
-        vm.searchText = searchText;
-        vm.arrayData.store.userParams = userParams;
-        applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
-        
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it('search resets pagination and applies filter', async () => {
-        const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
-        await vm.search();
-
-        expect(resetPaginationSpy).toHaveBeenCalled();
-        expect(applyFilterSpy).toHaveBeenCalledWith({
-            params: { search: searchText },
-        });
-    });
-
-    it('search includes static params if searchRemoveParams is false', async () => {
-        wrapper.setProps({ searchRemoveParams: false });
-        await vm.$nextTick();
-        await vm.search();
-
-        expect(applyFilterSpy).toHaveBeenCalledWith({
-            params: { staticKey: 'staticValue', search: searchText },
-            filter: {skip: 0},
-        });
-    });
-
-    it('updates store when dataKey changes', async () => {
-        expect(vm.store.userParams).toEqual(userParams);
-        wrapper.setProps({ dataKey: 'newTestKey' });
-        await vm.$nextTick();
-        expect(vm.store.userParams).toEqual({});
-    });
-
-    it('computes the "to" property correctly for redirection', () => {
-        vm.arrayData.store.searchUrl = 'searchParam';
-        vm.arrayData.store.currentFilter = { category: 'plants' };
-        const expectedQuery = JSON.stringify({
-            ...vm.arrayData.store.currentFilter,
-            search: searchText,
-        });
-        expect(vm.to.query.searchParam).toBe(expectedQuery);
-    });
-});

src/composables/useSession.js

@@ -6,7 +6,6 @@ import axios from 'axios';
 import { useRouter } from 'vue-router';
 import useNotify from './useNotify';
 import { useTokenConfig } from './useTokenConfig';
-import { getToken, getTokenMultimedia } from 'src/utils/session';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
 
@@ -16,6 +15,19 @@ export function useSession() {
     let isCheckingToken = false;
     let intervalId = null;
 
+    function getToken() {
+        const localToken = localStorage.getItem(TOKEN);
+        const sessionToken = sessionStorage.getItem(TOKEN);
+
+        return localToken || sessionToken || '';
+    }
+    function getTokenMultimedia() {
+        const localTokenMultimedia = localStorage.getItem(TOKEN_MULTIMEDIA);
+        const sessionTokenMultimedia = sessionStorage.getItem(TOKEN_MULTIMEDIA);
+
+        return localTokenMultimedia || sessionTokenMultimedia || '';
+    }
+
     function setSession(data) {
         let keepLogin = data.keepLogin;
         const storage = keepLogin ? localStorage : sessionStorage;

src/css/app.scss

@@ -1,6 +1,6 @@
 // app global css in SCSS form
 @import './icons.scss';
-@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.scss';
+@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
 
 body.body--light {
     --vn-header-color: #cecece;

src/layouts/OutLayout.vue

@@ -2,8 +2,6 @@
 import { Dark, Quasar } from 'quasar';
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { localeEquivalence } from 'src/i18n/index';
-import quasarLang from 'src/utils/quasarLang';
 
 const { t, locale } = useI18n();
 
@@ -14,9 +12,18 @@ const userLocale = computed({
     set(value) {
         locale.value = value;
 
-        value = localeEquivalence[value] ?? value;
+        if (value === 'en') value = 'en-GB';
 
-        quasarLang(value);
+        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
+        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
+        try {
+            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
+            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
+                Quasar.lang.set(lang.default);
+            });
+        } catch (error) {
+            //
+        }
     },
 });
 

src/pages/Customer/Card/CustomerCard.vue

@@ -1,12 +1,25 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
-import CustomerDescriptor from './CustomerDescriptor.vue';
-</script>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
 
+import VnCard from 'components/common/VnCard.vue';
+import CustomerDescriptor from './CustomerDescriptor.vue';
+import CustomerFilter from '../CustomerFilter.vue';
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+</script>
 <template>
-    <VnCardBeta
+    <VnCard
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
+        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
+        search-data-key="CustomerList"
+        :searchbar-props="{
+            url: 'Clients/filter',
+            label: 'Search customer',
+            info: 'You can search by customer id or name',
+        }"
     />
 </template>

src/pages/Customer/Card/CustomerConsumptionFilter.vue

@@ -0,0 +1,177 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import { QItem } from 'quasar';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import { QItemSection } from 'quasar';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { toDate } from 'src/filters';
+
+const { t } = useI18n();
+defineProps({ dataKey: { type: String, required: true } });
+</script>
+<template>
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.item')"
+                        v-model="params.itemId"
+                        is-outlined
+                        lazy-rules
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.buyerId"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
+                        :label="t('params.buyer')"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.typeId"
+                        url="ItemTypes"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
+                        :label="t('params.typeId')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.categoryId"
+                        url="ItemCategories"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
+                        :label="t('params.categoryId')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.campaignId"
+                        url="Campaigns/latest"
+                        sort-by="dated DESC"
+                        :label="t('params.campaignId')"
+                        option-label="code"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.code}`)
+                                    }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        toDate(scope.opt.dated)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+en:
+    params:
+        item: Item id
+        buyer: Buyer
+        type: Type
+        category: Category
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+        campaignId: Campaña
+        valentinesDay: Valentine's Day
+        mothersDay: Mother's Day
+        allSaints: All Saints' Day
+es:
+    params:
+        item: Id artículo
+        buyer: Comprador
+        type: Tipo
+        category: Categoría
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+        campaignId: Campaña
+        valentinesDay: Día de San Valentín
+        mothersDay: Día de la Madre
+        allSaints: Día de Todos los Santos
+</i18n>

src/pages/Customer/CustomerList.vue

@@ -5,19 +5,18 @@ import { useRouter } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toDate } from 'src/filters';
 
+import RightMenu from 'src/components/common/RightMenu.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import CustomerFilter from './CustomerFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const router = useRouter();
 const tableRef = ref();
-const dataKey = 'CustomerList';
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -399,23 +398,21 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <VnSection
-        :data-key="dataKey"
-        :columns="columns"
-        prefix="customer"
-        :array-data-props="{
-            url: 'Clients/filter',
-            order: ['id DESC'],
-        }"
-    >
-        <template #rightMenu>
+    <VnSearchbar
+        :info="t('You can search by customer id or name')"
+        :label="t('Search customer')"
+        data-key="CustomerList"
+    />
+    <RightMenu>
+        <template #right-panel>
             <CustomerFilter data-key="CustomerList" />
         </template>
-        <template #body>
+    </RightMenu>
     <VnTable
         ref="tableRef"
-                :data-key="dataKey"
+        data-key="CustomerList"
         url="Clients/filter"
+        order="id DESC"
         :create="{
             urlCreate: 'Clients/createWithUser',
             title: t('globals.pageTitles.customerCreate'),
@@ -434,7 +431,7 @@ function handleLocation(data, location) {
                 :label="t('customer.summary.salesPerson')"
                 v-model="data.salesPersonFk"
                 :params="{
-                            departmentCodes: ['VT', 'shopping'],
+                    departmentCodes: ['VT'],
                 }"
                 :has-avatar="true"
                 :id-value="data.salesPersonFk"
@@ -466,12 +463,7 @@ function handleLocation(data, location) {
                 @update:model-value="(location) => handleLocation(data, location)"
             />
             <QInput v-model="data.userName" :label="t('Web user')" />
-                    <QInput
-                        :label="t('Email')"
-                        clearable
-                        type="email"
-                        v-model="data.email"
-                    >
+            <QInput :label="t('Email')" clearable type="email" v-model="data.email">
                 <template #append>
                     <QIcon name="info" class="cursor-info">
                         <QTooltip max-width="400px">{{
@@ -482,8 +474,6 @@ function handleLocation(data, location) {
             </QInput>
         </template>
     </VnTable>
-        </template>
-    </VnSection>
 </template>
 <i18n>
 es:

src/pages/Customer/locale/en.yml

@@ -94,8 +94,6 @@ customer:
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
-    search: Search customer
-    searchInfo: You can search by customer ID
     params:
         id: Id
         isWorker: Is Worker

src/pages/Customer/locale/es.yml

@@ -1,3 +1,5 @@
+Search customer: Buscar cliente
+You can search by customer id or name: Puedes buscar por id o nombre del cliente
 customer:
     card:
         debt: Riesgo
@@ -94,8 +96,6 @@ customer:
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
             hasSepaVnl: Recibido B2B VNL
-    search: Buscar cliente
-    searchInfo: Puedes buscar por id o nombre del cliente
     params:
         id: ID
         isWorker: Es trabajador

src/pages/Route/Card/RouteCard.vue

@@ -1,19 +1,8 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
-import RouteFilter from './RouteFilter.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+
 </script>
 <template>
-    <VnCard
-        data-key="Route"
-        base-url="Routes"
-        :descriptor="RouteDescriptor"
-        :filter-panel="RouteFilter"
-        search-data-key="RouteList"
-    >
-        <template #searchbar>
-            <RouteSearchbar />
-        </template>
-    </VnCard>
+    <VnCardBeta data-key="Route" base-url="Routes" :descriptor="RouteDescriptor" />
 </template>

src/pages/Route/RouteList.vue

@@ -3,17 +3,16 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toHour } from 'src/filters';
-
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref([]);
+const dataKey = 'RouteList';
 const routeFilter = {
     include: [
         {
@@ -110,18 +109,23 @@ const columns = computed(() => [
 ]);
 </script>
 <template>
-    <RouteSearchbar />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="route"
+        :array-data-props="{
+            url: 'Routes/filter',
+            userFilter: routeFilter,
+        }"
+    >
+        <template #rightMenu>
             <RouteFilter data-key="RouteList" />
         </template>
-    </RightMenu>
+        <template #body>
             <VnTable
-        data-key="RouteList"
-        url="Routes/filter"
+                :data-key="dataKey"
                 :columns="columns"
                 :right-search="false"
-        :filter="routeFilter"
                 redirect="route"
                 :create="{
                     urlCreate: 'Routes',
@@ -138,4 +142,6 @@ const columns = computed(() => [
                     </span>
                 </template>
             </VnTable>
+        </template>
+    </VnSection>
 </template>

src/pages/Route/locale/en.yml

@@ -37,6 +37,8 @@ route:
     Summary: Summary
     Route is closed: Route is closed
     Route is not served: Route is not served
+    search: Search route
+    searchInfo: You can search by route reference
     cmr:
         list:
             results: results

src/pages/Route/locale/es.yml

@@ -37,6 +37,8 @@ route:
     Summary: Resumen
     Route is closed: La ruta está cerrada
     Route is not served: La ruta no está servida
+    search: Buscar rutas
+    searchInfo: Puedes buscar por referencia de la ruta
     cmr:
         list:
             results: resultados

src/pages/Worker/Card/WorkerCalendarItem.vue

@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 
 import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
 import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
 
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import useNotify from 'src/composables/useNotify.js';

src/pages/Worker/WorkerList.vue

@@ -196,7 +196,7 @@ async function autofillBic(worker) {
         prefix="workerSearch"
         :array-data-props="{
             url: 'Workers/filter',
-            order: 'id DESC',
+            order: ['id DESC'],
         }"
     >
         <template #rightMenu>

src/pages/Zone/ZoneCalendar.vue

@@ -7,7 +7,7 @@ import { useRoute } from 'vue-router';
 import ZoneClosingTable from './ZoneClosingTable.vue';
 import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
 import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
 
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import axios from 'axios';

src/router/index.js

@@ -1,4 +1,4 @@
-import { route as defineRouter } from 'quasar/wrappers';
+import { route } from 'quasar/wrappers';
 import {
     createRouter,
     createMemoryHistory,
@@ -8,14 +8,14 @@ import {
 import routes from './routes';
 import { i18n } from 'src/boot/i18n';
 import { useState } from 'src/composables/useState';
+import { useSession } from 'src/composables/useSession';
 import { useRole } from 'src/composables/useRole';
 import { useUserConfig } from 'src/composables/useUserConfig';
 import { useTokenConfig } from 'src/composables/useTokenConfig';
 import { useAcl } from 'src/composables/useAcl';
-import { isLoggedIn } from 'src/utils/session';
-import { useSession } from 'src/composables/useSession';
 
-let session = null;
+const state = useState();
+const session = useSession();
 const { t, te } = i18n.global;
 
 const createHistory = process.env.SERVER
@@ -43,12 +43,11 @@ const Router = createRouter({
  * with the Router instance.
  */
 export { Router };
-export default defineRouter(function (/* { store, ssrContext } */) {
-    const state = useState();
+export default route(function (/* { store, ssrContext } */) {
     Router.beforeEach(async (to, from, next) => {
-        if (!session) session = useSession();
+        const { isLoggedIn } = session;
         const outLayout = Router.options.routes[0].children.map((r) => r.name);
-        if (!session.isLoggedIn() && !outLayout.includes(to.name)) {
+        if (!isLoggedIn() && !outLayout.includes(to.name)) {
             return next({ name: 'Login', query: { redirect: to.fullPath } });
         }
 

src/router/modules/customer.js

@@ -1,12 +1,24 @@
 import { RouterView } from 'vue-router';
 
-const customerCard = {
-    name: 'CustomerCard',
-    path: ':id',
-    component: () => import('src/pages/Customer/Card/CustomerCard.vue'),
-    redirect: { name: 'CustomerSummary' },                                           
+export default {
+    path: '/customer',
+    name: 'Customer',
     meta: {
-        menu: [
+        title: 'customers',
+        icon: 'vn:client',
+        moduleName: 'Customer',
+        keyBinding: 'c',
+    },
+    component: RouterView,
+    redirect: { name: 'CustomerMain' },
+    menus: {
+        main: [
+            'CustomerList',
+            'CustomerPayments',
+            'CustomerNotifications',
+            'CustomerDefaulter',
+        ],
+        card: [
             'CustomerBasicData',
             'CustomerFiscalData',
             'CustomerBillingData',
@@ -23,6 +35,70 @@ const customerCard = {
             'CustomerOthers',
         ],
     },
+    children: [
+        {
+            path: '',
+            name: 'CustomerMain',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'CustomerList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'CustomerList',
+                    meta: {
+                        title: 'list',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Customer/CustomerList.vue'),
+                },
+                {
+                    path: 'create',
+                    name: 'CustomerCreate',
+                    meta: {
+                        title: 'customerCreate',
+                        icon: 'add',
+                    },
+                    component: () => import('src/pages/Customer/CustomerCreate.vue'),
+                },
+                {
+                    path: 'payments',
+                    name: 'CustomerPayments',
+                    meta: {
+                        title: 'webPayments',
+                        icon: 'vn:onlinepayment',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Payments/CustomerPayments.vue'),
+                },
+                {
+                    path: 'notifications',
+                    name: 'CustomerNotifications',
+                    meta: {
+                        title: 'notifications',
+                        icon: 'campaign',
+                    },
+                    component: () =>
+                        import(
+                            'src/pages/Customer/Notifications/CustomerNotifications.vue'
+                        ),
+                },
+                {
+                    path: 'defaulter',
+                    name: 'CustomerDefaulter',
+                    meta: {
+                        title: 'defaulter',
+                        icon: 'vn:defaulter',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),
+                },
+            ],
+        },
+        {
+            name: 'CustomerCard',
+            path: ':id',
+            component: () => import('src/pages/Customer/Card/CustomerCard.vue'),
+            redirect: { name: 'CustomerSummary' },
             children: [
                 {
                     name: 'CustomerSummary',
@@ -31,7 +107,8 @@ const customerCard = {
                         title: 'summary',
                         icon: 'launch',
                     },
-            component: () => import('src/pages/Customer/Card/CustomerSummary.vue'),
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerSummary.vue'),
                 },
                 {
                     path: 'basic-data',
@@ -426,91 +503,6 @@ const customerCard = {
                     ],
                 },
             ],
-};
-
-export default {
-    name: 'Customer',    
-    path: '/customer',
-    meta: {
-        title: 'customers',
-        icon: 'vn:client',
-        moduleName: 'Customer',
-        keyBinding: 'c',
-        menu: [
-            'CustomerList',
-            'CustomerPayments',
-            'CustomerNotifications',
-            'CustomerDefaulter',
-        ],
-    },
-    component: RouterView,
-    redirect: { name: 'CustomerMain' },
-    children: [
-        {
-            name: 'CustomerMain',
-            path: '',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'CustomerIndexMain' },
-            children: [
-                {
-                    path: '',
-                    name: 'CustomerIndexMain',
-                    redirect: { name: 'CustomerList' },
-                    component: () => import('src/pages/Customer/CustomerList.vue'),
-                    children: [
-                        {
-                            name: 'CustomerList',
-                            path: 'list',
-                            meta: {
-                                title: 'list',
-                                icon: 'view_list',
-                            },
-                        },
-                        customerCard,
-                    ],
-                },
-                {
-                    path: 'create',
-                    name: 'CustomerCreate',
-                    meta: {
-                        title: 'customerCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Customer/CustomerCreate.vue'),
-                },
-                {
-                    path: 'payments',
-                    name: 'CustomerPayments',
-                    meta: {
-                        title: 'webPayments',
-                        icon: 'vn:onlinepayment',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Payments/CustomerPayments.vue'),
-                },
-                {
-                    path: 'notifications',
-                    name: 'CustomerNotifications',
-                    meta: {
-                        title: 'notifications',
-                        icon: 'campaign',
-                    },
-                    component: () =>
-                        import(
-                            'src/pages/Customer/Notifications/CustomerNotifications.vue'
-                        ),
-                },
-                {
-                    path: 'defaulter',
-                    name: 'CustomerDefaulter',
-                    meta: {
-                        title: 'defaulter',
-                        icon: 'vn:defaulter',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),
-                },
-            ],
         },
     ],
 };

src/router/modules/route.js

@@ -1,41 +1,87 @@
 import { RouterView } from 'vue-router';
 
+const routeCard = {
+    name: 'RouteCard',
+    path: ':id',
+    component: () => import('src/pages/Route/Card/RouteCard.vue'),
+    redirect: { name: 'RouteSummary' },
+    meta: {
+        menu: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
+    },
+    children: [
+        {
+            name: 'RouteBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('pages/Route/Card/RouteForm.vue'),
+        },
+        {
+            name: 'RouteSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'open_in_new',
+            },
+            component: () => import('pages/Route/Card/RouteSummary.vue'),
+        },
+        {
+            path: 'tickets',
+            name: 'RouteTickets',
+            meta: {
+                title: 'tickets',
+                icon: 'vn:ticket',
+            },
+            component: () => import('src/pages/Route/RouteTickets.vue'),
+        },
+        {
+            path: 'log',
+            name: 'RouteLog',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+            },
+            component: () => import('src/pages/Route/RouteLog.vue'),
+        },
+    ]
+};
+
 export default {
-    path: '/route',
     name: 'Route',
+    path: '/route',
     meta: {
         title: 'routes',
         icon: 'vn:delivery',
         moduleName: 'Route',
+        menu: ['RouteList', 'RouteExtendedList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'],
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },
-    menus: {
-        main: [
-            'RouteList',
-            'RouteExtendedList',
-            'RouteAutonomous',
-            'RouteRoadmap',
-            'CmrList',
-            'AgencyList',
-        ],
-        card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
-    },
     children: [
         {
-            path: '/route',
             name: 'RouteMain',
+            path: '',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'RouteList' },
+            redirect: { name: 'RouteIndexMain' },
+            children: [
+                {
+                    path: '',
+                    name: 'RouteIndexMain',
+                    redirect: { name: 'RouteList' },
+                    component: () => import('src/pages/Route/RouteList.vue'),
                     children: [
                         {
-                    path: 'list',
                             name: 'RouteList',
+                            path: 'list',
                             meta: {
-                        title: 'RouteList',
+                                title: 'list',
                                 icon: 'view_list',
                             },
-                    component: () => import('src/pages/Route/RouteList.vue'),
+                        },
+                        routeCard,
+                    ]
                 },
                 {
                     path: 'extended-list',
@@ -100,49 +146,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'RouteCard',
-            path: ':id',
-            component: () => import('src/pages/Route/Card/RouteCard.vue'),
-            redirect: { name: 'RouteSummary' },
-            children: [
-                {
-                    name: 'RouteBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('pages/Route/Card/RouteForm.vue'),
-                },
-                {
-                    name: 'RouteSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'open_in_new',
-                    },
-                    component: () => import('pages/Route/Card/RouteSummary.vue'),
-                },
-                {
-                    path: 'tickets',
-                    name: 'RouteTickets',
-                    meta: {
-                        title: 'tickets',
-                        icon: 'vn:ticket',
-                    },
-                    component: () => import('src/pages/Route/RouteTickets.vue'),
-                },
-                {
-                    path: 'log',
-                    name: 'RouteLog',
-                    meta: {
-                        title: 'log',
-                        icon: 'vn:History',
-                    },
-                    component: () => import('src/pages/Route/RouteLog.vue'),
-                },
-            ],
-        },
     ],
 };

src/utils/quasarLang.js

@@ -1,12 +0,0 @@
-const langList = import.meta.glob('../../node_modules/quasar/lang/*.js');
-import { Quasar } from 'quasar';
-
-export default function (value) {
-    try {
-        langList[`../../node_modules/quasar/lang/${value}.js`]().then((lang) => {
-            Quasar.lang.set(lang.default);
-        });
-    } catch (error) {
-        //
-    }
-}

src/utils/session.js

@@ -1,23 +0,0 @@
-const TOKEN_MULTIMEDIA = 'tokenMultimedia';
-const TOKEN = 'token';
-
-function getToken() {
-    const localToken = localStorage.getItem(TOKEN);
-    const sessionToken = sessionStorage.getItem(TOKEN);
-
-    return localToken || sessionToken || '';
-}
-function getTokenMultimedia() {
-    const localTokenMultimedia = localStorage.getItem(TOKEN_MULTIMEDIA);
-    const sessionTokenMultimedia = sessionStorage.getItem(TOKEN_MULTIMEDIA);
-
-    return localTokenMultimedia || sessionTokenMultimedia || '';
-}
-function isLoggedIn() {
-    const localToken = localStorage.getItem(TOKEN);
-    const sessionToken = sessionStorage.getItem(TOKEN);
-
-    return !!(localToken || sessionToken);
-}
-
-export { getToken, getTokenMultimedia, isLoggedIn };