From ecd3154dd8b760ad3a3d3ae6fea3a438fea77ad5 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Sun, 7 Jan 2024 16:03:45 +0100 Subject: [PATCH] menu RIS --- _ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js | 2 ++ _ALL_SITES/piuchebuono.app/db/lang/ws_it.js | 8 ++++++ _ALL_SITES/piuchebuono.app/db/static_data.ts | 26 ++++++++++++++++++ _ALL_SITES/piuchebuono.app/quasar.conf.js | 20 +++++++------- public/images/favicon.ico | Bin 1150 -> 1150 bytes src/components/MyHeader/MyHeader.vue | 2 +- src/model/GlobalStore.ts | 1 + src/rootgen/admin/confsite/confsite.vue | 10 +++++++ src/statics/lang/it.js | 3 +- src/store/UserStore.ts | 2 +- src/store/globalStore.ts | 1 + src/views/user/mycircuit/mycircuit.ts | 2 ++ src/views/user/mycircuit/mycircuit.vue | 6 +++- 13 files changed, 69 insertions(+), 14 deletions(-) diff --git a/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js b/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js index 85c0f473..25b51103 100755 --- a/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js +++ b/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js @@ -9,6 +9,7 @@ const msg_website_enUs = { quantity: 'Quantità', quantityAvailable: 'Disponibili', stockQty: 'In Magazzino', + stockBloccatiQty: 'Bloccati In Magazzino', weight: 'Peso', stars: 'Voto', color: 'Colore', @@ -37,6 +38,7 @@ const msg_website_enUs = { productslist: 'Lista Prodotti', collabora: 'Collabora', storehouses: 'Magazzino', + providers: 'Fornitori', departments: 'Uffici', orders: 'Ordini Ricevuti', orders2: 'Ordini Ricevuti', diff --git a/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js b/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js index d67ccadf..aeab2813 100755 --- a/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js +++ b/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js @@ -31,10 +31,17 @@ const msg_website_it = { producer: 'Produttore', orderinfo: 'Ordini Effettuati', products: 'Prodotti', + cash: 'Cassa', + productInfos: 'Info Prodotti', + listinoprodotti: 'Listino Prodotti', productslist: 'Lista Prodotti', collabora: 'Collabora', categories: 'Categorie', storehouses: 'Magazzino', + providers: 'Fornitori', + catprods: 'Categorie', + gasordine: 'Gas Ordine', + scontisticas: 'Scontistica', departments: 'Uffici', orders: 'Ordini Ricevuti', orders2: 'Ordini Ricevuti', @@ -123,6 +130,7 @@ const msg_website_it = { only_residenti: 'Solo Residenti', only_consiglio: 'Solo Consiglieri', color: 'Colore', + gasordini: 'Gas Ordini', }, msg: { myAppName: 'Più che Buono', diff --git a/_ALL_SITES/piuchebuono.app/db/static_data.ts b/_ALL_SITES/piuchebuono.app/db/static_data.ts index 9b0f84e1..799d1f4a 100755 --- a/_ALL_SITES/piuchebuono.app/db/static_data.ts +++ b/_ALL_SITES/piuchebuono.app/db/static_data.ts @@ -88,6 +88,19 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: true, infooter: true, }, + { + active: site.confpages && site.confpages.enableCircuits, + order: 16, + path: '/circuits', + materialIcon: 'fas fa-coins', + name: 'mypages.circuits', + component: () => import('@/views/user/mycircuits/mycircuits.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + onlyAdmin: true, + onlyManager: true, + }, { active: site.confpages && site.confpages.enableGroups, order: 132, @@ -98,6 +111,8 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true }, inmenu: true, infooter: false, + onlyAdmin: true, + onlyManager: true, }, { active: true, @@ -109,6 +124,17 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true, newpage: true }, inmenu: false, infooter: false, + }, + { + active: true, + order: 137, + path: '/circuit/:path', + materialIcon: 'fas fa-user', + name: 'proj.circuit2', + component: () => import('@/views/user/mycircuit/mycircuit.vue'), + meta: { requiresAuth: true, newpage: true }, + inmenu: false, + infooter: false, }, { active: true, diff --git a/_ALL_SITES/piuchebuono.app/quasar.conf.js b/_ALL_SITES/piuchebuono.app/quasar.conf.js index b4bf3510..5f342f74 100755 --- a/_ALL_SITES/piuchebuono.app/quasar.conf.js +++ b/_ALL_SITES/piuchebuono.app/quasar.conf.js @@ -317,54 +317,54 @@ module.exports = configure((ctx) => ({ start_url: "/?homescreen=1", icons: [ { - src: 'images/fv-android-icon-512x512.png', + src: 'images/pcb-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/fv-android-icon-384x384.png', + src: 'images/pcb-android-icon-384x384.png', sizes: '384x384', type: 'image/png', }, { - src: 'images/fv-android-icon-192x192.png', + src: 'images/pcb-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/fv-android-icon-144x144.png', + src: 'images/pcb-android-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/fv-android-icon-96x96.png', + src: 'images/pcb-android-icon-96x96.png', sizes: '96x96', type: 'image/png', }, { - src: 'images/fv-apple-icon-120x120.png', + src: 'images/pcb-apple-icon-120x120.png', sizes: '120x120', type: 'image/png', }, { - src: 'images/fv-apple-icon-144x144.png', + src: 'images/pcb-apple-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/fv-apple-icon-152x152.png', + src: 'images/pcb-apple-icon-152x152.png', sizes: '152x152', type: 'image/png', }, { - src: 'images/fv-apple-icon-180x180.png', + src: 'images/pcb-apple-icon-180x180.png', sizes: '180x180', type: 'image/png', }, ], related_applications: [{ "platform": "webapp", - "url": "https://www.riso.app/manifest.json" + "url": "https://www.piuchebuono.app/manifest.json" }] }, }, diff --git a/public/images/favicon.ico b/public/images/favicon.ico index 105ff16cf84041e45fe469d20fbef00bdf5d320c..d283c964cea8bddedfa0c362bbdcbddd97cd3524 100644 GIT binary patch literal 1150 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 S*DyF{lMG1@5C0$hU;95!j}KY^ diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue index 56b229cb..981b05f2 100755 --- a/src/components/MyHeader/MyHeader.vue +++ b/src/components/MyHeader/MyHeader.vue @@ -115,7 +115,7 @@
-
+
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 1a0f34c8..71694ae7 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -233,6 +233,7 @@ export interface IConfPages { showMsgs: boolean showNotif: boolean showCoins: boolean + showRIS: boolean showMenuCoins: boolean showNameSurname: boolean showCompetenze: boolean diff --git a/src/rootgen/admin/confsite/confsite.vue b/src/rootgen/admin/confsite/confsite.vue index 4229c58d..b98bae3d 100755 --- a/src/rootgen/admin/confsite/confsite.vue +++ b/src/rootgen/admin/confsite/confsite.vue @@ -493,6 +493,16 @@ :type="costanti.FieldType.boolean" > + +