versione 1.2.14 :

- aggiornati i file di configurazione, ENV e script non funzionanti., package.
- corretto custom-service-worker.js con CORS
- ottimizzato il server, la chiamata Load iniziale (senza promise, con async/await).

.env

@@ -1,6 +1,6 @@
-VITE_APP_VERSION="1.2.2"
+VITE_APP_VERSION="1.2.13"
 VITE_LANG_DEFAULT="it"
 VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
-VITE_SERVICE_WORKER_FILE="sw-1.2.2.js"
+VITE_SERVICE_WORKER_FILE="sw-1.2.13.js"
 VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
 VITE_VUE_ROUTER_MODE="history"

.env.development

@@ -1,12 +1,13 @@
-VITE_APP_ID="17"
-VITE_APP_URL="https://localhost"
 VITE_MONGODB_HOST="https://localhost:3000"
-VITE_LOGO_REG='piuchebuono-logo-full.png'
 VITE_PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8'
+VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
+VITE_VUE_APP_ISTEST="1"
+VITE_VUE_APP_INLOCALE="1"
 VITE_DEBUG="1"
-VITE_VUE_APP_ISTEST=0
-VITE_VUE_APP_INLOCALE=1
-DIRECTORY_LOCAL="newfreeplanet"
-DIRECTORY_SERVER="freeplanet_serverside"
+VITE_APP_ID="13"
+VITE_LOGO_REG='riso-logo-full.png'
+VITE_APP_URL="https://localhost"
+DIRECTORY_LOCAL=myprojplanet_vite
+DIRECTORY_SERVER=freeplanet_serverside
 SERVERDIR_WEBSITE=""
-SERVERPW_WEBSITE=""
+SERVERPW_WEBSITE=""

.env.prod.gruppomacro

@@ -3,9 +3,9 @@ VITE_APP_URL="https://gruppomacro.app"
 VITE_MONGODB_HOST="https://api.gruppomacro.app"
 VITE_LOGO_REG='gruppomacro-logo-full.png'
 VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
-VITE_DEBUG="1"
+VITE_DEBUG="0"
 VITE_VUE_APP_ISTEST="0"
-DIRECTORY_LOCAL=newfreeplanet
-DIRECTORY_SERVER=/var/www/freeplanet_serverside
+DIRECTORY_LOCAL="myprojplanet_vite"
+DIRECTORY_SERVER="/var/www/nodejs_piuchebuono_server"
 SERVERDIR_WEBSITE="/var/www/gruppomacro.app"
-SERVERPW_WEBSITE=pwdadmin@1AOK
+SERVERPW_WEBSITE="pwdadmin@1AOK"

.env.production

@@ -1,11 +1,11 @@
-VITE_APP_ID="17"
-VITE_APP_URL="https://piuchebuono.app"
-VITE_MONGODB_HOST="https://api.piuchebuono.app"
-VITE_LOGO_REG="piuchebuono-logo-full.png"
-VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
-VITE_DEBUG="0"
-VITE_VUE_APP_ISTEST="0"
+VITE_APP_ID="13"
+VITE_APP_URL="https://test.riso.app"
+VITE_MONGODB_HOST="https://testapi.riso.app"
+VITE_LOGO_REG="riso-logo-full.png"
+VITE_PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs"
+VITE_DEBUG="1"
+VITE_VUE_APP_ISTEST="1"
 DIRECTORY_LOCAL="myprojplanet_vite"
-DIRECTORY_SERVER="/var/www/nodejs_piuchebuono_server"
-SERVERDIR_WEBSITE="/var/www/piuchebuono.app"
-SERVERPW_WEBSITE="pwdadmin@1AOK"
+DIRECTORY_SERVER="/var/www/nodejs_test.riso_server"
+SERVERDIR_WEBSITE="/var/www/test.riso.app"
+SERVERPW_WEBSITE="pwdadmin@1AOK"

.env.test.gruppomacro

@@ -1,11 +1,11 @@
 VITE_APP_ID="18"
 VITE_APP_URL="https://test.gruppomacro.app"
 VITE_MONGODB_HOST="https://testapi.gruppomacro.app"
-VITE_LOGO_REG='gruppomacro-logo-full.png'
+VITE_LOGO_REG="gruppomacro-logo-full.png"
 VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
 VITE_DEBUG="1"
-VITE_VUE_APP_ISTEST=1
-DIRECTORY_LOCAL=myprojplanet_vite
-DIRECTORY_SERVER=/var/www/nodejs_test.piuchebuono_server
+VITE_VUE_APP_ISTEST="1"
+DIRECTORY_LOCAL="myprojplanet_vite"
+DIRECTORY_SERVER="/var/www/nodejs_test.piuchebuono_server"
 SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app"
 SERVERPW_WEBSITE="pwdadmin@1AOK"

.env.test.pcb

@@ -5,7 +5,7 @@ VITE_LOGO_REG="piuchebuono-logo-full.png"
 VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
 VITE_DEBUG="1"
 VITE_VUE_APP_ISTEST="1"
-DIRECTORY_LOCAL="newfreeplanet"
+DIRECTORY_LOCAL="myprojplanet_vite"
 DIRECTORY_SERVER="/var/www/nodejs_test.piuchebuono_server"
 SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app"
 SERVERPW_WEBSITE="pwdadmin@1AOK"

.env.test.risosrv

@@ -1,11 +1,11 @@
 VITE_APP_ID="13"
 VITE_APP_URL="https://test.riso.app"
 VITE_MONGODB_HOST="https://testapi.riso.app"
-VITE_LOGO_REG='riso-logo-full.png'
+VITE_LOGO_REG="riso-logo-full.png"
 VITE_PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs"
 VITE_DEBUG="1"
-VITE_VUE_APP_ISTEST=1
-DIRECTORY_LOCAL=myprojplanet_vite
-DIRECTORY_SERVER=/var/www/nodejs_test.riso_server
+VITE_VUE_APP_ISTEST="1"
+DIRECTORY_LOCAL="myprojplanet_vite"
+DIRECTORY_SERVER="/var/www/nodejs_test.riso_server"
 SERVERDIR_WEBSITE="/var/www/test.riso.app"
 SERVERPW_WEBSITE="pwdadmin@1AOK"

.eslintrc.js

@@ -122,7 +122,7 @@ export default {
     '@typescript-eslint/no-unsafe-argument': 'off',
 
     // allow debugger during development only
-    'no-debugger': import.meta.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
 
     'max-classes-per-file': 'off',
     'no-useless-constructor': 'off',

index.html

@@ -10,7 +10,7 @@
   <meta name="description" content="<%= productDescription %>">
   <meta name="format-detection" content="telephone=no">
   <meta name="msapplication-tap-highlight" content="no">
-  <meta name="version" content="1.2.2">
+  <meta name="version" content="1.2.13">
   <meta name="viewport"
     content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
 

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "piuchebuono",
-  "version": "1.2.2",
-  "description": "PiuCheBuono",
-  "productName": "PiuCheBuono",
+  "name": "riso",
+  "version": "1.2.13",
+  "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.",
+  "productName": "Riso",
   "author": "Surya",
   "private": true,
   "keywords": [],
@@ -12,8 +12,8 @@
     "dev": "quasar dev",
     "dev_noCheck": "SKIP_TSC=true quasar dev",
     "build": "quasar build",
-    "buildpwa": "quasar build -m pwa",
-    "buildpwatest": "NODE_ENV=test quasar build -m pwa",
+    "buildpwa": "NODE_ENV=production quasar build -m pwa",
+    "buildpwatest": "NODE_ENV=production quasar build -m pwa",
     "type-check": "vue-tsc --noEmit",
     "type-check:watch": "vue-tsc --noEmit --watch",
     "buildspa": "quasar build -m spa",
@@ -29,7 +29,7 @@
     "postinstall": "quasar prepare"
   },
   "dependencies": {
-    "@cubejs-client/core": "^1.2.13",
+    "@cubejs-client/core": "^1.2.19",
     "@quasar/extras": "^1.16.17",
     "@quasar/quasar-ui-qcalendar": "^4.1.2",
     "@types/leaflet": "^1.9.16",
@@ -37,17 +37,17 @@
     "@vue/compiler-sfc": "^3.5.13",
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
-    "acorn": "^8.14.0",
+    "acorn": "^8.14.1",
     "animate.css": "^4.1.1",
-    "autoprefixer": "^10.4.20",
-    "axios": "^1.8.1",
+    "autoprefixer": "^10.4.21",
+    "axios": "^1.8.2",
     "bcryptjs": "^3.0.2",
     "chart.js": "^4.4.8",
     "core-js": "^3.41.0",
     "crypto-browserify": "^3.12.1",
     "date-fns": "^4.1.0",
     "echarts": "5.6.0",
-    "eslint-plugin-n": "^17.15.1",
+    "eslint-plugin-n": "^17.16.2",
     "eslint-plugin-quasar": "^1.1.0",
     "graphql": "^16.10.0",
     "graphql-tag": "^2.12.6",
@@ -64,17 +64,17 @@
     "nprogress": "^0.2.0",
     "pinia": "^3.0.1",
     "qrcode-vue3": "^1.7.1",
-    "quasar": "^2.18.0",
+    "quasar": "^2.18.1",
     "quasar-extras": "^2.0.9",
     "register-service-worker": "^1.7.2",
     "scrollreveal": "^4.0.9",
-    "typescript-eslint": "^8.25.0",
+    "typescript-eslint": "^8.26.0",
     "vee-validate": "^4.15.0",
     "vue": "^3.5.13",
     "vue-class-component": "^8.0.0-rc.1",
     "vue-country-code": "^1.1.3",
     "vue-echarts": "^7.0.3",
-    "vue-i18n": "^11.1.1",
+    "vue-i18n": "^11.1.2",
     "vue-idb": "^0.2.0",
     "vue-image-zoomer": "^2.4.4",
     "vue-property-decorator": "^10.0.0-rc.3",
@@ -95,24 +95,24 @@
     "workbox-window": "^7.3.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.21.0",
+    "@eslint/js": "^9.22.0",
     "@intlify/unplugin-vue-i18n": "^6.0.3",
-    "@quasar/app-vite": "^2.1.1",
+    "@quasar/app-vite": "^2.1.4",
     "@types/bcryptjs": "^2.4.6",
     "@types/google.maps": "^3.58.1",
     "@types/jest": "^29.5.14",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^22.13.8",
+    "@types/node": "^22.13.10",
     "@types/nprogress": "^0.2.3",
     "@types/vue-tel-input": "^2.1.7",
     "@types/vuelidate": "^0.7.22",
     "@vue/devtools": "^7.7.2",
     "@vue/eslint-config-prettier": "^10.2.0",
-    "@vue/eslint-config-typescript": "^14.4.0",
-    "autoprefixer": "^10.4.20",
+    "@vue/eslint-config-typescript": "^14.5.0",
+    "autoprefixer": "^10.4.21",
     "eslint": "9",
     "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-vue": "^9.32.0",
+    "eslint-plugin-vue": "^10.0.0",
     "file-loader": "^6.2.0",
     "globals": "^16.0.0",
     "http-proxy-middleware": "^3.0.3",
@@ -129,7 +129,7 @@
     "typescript": "5.7.3",
     "vite-plugin-checker": "^0.9.0",
     "vue-cli-plugin-element-ui": "^1.1.4",
-    "vue-tsc": "^2.2.6",
+    "vue-tsc": "^2.2.8",
     "vueify": "^9.4.1",
     "workbox-build": "^7.3.0"
   },

quasar.config.ts

@@ -3,6 +3,8 @@ import { fileURLToPath } from 'node:url';
 
 import path from 'path'
 
+// console.log(process.env)
+
 export default defineConfig((ctx) => {
   return {
     // https://v2.quasar.dev/quasar-cli/supporting-ts
@@ -121,7 +123,6 @@ export default defineConfig((ctx) => {
             'statics': path.resolve(__dirname, 'src/statics'),
             'components': path.resolve(__dirname, 'src/components'),
             'views': path.resolve(__dirname, 'src/views/index.ts'),
-            'icons': path.resolve(__dirname, 'public/myicons'),
             'images': path.resolve(__dirname, 'src/assets/images'),
             'maps': path.resolve(__dirname, 'public/maps'),
             'classes': path.resolve(__dirname, 'src/classes/index.ts'),
@@ -215,7 +216,7 @@ export default defineConfig((ctx) => {
     // Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer
     devServer: {
       https: false,
-      port: ctx.mode.spa ? 8088 : 8098,
+      port: ctx.mode.spa ? 8084 : 8094,
       vueDevtools: false, // automatically opening remote Vue Devtools
       open: false, // opens browser window automatically
       hot: true, // Disable hot module replacement
@@ -358,23 +359,24 @@ export default defineConfig((ctx) => {
       ],
     },
 
+
+    // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
     pwa: {
       workboxMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest'
-      swFilename: 'sw-' + "1.2.2" + '.js',
+      swFilename: 'sw-' + "1.2.13" + '.js',
       workboxOptions: {
         swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista
       },
-      extendGenerateSWOptions(cfg) {
+      /*extendGenerateSWOptions(cfg) {
         cfg.skipWaiting = false
         cfg.clientsClaim = false
-      },
+      },*/
     },
 
     sourceFiles: {
-      // DEFAULT: pwaRegisterServiceWorker: 'src-pwa/register-service-worker',
-      // DEFAULT: pwaServiceWorker: 'src-pwa/custom-service-worker',
-      // DEFAULT: pwaManifestFile: 'src-pwa/manifest.json',
-      // ...
+      pwaRegisterServiceWorker: 'src-pwa/register-service-worker',
+      pwaServiceWorker: 'src-pwa/custom-service-worker',
+      pwaManifestFile: 'src-pwa/manifest.json',
     },
 
     // Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
@@ -407,7 +409,7 @@ export default defineConfig((ctx) => {
       builder: {
         // https://www.electron.build/configuration/configuration
 
-        appId: 'PiuCheBuono',
+        appId: 'Riso',
       },
 
 

scripts/_ALL_SITES/comunitanuovomondo.app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "riso",
-  "version": "1.2.2",
+  "version": "1.2.13",
   "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.",
   "productName": "Riso",
   "author": "Surya",

scripts/_ALL_SITES/gruppomacro.app/.env.production

@@ -3,9 +3,9 @@ VITE_APP_URL="https://gruppomacro.app"
 VITE_MONGODB_HOST="https://api.gruppomacro.app"
 VITE_LOGO_REG='gruppomacro-logo-full.png'
 VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
-VITE_DEBUG="1"
+VITE_DEBUG="0"
 VITE_VUE_APP_ISTEST="0"
-DIRECTORY_LOCAL=newfreeplanet
-DIRECTORY_SERVER=/var/www/freeplanet_serverside
+DIRECTORY_LOCAL="myprojplanet_vite"
+DIRECTORY_SERVER="/var/www/nodejs_piuchebuono_server"
 SERVERDIR_WEBSITE="/var/www/gruppomacro.app"
-SERVERPW_WEBSITE=pwdadmin@1AOK
+SERVERPW_WEBSITE="pwdadmin@1AOK"

scripts/_ALL_SITES/gruppomacro.app/.env.test

@@ -1,9 +1,11 @@
 VITE_APP_ID="18"
-DIRECTORY_LOCAL=newfreeplanet
-DIRECTORY_SERVER=/var/www/nodejs_test.piuchebuono_server
-SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app"
 VITE_APP_URL="https://test.gruppomacro.app"
 VITE_MONGODB_HOST="https://testapi.gruppomacro.app"
-VITE_LOGO_REG='gruppomacro-logo-full.png'
+VITE_LOGO_REG="gruppomacro-logo-full.png"
 VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
-VITE_VUE_APP_ISTEST=1
+VITE_DEBUG="1"
+VITE_VUE_APP_ISTEST="1"
+DIRECTORY_LOCAL="myprojplanet_vite"
+DIRECTORY_SERVER="/var/www/nodejs_test.piuchebuono_server"
+SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app"
+SERVERPW_WEBSITE="pwdadmin@1AOK"

scripts/_ALL_SITES/gruppomacro.app/db/lang/ws_it.js

@@ -1,9 +1,9 @@
 const msg_website_it = {
   ws: {
-    sitename: 'Riso',
-    siteshortname: 'RISO',
-    description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
-    keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
+    sitename: 'Gruppo Macro',
+    siteshortname: 'Gruppo Macro',
+    description: '',
+    keywords: '',
   },
   hours: {
     descr: 'Descrizione',
@@ -16,29 +16,20 @@ const msg_website_it = {
   pages: {
     home: 'Home',
     profile: 'Profilo',
+    install_site: 'Installa Sito',
     profile2: 'ProfiloU',
     mypage2: 'mypage2',
     myservice2: 'myservice2',
     myhosps2: 'myhosps2',
     mygood2: 'mygood2',
+    catalogo: 'Catalogo',
     fundraising: 'Sostieni il Progetto',
     notifs: 'Configura le Notifiche',
     unsubscribe: 'Disiscriviti',
+    unsubscribe_user: 'Disiscriviti User',
     test: 'Test',
     projects: 'Progetti',
     report: 'Report Ore',
-    producer: 'Produttore',
-    orderinfo: 'Ordini Effettuati',
-    products: 'Prodotti',
-    productslist: 'Lista Prodotti',
-    collabora: 'Collabora',
-    storehouses: 'Magazzino',
-    departments: 'Uffici',
-    orders: 'Ordini Ricevuti',
-    orders2: 'Ordini Ricevuti',
-    sharewithus: 'Condividi con Noi',
-    checkout: 'Carrello',
-    payment: 'Pagamenti',
     regok: 'Registrazione Confermata',
     presentazione: 'Presentazione',
     presentazione2: 'Presentazione',
@@ -89,9 +80,6 @@ const msg_website_it = {
     projectsShared: 'Condivisi da me',
     myprojects: 'Privati',
     favproj: 'Favoriti',
-    admin_ecommerce: 'ECommerce',
-    ecommerce: 'Prodotti',
-    ecommerce_menu: 'ECommerce1',
     hours: 'Ore',
     department: 'Uffici',
     title: 'Titolo',
@@ -121,15 +109,9 @@ const msg_website_it = {
     only_residenti: 'Solo Residenti',
     only_consiglio: 'Solo Consiglieri',
     color: 'Colore',
-    mainMenu: 'Menu Principale',
-    subtitle: 'Sottotitolo',
-    lang: 'Lingua',
-    keywords: 'Parole Chiave',
-    desctiption: 'Descrizione',
-    heightimg: 'Altezza Immagine',
   },
   msg: {
-    myAppName: 'Riso',
+    myAppName: 'Più che Buono',
     myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
     underconstruction: 'App in costruzione...',
     myDescriz: '',

scripts/_ALL_SITES/gruppomacro.app/db/static_data.ts

@@ -1,4 +1,6 @@
-import type {
+/* GRUPPOMACRO APP
+*/
+import {
   IListRoutes,
   ILang,
   IPreloadImages,
@@ -67,39 +69,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 12,
-      path: '/goods',
-      materialIcon: 'fas fa-tshirt',
-      name: 'mypages.goods',
-      component: () => import('@src/root/goods/goods.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/services',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.services',
-      component: () => import('@src/root/services/services.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/activities',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.activities',
-      component: () => import('@src/root/activities/activities.vue'),
-      meta: { requiresAuth: true },
-      inmenu: false,
-      infooter: false,
-    },
     {
       active: true,
       order: 15,
@@ -111,17 +80,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 15,
-      path: '/hosps',
-      materialIcon: 'fas fa-bed',
-      name: 'mypages.hosp',
-      component: () => import('@src/root/hosp/hosp.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
     {
       active: site.confpages && site.confpages.enableCircuits,
       order: 16,
@@ -134,7 +92,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: true,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.enableEvents,
       order: 20,
       path: '/events',
       materialIcon: 'fas fa-bullhorn',
@@ -156,7 +114,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: false,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.showProfile,
       order: 120,
       path: '/myprofile',
       materialIcon: 'fas fa-user',
@@ -167,7 +125,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: true,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.showProfile,
       order: 120,
       path: '/editprofile',
       materialIcon: 'fas fa-user',
@@ -178,7 +136,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: false,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.showiscrittiMenu,
       order: 130,
       path: '/friends',
       materialIcon: 'fas fa-user-friends',
@@ -273,16 +231,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 150,
-      path: '/sostieniilprogetto',
-      materialIcon: 'fas fa-hand-holding-heart',
-      name: 'pages.fundraising',
-      component: () => import('@src/root/fundraising/fundraising.vue'),
-      inmenu: false,
-      infooter: false,
-    },
     {
       active: true,
       order: 80,
@@ -301,7 +249,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
 
 export function firstimagehome() {
 
-  const img = 'statics/images/background.jpg'
+  let img = 'statics/images/background.jpg'
   return img
 }
 

scripts/_ALL_SITES/gruppomacro.app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gruppomacro",
-  "version": "1.2.2",
+  "version": "1.2.13",
   "description": "Gruppo Macro",
   "productName": "Gruppo Macro",
   "author": "Surya",
@@ -12,8 +12,8 @@
     "dev": "quasar dev",
     "dev_noCheck": "SKIP_TSC=true quasar dev",
     "build": "quasar build",
-    "buildpwa": "quasar build -m pwa",
-    "buildpwatest": "NODE_ENV=test quasar build -m pwa",
+    "buildpwa": "NODE_ENV=production quasar build -m pwa",
+    "buildpwatest": "NODE_ENV=production quasar build -m pwa",
     "type-check": "vue-tsc --noEmit",
     "type-check:watch": "vue-tsc --noEmit --watch",
     "buildspa": "quasar build -m spa",
@@ -22,7 +22,7 @@
     "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt",
     "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt",
     "pwa": "quasar dev -m pwa",
-    "spa": "quasar dev",
+    "spa": "NODE_ENV=development quasar dev",
     "debug": "quasar dev --mode debug",
     "test": "echo \"No test specified\" && exit 0",
     "generate-sw": "workbox generateSW workbox-config.js",

scripts/_ALL_SITES/gruppomacro.app/quasar.config.ts

@@ -360,21 +360,20 @@ export default defineConfig((ctx) => {
 
     pwa: {
       workboxMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest'
-      swFilename: 'sw-' + "1.2.2" + '.js',
+      swFilename: 'sw-' + "1.2.13" + '.js',
       workboxOptions: {
         swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista
       },
-      extendGenerateSWOptions(cfg) {
+      /*extendGenerateSWOptions(cfg) {
         cfg.skipWaiting = false
         cfg.clientsClaim = false
-      },
+      },*/
     },
 
     sourceFiles: {
-      // DEFAULT: pwaRegisterServiceWorker: 'src-pwa/register-service-worker',
-      // DEFAULT: pwaServiceWorker: 'src-pwa/custom-service-worker',
-      // DEFAULT: pwaManifestFile: 'src-pwa/manifest.json',
-      // ...
+      pwaRegisterServiceWorker: 'src-pwa/register-service-worker',
+      pwaServiceWorker: 'src-pwa/custom-service-worker',
+      pwaManifestFile: 'src-pwa/manifest.json',
     },
 
     // Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova

scripts/_ALL_SITES/gruppomacro.app/src-pwa/manifest.json

@@ -13,17 +13,17 @@
         {
             "src": "images/gm-android-icon-512x512.png",
             "sizes": "512x512",
-            "type": "image/png",
+            "type": "image/png"
         },
         {
             "src": "images/gm-android-icon-192x192.png",
             "sizes": "192x192",
-            "type": "image/png",
+            "type": "image/png"
         },
         {
             "src": "images/gm-apple-touch-icon.png",
             "sizes": "180x180",
-            "type": "image/png",
+            "type": "image/png"
         }
     ]
 }

scripts/_ALL_SITES/gruppomacro.app/src/db/lang/ws_it.js

@@ -1,9 +1,9 @@
 const msg_website_it = {
   ws: {
-    sitename: 'Riso',
-    siteshortname: 'RISO',
-    description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
-    keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
+    sitename: 'Gruppo Macro',
+    siteshortname: 'Gruppo Macro',
+    description: '',
+    keywords: '',
   },
   hours: {
     descr: 'Descrizione',
@@ -16,29 +16,20 @@ const msg_website_it = {
   pages: {
     home: 'Home',
     profile: 'Profilo',
+    install_site: 'Installa Sito',
     profile2: 'ProfiloU',
     mypage2: 'mypage2',
     myservice2: 'myservice2',
     myhosps2: 'myhosps2',
     mygood2: 'mygood2',
+    catalogo: 'Catalogo',
     fundraising: 'Sostieni il Progetto',
     notifs: 'Configura le Notifiche',
     unsubscribe: 'Disiscriviti',
+    unsubscribe_user: 'Disiscriviti User',
     test: 'Test',
     projects: 'Progetti',
     report: 'Report Ore',
-    producer: 'Produttore',
-    orderinfo: 'Ordini Effettuati',
-    products: 'Prodotti',
-    productslist: 'Lista Prodotti',
-    collabora: 'Collabora',
-    storehouses: 'Magazzino',
-    departments: 'Uffici',
-    orders: 'Ordini Ricevuti',
-    orders2: 'Ordini Ricevuti',
-    sharewithus: 'Condividi con Noi',
-    checkout: 'Carrello',
-    payment: 'Pagamenti',
     regok: 'Registrazione Confermata',
     presentazione: 'Presentazione',
     presentazione2: 'Presentazione',
@@ -89,9 +80,6 @@ const msg_website_it = {
     projectsShared: 'Condivisi da me',
     myprojects: 'Privati',
     favproj: 'Favoriti',
-    admin_ecommerce: 'ECommerce',
-    ecommerce: 'Prodotti',
-    ecommerce_menu: 'ECommerce1',
     hours: 'Ore',
     department: 'Uffici',
     title: 'Titolo',
@@ -121,15 +109,9 @@ const msg_website_it = {
     only_residenti: 'Solo Residenti',
     only_consiglio: 'Solo Consiglieri',
     color: 'Colore',
-    mainMenu: 'Menu Principale',
-    subtitle: 'Sottotitolo',
-    lang: 'Lingua',
-    keywords: 'Parole Chiave',
-    desctiption: 'Descrizione',
-    heightimg: 'Altezza Immagine',
   },
   msg: {
-    myAppName: 'Riso',
+    myAppName: 'Più che Buono',
     myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
     underconstruction: 'App in costruzione...',
     myDescriz: '',

scripts/_ALL_SITES/gruppomacro.app/src/db/static_data.ts

@@ -1,4 +1,6 @@
-import type {
+/* GRUPPOMACRO APP
+*/
+import {
   IListRoutes,
   ILang,
   IPreloadImages,
@@ -67,39 +69,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 12,
-      path: '/goods',
-      materialIcon: 'fas fa-tshirt',
-      name: 'mypages.goods',
-      component: () => import('@src/root/goods/goods.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/services',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.services',
-      component: () => import('@src/root/services/services.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/activities',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.activities',
-      component: () => import('@src/root/activities/activities.vue'),
-      meta: { requiresAuth: true },
-      inmenu: false,
-      infooter: false,
-    },
     {
       active: true,
       order: 15,
@@ -111,17 +80,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 15,
-      path: '/hosps',
-      materialIcon: 'fas fa-bed',
-      name: 'mypages.hosp',
-      component: () => import('@src/root/hosp/hosp.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
     {
       active: site.confpages && site.confpages.enableCircuits,
       order: 16,
@@ -134,7 +92,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: true,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.enableEvents,
       order: 20,
       path: '/events',
       materialIcon: 'fas fa-bullhorn',
@@ -156,7 +114,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: false,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.showProfile,
       order: 120,
       path: '/myprofile',
       materialIcon: 'fas fa-user',
@@ -167,7 +125,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: true,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.showProfile,
       order: 120,
       path: '/editprofile',
       materialIcon: 'fas fa-user',
@@ -178,7 +136,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: false,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.showiscrittiMenu,
       order: 130,
       path: '/friends',
       materialIcon: 'fas fa-user-friends',
@@ -273,16 +231,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 150,
-      path: '/sostieniilprogetto',
-      materialIcon: 'fas fa-hand-holding-heart',
-      name: 'pages.fundraising',
-      component: () => import('@src/root/fundraising/fundraising.vue'),
-      inmenu: false,
-      infooter: false,
-    },
     {
       active: true,
       order: 80,
@@ -301,7 +249,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
 
 export function firstimagehome() {
 
-  const img = 'statics/images/background.jpg'
+  let img = 'statics/images/background.jpg'
   return img
 }
 

scripts/_ALL_SITES/kolibrilab.it/package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "dev": "quasar dev",
     "build": "quasar build",
-    "buildpwa": "quasar build -m pwa",
+    "buildpwa": "NODE_ENV=production quasar build -m pwa",
     "buildspa": "quasar build -m spa",
     "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./",
     "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt",
@@ -136,4 +136,4 @@
     "npm": ">= 6.14.8",
     "yarn": ">= 1.21.1"
   }
-}
+}

scripts/_ALL_SITES/piuchebuono.app/.env.production

@@ -1,11 +1,11 @@
 VITE_APP_ID="17"
-VITE_APP_URL="https://piuchebuono.app"
-VITE_MONGODB_HOST="https://api.piuchebuono.app"
+VITE_APP_URL="https://test.piuchebuono.app"
+VITE_MONGODB_HOST="https://testapi.piuchebuono.app"
 VITE_LOGO_REG="piuchebuono-logo-full.png"
 VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
-VITE_DEBUG="0"
-VITE_VUE_APP_ISTEST="0"
+VITE_DEBUG="1"
+VITE_VUE_APP_ISTEST="1"
 DIRECTORY_LOCAL="myprojplanet_vite"
-DIRECTORY_SERVER="/var/www/nodejs_piuchebuono_server"
-SERVERDIR_WEBSITE="/var/www/piuchebuono.app"
-SERVERPW_WEBSITE="pwdadmin@1AOK"
+DIRECTORY_SERVER="/var/www/nodejs_test.piuchebuono_server"
+SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app"
+SERVERPW_WEBSITE="pwdadmin@1AOK"

scripts/_ALL_SITES/piuchebuono.app/.env.test

@@ -5,6 +5,7 @@ VITE_LOGO_REG="piuchebuono-logo-full.png"
 VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
 VITE_DEBUG="1"
 VITE_VUE_APP_ISTEST="1"
-DIRECTORY_LOCAL="newfreeplanet"
+DIRECTORY_LOCAL="myprojplanet_vite"
 DIRECTORY_SERVER="/var/www/nodejs_test.piuchebuono_server"
-SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app"
+SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app"
+SERVERPW_WEBSITE="pwdadmin@1AOK"

scripts/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js

@@ -8,6 +8,8 @@ const msg_website_enUs = {
   products: {
     quantity: 'Quantità',
     quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
+    stockBloccatiQty: 'Bloccati In Magazzino',  
     weight: 'Peso',
     stars: 'Voto',
     color: 'Colore',
@@ -36,6 +38,7 @@ const msg_website_enUs = {
     productslist: 'Lista Prodotti',
     collabora: 'Collabora',
     storehouses: 'Magazzino',
+    providers: 'Fornitori',
     departments: 'Uffici',
     orders: 'Ordini Ricevuti',
     orders2: 'Ordini Ricevuti',

scripts/_ALL_SITES/piuchebuono.app/db/lang/ws_es.js

@@ -8,6 +8,7 @@ const msg_website_es = {
   products: {
     quantity: 'Quantità',
     quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
     weight: 'Peso',
     stars: 'Voto',
     color: 'Colore',

scripts/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js

@@ -1,9 +1,9 @@
 const msg_website_it = {
   ws: {
-    sitename: 'Riso',
-    siteshortname: 'RISO',
-    description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
-    keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
+    sitename: 'Più che Buono',
+    siteshortname: 'Più che Buono',
+    description: '',
+    keywords: '',
   },
   hours: {
     descr: 'Descrizione',
@@ -16,23 +16,35 @@ const msg_website_it = {
   pages: {
     home: 'Home',
     profile: 'Profilo',
+    install_site: 'Installa Sito',
     profile2: 'ProfiloU',
     mypage2: 'mypage2',
     myservice2: 'myservice2',
     myhosps2: 'myhosps2',
     mygood2: 'mygood2',
+    catalogo: 'Catalogo',
     fundraising: 'Sostieni il Progetto',
     notifs: 'Configura le Notifiche',
     unsubscribe: 'Disiscriviti',
+    unsubscribe_user: 'Disiscriviti User',
     test: 'Test',
     projects: 'Progetti',
     report: 'Report Ore',
     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',
+    subcatprods: 'Sotto-Categorie',
+    gasordine: 'Gas Ordine',
+    scontisticas: 'Scontistica',
     departments: 'Uffici',
     orders: 'Ordini Ricevuti',
     orders2: 'Ordini Ricevuti',
@@ -121,15 +133,11 @@ const msg_website_it = {
     only_residenti: 'Solo Residenti',
     only_consiglio: 'Solo Consiglieri',
     color: 'Colore',
-    mainMenu: 'Menu Principale',
-    subtitle: 'Sottotitolo',
-    lang: 'Lingua',
-    keywords: 'Parole Chiave',
-    desctiption: 'Descrizione',
-    heightimg: 'Altezza Immagine',
+    gasordini: 'Gas Ordini',
+    gestoreordini: 'Gestore Ordini',
   },
   msg: {
-    myAppName: 'Riso',
+    myAppName: 'Più che Buono',
     myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
     underconstruction: 'App in costruzione...',
     myDescriz: '',

scripts/_ALL_SITES/piuchebuono.app/db/static_data.ts

@@ -1,3 +1,5 @@
+/* PIUCHEBUONO APP
+*/
 import type {
   IListRoutes,
   ILang,
@@ -7,30 +9,6 @@ import type {
 import { func } from '@store/Modules/fieldsTable'
 
 
-// const SHOW_PROJINTHEMENU = false
-//
-// let arrlistafavourite = []
-// let arrlistaprojtutti = []
-// let arrlistaprojmiei = []
-// if (SHOW_PROJINTHEMENU) {
-//   arrlistaprojtutti = Projects.getters.listaprojects(RouteNames.projectsall)
-//   arrlistaprojmiei = Projects.getters.listaprojects(RouteNames.myprojects)
-//   arrlistafavourite = Projects.getters.listaprojects(RouteNames.favouriteprojects)
-// }
-// PROGETTI -> FAVORITI :
-
-// if (arrlistafavourite.length > 0) {
-//   arrMenu.push({
-//     icon: 'favorite_border',
-//     nametranslate: 'pages.' + RouteNames.favouriteprojects,
-//     urlroute: RouteNames.favouriteprojects,
-//     level_parent: 0.0,
-//     level_child: 0.5,
-//     routes2: arrlistafavourite,
-//     idelem: ''
-//   })
-// }
-
 const firstPage = {
   active: true,
   order: 5,
@@ -64,76 +42,12 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       materialIcon: 'fas fa-test',
       name: 'mypages.test',
       component: () => import('@src/views/testServer/testServer.vue'),
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 12,
-      path: '/goods',
-      materialIcon: 'fas fa-tshirt',
-      name: 'mypages.goods',
-      component: () => import('@src/root/goods/goods.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/services',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.services',
-      component: () => import('@src/root/services/services.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/activities',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.activities',
-      component: () => import('@src/root/activities/activities.vue'),
       meta: { requiresAuth: true },
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 15,
-      path: '/provapao',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.provapao',
-      component: () => import('@src/root/provapao/provapao.vue'),
-      meta: { requiresAuth: true },
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/hosps',
-      materialIcon: 'fas fa-bed',
-      name: 'mypages.hosp',
-      component: () => import('@src/root/hosp/hosp.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: site.confpages && site.confpages.enableCircuits,
-      order: 16,
-      path: '/circuits',
-      materialIcon: 'fas fa-coins',
-      name: 'mypages.circuits',
-      component: () => import('@src/views/user/mycircuits/mycircuits.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
+
+    /*{
       active: true,
       order: 20,
       path: '/events',
@@ -143,6 +57,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       meta: { requiresAuth: true },
       inmenu: true,
       infooter: true,
+    },*/
+    {
+      active: site.confpages && site.confpages.showProfile,
+      order: 120,
+      path: '/myprofile',
+      materialIcon: 'fas fa-user',
+      name: 'pages.profile',
+      component: () => import('@src/views/user/myprofile/myprofile.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
     },
     {
       active: true,
@@ -155,17 +80,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 120,
-      path: '/myprofile',
-      materialIcon: 'fas fa-user',
-      name: 'pages.profile',
-      component: () => import('@src/views/user/myprofile/myprofile.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
     {
       active: true,
       order: 120,
@@ -178,7 +92,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: false,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.showiscrittiMenu,
       order: 130,
       path: '/friends',
       materialIcon: 'fas fa-user-friends',
@@ -188,6 +102,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('@src/views/user/mycircuits/mycircuits.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+      onlyAdmin: true,
+      onlyManager: true,
+    },
     {
       active: site.confpages && site.confpages.enableGroups,
       order: 132,
@@ -198,6 +125,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       meta: { requiresAuth: true },
       inmenu: true,
       infooter: false,
+      onlyAdmin: true,
+      onlyManager: true,
     },
     {
       active: true,
@@ -276,7 +205,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
     {
       active: true,
       order: 150,
-      path: '/sostieniilprogetto',
+      path: '/fundraising',
       materialIcon: 'fas fa-hand-holding-heart',
       name: 'pages.fundraising',
       component: () => import('@src/root/fundraising/fundraising.vue'),
@@ -301,7 +230,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
 
 export function firstimagehome() {
 
-  const img = 'statics/images/background.jpg'
+  let img = 'statics/images/background.jpg'
   return img
 }
 

scripts/_ALL_SITES/piuchebuono.app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piuchebuono",
-  "version": "1.2.2",
+  "version": "1.2.13",
   "description": "PiuCheBuono",
   "productName": "PiuCheBuono",
   "author": "Surya",
@@ -12,8 +12,8 @@
     "dev": "quasar dev",
     "dev_noCheck": "SKIP_TSC=true quasar dev",
     "build": "quasar build",
-    "buildpwa": "quasar build -m pwa",
-    "buildpwatest": "NODE_ENV=test quasar build -m pwa",
+    "buildpwa": "NODE_ENV=production quasar build -m pwa",
+    "buildpwatest": "NODE_ENV=production quasar build -m pwa",
     "type-check": "vue-tsc --noEmit",
     "type-check:watch": "vue-tsc --noEmit --watch",
     "buildspa": "quasar build -m spa",

scripts/_ALL_SITES/piuchebuono.app/quasar.config.ts

@@ -360,20 +360,20 @@ export default defineConfig((ctx) => {
 
     pwa: {
       workboxMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest'
-      swFilename: 'sw-' + "1.2.2" + '.js',
+      swFilename: 'sw-' + "1.2.13" + '.js',
       workboxOptions: {
         swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista
       },
-      extendGenerateSWOptions(cfg) {
+      /*extendGenerateSWOptions(cfg) {
         cfg.skipWaiting = false
         cfg.clientsClaim = false
-      },
+      },*/
     },
 
     sourceFiles: {
-      // DEFAULT: pwaRegisterServiceWorker: 'src-pwa/register-service-worker',
-      // DEFAULT: pwaServiceWorker: 'src-pwa/custom-service-worker',
-      // DEFAULT: pwaManifestFile: 'src-pwa/manifest.json',
+      pwaRegisterServiceWorker: 'src-pwa/register-service-worker',
+      pwaServiceWorker: 'src-pwa/custom-service-worker',
+      pwaManifestFile: 'src-pwa/manifest.json',
       // ...
     },
 

scripts/_ALL_SITES/piuchebuono.app/src/db/lang/ws_enUs.js

@@ -8,6 +8,8 @@ const msg_website_enUs = {
   products: {
     quantity: 'Quantità',
     quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
+    stockBloccatiQty: 'Bloccati In Magazzino',  
     weight: 'Peso',
     stars: 'Voto',
     color: 'Colore',
@@ -36,6 +38,7 @@ const msg_website_enUs = {
     productslist: 'Lista Prodotti',
     collabora: 'Collabora',
     storehouses: 'Magazzino',
+    providers: 'Fornitori',
     departments: 'Uffici',
     orders: 'Ordini Ricevuti',
     orders2: 'Ordini Ricevuti',

scripts/_ALL_SITES/piuchebuono.app/src/db/lang/ws_es.js

@@ -8,6 +8,7 @@ const msg_website_es = {
   products: {
     quantity: 'Quantità',
     quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
     weight: 'Peso',
     stars: 'Voto',
     color: 'Colore',

scripts/_ALL_SITES/piuchebuono.app/src/db/lang/ws_it.js

@@ -1,9 +1,9 @@
 const msg_website_it = {
   ws: {
-    sitename: 'Riso',
-    siteshortname: 'RISO',
-    description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
-    keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
+    sitename: 'Più che Buono',
+    siteshortname: 'Più che Buono',
+    description: '',
+    keywords: '',
   },
   hours: {
     descr: 'Descrizione',
@@ -16,23 +16,35 @@ const msg_website_it = {
   pages: {
     home: 'Home',
     profile: 'Profilo',
+    install_site: 'Installa Sito',
     profile2: 'ProfiloU',
     mypage2: 'mypage2',
     myservice2: 'myservice2',
     myhosps2: 'myhosps2',
     mygood2: 'mygood2',
+    catalogo: 'Catalogo',
     fundraising: 'Sostieni il Progetto',
     notifs: 'Configura le Notifiche',
     unsubscribe: 'Disiscriviti',
+    unsubscribe_user: 'Disiscriviti User',
     test: 'Test',
     projects: 'Progetti',
     report: 'Report Ore',
     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',
+    subcatprods: 'Sotto-Categorie',
+    gasordine: 'Gas Ordine',
+    scontisticas: 'Scontistica',
     departments: 'Uffici',
     orders: 'Ordini Ricevuti',
     orders2: 'Ordini Ricevuti',
@@ -121,15 +133,11 @@ const msg_website_it = {
     only_residenti: 'Solo Residenti',
     only_consiglio: 'Solo Consiglieri',
     color: 'Colore',
-    mainMenu: 'Menu Principale',
-    subtitle: 'Sottotitolo',
-    lang: 'Lingua',
-    keywords: 'Parole Chiave',
-    desctiption: 'Descrizione',
-    heightimg: 'Altezza Immagine',
+    gasordini: 'Gas Ordini',
+    gestoreordini: 'Gestore Ordini',
   },
   msg: {
-    myAppName: 'Riso',
+    myAppName: 'Più che Buono',
     myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
     underconstruction: 'App in costruzione...',
     myDescriz: '',

scripts/_ALL_SITES/piuchebuono.app/src/db/static_data.ts

@@ -1,3 +1,5 @@
+/* PIUCHEBUONO APP
+*/
 import type {
   IListRoutes,
   ILang,
@@ -7,30 +9,6 @@ import type {
 import { func } from '@store/Modules/fieldsTable'
 
 
-// const SHOW_PROJINTHEMENU = false
-//
-// let arrlistafavourite = []
-// let arrlistaprojtutti = []
-// let arrlistaprojmiei = []
-// if (SHOW_PROJINTHEMENU) {
-//   arrlistaprojtutti = Projects.getters.listaprojects(RouteNames.projectsall)
-//   arrlistaprojmiei = Projects.getters.listaprojects(RouteNames.myprojects)
-//   arrlistafavourite = Projects.getters.listaprojects(RouteNames.favouriteprojects)
-// }
-// PROGETTI -> FAVORITI :
-
-// if (arrlistafavourite.length > 0) {
-//   arrMenu.push({
-//     icon: 'favorite_border',
-//     nametranslate: 'pages.' + RouteNames.favouriteprojects,
-//     urlroute: RouteNames.favouriteprojects,
-//     level_parent: 0.0,
-//     level_child: 0.5,
-//     routes2: arrlistafavourite,
-//     idelem: ''
-//   })
-// }
-
 const firstPage = {
   active: true,
   order: 5,
@@ -64,76 +42,12 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       materialIcon: 'fas fa-test',
       name: 'mypages.test',
       component: () => import('@src/views/testServer/testServer.vue'),
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 12,
-      path: '/goods',
-      materialIcon: 'fas fa-tshirt',
-      name: 'mypages.goods',
-      component: () => import('@src/root/goods/goods.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/services',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.services',
-      component: () => import('@src/root/services/services.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/activities',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.activities',
-      component: () => import('@src/root/activities/activities.vue'),
       meta: { requiresAuth: true },
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 15,
-      path: '/provapao',
-      materialIcon: 'fas fa-house-user',
-      name: 'mypages.provapao',
-      component: () => import('@src/root/provapao/provapao.vue'),
-      meta: { requiresAuth: true },
-      inmenu: false,
-      infooter: false,
-    },
-    {
-      active: true,
-      order: 15,
-      path: '/hosps',
-      materialIcon: 'fas fa-bed',
-      name: 'mypages.hosp',
-      component: () => import('@src/root/hosp/hosp.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
-      active: site.confpages && site.confpages.enableCircuits,
-      order: 16,
-      path: '/circuits',
-      materialIcon: 'fas fa-coins',
-      name: 'mypages.circuits',
-      component: () => import('@src/views/user/mycircuits/mycircuits.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
-    {
+
+    /*{
       active: true,
       order: 20,
       path: '/events',
@@ -143,6 +57,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       meta: { requiresAuth: true },
       inmenu: true,
       infooter: true,
+    },*/
+    {
+      active: site.confpages && site.confpages.showProfile,
+      order: 120,
+      path: '/myprofile',
+      materialIcon: 'fas fa-user',
+      name: 'pages.profile',
+      component: () => import('@src/views/user/myprofile/myprofile.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
     },
     {
       active: true,
@@ -155,17 +80,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
-    {
-      active: true,
-      order: 120,
-      path: '/myprofile',
-      materialIcon: 'fas fa-user',
-      name: 'pages.profile',
-      component: () => import('@src/views/user/myprofile/myprofile.vue'),
-      meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
-    },
     {
       active: true,
       order: 120,
@@ -178,7 +92,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       infooter: false,
     },
     {
-      active: true,
+      active: site.confpages && site.confpages.showiscrittiMenu,
       order: 130,
       path: '/friends',
       materialIcon: 'fas fa-user-friends',
@@ -188,6 +102,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('@src/views/user/mycircuits/mycircuits.vue'),
+      meta: { requiresAuth: true },
+      inmenu: true,
+      infooter: true,
+      onlyAdmin: true,
+      onlyManager: true,
+    },
     {
       active: site.confpages && site.confpages.enableGroups,
       order: 132,
@@ -198,6 +125,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       meta: { requiresAuth: true },
       inmenu: true,
       infooter: false,
+      onlyAdmin: true,
+      onlyManager: true,
     },
     {
       active: true,
@@ -276,7 +205,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
     {
       active: true,
       order: 150,
-      path: '/sostieniilprogetto',
+      path: '/fundraising',
       materialIcon: 'fas fa-hand-holding-heart',
       name: 'pages.fundraising',
       component: () => import('@src/root/fundraising/fundraising.vue'),
@@ -301,7 +230,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
 
 export function firstimagehome() {
 
-  const img = 'statics/images/background.jpg'
+  let img = 'statics/images/background.jpg'
   return img
 }
 

scripts/_ALL_SITES/riso.app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "riso",
-  "version": "1.2.2",
+  "version": "1.2.13",
   "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.",
   "productName": "Riso",
   "author": "Surya",
@@ -12,8 +12,8 @@
     "dev": "quasar dev",
     "dev_noCheck": "SKIP_TSC=true quasar dev",
     "build": "quasar build",
-    "buildpwa": "quasar build -m pwa",
-    "buildpwatest": "NODE_ENV=test quasar build -m pwa",
+    "buildpwa": "NODE_ENV=production quasar build -m pwa",
+    "buildpwatest": "NODE_ENV=production quasar build -m pwa",
     "type-check": "vue-tsc --noEmit",
     "type-check:watch": "vue-tsc --noEmit --watch",
     "buildspa": "quasar build -m spa",

scripts/_ALL_SITES/riso.app/quasar.config.ts

@@ -363,21 +363,20 @@ export default defineConfig((ctx) => {
     // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
     pwa: {
       workboxMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest'
-      swFilename: 'sw-' + "1.2.2" + '.js',
+      swFilename: 'sw-' + "1.2.13" + '.js',
       workboxOptions: {
         swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista
       },
-      extendGenerateSWOptions(cfg) {
+      /*extendGenerateSWOptions(cfg) {
         cfg.skipWaiting = false
         cfg.clientsClaim = false
-      },
+      },*/
     },
 
     sourceFiles: {
-      // DEFAULT: pwaRegisterServiceWorker: 'src-pwa/register-service-worker',
-      // DEFAULT: pwaServiceWorker: 'src-pwa/custom-service-worker',
-      // DEFAULT: pwaManifestFile: 'src-pwa/manifest.json',
-      // ...
+      pwaRegisterServiceWorker: 'src-pwa/register-service-worker',
+      pwaServiceWorker: 'src-pwa/custom-service-worker',
+      pwaManifestFile: 'src-pwa/manifest.json',
     },
 
     // Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova