diff --git a/.env.development b/.env.development index 4267996f..189f2b39 100755 --- a/.env.development +++ b/.env.development @@ -1,13 +1,12 @@ -VITE_MONGODB_HOST="https://localhost:3000" -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_APP_ID="13" -VITE_LOGO_REG='riso-logo-full.png' +VITE_APP_ID="17" VITE_APP_URL="https://localhost" -DIRECTORY_LOCAL=myprojplanet_vite -DIRECTORY_SERVER=freeplanet_serverside +VITE_MONGODB_HOST="https://localhost:3000" +VITE_LOGO_REG='piuchebuono-logo-full.png' +VITE_PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8' +VITE_DEBUG="1" +VITE_VUE_APP_ISTEST=0 +VITE_VUE_APP_INLOCALE=1 +DIRECTORY_LOCAL="newfreeplanet" +DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" -SERVERPW_WEBSITE="" \ No newline at end of file +SERVERPW_WEBSITE="" diff --git a/.env.production b/.env.production index eed57b23..97ce984b 100644 --- a/.env.production +++ b/.env.production @@ -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_PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" -VITE_DEBUG="1" -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" \ No newline at end of file +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" +DIRECTORY_LOCAL="myprojplanet_vite" +DIRECTORY_SERVER="/var/www/nodejs_piuchebuono_server" +SERVERDIR_WEBSITE="/var/www/piuchebuono.app" +SERVERPW_WEBSITE="pwdadmin@1AOK" diff --git a/package.json b/package.json index 6b7f32cc..79a9cb48 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "riso", + "name": "piuchebuono", "version": "1.2.2", - "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", + "description": "PiuCheBuono", + "productName": "PiuCheBuono", "author": "Surya", "private": true, "keywords": [], @@ -29,7 +29,7 @@ "postinstall": "quasar prepare" }, "dependencies": { - "@cubejs-client/core": "^1.2.19", + "@cubejs-client/core": "^1.2.13", "@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.1", + "acorn": "^8.14.0", "animate.css": "^4.1.1", - "autoprefixer": "^10.4.21", - "axios": "^1.8.2", + "autoprefixer": "^10.4.20", + "axios": "^1.8.1", "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.16.2", + "eslint-plugin-n": "^17.15.1", "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.1", + "quasar": "^2.18.0", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", "scrollreveal": "^4.0.9", - "typescript-eslint": "^8.26.0", + "typescript-eslint": "^8.25.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.2", + "vue-i18n": "^11.1.1", "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.22.0", + "@eslint/js": "^9.21.0", "@intlify/unplugin-vue-i18n": "^6.0.3", - "@quasar/app-vite": "^2.1.4", + "@quasar/app-vite": "^2.1.1", "@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.10", + "@types/node": "^22.13.8", "@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.5.0", - "autoprefixer": "^10.4.21", + "@vue/eslint-config-typescript": "^14.4.0", + "autoprefixer": "^10.4.20", "eslint": "9", "eslint-plugin-import": "^2.31.0", - "eslint-plugin-vue": "^10.0.0", + "eslint-plugin-vue": "^9.32.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.8", + "vue-tsc": "^2.2.6", "vueify": "^9.4.1", "workbox-build": "^7.3.0" }, diff --git a/public/favicon.ico b/public/favicon.ico index d283c964..765302c2 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/images/freeplanet-logo-full.odg b/public/images/freeplanet-logo-full.odg new file mode 100755 index 00000000..854da650 Binary files /dev/null and b/public/images/freeplanet-logo-full.odg differ diff --git a/public/images/freeplanet-logo-full.svg b/public/images/freeplanet-logo-full.svg new file mode 100755 index 00000000..b9c10df3 --- /dev/null +++ b/public/images/freeplanet-logo-full.svg @@ -0,0 +1,1186 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/pcb-android-icon-144x144.png b/public/images/pcb-android-icon-144x144.png new file mode 100644 index 00000000..fdea5eb1 Binary files /dev/null and b/public/images/pcb-android-icon-144x144.png differ diff --git a/public/images/pcb-android-icon-192x192.png b/public/images/pcb-android-icon-192x192.png new file mode 100644 index 00000000..93bb5fb7 Binary files /dev/null and b/public/images/pcb-android-icon-192x192.png differ diff --git a/public/images/pcb-android-icon-36x36.png b/public/images/pcb-android-icon-36x36.png new file mode 100644 index 00000000..f700c0d2 Binary files /dev/null and b/public/images/pcb-android-icon-36x36.png differ diff --git a/public/images/pcb-android-icon-48x48.png b/public/images/pcb-android-icon-48x48.png new file mode 100644 index 00000000..4018b080 Binary files /dev/null and b/public/images/pcb-android-icon-48x48.png differ diff --git a/public/images/pcb-android-icon-72x72.png b/public/images/pcb-android-icon-72x72.png new file mode 100644 index 00000000..fdaff445 Binary files /dev/null and b/public/images/pcb-android-icon-72x72.png differ diff --git a/public/images/pcb-android-icon-96x96.png b/public/images/pcb-android-icon-96x96.png new file mode 100644 index 00000000..74ae0a32 Binary files /dev/null and b/public/images/pcb-android-icon-96x96.png differ diff --git a/public/images/pcb-apple-icon-114x114.png b/public/images/pcb-apple-icon-114x114.png new file mode 100644 index 00000000..de67dfff Binary files /dev/null and b/public/images/pcb-apple-icon-114x114.png differ diff --git a/public/images/pcb-apple-icon-120x120.png b/public/images/pcb-apple-icon-120x120.png new file mode 100644 index 00000000..5864c9c8 Binary files /dev/null and b/public/images/pcb-apple-icon-120x120.png differ diff --git a/public/images/pcb-apple-icon-144x144.png b/public/images/pcb-apple-icon-144x144.png new file mode 100644 index 00000000..fdea5eb1 Binary files /dev/null and b/public/images/pcb-apple-icon-144x144.png differ diff --git a/public/images/pcb-apple-icon-152x152.png b/public/images/pcb-apple-icon-152x152.png new file mode 100644 index 00000000..6e92509a Binary files /dev/null and b/public/images/pcb-apple-icon-152x152.png differ diff --git a/public/images/pcb-apple-icon-180x180.png b/public/images/pcb-apple-icon-180x180.png new file mode 100644 index 00000000..4d59cedc Binary files /dev/null and b/public/images/pcb-apple-icon-180x180.png differ diff --git a/public/images/pcb-apple-icon-57x57.png b/public/images/pcb-apple-icon-57x57.png new file mode 100644 index 00000000..fb201a9d Binary files /dev/null and b/public/images/pcb-apple-icon-57x57.png differ diff --git a/public/images/pcb-apple-icon-60x60.png b/public/images/pcb-apple-icon-60x60.png new file mode 100644 index 00000000..3b5f1c33 Binary files /dev/null and b/public/images/pcb-apple-icon-60x60.png differ diff --git a/public/images/pcb-apple-icon-72x72.png b/public/images/pcb-apple-icon-72x72.png new file mode 100644 index 00000000..fdaff445 Binary files /dev/null and b/public/images/pcb-apple-icon-72x72.png differ diff --git a/public/images/pcb-apple-icon-76x76.png b/public/images/pcb-apple-icon-76x76.png new file mode 100644 index 00000000..2882992b Binary files /dev/null and b/public/images/pcb-apple-icon-76x76.png differ diff --git a/public/images/pcb-apple-icon.png b/public/images/pcb-apple-icon.png new file mode 100644 index 00000000..422a8dca Binary files /dev/null and b/public/images/pcb-apple-icon.png differ diff --git a/public/images/piuchebuono-logo-full.png b/public/images/piuchebuono-logo-full.png new file mode 100644 index 00000000..5465d80c Binary files /dev/null and b/public/images/piuchebuono-logo-full.png differ diff --git a/public/images/riso-android-icon-144x144.png b/public/images/riso-android-icon-144x144.png deleted file mode 100644 index 37dcd661..00000000 Binary files a/public/images/riso-android-icon-144x144.png and /dev/null differ diff --git a/public/images/riso-android-icon-192x192.png b/public/images/riso-android-icon-192x192.png deleted file mode 100644 index 95b960e9..00000000 Binary files a/public/images/riso-android-icon-192x192.png and /dev/null differ diff --git a/public/images/riso-android-icon-384x384.png b/public/images/riso-android-icon-384x384.png deleted file mode 100644 index ce1ffc47..00000000 Binary files a/public/images/riso-android-icon-384x384.png and /dev/null differ diff --git a/public/images/riso-android-icon-48x48.png b/public/images/riso-android-icon-48x48.png deleted file mode 100644 index 499e8674..00000000 Binary files a/public/images/riso-android-icon-48x48.png and /dev/null differ diff --git a/public/images/riso-android-icon-512x512.png b/public/images/riso-android-icon-512x512.png deleted file mode 100644 index e1c31acd..00000000 Binary files a/public/images/riso-android-icon-512x512.png and /dev/null differ diff --git a/public/images/riso-android-icon-96x96.png b/public/images/riso-android-icon-96x96.png deleted file mode 100644 index 98dbf9d9..00000000 Binary files a/public/images/riso-android-icon-96x96.png and /dev/null differ diff --git a/public/images/riso-apple-icon-114x114.png b/public/images/riso-apple-icon-114x114.png deleted file mode 100644 index 882dd21c..00000000 Binary files a/public/images/riso-apple-icon-114x114.png and /dev/null differ diff --git a/public/images/riso-apple-icon-120x120.png b/public/images/riso-apple-icon-120x120.png deleted file mode 100644 index 734b0503..00000000 Binary files a/public/images/riso-apple-icon-120x120.png and /dev/null differ diff --git a/public/images/riso-apple-icon-144x144.png b/public/images/riso-apple-icon-144x144.png deleted file mode 100644 index 923da7be..00000000 Binary files a/public/images/riso-apple-icon-144x144.png and /dev/null differ diff --git a/public/images/riso-apple-icon-152x152.png b/public/images/riso-apple-icon-152x152.png deleted file mode 100644 index 84fd455d..00000000 Binary files a/public/images/riso-apple-icon-152x152.png and /dev/null differ diff --git a/public/images/riso-apple-icon-180x180.png b/public/images/riso-apple-icon-180x180.png deleted file mode 100644 index e457d906..00000000 Binary files a/public/images/riso-apple-icon-180x180.png and /dev/null differ diff --git a/public/images/riso-apple-icon-57x57.png b/public/images/riso-apple-icon-57x57.png deleted file mode 100644 index f5f538db..00000000 Binary files a/public/images/riso-apple-icon-57x57.png and /dev/null differ diff --git a/public/images/riso-apple-icon-60x60.png b/public/images/riso-apple-icon-60x60.png deleted file mode 100644 index 4121f834..00000000 Binary files a/public/images/riso-apple-icon-60x60.png and /dev/null differ diff --git a/public/images/riso-apple-icon-72x72.png b/public/images/riso-apple-icon-72x72.png deleted file mode 100644 index 5efd872d..00000000 Binary files a/public/images/riso-apple-icon-72x72.png and /dev/null differ diff --git a/public/images/riso-apple-icon-76x76.png b/public/images/riso-apple-icon-76x76.png deleted file mode 100644 index 6db4b76f..00000000 Binary files a/public/images/riso-apple-icon-76x76.png and /dev/null differ diff --git a/public/images/riso-apple-icon.png b/public/images/riso-apple-icon.png deleted file mode 100644 index cfaeb3c0..00000000 Binary files a/public/images/riso-apple-icon.png and /dev/null differ diff --git a/public/images/riso-logo-full.png b/public/images/riso-logo-full.png deleted file mode 100644 index 51a29654..00000000 Binary files a/public/images/riso-logo-full.png and /dev/null differ diff --git a/public/myicons/favicon-16x16.png b/public/myicons/favicon-16x16.png index c28cef9f..d5a67f48 100644 Binary files a/public/myicons/favicon-16x16.png and b/public/myicons/favicon-16x16.png differ diff --git a/public/myicons/favicon-32x32.png b/public/myicons/favicon-32x32.png index a02e38b0..f2149cac 100644 Binary files a/public/myicons/favicon-32x32.png and b/public/myicons/favicon-32x32.png differ diff --git a/public/myicons/favicon-96x96.png b/public/myicons/favicon-96x96.png deleted file mode 100644 index f741b210..00000000 Binary files a/public/myicons/favicon-96x96.png and /dev/null differ diff --git a/quasar.config.ts b/quasar.config.ts index c58316b0..5cb69fb6 100644 --- a/quasar.config.ts +++ b/quasar.config.ts @@ -3,8 +3,6 @@ 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 @@ -123,6 +121,7 @@ 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'), @@ -216,7 +215,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 ? 8084 : 8094, + port: ctx.mode.spa ? 8088 : 8098, vueDevtools: false, // automatically opening remote Vue Devtools open: false, // opens browser window automatically hot: true, // Disable hot module replacement @@ -359,8 +358,6 @@ 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', @@ -410,7 +407,7 @@ export default defineConfig((ctx) => { builder: { // https://www.electron.build/configuration/configuration - appId: 'Riso', + appId: 'PiuCheBuono', }, diff --git a/scripts/_ALL_SITES/gruppomacro.app/quasar.config.ts b/scripts/_ALL_SITES/gruppomacro.app/quasar.config.ts index 26889adb..10193546 100644 --- a/scripts/_ALL_SITES/gruppomacro.app/quasar.config.ts +++ b/scripts/_ALL_SITES/gruppomacro.app/quasar.config.ts @@ -360,7 +360,7 @@ export default defineConfig((ctx) => { pwa: { workboxMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest' - swFilename: 'service2.js', + swFilename: 'sw-' + "1.2.2" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/_ALL_SITES/piuchebuono.app/quasar.config.ts b/scripts/_ALL_SITES/piuchebuono.app/quasar.config.ts index 6cf0d283..5cb69fb6 100644 --- a/scripts/_ALL_SITES/piuchebuono.app/quasar.config.ts +++ b/scripts/_ALL_SITES/piuchebuono.app/quasar.config.ts @@ -360,7 +360,7 @@ export default defineConfig((ctx) => { pwa: { workboxMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest' - swFilename: 'sw5.js', + swFilename: 'sw-' + "1.2.2" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/_ALL_SITES/riso.app/quasar.config.ts b/scripts/_ALL_SITES/riso.app/quasar.config.ts index d0328b54..c58316b0 100644 --- a/scripts/_ALL_SITES/riso.app/quasar.config.ts +++ b/scripts/_ALL_SITES/riso.app/quasar.config.ts @@ -363,7 +363,7 @@ export default defineConfig((ctx) => { // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa pwa: { workboxMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest' - swFilename: 'sw5.js', + swFilename: 'sw-' + "1.2.2" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/now.txt b/scripts/now.txt index a1eb1e45..1e23559a 100644 --- a/scripts/now.txt +++ b/scripts/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU gruppomacro.app: (Sovrascrivo!) +TERMINA DI LAVORARE SU riso.app: (Sovrascrivo!) diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index ce5823eb..62dca5ec 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -31,9 +31,6 @@ import { CacheableResponsePlugin } from 'workbox-cacheable-response'; import { ExpirationPlugin } from 'workbox-expiration'; - - - setCacheNameDetails({ prefix: self.location.hostname, suffix: 'v1', @@ -60,18 +57,24 @@ self.addEventListener('install', () => { console.log('Service Worker: Skip...'); self.skipWaiting() }); + self.addEventListener('activate', (event) => { - clientsClaim(); + console.log('Service Worker: Activated'); + + // Pulizia delle cache obsolete durante l'attivazione event.waitUntil( (async () => { const cacheNames = await caches.keys(); await Promise.all( - cacheNames.map(cacheName => { + cacheNames.map((cacheName) => { if (!cacheName.startsWith(`${self.location.hostname}-v1`)) { return caches.delete(cacheName); } }) ); + + // Reclama immediatamente il controllo delle pagine + self.clients.claim(); })() ); }); diff --git a/src/index.template.html b/src/OLD_index.template-OLD.html. similarity index 100% rename from src/index.template.html rename to src/OLD_index.template-OLD.html.