diff --git a/.env.development b/.env.development index 888efcae..31682ca2 100755 --- a/.env.development +++ b/.env.development @@ -1,18 +1,17 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="18" +APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" SERVERPW_WEBSITE="" APP_URL="https://localhost" URL_FACEBOOK="https://www.facebook.com/freeplanetapp" -PROVA_PAOLO="PROVA ENV FUNZIONA!" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="https://localhost:3000" -LOGO_REG='gruppomacro-logo-full.png' +LOGO_REG='riso-logo-full.png' TEST_NAME="Paolo" TEST_SURNAME="Arena" TEST_EMAIL="" @@ -25,5 +24,5 @@ DEBUG="1" TELEGRAM_SUPPORT="" PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" TEST_CELL="" -VUE_APP_ISTEST=1 -VUE_APP_INLOCALE=1 \ No newline at end of file +VUE_APP_ISTEST="1" +VUE_APP_INLOCALE="1" diff --git a/.env.example.production b/.env.example.production index e361bb33..9005a869 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro index 37217f62..0ff915fd 100644 --- a/.env.prod.gruppomacro +++ b/.env.prod.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index 7c3a70c2..e6ef4e9e 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.prod.riso_srv_pcb b/.env.prod.riso similarity index 52% rename from .env.prod.riso_srv_pcb rename to .env.prod.riso index 8a6e3f0b..e17b13de 100644 --- a/.env.prod.riso_srv_pcb +++ b/.env.prod.riso @@ -1,27 +1,27 @@ -APP_VERSION="1.1.0" -SERVICE_WORKER_FILE="service-worker_1.1.0.js" +APP_VERSION="1.1.6" +SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=freeplanet_serverside -SERVERDIR_WEBSITE=riso.app -SERVERPW_WEBSITE=pwdadmin@1AOK +DIRECTORY_SERVER=/var/www/nodejs_riso_server +SERVERDIR_WEBSITE="/var/www/riso.app" APP_URL="https://riso.app" URL_FACEBOOK="" PROVA_PAOLO="" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -MONGODB_HOST="https://www.freeplanet.app:3000" +MONGODB_HOST="https://api.riso.app" LOGO_REG='riso-logo-full.png' TEST_NAME="" TEST_SURNAME="" TEST_EMAIL="" TEST_USERNAME="" TEST_PASSWORD="" -TEST_APORTADOR="------" -PUBLICKEY_PUSH="BNM-cEpTbPVc_ujXf3QOC8ggf7b-X44P44esfJUWqNOFq1XhWCoZJpOi71_cbXC5SnfO9HassQ6OouAYgtBA9Pw" -DEBUG="1" +TEST_APORTADOR="" +PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" +IN_CONSTRUCTION="0" +DEBUG="0" TELEGRAM_SUPPORT="" PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" TEST_CELL="" -VUE_APP_ISTEST=0 \ No newline at end of file +VUE_APP_ISTEST=0 diff --git a/.env.prod.riso_srv_freeplanet b/.env.prod.riso_srv_freeplanet_old similarity index 100% rename from .env.prod.riso_srv_freeplanet rename to .env.prod.riso_srv_freeplanet_old diff --git a/.env.test.abitaregliiblei.it b/.env.test.abitaregliiblei.it index a94d293e..3151ae19 100755 --- a/.env.test.abitaregliiblei.it +++ b/.env.test.abitaregliiblei.it @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro index 1e632040..a6019b28 100755 --- a/.env.test.gruppomacro +++ b/.env.test.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index 417a7a89..ef91591d 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.test.risosrv b/.env.test.risosrv index 21f6418d..c7388984 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test2 b/.env.test2 index 23f8983c..873d0c28 100755 --- a/.env.test2 +++ b/.env.test2 @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb index 3445b7fa..7db1964c 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/abitaregliiblei.it/.env.development b/_ALL_SITES/abitaregliiblei.it/.env.development index 367c8dd9..797b5c0e 100755 --- a/_ALL_SITES/abitaregliiblei.it/.env.development +++ b/_ALL_SITES/abitaregliiblei.it/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/abitaregliiblei.it/package.json b/_ALL_SITES/abitaregliiblei.it/package.json index 34d82330..875da9ab 100755 --- a/_ALL_SITES/abitaregliiblei.it/package.json +++ b/_ALL_SITES/abitaregliiblei.it/package.json @@ -1,6 +1,6 @@ { "name": "abitaregliiblei", - "version": "1.1.4", + "version": "1.1.6", "description": "Abitare Gli Iblei", "productName": "AbitareGliIblei", "author": "Paolo Arena", diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index b507e282..de275dfb 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.development +++ b/_ALL_SITES/fioredellavita.riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.test b/_ALL_SITES/fioredellavita.riso.app/.env.test index a8363e89..4fc020bc 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.test +++ b/_ALL_SITES/fioredellavita.riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/fioredellavita.riso.app/package.json b/_ALL_SITES/fioredellavita.riso.app/package.json index 3d91fbd9..d10af448 100755 --- a/_ALL_SITES/fioredellavita.riso.app/package.json +++ b/_ALL_SITES/fioredellavita.riso.app/package.json @@ -1,6 +1,6 @@ { "name": "fioredellavita", - "version": "1.1.4", + "version": "1.1.6", "description": "Fiore Della Vita", "productName": "Fiore Della Vita", "author": "Paolo Arena", diff --git a/_ALL_SITES/gruppomacro.app/.env.development b/_ALL_SITES/gruppomacro.app/.env.development index 888efcae..cd1b7acf 100755 --- a/_ALL_SITES/gruppomacro.app/.env.development +++ b/_ALL_SITES/gruppomacro.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/gruppomacro.app/.env.test b/_ALL_SITES/gruppomacro.app/.env.test index c184e7e3..6d6a3f2a 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/gruppomacro.app/package.json b/_ALL_SITES/gruppomacro.app/package.json index 9ff1b9cc..e04fa1d3 100755 --- a/_ALL_SITES/gruppomacro.app/package.json +++ b/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.1.4", + "version": "1.1.6", "description": "GruppoMacro", "productName": "Gruppo Macro", "author": "Paolo Arena", @@ -54,9 +54,11 @@ "graphql": "^16.9.0", "graphql-tag": "^2.12.6", "gsap": "^3.12.5", + "html2canvas": "^1.4.1", "html2pdf.js": "^0.10.2", "jquery": "^3.7.1", "js-cookie": "^3.0.5", + "jspdf": "^2.5.2", "leaflet": "^1.9.4", "leaflet-routing-machine": "^3.2.12", "leaflet.markercluster": "^1.5.3", @@ -66,6 +68,7 @@ "npm": "^10.8.3", "nprogress": "^0.2.0", "pinia": "^2.2.4", + "qrcode-vue3": "^1.7.1", "quasar": "^2.17.0", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", @@ -87,6 +90,7 @@ "vue-timeago3": "^2.3.2", "vue2-dragula": "^2.5.5", "vue3-pdf-app": "^1.0.3", + "vue3-qr-reader": "^1.0.0", "vuex": "^4.1.0", "vuex-router-sync": "^6.0.0-rc.1" }, @@ -162,4 +166,4 @@ "npm": ">= 6.14.8", "yarn": ">= 1.21.1" } -} \ No newline at end of file +} diff --git a/_ALL_SITES/piuchebuono.app/.env.development b/_ALL_SITES/piuchebuono.app/.env.development index 5902cb73..92d2336c 100755 --- a/_ALL_SITES/piuchebuono.app/.env.development +++ b/_ALL_SITES/piuchebuono.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/.env.test b/_ALL_SITES/piuchebuono.app/.env.test index 417a7a89..ef91591d 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/package.json b/_ALL_SITES/piuchebuono.app/package.json index 16ad4128..6efa3214 100755 --- a/_ALL_SITES/piuchebuono.app/package.json +++ b/_ALL_SITES/piuchebuono.app/package.json @@ -1,6 +1,6 @@ { "name": "piuchebuono", - "version": "1.1.4", + "version": "1.1.6", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Paolo Arena", diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index c01258c0..31682ca2 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index 3e934a73..5cde156a 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index c184e7e3..6d6a3f2a 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.4" +APP_VERSION="1.1.6" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json index 5d281b29..f0b768b6 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.1.4", + "version": "1.1.6", "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": "Paolo Arena", diff --git a/deploy_on_prod_riso.sh b/deploy_on_prod_riso.sh new file mode 100755 index 00000000..a0e79e14 --- /dev/null +++ b/deploy_on_prod_riso.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +source ./.env.prod.riso + +msg="*** Sincronizzazione ??? $DIRECTORY_LOCAL e $SERVERDIR_WEBSITE (Y/N) ? " + +if [ "$1" = "" ]; then + read -p "$msg" risposta +else + risposta=$1 +fi + +cp .env.production .env.prod.bak +cp .env.prod.riso .env.production + +sleep 1 + +npm run buildpwa + +echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." +rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE +rsync -e 'ssh -p 8822' -a dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js + + +cp .env.prod.bak .env.production + +sleep 1 + +echo "Finito $SERVERDIR_WEBSITE" diff --git a/deploy_risosrv_on_test_server.sh b/deploy_on_test_riso.sh similarity index 100% rename from deploy_risosrv_on_test_server.sh rename to deploy_on_test_riso.sh diff --git a/now.txt b/now.txt index e5f5d4ff..63f31c52 100644 --- a/now.txt +++ b/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !) +TERMINA DI LAVORARE SU gruppomacro.app: (Sovrascrivo !) diff --git a/package.json b/package.json index 143e04ec..f0b768b6 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "gruppomacro", - "version": "1.1.4", - "description": "GruppoMacro", - "productName": "Gruppo Macro", + "name": "riso", + "version": "1.1.6", + "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": "Paolo Arena", "private": true, "keywords": [], @@ -54,11 +54,9 @@ "graphql": "^16.9.0", "graphql-tag": "^2.12.6", "gsap": "^3.12.5", - "html2canvas": "^1.4.1", "html2pdf.js": "^0.10.2", "jquery": "^3.7.1", "js-cookie": "^3.0.5", - "jspdf": "^2.5.2", "leaflet": "^1.9.4", "leaflet-routing-machine": "^3.2.12", "leaflet.markercluster": "^1.5.3", @@ -129,6 +127,7 @@ "jest": "^29.7.0", "json-loader": "^0.5.7", "node-sass": "^9.0.0", + "nodemon": "^3.1.7", "npm-check-updates": "^17.1.3", "optimize-css-assets-webpack-plugin": "^6.0.1", "parcel": "^2.12.0", diff --git a/public/images/ferrara.jpg b/public/images/ferrara.jpg new file mode 100644 index 00000000..b4615a3a Binary files /dev/null and b/public/images/ferrara.jpg 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 @@ + + + + diff --git a/public/images/gm-android-icon-192x192.png b/public/images/gm-android-icon-192x192.png deleted file mode 100644 index cd503622..00000000 Binary files a/public/images/gm-android-icon-192x192.png and /dev/null differ diff --git a/public/images/gm-android-icon-512x512.png b/public/images/gm-android-icon-512x512.png deleted file mode 100644 index 1669de97..00000000 Binary files a/public/images/gm-android-icon-512x512.png and /dev/null differ diff --git a/public/images/gm-apple-touch-icon.png b/public/images/gm-apple-touch-icon.png deleted file mode 100644 index 9626b275..00000000 Binary files a/public/images/gm-apple-touch-icon.png and /dev/null differ diff --git a/public/images/gruppomacro-logo-full.png b/public/images/gruppomacro-logo-full.png deleted file mode 100644 index d6e578b8..00000000 Binary files a/public/images/gruppomacro-logo-full.png and /dev/null differ diff --git a/public/images/riso-android-icon-144x144.png b/public/images/riso-android-icon-144x144.png new file mode 100644 index 00000000..37dcd661 Binary files /dev/null and b/public/images/riso-android-icon-144x144.png differ diff --git a/public/images/riso-android-icon-192x192.png b/public/images/riso-android-icon-192x192.png new file mode 100644 index 00000000..95b960e9 Binary files /dev/null and b/public/images/riso-android-icon-192x192.png differ diff --git a/public/images/riso-android-icon-36x36.png b/public/images/riso-android-icon-36x36.png new file mode 100644 index 00000000..c78a13a3 Binary files /dev/null and b/public/images/riso-android-icon-36x36.png differ diff --git a/public/images/riso-android-icon-384x384.png b/public/images/riso-android-icon-384x384.png new file mode 100644 index 00000000..ce1ffc47 Binary files /dev/null and b/public/images/riso-android-icon-384x384.png differ diff --git a/public/images/riso-android-icon-48x48.png b/public/images/riso-android-icon-48x48.png new file mode 100644 index 00000000..499e8674 Binary files /dev/null and b/public/images/riso-android-icon-48x48.png differ diff --git a/public/images/riso-android-icon-512x512.png b/public/images/riso-android-icon-512x512.png new file mode 100644 index 00000000..e1c31acd Binary files /dev/null and b/public/images/riso-android-icon-512x512.png differ diff --git a/public/images/riso-android-icon-72x72.png b/public/images/riso-android-icon-72x72.png new file mode 100644 index 00000000..f95f7320 Binary files /dev/null and b/public/images/riso-android-icon-72x72.png differ diff --git a/public/images/riso-android-icon-96x96.png b/public/images/riso-android-icon-96x96.png new file mode 100644 index 00000000..98dbf9d9 Binary files /dev/null and b/public/images/riso-android-icon-96x96.png differ diff --git a/public/images/riso-apple-icon-114x114.png b/public/images/riso-apple-icon-114x114.png new file mode 100644 index 00000000..882dd21c Binary files /dev/null and b/public/images/riso-apple-icon-114x114.png differ diff --git a/public/images/riso-apple-icon-120x120.png b/public/images/riso-apple-icon-120x120.png new file mode 100644 index 00000000..734b0503 Binary files /dev/null and b/public/images/riso-apple-icon-120x120.png differ diff --git a/public/images/riso-apple-icon-144x144.png b/public/images/riso-apple-icon-144x144.png new file mode 100644 index 00000000..923da7be Binary files /dev/null and b/public/images/riso-apple-icon-144x144.png differ diff --git a/public/images/riso-apple-icon-152x152.png b/public/images/riso-apple-icon-152x152.png new file mode 100644 index 00000000..84fd455d Binary files /dev/null and b/public/images/riso-apple-icon-152x152.png differ diff --git a/public/images/riso-apple-icon-180x180.png b/public/images/riso-apple-icon-180x180.png new file mode 100644 index 00000000..e457d906 Binary files /dev/null and b/public/images/riso-apple-icon-180x180.png differ diff --git a/public/images/riso-apple-icon-57x57.png b/public/images/riso-apple-icon-57x57.png new file mode 100644 index 00000000..f5f538db Binary files /dev/null and b/public/images/riso-apple-icon-57x57.png differ diff --git a/public/images/riso-apple-icon-60x60.png b/public/images/riso-apple-icon-60x60.png new file mode 100644 index 00000000..4121f834 Binary files /dev/null and b/public/images/riso-apple-icon-60x60.png differ diff --git a/public/images/riso-apple-icon-72x72.png b/public/images/riso-apple-icon-72x72.png new file mode 100644 index 00000000..5efd872d Binary files /dev/null and b/public/images/riso-apple-icon-72x72.png differ diff --git a/public/images/riso-apple-icon-76x76.png b/public/images/riso-apple-icon-76x76.png new file mode 100644 index 00000000..6db4b76f Binary files /dev/null and b/public/images/riso-apple-icon-76x76.png differ diff --git a/public/images/riso-apple-icon.png b/public/images/riso-apple-icon.png new file mode 100644 index 00000000..cfaeb3c0 Binary files /dev/null and b/public/images/riso-apple-icon.png differ diff --git a/public/images/riso-logo-full.png b/public/images/riso-logo-full.png new file mode 100644 index 00000000..38a9695f Binary files /dev/null and b/public/images/riso-logo-full.png differ diff --git a/public/images/riso_home.png b/public/images/riso_home.png new file mode 100644 index 00000000..3d065405 Binary files /dev/null and b/public/images/riso_home.png differ diff --git a/public/images/riso_home_dark.png b/public/images/riso_home_dark.png new file mode 100644 index 00000000..fe6b8225 Binary files /dev/null and b/public/images/riso_home_dark.png differ diff --git a/public/images/riso_services.png b/public/images/riso_services.png new file mode 100644 index 00000000..85a940bc Binary files /dev/null and b/public/images/riso_services.png differ diff --git a/quasar.conf.js b/quasar.conf.js index a9d1c456..652989b2 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -17,6 +17,8 @@ const webpack = require('webpack') const helpers = require('./helpers') const envparser = require('./config/envparser') +const package = require('./package.json'); + // const ESLintPlugin = require('eslint-webpack-plugin') module.exports = configure((ctx) => ({ @@ -87,6 +89,7 @@ module.exports = configure((ctx) => ({ // Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build build: { env: envparser(), + versionCode: package.version, vueRouterMode: 'history', vueCompiler: true, gzip: false, // gzip true @@ -149,9 +152,9 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8089, + port: 8084, open: false, // opens browser window automatically - hot: true, // Disable hot module replacement + hot: false, // Disable hot module replacement headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Headers': '*', @@ -248,6 +251,8 @@ module.exports = configure((ctx) => ({ 'Cookies', 'Loading', 'AppVisibility', + 'LocalStorage', + 'SessionStorage', ], get plugins_1() { return this._plugins; @@ -308,9 +313,9 @@ module.exports = configure((ctx) => ({ }, manifest: { - name: 'Gruppo Macro', - short_name: 'GruppoMacro', - description: '', + name: 'Riso', + short_name: 'Riso', + 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.', display: 'standalone', orientation: 'portrait', background_color: '#fff', @@ -320,24 +325,54 @@ module.exports = configure((ctx) => ({ start_url: "/?homescreen=1", icons: [ { - src: 'images/gm-android-icon-512x512.png', + src: 'images/riso-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/gm-android-icon-192x192.png', + src: 'images/riso-android-icon-384x384.png', + sizes: '384x384', + type: 'image/png', + }, + { + src: 'images/riso-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/gm-apple-touch-icon.png', + src: 'images/riso-android-icon-144x144.png', + sizes: '144x144', + type: 'image/png', + }, + { + src: 'images/riso-android-icon-96x96.png', + sizes: '96x96', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-120x120.png', + sizes: '120x120', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-144x144.png', + sizes: '144x144', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-152x152.png', + sizes: '152x152', + type: 'image/png', + }, + { + src: 'images/riso-apple-icon-180x180.png', sizes: '180x180', type: 'image/png', }, ], related_applications: [{ "platform": "webapp", - "url": "https://www.gruppomacro.app/manifest.json" + "url": "https://www.riso.app/manifest.json" }] }, }, @@ -372,7 +407,7 @@ module.exports = configure((ctx) => ({ builder: { // https://www.electron.build/configuration/configuration - appId: 'GruppoMacro', + appId: 'Riso', }, // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index f7c88cdf..8a69e965 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -34,13 +34,15 @@ self.addEventListener('activate', (event) => { }); -const APP_VERSION = "1.1.4"; +const APP_VERSION = "1.1.6"; console.log(' [ VER-' + APP_VERSION + ' ] _---------________------ PAO: this is my custom service worker'); importScripts('js/idb.js', 'js/storage.js'); let port = self.location.hostname.startsWith('test') ? 3001 : 3000; +let ISTEST = self.location.hostname.startsWith('test'); +let ISLOCALE = self.location.hostname.startsWith('localhost'); console.log('SW- app ver ' + APP_VERSION + ' on port ' + port); @@ -172,8 +174,169 @@ if (workbox) { console.log(event.data); }); + // Costanti di configurazione + const DYNAMIC_CACHE = 'dynamic-cache-v1'; + const ENABLE_DYNAMIC_CACHING = true; + const baseUrl = self.location.origin; + console.log('baseUrl', baseUrl); + const APP_DOMAIN = extractDomain(baseUrl); + let API_DOMAIN = ''; + if (ISTEST) { + API_DOMAIN = 'testapi.' + removeTestPrefix(APP_DOMAIN); + } else { + API_DOMAIN = 'api.' + APP_DOMAIN; + } + + 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; + } + } + + // Funzione per gestire specificamente le richieste API + async function handleApiRequest(request) { + const modifiedRequest = new Request(request.url, { + method: request.method, + headers: { + ...Object.fromEntries(request.headers.entries()), + 'Origin': `https://${APP_DOMAIN}`, + 'Accept': 'application/json', + }, + mode: 'cors', + // credentials: 'include' + }); + + try { + const response = await fetch(modifiedRequest); + + // Se la risposta è ok, restituiscila + if (response.ok) { + return response; + } + + // Se riceviamo un errore CORS, prova con una richiesta no-cors + if (response.status === 0 || response.type === 'opaque') { + console.log('[Service Worker] Fallback to no-cors mode for:', request.url); + return fetch(new Request(request.url, { + method: 'GET', + mode: 'no-cors', + // credentials: 'include' + })); + } + + return response; + } catch (error) { + console.error('[Service Worker] API request error:', error); + return new Response(JSON.stringify({ + error: 'Network error', + message: 'Unable to fetch from API' + }), { + status: 503, + headers: { + 'Content-Type': 'application/json', + 'Access-Control-Allow-Origin': `https://${APP_DOMAIN}`, + 'Access-Control-Allow-Methods': 'GET, POST, OPTIONS', + 'Access-Control-Allow-Headers': 'Content-Type' + } + }); + } + } + + // Funzione principale per gestire il fetch + async function handleFetch(request) { + try { + // Verifica se è una richiesta all'API + const url = new URL(request.url); + const isApiRequest = url.hostname === API_DOMAIN; + + // Se è una richiesta API, gestiscila separatamente + if (isApiRequest) { + return handleApiRequest(request); + } + + // Per le altre richieste, prova prima la cache + const cachedResponse = await caches.match(request); + if (cachedResponse) { + return cachedResponse; + } + + // Se non è in cache, fai la richiesta di rete + const response = await fetch(request); + + // Verifica la validità della risposta + if (!response || (!response.ok && response.type !== 'opaque')) { + console.warn('[Service Worker] Invalid response for:', request.url); + return response; + } + + // Cache solo le risorse dello stesso origine + if (ENABLE_DYNAMIC_CACHING && !isCrossOrigin(request.url)) { + try { + const cache = await caches.open(DYNAMIC_CACHE); + cache.put(request, response.clone()); + } catch (cacheError) { + console.error('[Service Worker] Cache error:', cacheError); + } + } + + return response; + } catch (error) { + console.error('[Service Worker] Fetch error:', error); + + // Personalizza la risposta di errore in base al tipo di richiesta + if (request.headers.get('Accept')?.includes('application/json')) { + return new Response(JSON.stringify({ + error: 'Network error', + message: 'Service unavailable' + }), { + status: 503, + headers: { + 'Content-Type': 'application/json', + 'Access-Control-Allow-Origin': `https://${APP_DOMAIN}` + } + }); + } + + return new Response('Network error', { + status: 503, + statusText: 'Service Unavailable' + }); + } + } + + // Event listener per il fetch self.addEventListener('fetch', event => { - // Ignora le richieste non-GET + // Gestione delle richieste OPTIONS per CORS + if (event.request.method === 'OPTIONS') { + event.respondWith( + new Response(null, { + status: 204, + headers: { + 'Access-Control-Allow-Origin': `https://${APP_DOMAIN}`, + 'Access-Control-Allow-Methods': 'GET, POST, OPTIONS', + 'Access-Control-Allow-Headers': 'Content-Type', + 'Access-Control-Max-Age': '86400' + } + }) + ); + return; + } + + // Ignora le richieste non-GET che non sono OPTIONS if (event.request.method !== 'GET') return; // Gestisci il caso 'only-if-cached' @@ -184,35 +347,15 @@ if (workbox) { event.respondWith(handleFetch(event.request)); }); - async function handleFetch(request) { - try { - // Prova prima a ottenere dalla cache - const cachedResponse = await caches.match(request); - if (cachedResponse) { - return cachedResponse; - } - - // Se non è in cache, fai la richiesta di rete - const response = await fetch(request); - - // Controlla se la risposta è valida - if (!response || response.status !== 200 || response.type !== 'basic') { - return response; - } - - // Salva in cache se il caching dinamico è abilitato - if (ENABLE_DYNAMIC_CACHING) { - const cache = await caches.open(DYNAMIC_CACHE); - cache.put(request, response.clone()); - } - - return response; - } catch (error) { - console.error('[Service Worker] Fetch error:', error); - return new Response('Network error', { status: 503, statusText: 'Service Unavailable' }); - } - } + // Gestione degli errori non catturati + self.addEventListener('unhandledrejection', event => { + console.error('[Service Worker] Unhandled rejection:', event.reason); + }); + // Gestione degli errori globali + self.addEventListener('error', event => { + console.error('[Service Worker] Global error:', event.error); + }); // Funzione di utilità per il logging (decommentare se necessario) // function logFetchDetails(request) { // console.log('[Service Worker] Fetching:', request.url); diff --git a/src/components/CBarSelection/CBarSelection.ts b/src/components/CBarSelection/CBarSelection.ts index 1a796305..2be7069e 100755 --- a/src/components/CBarSelection/CBarSelection.ts +++ b/src/components/CBarSelection/CBarSelection.ts @@ -230,7 +230,7 @@ export default defineComponent({ } function searchval(newval: any, table: any, tablesel: any) { - console.log('REFRR searchval', newval, table, 'tablesel', tablesel) + // console.log('REFRR searchval', newval, table, 'tablesel', tablesel) globalStore.myselector = { table, data: newval } // console.log('globalStore.myselector', globalStore.myselector) diff --git a/src/components/CCurrencyValue/CCurrencyValue.vue b/src/components/CCurrencyValue/CCurrencyValue.vue index 95a1e1b6..b2b44ac3 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.vue +++ b/src/components/CCurrencyValue/CCurrencyValue.vue @@ -2,7 +2,7 @@