diff --git a/.env b/.env index 4945b028..77cb6301 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -VITE_APP_VERSION="1.2.17" +VITE_APP_VERSION="1.2.18" VITE_LANG_DEFAULT="it" VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -VITE_SERVICE_WORKER_FILE="sw-1.2.17.js" +VITE_SERVICE_WORKER_FILE="sw-1.2.18.js" VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" VITE_VUE_ROUTER_MODE="history" \ No newline at end of file diff --git a/index.html b/index.html index ac816aa6..44d51a52 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index 75a3f87e..55a36fb9 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.2.17", + "version": "1.2.18", "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", diff --git a/quasar.config.ts b/quasar.config.ts index adaf4f6e..c24d4eb7 100644 --- a/quasar.config.ts +++ b/quasar.config.ts @@ -366,7 +366,7 @@ export default defineConfig((ctx) => { // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa pwa: { workboxMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest' - swFilename: 'sw-' + "1.2.17" + '.js', + swFilename: 'sw-' + "1.2.18" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/_ALL_SITES/comunitanuovomondo.app/db/static_data.ts b/scripts/_ALL_SITES/comunitanuovomondo.app/db/static_data.ts index de1ad4f1..0657e230 100755 --- a/scripts/_ALL_SITES/comunitanuovomondo.app/db/static_data.ts +++ b/scripts/_ALL_SITES/comunitanuovomondo.app/db/static_data.ts @@ -4,7 +4,6 @@ import { IPreloadImages, ISites, } from '@model' -import { func } from '@store/Modules/fieldsTable' // const SHOW_PROJINTHEMENU = false diff --git a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json index 1351184c..2d01d1d1 100755 --- a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json +++ b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.2.17", + "version": "1.2.18", "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", diff --git a/scripts/_ALL_SITES/gruppomacro.app/db/static_data.ts b/scripts/_ALL_SITES/gruppomacro.app/db/static_data.ts index 3e5faa34..a2cc7074 100755 --- a/scripts/_ALL_SITES/gruppomacro.app/db/static_data.ts +++ b/scripts/_ALL_SITES/gruppomacro.app/db/static_data.ts @@ -6,7 +6,6 @@ import { IPreloadImages, ISites, } from '@model' -import { func } from '@store/Modules/fieldsTable' // const SHOW_PROJINTHEMENU = false diff --git a/scripts/_ALL_SITES/gruppomacro.app/package.json b/scripts/_ALL_SITES/gruppomacro.app/package.json index 6fb49630..05ee1103 100755 --- a/scripts/_ALL_SITES/gruppomacro.app/package.json +++ b/scripts/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.17", + "version": "1.2.18", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", diff --git a/scripts/_ALL_SITES/gruppomacro.app/quasar.config.ts b/scripts/_ALL_SITES/gruppomacro.app/quasar.config.ts index e01d444a..3ac647c1 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: 'sw-' + "1.2.17" + '.js', + swFilename: 'sw-' + "1.2.18" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/_ALL_SITES/gruppomacro.app/src-pwa/manifest.json b/scripts/_ALL_SITES/gruppomacro.app/src-pwa/manifest.json index 630ede53..d70a91e9 100644 --- a/scripts/_ALL_SITES/gruppomacro.app/src-pwa/manifest.json +++ b/scripts/_ALL_SITES/gruppomacro.app/src-pwa/manifest.json @@ -11,17 +11,17 @@ "start_url": "/?homescreen=1", "icons": [ { - "src": "images/gm-android-icon-512x512.png", + "src": "/images/gm-android-icon-512x512.png", "sizes": "512x512", "type": "image/png" }, { - "src": "images/gm-android-icon-192x192.png", + "src": "/images/gm-android-icon-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "images/gm-apple-touch-icon.png", + "src": "/images/gm-apple-touch-icon.png", "sizes": "180x180", "type": "image/png" } diff --git a/scripts/_ALL_SITES/gruppomacro.app/src/db/static_data.ts b/scripts/_ALL_SITES/gruppomacro.app/src/db/static_data.ts index 3e5faa34..a2cc7074 100755 --- a/scripts/_ALL_SITES/gruppomacro.app/src/db/static_data.ts +++ b/scripts/_ALL_SITES/gruppomacro.app/src/db/static_data.ts @@ -6,7 +6,6 @@ import { IPreloadImages, ISites, } from '@model' -import { func } from '@store/Modules/fieldsTable' // const SHOW_PROJINTHEMENU = false diff --git a/scripts/_ALL_SITES/piuchebuono.app/db/static_data.ts b/scripts/_ALL_SITES/piuchebuono.app/db/static_data.ts index 6d52b244..4e2d487d 100755 --- a/scripts/_ALL_SITES/piuchebuono.app/db/static_data.ts +++ b/scripts/_ALL_SITES/piuchebuono.app/db/static_data.ts @@ -6,7 +6,6 @@ import type { IPreloadImages, ISites, } from '@model' -import { func } from '@store/Modules/fieldsTable' const firstPage = { diff --git a/scripts/_ALL_SITES/piuchebuono.app/package.json b/scripts/_ALL_SITES/piuchebuono.app/package.json index 9cf058b2..8ae9b3e3 100755 --- a/scripts/_ALL_SITES/piuchebuono.app/package.json +++ b/scripts/_ALL_SITES/piuchebuono.app/package.json @@ -1,6 +1,6 @@ { "name": "piuchebuono", - "version": "1.2.17", + "version": "1.2.18", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Surya", diff --git a/scripts/_ALL_SITES/piuchebuono.app/quasar.config.ts b/scripts/_ALL_SITES/piuchebuono.app/quasar.config.ts index b57c6245..251da2ca 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: 'sw-' + "1.2.17" + '.js', + swFilename: 'sw-' + "1.2.18" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/_ALL_SITES/piuchebuono.app/src-pwa/manifest.json b/scripts/_ALL_SITES/piuchebuono.app/src-pwa/manifest.json index a3b6c9d6..91e46ac9 100644 --- a/scripts/_ALL_SITES/piuchebuono.app/src-pwa/manifest.json +++ b/scripts/_ALL_SITES/piuchebuono.app/src-pwa/manifest.json @@ -11,47 +11,47 @@ "start_url": "/?homescreen=1", "icons": [ { - "src:": "images/pcb-android-icon-512x512.png", + "src:": "/images/pcb-android-icon-512x512.png", "sizes": "512x512", "type": "image/png" }, { - "src:": "images/pcb-android-icon-384x384.png", + "src:": "/images/pcb-android-icon-384x384.png", "sizes": "384x384", "type": "image/png" }, { - "src:": "images/pcb-android-icon-192x192.png", + "src:": "/images/pcb-android-icon-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src:": "images/pcb-android-icon-144x144.png", + "src:": "/images/pcb-android-icon-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src:": "images/pcb-android-icon-96x96.png", + "src:": "/images/pcb-android-icon-96x96.png", "sizes": "96x96", "type": "image/png" }, { - "src:": "images/pcb-apple-icon-120x120.png", + "src:": "/images/pcb-apple-icon-120x120.png", "sizes": "120x120", "type": "image/png" }, { - "src:": "images/pcb-apple-icon-144x144.png", + "src:": "/images/pcb-apple-icon-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src:": "images/pcb-apple-icon-152x152.png", + "src:": "/images/pcb-apple-icon-152x152.png", "sizes": "152x152", "type": "image/png" }, { - "src:": "images/pcb-apple-icon-180x180.png", + "src:": "/images/pcb-apple-icon-180x180.png", "sizes": "180x180", "type": "image/png" } diff --git a/scripts/_ALL_SITES/piuchebuono.app/src/db/static_data.ts b/scripts/_ALL_SITES/piuchebuono.app/src/db/static_data.ts index 6d52b244..4e2d487d 100755 --- a/scripts/_ALL_SITES/piuchebuono.app/src/db/static_data.ts +++ b/scripts/_ALL_SITES/piuchebuono.app/src/db/static_data.ts @@ -6,7 +6,6 @@ import type { IPreloadImages, ISites, } from '@model' -import { func } from '@store/Modules/fieldsTable' const firstPage = { diff --git a/scripts/_ALL_SITES/riso.app/package.json b/scripts/_ALL_SITES/riso.app/package.json index 75a3f87e..55a36fb9 100755 --- a/scripts/_ALL_SITES/riso.app/package.json +++ b/scripts/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.2.17", + "version": "1.2.18", "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", diff --git a/scripts/_ALL_SITES/riso.app/quasar.config.ts b/scripts/_ALL_SITES/riso.app/quasar.config.ts index adaf4f6e..c24d4eb7 100644 --- a/scripts/_ALL_SITES/riso.app/quasar.config.ts +++ b/scripts/_ALL_SITES/riso.app/quasar.config.ts @@ -366,7 +366,7 @@ export default defineConfig((ctx) => { // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa pwa: { workboxMode: 'InjectManifest', // 'GenerateSW' or 'InjectManifest' - swFilename: 'sw-' + "1.2.17" + '.js', + swFilename: 'sw-' + "1.2.18" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/_ALL_SITES/riso.app/src-pwa/manifest.json b/scripts/_ALL_SITES/riso.app/src-pwa/manifest.json index 9fb829a5..c4032e4f 100644 --- a/scripts/_ALL_SITES/riso.app/src-pwa/manifest.json +++ b/scripts/_ALL_SITES/riso.app/src-pwa/manifest.json @@ -11,47 +11,47 @@ "start_url": "/?homescreen=1", "icons": [ { - "src:": "images/riso-android-icon-512x512.png", + "src:": "/images/riso-android-icon-512x512.png", "sizes": "512x512", "type": "image/png" }, { - "src:": "images/riso-android-icon-384x384.png", + "src:": "/images/riso-android-icon-384x384.png", "sizes": "384x384", "type": "image/png" }, { - "src:": "images/riso-android-icon-192x192.png", + "src:": "/images/riso-android-icon-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src:": "images/riso-android-icon-144x144.png", + "src:": "/images/riso-android-icon-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src:": "images/riso-android-icon-96x96.png", + "src:": "/images/riso-android-icon-96x96.png", "sizes": "96x96", "type": "image/png" }, { - "src:": "images/riso-apple-icon-120x120.png", + "src:": "/images/riso-apple-icon-120x120.png", "sizes": "120x120", "type": "image/png" }, { - "src:": "images/riso-apple-icon-144x144.png", + "src:": "/images/riso-apple-icon-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src:": "images/riso-apple-icon-152x152.png", + "src:": "/images/riso-apple-icon-152x152.png", "sizes": "152x152", "type": "image/png" }, { - "src:": "images/riso-apple-icon-180x180.png", + "src:": "/images/riso-apple-icon-180x180.png", "sizes": "180x180", "type": "image/png" } diff --git a/scripts/_ALL_SITES/riso.app/src/db/static_data.ts b/scripts/_ALL_SITES/riso.app/src/db/static_data.ts index 374cda12..b8e31a9f 100755 --- a/scripts/_ALL_SITES/riso.app/src/db/static_data.ts +++ b/scripts/_ALL_SITES/riso.app/src/db/static_data.ts @@ -6,7 +6,6 @@ import type { IPreloadImages, ISites, } from '@model' -import { func } from '@store/Modules/fieldsTable' // const SHOW_PROJINTHEMENU = false diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 98a5cfe1..352b9057 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -80,7 +80,7 @@ self.addEventListener('activate', (event) => { ); }); -const VITE_APP_VERSION = "1.2.17"; +const VITE_APP_VERSION = "1.2.18"; console.log(' [ VER-' + VITE_APP_VERSION + ' ] _---------________------ PAO: this is my custom service worker: ' + ORA); diff --git a/src-pwa/manifest.json b/src-pwa/manifest.json index 9fb829a5..c4032e4f 100644 --- a/src-pwa/manifest.json +++ b/src-pwa/manifest.json @@ -11,47 +11,47 @@ "start_url": "/?homescreen=1", "icons": [ { - "src:": "images/riso-android-icon-512x512.png", + "src:": "/images/riso-android-icon-512x512.png", "sizes": "512x512", "type": "image/png" }, { - "src:": "images/riso-android-icon-384x384.png", + "src:": "/images/riso-android-icon-384x384.png", "sizes": "384x384", "type": "image/png" }, { - "src:": "images/riso-android-icon-192x192.png", + "src:": "/images/riso-android-icon-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src:": "images/riso-android-icon-144x144.png", + "src:": "/images/riso-android-icon-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src:": "images/riso-android-icon-96x96.png", + "src:": "/images/riso-android-icon-96x96.png", "sizes": "96x96", "type": "image/png" }, { - "src:": "images/riso-apple-icon-120x120.png", + "src:": "/images/riso-apple-icon-120x120.png", "sizes": "120x120", "type": "image/png" }, { - "src:": "images/riso-apple-icon-144x144.png", + "src:": "/images/riso-apple-icon-144x144.png", "sizes": "144x144", "type": "image/png" }, { - "src:": "images/riso-apple-icon-152x152.png", + "src:": "/images/riso-apple-icon-152x152.png", "sizes": "152x152", "type": "image/png" }, { - "src:": "images/riso-apple-icon-180x180.png", + "src:": "/images/riso-apple-icon-180x180.png", "sizes": "180x180", "type": "image/png" } diff --git a/src/OLD_index.template-OLD.html. b/src/OLD_index.template-OLD.html. index beb29167..2aca89c9 100755 --- a/src/OLD_index.template-OLD.html. +++ b/src/OLD_index.template-OLD.html. @@ -19,8 +19,8 @@ - - + + diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index b931b8ab..9c6b5694 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -1,57 +1,36 @@ - + - - + +
-
- + + ? 'Sostituisci Immagine' + : 'Aggiungi Immagine' + " accept="image/*" :url="getUrl()" :headers="tools.getheaders()" :max-file-size="3000000" + :multiple="!single" auto-upload hide-upload-btn no-thumbnails @uploaded="uploaded" @rejected="onRejected" + style="width: 208px">
- + - - Minimize + + Minimize - - Maximize + + Maximize - {{ t('dialog.close') }} + {{ t('dialog.close') }} @@ -221,52 +114,22 @@
-
+
- +
Foto {{ index + 1 }}
- +
- - -
+ + +
{{ mygallery.description }} @@ -276,24 +139,13 @@ - + @@ -301,20 +153,9 @@
- +
@@ -325,43 +166,16 @@
- - - + + + - + - + diff --git a/src/components/CMapByTable/CMapByTable.ts b/src/components/CMapByTable/CMapByTable.ts index 86894b90..dc12233f 100755 --- a/src/components/CMapByTable/CMapByTable.ts +++ b/src/components/CMapByTable/CMapByTable.ts @@ -317,8 +317,8 @@ export default defineComponent({ const markerHtml = `
- Shadow - + Shadow +
diff --git a/src/components/CPresentazione/CPresentazione.vue b/src/components/CPresentazione/CPresentazione.vue index 6df3afe1..97fc5925 100755 --- a/src/components/CPresentazione/CPresentazione.vue +++ b/src/components/CPresentazione/CPresentazione.vue @@ -4,19 +4,10 @@
- - + +
@@ -26,7 +17,8 @@
{{ t('msg.myAppName') }}
- {{ t('msg.sottoTitoloApp') }} + {{ + t('msg.sottoTitoloApp') }}
@@ -38,23 +30,15 @@ - +
- + @@ -65,7 +49,7 @@
- +
@@ -91,23 +75,15 @@ - +
- + @@ -122,7 +98,7 @@ - +
@@ -134,16 +110,14 @@
{{ - }} + }}
- + {{ $t('login.enter') }}
@@ -151,23 +125,15 @@
- +
- + @@ -185,9 +151,11 @@
-
+
-

{{ t('homepage.descrapp_title1') }}

+
+

{{ t('homepage.descrapp_title1') }}

@@ -197,52 +165,54 @@
-

- {{ t('homepage.freesocial.title') }}

-

+
+

+ {{ t('homepage.freesocial.title') }}

+

+
-

- {{ t('homepage.freetalent.title') }}

-

+
+

+ {{ t('homepage.freetalent.title') }}

+

+
-

- {{ t('homepage.freeliving.title') }}

-

+
+

+ {{ t('homepage.freeliving.title') }}

+

+ +

+
-

- {{ t('homepage.coin.title') }}

-

+
+

+ {{ t('homepage.coin.title') }}

+

+ +

+
-

- {{ t('homepage.freecollabora.title') }}

-

+
+

+ {{ t('homepage.freecollabora.title') }}

+

+
-
+
@@ -251,14 +221,15 @@

{{ t('homepage.multiplatform.title') }}

-

+

+
-

- {{ t('homepage.free.title') }}

-

+
+

+ {{ t('homepage.free.title') }}

+

+
diff --git a/src/components/CSelectImage/CSelectImage.vue b/src/components/CSelectImage/CSelectImage.vue index c2e629a3..aff15f27 100755 --- a/src/components/CSelectImage/CSelectImage.vue +++ b/src/components/CSelectImage/CSelectImage.vue @@ -6,14 +6,8 @@
- -
+ +
({{ getnumimages() }})
@@ -21,40 +15,23 @@
- +
- +
- +
- +
@@ -62,24 +39,10 @@ v-model="order">-->
-
- - +
+ +
@@ -96,114 +59,46 @@ - + - - + +
-
- +
+
- + - - Minimize + + Minimize - - Maximize + + Maximize - {{ t('dialog.close') }} + {{ t('dialog.close') }} @@ -214,52 +109,22 @@
-
+
- +
Foto {{ index + 1 }}
- +
- - -
+ + +
{{ mygallery.description }} @@ -269,24 +134,13 @@ - + @@ -294,20 +148,9 @@
- +
@@ -318,43 +161,16 @@
- - - + + + - + - + diff --git a/src/components/CVerifyTelegram/CVerifyTelegram.vue b/src/components/CVerifyTelegram/CVerifyTelegram.vue index 026b738f..77ae592c 100755 --- a/src/components/CVerifyTelegram/CVerifyTelegram.vue +++ b/src/components/CVerifyTelegram/CVerifyTelegram.vue @@ -9,21 +9,23 @@ -
+
-
{{ $t('components.authentication.telegram.open')}}
+
{{ $t('components.authentication.telegram.open') }}
- +
- {{ $t('components.authentication.telegram.ifclose', {botname: tools.getBotName() })}} + {{ $t('components.authentication.telegram.ifclose', { + botname: tools.getBotName() + })}}
-
@@ -35,5 +37,5 @@ diff --git a/src/components/MyFooter/MyFooter.vue b/src/components/MyFooter/MyFooter.vue index d6e5ba50..1ba22048 100755 --- a/src/components/MyFooter/MyFooter.vue +++ b/src/components/MyFooter/MyFooter.vue @@ -1,32 +1,15 @@