diff --git a/.env b/.env index e8316933..c9b9f3ca 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -VITE_APP_VERSION="1.2.29" +VITE_APP_VERSION="1.2.31" VITE_LANG_DEFAULT="it" VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -VITE_SERVICE_WORKER_FILE="sw-1.2.29.js" +VITE_SERVICE_WORKER_FILE="sw-1.2.31.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 90892857..ae8aaf0e 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index b69745f2..94fdfce4 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.2.29", + "version": "1.2.31", "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", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "APP_VERSION='1.2.29' PORT=8084 quasar dev", + "dev": "APP_VERSION='1.2.31' PORT=8084 quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "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": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.29' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.29' quasar dev", + "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.31' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.31' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json index a43a8cef..cf926990 100755 --- a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json +++ b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json @@ -1,6 +1,6 @@ { "name": "cnm", - "version": "1.2.29", + "version": "1.2.31", "description": "Comunita Nuovo Mondo", "productName": "ComunitaNuovoMondo", "author": "Surya", @@ -9,7 +9,7 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.29' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.31' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", "buildpwa": "NODE_ENV=production quasar build -m pwa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "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": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.29' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.29' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.31' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.31' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/freeplanet.app/package.json b/scripts/_ALL_SITES/freeplanet.app/package.json index a99397e9..4d8f6009 100755 --- a/scripts/_ALL_SITES/freeplanet.app/package.json +++ b/scripts/_ALL_SITES/freeplanet.app/package.json @@ -1,6 +1,6 @@ { "name": "freeplanet", - "version": "1.2.29", + "version": "1.2.31", "description": "freeplanet", "productName": "freeplanet", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8087 APP_VERSION='1.2.29' quasar dev", + "dev": "PORT=8087 APP_VERSION='1.2.31' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "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": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.29' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.29' quasar dev", + "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.31' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.31' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/gruppomacro.app/package.json b/scripts/_ALL_SITES/gruppomacro.app/package.json index 616a29ff..b0c0b627 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.29", + "version": "1.2.31", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.29' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.31' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.29' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.31' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "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": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.29' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.29' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.31' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.31' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/kolibrilab.it/package.json b/scripts/_ALL_SITES/kolibrilab.it/package.json index e1b1ae73..06eba907 100755 --- a/scripts/_ALL_SITES/kolibrilab.it/package.json +++ b/scripts/_ALL_SITES/kolibrilab.it/package.json @@ -1,6 +1,6 @@ { "name": "kolibrilab", - "version": "1.2.29", + "version": "1.2.31", "description": "kolibrilab", "productName": "kolibrilab", "author": "Surya Paolo", @@ -8,11 +8,11 @@ "keywords": [], "license": "MIT", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.29' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.31' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -20,8 +20,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint --ext .ts,.vue --ignore-path .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.29' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.29' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.31' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.31' quasar dev", "spanorefresh": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m spa", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js" diff --git a/scripts/_ALL_SITES/piuchebuono.app/package.json b/scripts/_ALL_SITES/piuchebuono.app/package.json index aa5ec550..75da05dd 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.29", + "version": "1.2.31", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8085 APP_VERSION='1.2.29' quasar dev", + "dev": "PORT=8085 APP_VERSION='1.2.31' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "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": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.29' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.29' quasar dev", + "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.31' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.31' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/riso.app/package.json b/scripts/_ALL_SITES/riso.app/package.json index 8012eaf1..93aa43fe 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.29", + "version": "1.2.31", "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", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8084 APP_VERSION='1.2.29' quasar dev", + "dev": "PORT=8084 APP_VERSION='1.2.31' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.29' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.31' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "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": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.29' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.29' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.31' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.31' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 56d752cc..7218d9a0 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -3,7 +3,32 @@ /* global workbox */ /* global cfgenv */ -const VITE_APP_VERSION = "1.2.29"; +const VITE_APP_VERSION = "1.2.31"; + +// Costanti di configurazione +const DYNAMIC_CACHE = 'dynamic-cache-v2'; +const baseUrl = self.location.origin; + +function extractDomain(url) { + return url.replace(/^https?:\/\//, ''); +} + +function removeTestPrefix(str) { + return str.startsWith('test.') ? str.slice(5) : str; +} + +// Funzione per determinare il dominio API +function determineApiDomain(appDomain) { + if (ISTEST) { + return 'testapi.' + removeTestPrefix(appDomain); + } + return appDomain.includes('localhost') ? 'localhost:3000' : 'api.' + appDomain; +} + +const APP_DOMAIN = extractDomain(baseUrl); +const API_DOMAIN = determineApiDomain(APP_DOMAIN); + +console.log('API_DOMAIN', API_DOMAIN); const CACHE_NAME = 'pwa-cache-' + VITE_APP_VERSION; // Nome della cache @@ -235,42 +260,6 @@ if (workbox) { }); - function removeTestPrefix(str) { - return str.startsWith('test.') ? str.slice(5) : str; - } - - function extractDomain(url) { - return url.replace(/^https?:\/\//, ''); - } - - // Funzione per verificare se una richiesta è cross-origin - function isCrossOrigin(url) { - try { - const requestUrl = new URL(url); - const baseUrl = self.location.origin; - return requestUrl.origin !== baseUrl; - } catch (e) { - console.error('Error parsing URL: ❌', e); - return true; - } - } - - // Costanti di configurazione - const DYNAMIC_CACHE = 'dynamic-cache-v2'; - const ENABLE_DYNAMIC_CACHING = true; - const baseUrl = self.location.origin; - const APP_DOMAIN = extractDomain(baseUrl); - const API_DOMAIN = determineApiDomain(APP_DOMAIN); - - console.log('API_DOMAIN', API_DOMAIN); - - // Funzione per determinare il dominio API - function determineApiDomain(appDomain) { - if (ISTEST) { - return 'testapi.' + removeTestPrefix(appDomain); - } - return appDomain.includes('localhost') ? 'localhost:3000' : 'api.' + appDomain; - } // Funzione per gestire richieste API async function handleApiRequest(request) { diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index cf48a2ef..416c04d3 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -298,7 +298,7 @@
Registrazione
- +
diff --git a/src/components/CMyUser/CMyUser.ts b/src/components/CMyUser/CMyUser.ts index b5303d07..a21e983c 100755 --- a/src/components/CMyUser/CMyUser.ts +++ b/src/components/CMyUser/CMyUser.ts @@ -67,6 +67,11 @@ export default defineComponent({ type: Boolean, required: false, default: false, + }, + hideellipses: { + type: Boolean, + required: false, + default: false, } }, diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue index d37fb28c..dc092d58 100755 --- a/src/components/CMyUser/CMyUser.vue +++ b/src/components/CMyUser/CMyUser.vue @@ -828,7 +828,7 @@
globalStore.datastat ? globalStore.datastat.listlinksreg : []) + const slide = ref(props.slide) - const slide = ref('start') + const listlinksreg = computed(() => globalStore.datastat ? globalStore.datastat.listlinksreg : []) const actionType = ref(costanti.ACTIONTYPE.LINK_REG) @@ -66,8 +71,6 @@ export default defineComponent({ const invitante = tools.getInvitante() console.log('invitante', invitante) - - if (props.invited) { start.value = true chooseReg.value = true diff --git a/src/components/CRegistration/CRegistration.vue b/src/components/CRegistration/CRegistration.vue index 8b2fac1d..6cb3b6f5 100755 --- a/src/components/CRegistration/CRegistration.vue +++ b/src/components/CRegistration/CRegistration.vue @@ -45,7 +45,7 @@ size="lg" color="positive" @click=" - listlinksreg.length > 0 ? slide = 'sceglilink' : slide = 'second'; + listlinksreg.length > 0 ? (slide = 'sceglilink') : (slide = 'second'); noInvited = false; chooseReg = true; " @@ -72,7 +72,8 @@ - +
{{ $t('reg.title_reg_con_link') }}
+
- - + + +
+ + +
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index a1c16126..b21257ec 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -535,6 +535,8 @@ const msg_it = { ritessitura: 'RITESSITURA', }, reg: { + title_reg_con_link: 'Registrati scegliendo quale invitante conosci:', + scelgo_l_invitante: 'Ho l\'username della persona che mi ha invitato', nameorg: 'Nome Organizzazione', version: 'Versione', socio: 'Socio',