diff --git a/.env b/.env index c014eb02..4945b028 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -VITE_APP_VERSION="1.2.15" +VITE_APP_VERSION="1.2.17" VITE_LANG_DEFAULT="it" VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -VITE_SERVICE_WORKER_FILE="sw-1.2.15.js" +VITE_SERVICE_WORKER_FILE="sw-1.2.17.js" VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" VITE_VUE_ROUTER_MODE="history" \ No newline at end of file diff --git a/.env.production b/.env.production index e834adfe..5e0af09a 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_APP_URL="https://riso.app" +VITE_MONGODB_HOST="https://api.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" +VITE_DEBUG="0" +VITE_VUE_APP_ISTEST="0" +DIRECTORY_LOCAL=myprojplanet_vite +DIRECTORY_SERVER=/var/www/nodejs_riso_server +SERVERDIR_WEBSITE="/var/www/riso.app" SERVERPW_WEBSITE="pwdadmin@1AOK" \ No newline at end of file diff --git a/index.html b/index.html index 1223e870..ac816aa6 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index e8b6ab8e..75a3f87e 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.2.15", + "version": "1.2.17", "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 25390f7c..adaf4f6e 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.15" + '.js', + swFilename: 'sw-' + "1.2.17" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json index 7473dc14..1351184c 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.15", + "version": "1.2.17", "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/package.json b/scripts/_ALL_SITES/gruppomacro.app/package.json index a179d5d6..6fb49630 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.15", + "version": "1.2.17", "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 4481e3b3..e01d444a 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.15" + '.js', + swFilename: 'sw-' + "1.2.17" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/_ALL_SITES/piuchebuono.app/.env.production b/scripts/_ALL_SITES/piuchebuono.app/.env.production index a651dc30..97ce984b 100644 --- a/scripts/_ALL_SITES/piuchebuono.app/.env.production +++ b/scripts/_ALL_SITES/piuchebuono.app/.env.production @@ -1,11 +1,11 @@ VITE_APP_ID="17" -VITE_APP_URL="https://test.piuchebuono.app" -VITE_MONGODB_HOST="https://testapi.piuchebuono.app" +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="1" -VITE_VUE_APP_ISTEST="1" +VITE_DEBUG="0" +VITE_VUE_APP_ISTEST="0" DIRECTORY_LOCAL="myprojplanet_vite" -DIRECTORY_SERVER="/var/www/nodejs_test.piuchebuono_server" -SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app" -SERVERPW_WEBSITE="pwdadmin@1AOK" \ No newline at end of file +DIRECTORY_SERVER="/var/www/nodejs_piuchebuono_server" +SERVERDIR_WEBSITE="/var/www/piuchebuono.app" +SERVERPW_WEBSITE="pwdadmin@1AOK" diff --git a/scripts/_ALL_SITES/piuchebuono.app/package.json b/scripts/_ALL_SITES/piuchebuono.app/package.json index ca179f55..9cf058b2 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.15", + "version": "1.2.17", "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 5d1343ad..b57c6245 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.15" + '.js', + swFilename: 'sw-' + "1.2.17" + '.js', workboxOptions: { swSrc: 'src-pwa/custom-service-worker.js', // Assicurati che il file esista }, diff --git a/scripts/_ALL_SITES/riso.app/package.json b/scripts/_ALL_SITES/riso.app/package.json index e8b6ab8e..75a3f87e 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.15", + "version": "1.2.17", "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 23a8a78f..adaf4f6e 100644 --- a/scripts/_ALL_SITES/riso.app/quasar.config.ts +++ b/scripts/_ALL_SITES/riso.app/quasar.config.ts @@ -215,7 +215,10 @@ export default defineConfig((ctx) => { // Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer devServer: { - https: false, + https: { + key: path.resolve(__dirname, 'localhost-key.pem'), + cert: path.resolve(__dirname, 'localhost.pem'), + }, port: ctx.mode.spa ? 8084 : 8094, vueDevtools: false, // automatically opening remote Vue Devtools open: false, // opens browser window automatically @@ -363,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.15" + '.js', + swFilename: 'sw-' + "1.2.17" + '.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 3b39ebd8..a1eb1e45 100644 --- a/scripts/now.txt +++ b/scripts/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo!) +TERMINA DI LAVORARE SU gruppomacro.app: (Sovrascrivo!) diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 6bd88fbb..98a5cfe1 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -7,10 +7,6 @@ const CACHE_NAME = 'pwa-cache-v2'; // Nome della cache const ORA = "12.57" -console.log('***** INIZIO CUSTOM-SERVICE-WORKER.JS ' + ORA); - -//importScripts('https://storage.googleapis.com/workbox-cdn/releases/6.5.4/workbox-sw.js'); - importScripts('workbox/workbox-sw.js') import { clientsClaim } from 'workbox-core' @@ -84,7 +80,7 @@ self.addEventListener('activate', (event) => { ); }); -const VITE_APP_VERSION = "1.2.15"; +const VITE_APP_VERSION = "1.2.17"; console.log(' [ VER-' + VITE_APP_VERSION + ' ] _---------________------ PAO: this is my custom service worker: ' + ORA); diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts index e1673de4..000debc8 100755 --- a/src/model/UserStore.ts +++ b/src/model/UserStore.ts @@ -43,7 +43,7 @@ export interface IMyGroup { username_who_block?: string date_blocked?: Date createdBy?: string - mycircuits?: IMyCircuit[] + mycircuits?: ICircuit[] lastdate_reqRisGroup?: Date account?: IAccount diff --git a/src/store/CircuitStore.ts b/src/store/CircuitStore.ts index 75e7afce..41d569c1 100755 --- a/src/store/CircuitStore.ts +++ b/src/store/CircuitStore.ts @@ -4,7 +4,8 @@ import type { IAccount, ICircuit, ICircuitState, IGroupShort, IMyCircuit, IMyGroup, IUserFields } from '@src/model'; -import { IGlobalState +import { + IGlobalState } from '@src/model' import { tools } from '@tools' import translate from '@src/globalroutines/util' @@ -252,7 +253,7 @@ export const useCircuitStore = defineStore('CircuitStore', { getCircuitsListByGroup(mygrp: IMyGroup): ICircuit[] { if (mygrp.mycircuits) - return this.listcircuits.filter((rec: ICircuit) => mygrp.mycircuits!.findIndex((circ: IMyCircuit) => circ.circuitname === rec.name) >= 0) + return this.listcircuits.filter((rec: ICircuit) => mygrp.mycircuits!.findIndex((circ: ICircuit) => circ.name === rec.name) >= 0) return [] }, diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index b4d08765..638446cc 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -7823,7 +7823,7 @@ export const tools = { if (username) { await userStore.loadGroups(username).then((ris) => { - // console.log('ris', ris) + console.log('loadGroupsByUsername ', ris) if (ris) { userStore.my.profile.mygroups = ris.mygroups ? ris.mygroups : [] userStore.my.profile.list_usersgroup = ris.listUsersGroup ? ris.listUsersGroup : [] diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 613e59f6..9b19ac33 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -306,10 +306,14 @@ export const useUserStore = defineStore('UserStore', { }, IsMyGroupByGroupname(groupname: string): boolean { - if (this.my.profile.mygroups) - return this.my.profile.mygroups.findIndex((rec) => rec.groupname === groupname) >= 0 - else + try { + if (this.my.profile?.mygroups) + return this.my.profile.mygroups.findIndex((rec) => rec.groupname === groupname) >= 0 + else + return false + } catch (e) { return false + } }, getMyGroupByGroupname(groupname: string): IMyGroup | null { diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index 6c4a71a4..ec0a359d 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -1724,6 +1724,11 @@ export const useGlobalStore = defineStore('GlobalStore', { }) }, + async loadTest(ind: number, numval: number) { + const restest = await Api.SendReq(`/testpao/?numval=${numval}&ind=${ind}`, 'GET', null) + return restest + }, + async loadSite() { const userStore = useUserStore() const calendarStore = useCalendarStore() @@ -1740,10 +1745,6 @@ export const useGlobalStore = defineStore('GlobalStore', { // calendarStore.editable = false try { - console.log('CHIAMA testpao...') - const restest = await Api.SendReq(`/testpao/`, 'GET', null) - console.log(' RISULTATO = ', restest) - const res = await Api.SendReq(`/loadsite/${myuserid}/${tools.getEnv('VITE_APP_ID')}/${import.meta.env.VITE_APP_VERSION}`, 'GET', null) if (res.status === 200) { diff --git a/src/views/test/test.ts b/src/views/test/test.ts index f725f9fd..e68868b6 100755 --- a/src/views/test/test.ts +++ b/src/views/test/test.ts @@ -24,6 +24,10 @@ export default defineComponent({ const $q = useQuasar() const { t } = useI18n(); + const log = ref(''); + const log2 = ref(''); + const numval = ref(20); + const loading = ref(false); const filtroutente = ref([]) function getpayment() { @@ -79,6 +83,26 @@ export default defineComponent({ ] } + async function runTest(ind: number) { + loading.value = true; + log.value = ''; + try { + // Assicurati che l'URL di base di axios sia impostato correttamente + // Puoi configurarlo globalmente o usare direttamente import.meta.env.VITE_API_BASE_URL + const response = await globalStore.loadTest(ind, numval.value); + if (ind === 1) + log.value = response.data.log; + else if (ind === 2) + log2.value = response.data.log; + } catch (error) { + console.error('Errore nella chiamata a /testpao:', error); + + log.value = 'Errore: ' + error.message; + } finally { + loading.value = false; + } + } + onMounted(mounted) return { @@ -88,6 +112,11 @@ export default defineComponent({ tools, costanti, filtroutente, + log, + log2, + loading, + runTest, + numval, } } }) diff --git a/src/views/test/test.vue b/src/views/test/test.vue index 58c3ac24..a7ae2969 100755 --- a/src/views/test/test.vue +++ b/src/views/test/test.vue @@ -1,137 +1,22 @@ - diff --git a/src/views/user/mygroup/mygroup.ts b/src/views/user/mygroup/mygroup.ts index 4b904d57..1eeaad45 100755 --- a/src/views/user/mygroup/mygroup.ts +++ b/src/views/user/mygroup/mygroup.ts @@ -50,7 +50,7 @@ export default defineComponent({ return costanti.MAINCARDS.filter((rec: any) => rec.table && rec.showinprofile) }) - const groupname = computed(() => $route.params.groupname ? $route.params.groupname.toString() : '') + const groupname = computed(() => $route.params?.groupname ? $route.params?.groupname.toString() : '') const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '') const filtroutente = ref([]) diff --git a/src/views/user/mygroup/mygroup.vue b/src/views/user/mygroup/mygroup.vue index 71b35b60..3b01468c 100755 --- a/src/views/user/mygroup/mygroup.vue +++ b/src/views/user/mygroup/mygroup.vue @@ -14,95 +14,57 @@
-
+
- +
{{ mygrp.title }}
-
+
{{ mygrp.groupname }}
- + {{ $t("db.youarerefusedgroup") }}
- +
- - + + - + @@ -111,26 +73,19 @@ - - + + @@ -143,42 +98,26 @@ - +
- +
-
+
- - - - + + + + @@ -230,48 +151,25 @@
- +
- +
-
+
@@ -283,14 +181,11 @@
-
+
@@ -304,18 +199,11 @@ -
- +
+ - {{ rec.descr }} + {{ rec.descr }}
@@ -340,11 +228,7 @@
- +
@@ -368,14 +252,11 @@ }) }}
-
+
{{ $t("shared.lastmodify", { @@ -405,98 +286,43 @@ - - + + - - + + - + - + - + - - - + + + @@ -533,12 +346,8 @@
{{ circuit.name }}:
- +
@@ -547,85 +356,38 @@
- - + + }" :showType="costanti.SHOW_MOVEMENTS" :showCol="false" :showHeaderCol="false" :extraparams="getExtraparams_movs_grp(circuitslist[circuitIndex]) + " extrafield :visufind="costanti.FRIENDS">
-
-
+
+
@@ -634,87 +396,43 @@ - + :butt_modif_new="tools.iAmAdminGroup(groupname)" :visuinpage="true" :noaut="false" + :title="card.title" /> - + :butt_modif_new="tools.iAmAdminGroup(groupname)" :visuinpage="true" :noaut="false" + :title="card.title" />
- +
- +
-
- +
+
@@ -744,12 +462,7 @@
- +
@@ -760,4 +473,3 @@ -