From 4a39e73625ac39623841e93a6adb8e6d0ffdcdc9 Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Thu, 17 Nov 2022 14:03:50 +0100 Subject: [PATCH 001/207] refs #4834 @7h --- src/i18n/en/index.js | 38 +++ src/i18n/es/index.js | 37 +++ src/pages/Worker/Card/WorkerCard.vue | 43 +++ src/pages/Worker/Card/WorkerSummary.vue | 280 ++++++++++++++++++ src/pages/Worker/Card/WorkerSummaryDialog.vue | 21 ++ src/pages/Worker/WorkerList.vue | 92 ++++++ src/pages/Worker/WorkerMain.vue | 17 ++ src/router/modules/worker.js | 47 +++ src/router/routes.js | 2 + 9 files changed, 577 insertions(+) create mode 100644 src/pages/Worker/Card/WorkerCard.vue create mode 100644 src/pages/Worker/Card/WorkerSummary.vue create mode 100644 src/pages/Worker/Card/WorkerSummaryDialog.vue create mode 100644 src/pages/Worker/WorkerList.vue create mode 100644 src/pages/Worker/WorkerMain.vue create mode 100644 src/router/modules/worker.js diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 229a5b995..687fbdce7 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -249,6 +249,44 @@ export default { returnOfMaterial: 'Return of material authorization (RMA)' }, }, + worker: { + pageTitles: { + workers: 'Workers', + list: 'List', + }, + list: { + name: 'Name', + email: 'Email', + phone: 'Phone', + mobile: 'Mobile', + active: 'Active', + department: 'Department', + schedule: 'Schedule', + }, + card: { + workerId: 'Worker ID', + name: 'Name', + email: 'Email', + phone: 'Phone', + mobile: 'Mobile', + active: 'Active', + warehouse: 'Warehouse', + agency: 'Agency', + salesPerson: 'Sales person', + }, + summary: { + basicData: 'Basic data', + boss: 'Boss', + phoneExtension: 'Phone extension', + entPhone: 'Enterprise phone', + personalPhone: 'Personal phone', + noBoss: 'No boss', + userData: 'User data', + userId: 'User ID', + role: 'Role', + sipExtension: 'Extension', + }, + }, components: { topbar: {}, userPanel: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index c8dff9d30..84586ab47 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -247,6 +247,43 @@ export default { picked: 'Recogida', returnOfMaterial: 'Autorización de retorno de materiales (RMA)' } + }, worker: { + pageTitles: { + workers: 'Trabajadores', + list: 'Listado', + }, + list: { + name: 'Nombre', + email: 'Email', + phone: 'Teléfono', + mobile: 'Móvil', + active: 'Activo', + department: 'Departamento', + schedule: 'Horario', + }, + card: { + workerId: 'ID Trabajador', + name: 'Nombre', + email: 'Email', + phone: 'Teléfono', + mobile: 'Móvil', + active: 'Activo', + warehouse: 'Almacén', + agency: 'Empresa', + salesPerson: 'Comercial', + }, + summary: { + basicData: 'Datos básicos', + boss: 'Jefe', + phoneExtension: 'Extensión de teléfono', + entPhone: 'Teléfono de empresa', + personalPhone: 'Teléfono personal', + noBoss: 'Sin jefe', + userData: 'Datos de usuario', + userId: 'ID del usuario', + role: 'Rol', + sipExtension: 'Extensión', + }, }, components: { topbar: {}, diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue new file mode 100644 index 000000000..856710e17 --- /dev/null +++ b/src/pages/Worker/Card/WorkerCard.vue @@ -0,0 +1,43 @@ + + diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue new file mode 100644 index 000000000..043622340 --- /dev/null +++ b/src/pages/Worker/Card/WorkerSummary.vue @@ -0,0 +1,280 @@ + + + + diff --git a/src/pages/Worker/Card/WorkerSummaryDialog.vue b/src/pages/Worker/Card/WorkerSummaryDialog.vue new file mode 100644 index 000000000..4eedb6f6a --- /dev/null +++ b/src/pages/Worker/Card/WorkerSummaryDialog.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue new file mode 100644 index 000000000..90a14d96d --- /dev/null +++ b/src/pages/Worker/WorkerList.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/pages/Worker/WorkerMain.vue b/src/pages/Worker/WorkerMain.vue new file mode 100644 index 000000000..099e82879 --- /dev/null +++ b/src/pages/Worker/WorkerMain.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js new file mode 100644 index 000000000..d5703d04b --- /dev/null +++ b/src/router/modules/worker.js @@ -0,0 +1,47 @@ +import { RouterView } from 'vue-router'; + +export default { + name: 'Worker', + path: '/worker', + meta: { + title: 'workers', + icon: 'vn:worker' + }, + component: RouterView, + redirect: { name: 'WorkerMain' }, + children: [ + { + name: 'WorkerMain', + path: '', + component: () => import('src/pages/Worker/WorkerMain.vue'), + redirect: { name: 'WorkerList' }, + children: [ + { + name: 'WorkerList', + path: 'list', + meta: { + title: 'list', + icon: 'view_list', + }, + component: () => import('src/pages/Worker/WorkerList.vue'), + }, + ] + }, + { + name: 'WorkerCard', + path: ':id', + component: () => import('src/pages/Worker/Card/WorkerCard.vue'), + redirect: { name: 'WorkerSummary' }, + children: [ + { + name: 'WorkerSummary', + path: 'summary', + meta: { + title: 'summary' + }, + component: () => import('src/pages/Worker/Card/WorkerSummary.vue'), + }, + ] + }, + ] +}; diff --git a/src/router/routes.js b/src/router/routes.js index a7261379f..4b9ca728c 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -1,6 +1,7 @@ import customer from './modules/customer'; import ticket from './modules/ticket'; import claim from './modules/claim'; +import worker from './modules/worker'; const routes = [ { @@ -25,6 +26,7 @@ const routes = [ customer, ticket, claim, + worker, { path: '/:pathMatch(.*)*', name: 'NotFound', From b74569e67149a76e1cae573331b1e45d58af31bc Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Fri, 18 Nov 2022 07:59:19 +0100 Subject: [PATCH 002/207] refs #4834 worker card & descriptor implementation @1h --- src/i18n/en/index.js | 6 + src/i18n/es/index.js | 6 + src/pages/Worker/Card/WorkerCard.vue | 53 +++++---- src/pages/Worker/Card/WorkerDescriptor.vue | 121 +++++++++++++++++++++ src/pages/Worker/Card/WorkerPopover.vue | 15 +++ src/pages/Worker/Card/WorkerSummary.vue | 2 +- 6 files changed, 183 insertions(+), 20 deletions(-) create mode 100644 src/pages/Worker/Card/WorkerDescriptor.vue create mode 100644 src/pages/Worker/Card/WorkerPopover.vue diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 687fbdce7..3cc76edb3 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -253,6 +253,7 @@ export default { pageTitles: { workers: 'Workers', list: 'List', + basicData: 'Basic data', }, list: { name: 'Name', @@ -305,4 +306,9 @@ export default { moreOptions: 'More options' } }, + notFound: { + pageTitles: { + undefined: 'Undefined', + }, + } }; diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 84586ab47..cdaee02bd 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -251,6 +251,7 @@ export default { pageTitles: { workers: 'Trabajadores', list: 'Listado', + basicData: 'Datos básicos', }, list: { name: 'Nombre', @@ -303,4 +304,9 @@ export default { moreOptions: 'Más opciones', } }, + notFound: { + pageTitles: { + undefined: 'Página no encontrada', + }, + } }; diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue index 856710e17..b014e9b7f 100644 --- a/src/pages/Worker/Card/WorkerCard.vue +++ b/src/pages/Worker/Card/WorkerCard.vue @@ -1,6 +1,7 @@ + diff --git a/src/pages/Worker/Card/WorkerPopover.vue b/src/pages/Worker/Card/WorkerPopover.vue new file mode 100644 index 000000000..5aad1377c --- /dev/null +++ b/src/pages/Worker/Card/WorkerPopover.vue @@ -0,0 +1,15 @@ + + diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue index 043622340..e39027dd6 100644 --- a/src/pages/Worker/Card/WorkerSummary.vue +++ b/src/pages/Worker/Card/WorkerSummary.vue @@ -104,7 +104,7 @@ function sipExtension() { - + {{ t('worker.list.department') }} From 863a74ee67afdb26f895fcc49ea7f51359cfead0 Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Fri, 18 Nov 2022 08:05:23 +0100 Subject: [PATCH 003/207] Translations --- src/i18n/en/index.js | 5 ----- src/i18n/es/index.js | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 3cc76edb3..2f2b40d85 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -305,10 +305,5 @@ export default { summary: 'Summary', moreOptions: 'More options' } - }, - notFound: { - pageTitles: { - undefined: 'Undefined', - }, } }; diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index cdaee02bd..179f94add 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -303,10 +303,5 @@ export default { summary: 'Resumen', moreOptions: 'Más opciones', } - }, - notFound: { - pageTitles: { - undefined: 'Página no encontrada', - }, } }; From 09f8c70f68ae770eabe425924a784561bac6a07a Mon Sep 17 00:00:00 2001 From: vicent Date: Mon, 21 Nov 2022 13:45:48 +0100 Subject: [PATCH 004/207] =?UTF-8?q?feat:=20a=C3=B1adido=20modulo=20invoice?= =?UTF-8?q?Out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en/index.js | 44 ++++ src/i18n/es/index.js | 44 ++++ src/pages/InvoiceOut/Card/InvoiceOutCard.vue | 18 ++ .../InvoiceOut/Card/InvoiceOutDescriptor.vue | 104 +++++++++ .../Card/InvoiceOutDescriptorPopover.vue | 15 ++ .../InvoiceOut/Card/InvoiceOutSummary.vue | 200 ++++++++++++++++++ .../Card/InvoiceOutSummaryDialog.vue | 21 ++ src/pages/InvoiceOut/InvoiceOutList.vue | 83 ++++++++ src/pages/InvoiceOut/InvoiceOutMain.vue | 17 ++ src/router/modules/invoiceOut.js | 47 ++++ src/router/routes.js | 4 +- 11 files changed, 596 insertions(+), 1 deletion(-) create mode 100644 src/pages/InvoiceOut/Card/InvoiceOutCard.vue create mode 100644 src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue create mode 100644 src/pages/InvoiceOut/Card/InvoiceOutDescriptorPopover.vue create mode 100644 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue create mode 100644 src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue create mode 100644 src/pages/InvoiceOut/InvoiceOutList.vue create mode 100644 src/pages/InvoiceOut/InvoiceOutMain.vue create mode 100644 src/router/modules/invoiceOut.js diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 88fae5bb7..5d483c6fc 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -251,6 +251,50 @@ export default { returnOfMaterial: 'Return of material authorization (RMA)', }, }, + invoiceOut: { + pageTitles: { + invoiceOuts: 'InvoiceOuts', + list: 'List', + createInvoiceOut: 'Create invoice out', + summary: 'Summary', + basicData: 'Basic Data' + }, + list: { + ref: 'Reference', + issued: 'Issued', + amount: 'Amount', + client: 'Client', + created: 'Created', + company: 'Company', + dued: 'Due date' + }, + card: { + issued: 'Issued', + amount: 'Amount', + client: 'Client', + company: 'Company', + customerCard: 'Customer card', + ticketList: 'Ticket List' + }, + summary: { + issued: 'Issued', + created: 'Created', + dued: 'Due', + booked: 'Booked', + company: 'Company', + taxBreakdown: 'Tax breakdown', + type: 'Type', + taxableBase: 'Taxable base', + rate: 'Rate', + fee: 'Fee', + tickets: 'Tickets', + ticketId: 'Ticket id', + nickname: 'Alias', + shipped: 'Shipped', + totalWithVat: 'Amount', + + } + }, components: { topbar: {}, userPanel: { diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index 0103b1a92..bbe30970e 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -250,6 +250,50 @@ export default { returnOfMaterial: 'Autorización de retorno de materiales (RMA)', }, }, + invoiceOut: { + pageTitles: { + invoiceOuts: 'Fact. emitidas', + list: 'Listado', + createInvoiceOut: 'Crear fact. emitida', + summary: 'Resumen', + basicData: 'Datos básicos' + }, + list: { + ref: 'Referencia', + issued: 'Fecha emisión', + amount: 'Importe', + client: 'Cliente', + created: 'Fecha creación', + company: 'Empresa', + dued: 'Fecha vencimineto' + }, + card: { + issued: 'Fecha emisión', + amount: 'Importe', + client: 'Cliente', + company: 'Empresa', + customerCard: 'Ficha del cliente', + ticketList: 'Listado de tickets' + }, + summary: { + issued: 'Fecha', + created: 'Fecha creación', + dued: 'Vencimiento', + booked: 'Contabilizada', + company: 'Empresa', + taxBreakdown: 'Desglose impositivo', + type: 'Tipo', + taxableBase: 'Base imp.', + rate: 'Tarifa', + fee: 'Cuota', + tickets: 'Tickets', + ticketId: 'Id ticket', + nickname: 'Alias', + shipped: 'F. envío', + totalWithVat: 'Importe', + + } + }, components: { topbar: {}, userPanel: { diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue new file mode 100644 index 000000000..00e603d20 --- /dev/null +++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue @@ -0,0 +1,18 @@ + + diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue new file mode 100644 index 000000000..ece6b2053 --- /dev/null +++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue @@ -0,0 +1,104 @@ + + + diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorPopover.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorPopover.vue new file mode 100644 index 000000000..30d27669d --- /dev/null +++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorPopover.vue @@ -0,0 +1,15 @@ + + diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue new file mode 100644 index 000000000..3db0a7299 --- /dev/null +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue new file mode 100644 index 000000000..0e5b3127a --- /dev/null +++ b/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue new file mode 100644 index 000000000..f5eebd2a3 --- /dev/null +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/pages/InvoiceOut/InvoiceOutMain.vue b/src/pages/InvoiceOut/InvoiceOutMain.vue new file mode 100644 index 000000000..099e82879 --- /dev/null +++ b/src/pages/InvoiceOut/InvoiceOutMain.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js new file mode 100644 index 000000000..7f30de62f --- /dev/null +++ b/src/router/modules/invoiceOut.js @@ -0,0 +1,47 @@ +import { RouterView } from 'vue-router'; + +export default { + path: '/invoiceOut', + name: 'InvoiceOut2', + meta: { + title: 'invoiceOuts', + icon: 'vn:invoice-out' + }, + component: RouterView, + redirect: { name: 'InvoiceOutMain' }, + children: [ + { + path: '', + name: 'InvoiceOutMain', + component: () => import('src/pages/InvoiceOut/InvoiceOutMain.vue'), + redirect: { name: 'InvoiceOutList' }, + children: [ + { + path: 'list', + name: 'InvoiceOutList', + meta: { + title: 'list', + icon: 'view_list', + }, + component: () => import('src/pages/InvoiceOut/InvoiceOutList.vue'), + } + ] + }, + { + name: 'InvoiceOutCard', + path: ':id', + component: () => import('src/pages/InvoiceOut/Card/InvoiceOutCard.vue'), + redirect: { name: 'InvoiceOutSummary' }, + children: [ + { + name: 'InvoiceOutSummary', + path: 'summary', + meta: { + title: 'summary' + }, + component: () => import('src/pages/InvoiceOut/Card/InvoiceOutSummary.vue'), + } + ] + }, + ] +}; diff --git a/src/router/routes.js b/src/router/routes.js index a7261379f..8fc355e64 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -1,6 +1,7 @@ import customer from './modules/customer'; import ticket from './modules/ticket'; import claim from './modules/claim'; +import invoiceOut from './modules/invoiceOut'; const routes = [ { @@ -25,6 +26,7 @@ const routes = [ customer, ticket, claim, + invoiceOut, { path: '/:pathMatch(.*)*', name: 'NotFound', @@ -34,4 +36,4 @@ const routes = [ } ]; -export default routes; \ No newline at end of file +export default routes; From 26d7640bc183a796898bae1520ada4bde37977b4 Mon Sep 17 00:00:00 2001 From: joan Date: Mon, 21 Nov 2022 17:33:21 +0100 Subject: [PATCH 005/207] 4722 - Routes refactor --- package-lock.json | 112 ++++++-- package.json | 5 +- src/components/FavoriteModules.vue | 102 +++---- src/components/LeftMenu.vue | 344 ++++++++++++++--------- src/composables/useNavigation.js | 176 ++++++------ src/pages/Customer/Card/CustomerCard.vue | 2 + src/pages/Dashboard/Dashboard.vue | 79 +++--- src/router/index.js | 1 - src/router/modules/claim.js | 31 +- src/router/modules/customer.js | 23 +- src/router/modules/index.js | 9 + 11 files changed, 525 insertions(+), 359 deletions(-) create mode 100644 src/router/modules/index.js diff --git a/package-lock.json b/package-lock.json index 1af3be8e6..bb0e9e90f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,10 +8,11 @@ "name": "salix-front", "version": "0.0.1", "dependencies": { - "@quasar/extras": "^1.15.5", + "@quasar/extras": "^1.15.6", "axios": "^0.21.1", "core-js": "^3.6.5", - "quasar": "^2.10.0", + "pinia": "^2.0.24", + "quasar": "^2.10.2", "validator": "^13.7.0", "vue": "^3.0.0", "vue-i18n": "^9.0.0", @@ -3519,9 +3520,9 @@ } }, "node_modules/@quasar/extras": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.15.5.tgz", - "integrity": "sha512-JzKKx5/eKAip3X3bZUEJOOWT9NudqjF01gcce6rtyviko49OU4r+ekyJU3QQIKF8ZqnjZ+DpsVpMWBBZnO6hSQ==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.15.6.tgz", + "integrity": "sha512-lG3wrcz47c86N/j1ULZugmyVfwpmnsJpjtSWh+LhaFfe0g1kTMdAnxkWGKsa3ouZ4QBcnkrNan0kYSnKc3MiBg==", "funding": { "type": "github", "url": "https://donate.quasar.dev" @@ -4307,9 +4308,9 @@ } }, "node_modules/@vue/devtools-api": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.1.3.tgz", - "integrity": "sha512-79InfO2xHv+WHIrH1bHXQUiQD/wMls9qBk6WVwGCbdwP7/3zINtvqPNMtmSHXsIKjvUAHc8L0ouOj6ZQQRmcXg==" + "version": "6.4.5", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz", + "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==" }, "node_modules/@vue/reactivity": { "version": "3.2.31", @@ -15743,6 +15744,56 @@ "node": ">=0.10.0" } }, + "node_modules/pinia": { + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.24.tgz", + "integrity": "sha512-DDLd4Iphyc+6PYYYbx7jkb6WP9gecgu9bz9huyB5rb7CdJI3DhzYiZI+/Ih8MLewRrP9DSpslF/BgSNrJtZU7A==", + "dependencies": { + "@vue/devtools-api": "^6.4.5", + "vue-demi": "*" + }, + "funding": { + "url": "https://github.com/sponsors/posva" + }, + "peerDependencies": { + "@vue/composition-api": "^1.4.0", + "typescript": ">=4.4.4", + "vue": "^2.6.14 || ^3.2.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + }, + "typescript": { + "optional": true + } + } + }, + "node_modules/pinia/node_modules/vue-demi": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "hasInstallScript": true, + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, "node_modules/pirates": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", @@ -16622,9 +16673,9 @@ } }, "node_modules/quasar": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.10.0.tgz", - "integrity": "sha512-PHGcrzPQfFa4tv9a5Z/3D2uat48D4WC9Ad/imzHk/k3G41t0eFMH6glCjAvpCWF2q8dBYIg4nEchiPhlujbKsw==", + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.10.2.tgz", + "integrity": "sha512-y6suu0f2hJKrnFPHzx+p2EBVGzDF6xHaqYGkDIsMNkhxsrO9Qi2+dZCjq1J6+48EJiqPEOn8t9X/gT7yLSSnLw==", "engines": { "node": ">= 10.18.1", "npm": ">= 6.13.4", @@ -19517,7 +19568,7 @@ "version": "4.5.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", - "dev": true, + "devOptional": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -23528,9 +23579,9 @@ } }, "@quasar/extras": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.15.5.tgz", - "integrity": "sha512-JzKKx5/eKAip3X3bZUEJOOWT9NudqjF01gcce6rtyviko49OU4r+ekyJU3QQIKF8ZqnjZ+DpsVpMWBBZnO6hSQ==" + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.15.6.tgz", + "integrity": "sha512-lG3wrcz47c86N/j1ULZugmyVfwpmnsJpjtSWh+LhaFfe0g1kTMdAnxkWGKsa3ouZ4QBcnkrNan0kYSnKc3MiBg==" }, "@quasar/fastclick": { "version": "1.1.5", @@ -24211,9 +24262,9 @@ } }, "@vue/devtools-api": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.1.3.tgz", - "integrity": "sha512-79InfO2xHv+WHIrH1bHXQUiQD/wMls9qBk6WVwGCbdwP7/3zINtvqPNMtmSHXsIKjvUAHc8L0ouOj6ZQQRmcXg==" + "version": "6.4.5", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz", + "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==" }, "@vue/reactivity": { "version": "3.2.31", @@ -32797,6 +32848,23 @@ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, + "pinia": { + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.24.tgz", + "integrity": "sha512-DDLd4Iphyc+6PYYYbx7jkb6WP9gecgu9bz9huyB5rb7CdJI3DhzYiZI+/Ih8MLewRrP9DSpslF/BgSNrJtZU7A==", + "requires": { + "@vue/devtools-api": "^6.4.5", + "vue-demi": "*" + }, + "dependencies": { + "vue-demi": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz", + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "requires": {} + } + } + }, "pirates": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz", @@ -33385,9 +33453,9 @@ } }, "quasar": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.10.0.tgz", - "integrity": "sha512-PHGcrzPQfFa4tv9a5Z/3D2uat48D4WC9Ad/imzHk/k3G41t0eFMH6glCjAvpCWF2q8dBYIg4nEchiPhlujbKsw==" + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.10.2.tgz", + "integrity": "sha512-y6suu0f2hJKrnFPHzx+p2EBVGzDF6xHaqYGkDIsMNkhxsrO9Qi2+dZCjq1J6+48EJiqPEOn8t9X/gT7yLSSnLw==" }, "queue-microtask": { "version": "1.2.3", @@ -35619,7 +35687,7 @@ "version": "4.5.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", - "dev": true + "devOptional": true }, "uglify-js": { "version": "3.15.3", diff --git a/package.json b/package.json index 3060e75ac..18d015577 100644 --- a/package.json +++ b/package.json @@ -18,10 +18,11 @@ "test:e2e:ci": "cross-env E2E_TEST=true start-test \"quasar dev\" http-get://localhost:8080 \"cypress run\"" }, "dependencies": { - "@quasar/extras": "^1.15.5", + "@quasar/extras": "^1.15.6", "axios": "^0.21.1", "core-js": "^3.6.5", - "quasar": "^2.10.0", + "pinia": "^2.0.24", + "quasar": "^2.10.2", "validator": "^13.7.0", "vue": "^3.0.0", "vue-i18n": "^9.0.0", diff --git a/src/components/FavoriteModules.vue b/src/components/FavoriteModules.vue index 1a01bd1c7..65d070d95 100644 --- a/src/components/FavoriteModules.vue +++ b/src/components/FavoriteModules.vue @@ -1,55 +1,55 @@ - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue index 75c821d74..38563df39 100644 --- a/src/components/LeftMenu.vue +++ b/src/components/LeftMenu.vue @@ -1,161 +1,235 @@