From 701e1f196823f977fa569effea65bf68f165ebd0 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Fri, 7 Apr 2023 17:14:51 +0200 Subject: [PATCH] Aggiornamento a 0.6.1 --- .env.development | 2 +- .env.example.production | 2 +- .env.test.risosrv | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.production | 2 +- .../terradellavisione.app/.env.development | 2 +- deploy_on_production.sh | 2 +- deploy_on_test_server.sh | 2 +- deploy_risosrv_on_test_server.sh | 2 +- package.json | 89 ++++----- send_pwa_to_risotest.sh | 2 +- send_pwa_to_test.sh | 2 +- src-pwa/custom-service-worker.js | 4 +- src/common/shared_vuejs.ts | 8 + src/components/CAccomodation/CAccomodation.ts | 4 +- .../CAccomodation/CAccomodation.vue | 10 +- .../CGridTableRec/CGridTableRec.vue | 8 +- .../CMyActivities/CMyActivities.vue | 6 +- .../CMyCardService/CMyCardService.ts | 4 +- .../CMyCardService/CMyCardService.vue | 59 ++++-- src/components/CMyRecCard/CMyRecCard.vue | 172 ++++++++++++++---- src/css/app.scss | 18 ++ src/statics/lang/it.js | 4 +- src/store/Modules/tools.ts | 7 + 24 files changed, 284 insertions(+), 131 deletions(-) diff --git a/.env.development b/.env.development index afaccfb1..3f86a585 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.85" +APP_VERSION="0.6.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 48ec60d6..44f12552 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.85" +APP_VERSION="0.6.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index c62be2ae..1f1c69d0 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="0.5.85" +APP_VERSION="0.6.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index afaccfb1..3f86a585 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.85" +APP_VERSION="0.6.1" 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 98fa7535..72bebaa5 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.85" +APP_VERSION="0.6.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 6d827020..78ee01e6 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.85" +APP_VERSION="0.6.1" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/deploy_on_production.sh b/deploy_on_production.sh index 9f17ff55..4f8e9d0d 100755 --- a/deploy_on_production.sh +++ b/deploy_on_production.sh @@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/deploy_on_test_server.sh b/deploy_on_test_server.sh index a1aa307c..1cd4855f 100755 --- a/deploy_on_test_server.sh +++ b/deploy_on_test_server.sh @@ -19,7 +19,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ cp .env.prod.bak .env.production diff --git a/deploy_risosrv_on_test_server.sh b/deploy_risosrv_on_test_server.sh index 0c3eee20..fb673384 100755 --- a/deploy_risosrv_on_test_server.sh +++ b/deploy_risosrv_on_test_server.sh @@ -18,7 +18,7 @@ sleep 1 npm run buildpwa echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." -rsync -e 'ssh -p 5522' -a dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE +rsync -e 'ssh -p 5522' -a --exclude 'upload' dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE cp .env.prod.bak .env.production diff --git a/package.json b/package.json index d06cb9db..4d2a25ce 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "0.5.3", + "version": "0.6.1", "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", @@ -22,48 +22,48 @@ "generate-sw": "workbox generateSW workbox-config.js" }, "dependencies": { - "@quasar/extras": "^1.15.8", - "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.13", - "@vue-leaflet/vue-leaflet": "^0.7.0", - "@vue/compat": "^3.2.45", - "@vue/compiler-sfc": "^3.2.45", + "@quasar/extras": "^1.16.2", + "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.16", + "@vue-leaflet/vue-leaflet": "^0.9.0", + "@vue/compat": "^3.2.47", + "@vue/compiler-sfc": "^3.2.47", "@vue/eslint-config-standard": "7.0.0", - "@vuelidate/core": "^2.0.0", - "@vuelidate/validators": "^2.0.0", - "acorn": "^8.8.1", + "@vuelidate/core": "^2.0.2", + "@vuelidate/validators": "^2.0.2", + "acorn": "^8.8.2", "animate.css": "^4.1.1", - "autoprefixer": "^10.4.13", - "axios": "^1.2.1", + "autoprefixer": "^10.4.14", + "axios": "^1.3.5", "bcryptjs": "^2.4.3", "chart.js": "3.9.1", - "core-js": "^3.26.1", + "core-js": "^3.30.0", "crypto": "^1.0.1", "date-fns": "^2.29.3", "dotenv": "^16.0.3", - "echarts": "5.3.3", + "echarts": "5.4.2", "eslint-plugin-quasar": "^1.1.0", "eslint-plugin-standard": "^5.0.0", "graphql": "^16.6.0", "graphql-tag": "^2.12.6", - "gsap": "^3.11.3", - "jquery": "^3.6.2", + "gsap": "^3.11.5", + "jquery": "^3.6.4", "js-cookie": "^3.0.1", "localforage": "^1.10.0", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "npm": "^9.2.0", + "npm": "^9.6.4", "nprogress": "^0.2.0", - "pinia": "^2.0.28", + "pinia": "^2.0.33", "prerender-spa-plugin": "^3.4.0", - "quasar": "^2.11.0", + "quasar": "^2.11.10", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", - "vee-validate": "^4.7.3", - "vue": "^3.2.45", + "vee-validate": "^4.8.4", + "vue": "^3.2.47", "vue-chart-3": "^3.1.8", "vue-class-component": "^8.0.0-rc.1", "vue-country-code": "^1.1.3", - "vue-echarts": "^6.3.1", + "vue-echarts": "^6.5.4", "vue-i18n": "^9.2.2", "vue-idb": "^0.2.0", "vue-loader": "^17.0.1", @@ -82,56 +82,47 @@ "@types/bcryptjs": "^2.4.2", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", - "@types/jest": "^29.2.4", - "@types/js-cookie": "^3.0.2", - "@types/node": "18.11.16", + "@types/jest": "^29.5.0", + "@types/js-cookie": "^3.0.3", + "@types/node": "18.15.11", "@types/nprogress": "^0.2.0", "@types/vue-tel-input": "^2.1.2", - "@types/vuelidate": "^0.7.15", - "@typescript-eslint/eslint-plugin": "^5.46.1", - "@typescript-eslint/parser": "^5.46.1", - "eslint": "^8.30.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-import": "^2.26.0", + "@types/vuelidate": "^0.7.16", + "@typescript-eslint/eslint-plugin": "^5.57.1", + "@typescript-eslint/parser": "^5.57.1", + "eslint": "^8.37.0", + "eslint-config-prettier": "^8.8.0", + "eslint-plugin-import": "^2.27.5", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^6.1.1", - "eslint-plugin-vue": "^9.8.0", + "eslint-plugin-vue": "^9.10.0", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.5.0", "http-proxy-middleware": "^2.0.6", - "jest": "^29.3.1", + "jest": "^29.5.0", "json-loader": "^0.5.7", - "node-sass": "7.0.1", - "npm-check-updates": "^16.6.0", + "node-sass": "7.0.0", + "npm-check-updates": "^16.10.7", "optimize-css-assets-webpack-plugin": "^6.0.1", - "postcss": "^8.4.20", - "postcss-loader": "^7.0.2", - "sass-loader": "^13.2.0", + "postcss": "^8.4.21", + "postcss-loader": "^7.2.4", + "sass-loader": "^13.2.2", "strip-ansi": "=7.0.1", - "ts-jest": "^29.0.3", + "ts-jest": "^29.1.0", "ts-loader": "^9.4.2", "tslint": "^6.1.3", "tslint-config-standard": "^9.0.0", "tslint-loader": "^3.5.4", - "typescript": "^4.9.4", + "typescript": "^5.0.3", "vue-cli-plugin-element-ui": "^1.1.4", "vueify": "^9.4.1", - "webpack": "^5.75.0", + "webpack": "^5.78.0", "workbox-webpack-plugin": "^6.5.4" }, "browser": { "crypto": false }, "browserslist": [ - "last 40 Chrome versions", - "last 40 Firefox versions", - "last 10 Edge versions", - "last 35 Safari versions", - "last 60 Android versions", - "last 250 ChromeAndroid versions", - "last 60 FirefoxAndroid versions", - "last 30 iOS versions", - "last 10 Opera versions", "> 0.05%", "not dead" ], diff --git a/send_pwa_to_risotest.sh b/send_pwa_to_risotest.sh index eef33578..eb41976b 100755 --- a/send_pwa_to_risotest.sh +++ b/send_pwa_to_risotest.sh @@ -5,7 +5,7 @@ source .env.test.risosrv cp .env.test.risosrv .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -rsync -e 'ssh -p 5522' -a dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE/ +rsync -e 'ssh -p 5522' -a --exclude 'upload' dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE" cp .env.prod.bak .env.production diff --git a/send_pwa_to_test.sh b/send_pwa_to_test.sh index 99974a2d..130a9976 100755 --- a/send_pwa_to_test.sh +++ b/send_pwa_to_test.sh @@ -5,7 +5,7 @@ source ./.env.test cp .env.test .env.production echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." -sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ +sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE" cp .env.prod.bak .env.production diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 974fac1d..102e93e2 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -18,7 +18,7 @@ import { CacheableResponsePlugin } from 'workbox-cacheable-response' import { ExpirationPlugin } from 'workbox-expiration' console.log( - ' [ VER-0.5.4 ] _---------________------ PAO: this is my custom service worker') + ' [ VER-0.6.1 ] _---------________------ PAO: this is my custom service worker') importScripts('js/idb.js') importScripts('js/storage.js') @@ -36,7 +36,7 @@ let port = 3000 if (self.location.hostname.startsWith('test')) { port = 3001 } -console.log('SW- app ver 0.5.4') +console.log('SW- app ver 0.6.1') const cfgenv = { serverweb: `${self.location.protocol}//${self.location.hostname}:${port}`, diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index f04ea625..1cf71de9 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -541,6 +541,14 @@ export const shared_consts = { value: 23, label: 'Asciugacapelli', }, + { + value: 24, + label: 'Riscaldamento a legna', + }, + { + value: 25, + label: 'Riscaldamento a gas', + }, ], Regions: [ diff --git a/src/components/CAccomodation/CAccomodation.ts b/src/components/CAccomodation/CAccomodation.ts index cf83ccfb..049c19ee 100755 --- a/src/components/CAccomodation/CAccomodation.ts +++ b/src/components/CAccomodation/CAccomodation.ts @@ -30,7 +30,7 @@ export default defineComponent({ title: String, mylist: { type: [Array, String, undefined, null] as PropType, - required: true, + required: false, }, }, emits: ['showandsave'], @@ -68,7 +68,7 @@ export default defineComponent({ }) function created() { - // console.log('created CAccomodation', props.mylist) + console.log('created CAccomodation', props.mylist) if (isValid(props.mylist)) { // @ts-ignore let myarr: any = props.mylist diff --git a/src/components/CAccomodation/CAccomodation.vue b/src/components/CAccomodation/CAccomodation.vue index 6ad7cd6f..3d9606be 100755 --- a/src/components/CAccomodation/CAccomodation.vue +++ b/src/components/CAccomodation/CAccomodation.vue @@ -3,10 +3,6 @@
- -
@@ -17,6 +13,8 @@ v-model:value="myaccom.num" optval="value" optlab="label" + style="min-width:80px;" + :sola_lettura="!isInModif" :options="shared_consts.People" :useinput="false" > @@ -58,6 +56,10 @@
+ + diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index d98a131b..580eebc6 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -1104,13 +1104,7 @@ :prop_myrec="myrecdialog" > - - - - - diff --git a/src/components/CMyActivities/CMyActivities.vue b/src/components/CMyActivities/CMyActivities.vue index 1143e55c..824fd6de 100755 --- a/src/components/CMyActivities/CMyActivities.vue +++ b/src/components/CMyActivities/CMyActivities.vue @@ -95,11 +95,11 @@ v-model="mytab" inline-label dense - class="text-black shadow-2" + class="shadow-2" > - - + + - + + + + + + + {{ $t('dialog.contact') }} - {{tools.getNomeUtenteByRecUser(myrec)}} + + @@ -86,7 +98,7 @@ - {{ $t('cmd.favorite') }} + {{ $t('cmd.favorite', {num: myrec.myfav ? myrec.myfav.length : 0}) }} @@ -104,7 +116,7 @@ - {{ $t('cmd.bookmark') }} + {{ $t('cmd.bookmark', {num: myrec.mybook ? myrec.mybook.length : 0}) }} @@ -142,6 +154,29 @@ + + + + + + + + {{tools.getstrDateMonthTimeLong(myrec.dateTimeStart)}} + + + + + + + + + + + {{tools.getstrDateMonthTimeLong(myrec.dateTimeEnd)}} + + + + @@ -371,7 +406,7 @@