From 6d112b8e45a2e3964a40c852dfbdfeb4c69b98be Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Mon, 3 Mar 2025 00:45:56 +0100 Subject: [PATCH] - Aggiornato node.js alla versione 22.18.1 - Aggiornato tutti i pacchetti del server all'ultima versione. - passato mongoose da versione 5 a versione 6 --- .env.example.production | 30 +++-------- .env.prod.riso_srv_freeplanet_old | 27 ---------- .env.test.abitaregliiblei.it | 28 ---------- .env.test.gruppomacro | 24 ++------- .env.test2 | 28 ---------- .env.test_riso.pcb | 28 ---------- package.json | 8 +-- src-pwa/custom-service-worker.js | 2 +- src/components/CElemStat/CElemStat.ts | 2 +- src/components/CElemStat/CElemStat.vue | 4 +- .../CMyCardService/CMyCardService.ts | 17 +++++- .../CMyCardService/CMyCardService.vue | 53 ++++--------------- src/components/CMyEditElem/CMyEditElem.vue | 3 +- src/components/CMyElem/CMyElem.vue | 1 - src/store/Api/Inst-Pao.ts | 2 +- src/store/Modules/fieldsTable.ts | 2 +- src/store/Modules/tools.ts | 9 ---- yarn.lock | 42 +++++++++------ 18 files changed, 76 insertions(+), 234 deletions(-) delete mode 100644 .env.prod.riso_srv_freeplanet_old delete mode 100755 .env.test.abitaregliiblei.it delete mode 100755 .env.test2 delete mode 100755 .env.test_riso.pcb diff --git a/.env.example.production b/.env.example.production index b0469933..47a2681f 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,27 +1,13 @@ -VITE_APP_VERSION="1.1.23" -VITE_SERVICE_WORKER_FILE="service-worker.js" VITE_APP_ID="13" -DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=freeplanet_serverside -SERVERDIR_WEBSITE=riso.app -SERVERPW_WEBSITE= -VITE_APP_URL="https://riso.app" -URL_FACEBOOK="" -PROVA_PAOLO="" -VITE_LANG_DEFAULT="it" -VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -VITE_MONGODB_HOST="https://www.freeplanet.app:3000" +VITE_APP_URL="https://miodominio.com" +VITE_PAO_APP_ID="KKP---------SDF" +MASTER_KEY="KKP---------R3T" +VITE_MONGODB_HOST="https://www.miodominio.com:3000" VITE_LOGO_REG='riso-logo-full.png' -TEST_NAME="" -TEST_SURNAME="" -TEST_EMAIL="" -TEST_USERNAME="" -TEST_PASSWORD="" -TEST_APORTADOR="------" VITE_PUBLICKEY_PUSH="" VITE_DEBUG="1" -TELEGRAM_SUPPORT="" -VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" -TEST_CELL="" VITE_VUE_APP_ISTEST=0 +DIRECTORY_LOCAL=directory_sourcecode_local +DIRECTORY_SERVER=freeplanet_serverside +SERVERDIR_WEBSITE=miodominio.com +SERVERPW_WEBSITE= diff --git a/.env.prod.riso_srv_freeplanet_old b/.env.prod.riso_srv_freeplanet_old deleted file mode 100644 index a8fdb2fc..00000000 --- a/.env.prod.riso_srv_freeplanet_old +++ /dev/null @@ -1,27 +0,0 @@ -VITE_APP_VERSION="1.1.0" -VITE_SERVICE_WORKER_FILE="service-worker_1.1.0.js" -VITE_APP_ID="13" -DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=freeplanet_serverside -SERVERDIR_WEBSITE=riso.app -SERVERPW_WEBSITE=pwdadmin@1AOK -VITE_APP_URL="https://riso.app" -URL_FACEBOOK="" -PROVA_PAOLO="" -VITE_LANG_DEFAULT="it" -VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -VITE_MONGODB_HOST="https://www.freeplanet.app:3000" -VITE_LOGO_REG='riso-logo-full.png' -TEST_NAME="" -TEST_SURNAME="" -TEST_EMAIL="" -TEST_USERNAME="" -TEST_PASSWORD="" -TEST_APORTADOR="------" -VITE_PUBLICKEY_PUSH="BNM-cEpTbPVc_ujXf3QOC8ggf7b-X44P44esfJUWqNOFq1XhWCoZJpOi71_cbXC5SnfO9HassQ6OouAYgtBA9Pw" -VITE_DEBUG="1" -TELEGRAM_SUPPORT="" -VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" -TEST_CELL="" -VITE_VUE_APP_ISTEST=0 \ No newline at end of file diff --git a/.env.test.abitaregliiblei.it b/.env.test.abitaregliiblei.it deleted file mode 100755 index e70a0a8f..00000000 --- a/.env.test.abitaregliiblei.it +++ /dev/null @@ -1,28 +0,0 @@ -VITE_APP_VERSION="1.1.23" -VITE_SERVICE_WORKER_FILE="service-worker.js" -VITE_APP_ID="19" -DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=/var/www/nodejs_test.riso_server -SERVERDIR_WEBSITE="/var/www/test.abitaregliiblei.it" -SERVERPW_WEBSITE="pwdadmin@1AOK" -VITE_APP_URL="https://test.abitaregliiblei.it" -URL_FACEBOOK="" -PROVA_PAOLO="" -VITE_LANG_DEFAULT="it" -VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -VITE_MONGODB_HOST="https://testapi.abitaregliiblei.it" -VITE_LOGO_REG='abitaregliiblei-logo-full.png' -TEST_NAME="" -TEST_SURNAME="" -TEST_EMAIL="" -TEST_USERNAME="" -TEST_PASSWORD="" -TEST_APORTADOR="" -VITE_PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" -IN_CONSTRUCTION="0" -VITE_DEBUG="1" -TELEGRAM_SUPPORT="" -VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" -TEST_CELL="" -VITE_VUE_APP_ISTEST=1 diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro index 0da53c04..8de374a5 100755 --- a/.env.test.gruppomacro +++ b/.env.test.gruppomacro @@ -1,28 +1,12 @@ -VITE_APP_VERSION="1.1.23" -VITE_SERVICE_WORKER_FILE="service-worker.js" 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" -URL_FACEBOOK="" -PROVA_PAOLO="" -VITE_LANG_DEFAULT="it" -VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" VITE_MONGODB_HOST="https://testapi.gruppomacro.app" VITE_LOGO_REG='gruppomacro-logo-full.png' -TEST_NAME="" -TEST_SURNAME="" -TEST_EMAIL="" -TEST_USERNAME="" -TEST_PASSWORD="" -TEST_APORTADOR="" VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc" -IN_CONSTRUCTION="0" VITE_DEBUG="1" -TELEGRAM_SUPPORT="" -VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" -TEST_CELL="" VITE_VUE_APP_ISTEST=1 -API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK" \ No newline at end of file +DIRECTORY_LOCAL=myprojplanet_vite +DIRECTORY_SERVER=/var/www/nodejs_test.piuchebuono_server +SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app" +SERVERPW_WEBSITE="pwdadmin@1AOK" \ No newline at end of file diff --git a/.env.test2 b/.env.test2 deleted file mode 100755 index a2775303..00000000 --- a/.env.test2 +++ /dev/null @@ -1,28 +0,0 @@ -VITE_APP_VERSION="1.1.23" -VITE_SERVICE_WORKER_FILE="service-worker.js" -VITE_APP_ID="13" -DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=test2.freeplanet_serverside -SERVERDIR_WEBSITE="test2.riso.app" -SERVERPW_WEBSITE="pwdadmin@1AOK" -VITE_APP_URL="https://test2.riso.app" -URL_FACEBOOK="" -PROVA_PAOLO="" -VITE_LANG_DEFAULT="it" -VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -VITE_MONGODB_HOST="https://freeplanet.app:3001" -VITE_LOGO_REG='riso-logo-full.png' -TEST_NAME="" -TEST_SURNAME="" -TEST_EMAIL="" -TEST_USERNAME="" -TEST_PASSWORD="" -TEST_APORTADOR="" -VITE_PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" -IN_CONSTRUCTION="0" -VITE_DEBUG="1" -TELEGRAM_SUPPORT="" -VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" -TEST_CELL="" -VITE_VUE_APP_ISTEST=1 diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb deleted file mode 100755 index d1104d15..00000000 --- a/.env.test_riso.pcb +++ /dev/null @@ -1,28 +0,0 @@ -VITE_APP_VERSION="1.1.23" -VITE_SERVICE_WORKER_FILE="service-worker.js" -VITE_APP_ID="13" -DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=/var/www/nodejs_test.riso_server -SERVERDIR_WEBSITE="/var/www/test.piuchebuono.app" -VITE_APP_URL="https://testriso.piuchebuono.app" -URL_FACEBOOK="" -PROVA_PAOLO="" -VITE_LANG_DEFAULT="it" -VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -VITE_MONGODB_HOST="https://testriso.piuchebuono.app:3001" -VITE_LOGO_REG='riso-logo-full.png' -TEST_NAME="" -TEST_SURNAME="" -TEST_EMAIL="" -TEST_USERNAME="" -TEST_PASSWORD="" -TEST_APORTADOR="" -VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc" -IN_CONSTRUCTION="0" -VITE_DEBUG="1" -TELEGRAM_SUPPORT="" -VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" -TEST_CELL="" -VITE_VUE_APP_ISTEST=1 -API_KEY_MSSQL="m68yADSr123MIVIDA@154$DSAGVOK" \ No newline at end of file diff --git a/package.json b/package.json index ab4275be..811df17b 100755 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "axios": "^1.8.1", "bcryptjs": "^3.0.2", "chart.js": "^4.4.8", - "core-js": "^3.40.0", + "core-js": "^3.41.0", "crypto-browserify": "^3.12.1", "date-fns": "^4.1.0", "echarts": "5.6.0", @@ -64,7 +64,7 @@ "nprogress": "^0.2.0", "pinia": "^3.0.1", "qrcode-vue3": "^1.7.1", - "quasar": "^2.17.7", + "quasar": "^2.18.0", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", "scrollreveal": "^4.0.9", @@ -102,7 +102,7 @@ "@types/google.maps": "^3.58.1", "@types/jest": "^29.5.14", "@types/js-cookie": "^3.0.6", - "@types/node": "^22.13.5", + "@types/node": "^22.13.8", "@types/nprogress": "^0.2.3", "@types/vue-tel-input": "^2.1.7", "@types/vuelidate": "^0.7.22", @@ -129,7 +129,7 @@ "typescript": "~5.8.2", "vite-plugin-checker": "^0.9.0", "vue-cli-plugin-element-ui": "^1.1.4", - "vue-tsc": "^2.2.4", + "vue-tsc": "^2.2.6", "vueify": "^9.4.1", "workbox-build": "^7.3.0" }, diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index d8420d3b..0195a2c4 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -230,7 +230,7 @@ if (workbox) { } // Se riceviamo un errore CORS, prova con una richiesta no-cors - if (response.status === 0 || response.type === 'opaque') { + if (response.status === 0 || response.type === 'opaque' || response.headers.get('Access-Control-Allow-Origin') !== `https://${APP_DOMAIN}`) { console.log('[Service Worker] Fallback to no-cors mode for:', request.url); return fetch(new Request(request.url, { method: 'GET', diff --git a/src/components/CElemStat/CElemStat.ts b/src/components/CElemStat/CElemStat.ts index 6c70d2c8..64d3d3bf 100644 --- a/src/components/CElemStat/CElemStat.ts +++ b/src/components/CElemStat/CElemStat.ts @@ -8,7 +8,7 @@ export default defineComponent({ title: String, icon: String, value_today: Number, - mytextval: Number, + mytextval: String, classColor: String, colBack: String, mystyle: String, diff --git a/src/components/CElemStat/CElemStat.vue b/src/components/CElemStat/CElemStat.vue index bbd68199..f8fa5986 100644 --- a/src/components/CElemStat/CElemStat.vue +++ b/src/components/CElemStat/CElemStat.vue @@ -16,7 +16,7 @@ {{ mytextval }} @@ -30,5 +30,5 @@ diff --git a/src/components/CMyCardService/CMyCardService.ts b/src/components/CMyCardService/CMyCardService.ts index e22e8549..14eed271 100644 --- a/src/components/CMyCardService/CMyCardService.ts +++ b/src/components/CMyCardService/CMyCardService.ts @@ -163,6 +163,16 @@ export default defineComponent({ transition: 'height 0.3s ease-in-out' })) + const numpart = ref(null); + + const updatePart = () => { + numpart.value = calendarStore.getNumParticipants( + myrec.value, + true, + tools.peopleWhere.participants + ); + }; + const filtercustom: any = computed(() => { let queryreact = {} @@ -190,7 +200,7 @@ export default defineComponent({ } async function load() { - console.log('load') + // console.log('load') // Carica il record if (props.idRec) { await userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => { @@ -218,6 +228,8 @@ export default defineComponent({ col.value = fieldsTable.getArrColsByTable(props.table) + updatePart() + ismounted.value = true } @@ -660,6 +672,7 @@ export default defineComponent({ emit('showInMap', rec) } + onMounted(mounted) return { @@ -717,6 +730,8 @@ export default defineComponent({ toggleShowScheda, showInMap, ismounted, + updatePart, + numpart, } } }) diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue index e2bdafc5..bd497b3f 100644 --- a/src/components/CMyCardService/CMyCardService.vue +++ b/src/components/CMyCardService/CMyCardService.vue @@ -190,11 +190,7 @@ costanti.TIPOFAVBOOK.ATTEND, false, $t('cmd.attend', { - num: calendarStore.getNumParticipants( - myrec, - true, - tools.peopleWhere.participants - ), + num: numpart, }) ) " @@ -205,11 +201,7 @@ {{ $t("cmd.attend", { - num: calendarStore.getNumParticipants( - myrec, - true, - tools.peopleWhere.participants - ), + num: numpart, }) }} @@ -287,13 +279,7 @@ text-color="primary" color="white" class="badge-favbook" - :label=" - calendarStore.getNumParticipants( - myrec, - true, - tools.peopleWhere.participants - ) - " + :label="numpart" floating transparent /> @@ -764,10 +750,7 @@ - @@ -809,12 +792,7 @@ @@ -823,32 +801,19 @@ - {{ - (part = calendarStore.getNumParticipants( - myrec, - true, - tools.peopleWhere.participants - )) - }} diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index 6cee2ce1..2f912571 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -241,6 +241,7 @@ > diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index 4a07f4fc..3ec03021 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -59,7 +59,6 @@ :style="`background-color: ${myel.color} !important`" @mouseenter="animarecard = false" @mouseleave="animarecard = true" - @transition="handleTransition" >