diff --git a/.env.test.macro b/.env.test.macro new file mode 100755 index 00000000..ef684c90 --- /dev/null +++ b/.env.test.macro @@ -0,0 +1,27 @@ +APP_VERSION="1.0.20" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="13" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=test.freeplanet_serverside +SERVERDIR_WEBSITE="piuchebuono.app/testriso" +APP_URL="https://testriso.piuchebuono.app" +URL_FACEBOOK="" +PROVA_PAOLO="" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://piuchebuono.app:3001" +LOGO_REG='riso-logo-full.png' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="" +PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/.env.test.macro.save b/.env.test.macro.save new file mode 100644 index 00000000..77d3c2a1 --- /dev/null +++ b/.env.test.macro.save @@ -0,0 +1,27 @@ +APP_VERSION="1.0.20" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="13" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=test.freeplanet_serverside +SERVERDIR_WEBSITE="/riso" +APP_URL="https://risotest.piuchebuono.app" +URL_FACEBOOK="" +PROVA_PAOLO="" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://piuchebuono.app:3001" +LOGO_REG='riso-logo-full.png' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="" +PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/deploy_riso_on_macrotest_server.sh b/deploy_riso_on_macrotest_server.sh new file mode 100755 index 00000000..d0c89eb0 --- /dev/null +++ b/deploy_riso_on_macrotest_server.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +source ./.env.test.macro + +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.test.macro .env.production + +sleep 1 + +npm run buildpwa + +echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." +rsync -e 'ssh -p 8822' -a dist/pwa/ root@macro:/home/$SERVERDIR_WEBSITE + +cp .env.prod.bak .env.production + +sleep 1 + +echo "Finito $SERVERDIR_WEBSITE" diff --git a/p_old_package copy.json b/p_old_package copy.json new file mode 100755 index 00000000..e760c1ab --- /dev/null +++ b/p_old_package copy.json @@ -0,0 +1,143 @@ +{ + "name": "riso", + "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", + "private": true, + "keywords": [], + "license": "MIT", + "scripts": { + "dev": "quasar dev", + "build": "quasar build", + "buildpwa": "quasar build -m pwa", + "buildspa": "quasar build -m spa", + "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./", + "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 NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m pwa", + "spa": "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" + }, + "dependencies": { + "@quasar/extras": "^1.16.7", + "@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.2", + "@vuelidate/validators": "^2.0.2", + "acorn": "^8.8.2", + "animate.css": "^4.1.1", + "autoprefixer": "^10.4.14", + "axios": "^1.3.5", + "bcryptjs": "^2.4.3", + "chart.js": "3.9.1", + "core-js": "^3.30.0", + "crypto": "^1.0.1", + "date-fns": "^2.29.3", + "dotenv": "^16.0.3", + "echarts": "5.4.2", + "eslint-plugin-quasar": "^1.1.0", + "graphql": "^16.6.0", + "graphql-tag": "^2.12.6", + "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.6.4", + "nprogress": "^0.2.0", + "pinia": "^2.0.33", + "prerender-spa-plugin": "^3.4.0", + "quasar": "^2.12.07", + "quasar-extras": "^2.0.9", + "register-service-worker": "^1.7.2", + "typescript-eslint": "^0.0.1-alpha.0", + "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.5.4", + "vue-i18n": "^9.2.2", + "vue-idb": "^0.2.0", + "vue-loader": "^17.0.1", + "vue-property-decorator": "^10.0.0-rc.3", + "vue-router": "^4.1.6", + "vue-scroll-reveal": "^1.0.11", + "vue-social-sharing": "^4.0.0-alpha4", + "vue-svgicon": "^4.0.0-alpha.3", + "vue-timeago3": "^2.3.0", + "vue2-dragula": "^2.5.5", + "vuex": "^4.1.0", + "vuex-router-sync": "^6.0.0-rc.1" + }, + "devDependencies": { + "@quasar/app": "^3.3.3", + "@types/bcryptjs": "^2.4.2", + "@types/dotenv": "^8.2.0", + "@types/googlemaps": "^3.43.3", + "@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.16", + "@typescript-eslint/eslint-plugin": "^6.7.3", + "@typescript-eslint/parser": "^6.7.2", + "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.10.0", + "file-loader": "^6.2.0", + "html-webpack-plugin": "^5.5.0", + "http-proxy-middleware": "^2.0.6", + "jest": "^29.5.0", + "json-loader": "^0.5.7", + "node-sass": "^9.0.0", + "npm-check-updates": "^16.10.7", + "optimize-css-assets-webpack-plugin": "^6.0.1", + "postcss": "^8.4.21", + "postcss-loader": "^7.2.4", + "sass-loader": "^13.2.2", + "strip-ansi": "=7.0.1", + "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": "^5.2.2", + "vue-cli-plugin-element-ui": "^1.1.4", + "vueify": "^9.4.1", + "webpack": "^5.78.0", + "workbox-webpack-plugin": "^6.5.4" + }, + "browser": { + "crypto": false + }, + "browserslist": [ + "last 100 Chrome versions", + "last 40 Firefox versions", + "last 20 Edge versions", + "last 55 Safari versions", + "last 90 Android versions", + "last 250 ChromeAndroid versions", + "last 60 FirefoxAndroid versions", + "last 35 iOS versions", + "last 10 Opera versions", + "> 0.03%", + "not dead" + ], + "engines": { + "node": ">= 16.14.0", + "npm": ">= 6.14.8", + "yarn": ">= 1.21.1" + } +} diff --git a/package.json b/package.json index e760c1ab..8cff5ca4 100755 --- a/package.json +++ b/package.json @@ -22,102 +22,102 @@ "generate-sw": "workbox generateSW workbox-config.js" }, "dependencies": { - "@quasar/extras": "^1.16.7", + "@quasar/extras": "^1.16.9", "@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-leaflet/vue-leaflet": "^0.10.1", + "@vue/compat": "^3.3.9", + "@vue/compiler-sfc": "^3.3.9", "@vue/eslint-config-standard": "7.0.0", - "@vuelidate/core": "^2.0.2", - "@vuelidate/validators": "^2.0.2", - "acorn": "^8.8.2", + "@vuelidate/core": "^2.0.3", + "@vuelidate/validators": "^2.0.4", + "acorn": "^8.11.2", "animate.css": "^4.1.1", - "autoprefixer": "^10.4.14", - "axios": "^1.3.5", + "autoprefixer": "^10.4.16", + "axios": "^1.6.2", "bcryptjs": "^2.4.3", "chart.js": "3.9.1", - "core-js": "^3.30.0", + "core-js": "^3.33.3", "crypto": "^1.0.1", - "date-fns": "^2.29.3", - "dotenv": "^16.0.3", + "date-fns": "^2.30.0", + "dotenv": "^16.3.1", "echarts": "5.4.2", "eslint-plugin-quasar": "^1.1.0", - "graphql": "^16.6.0", + "graphql": "^16.8.1", "graphql-tag": "^2.12.6", - "gsap": "^3.11.5", - "jquery": "^3.6.4", - "js-cookie": "^3.0.1", + "gsap": "^3.12.3", + "jquery": "^3.7.1", + "js-cookie": "^3.0.5", "localforage": "^1.10.0", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "npm": "^9.6.4", + "npm": "^10.2.4", "nprogress": "^0.2.0", - "pinia": "^2.0.33", + "pinia": "^2.1.7", "prerender-spa-plugin": "^3.4.0", "quasar": "^2.12.07", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", "typescript-eslint": "^0.0.1-alpha.0", - "vee-validate": "^4.8.4", - "vue": "^3.2.47", + "vee-validate": "^4.12.2", + "vue": "^3.3.9", "vue-chart-3": "^3.1.8", "vue-class-component": "^8.0.0-rc.1", "vue-country-code": "^1.1.3", - "vue-echarts": "^6.5.4", - "vue-i18n": "^9.2.2", + "vue-echarts": "^6.6.1", + "vue-i18n": "^9.8.0", "vue-idb": "^0.2.0", - "vue-loader": "^17.0.1", + "vue-loader": "^17.3.1", "vue-property-decorator": "^10.0.0-rc.3", - "vue-router": "^4.1.6", - "vue-scroll-reveal": "^1.0.11", + "vue-router": "^4.2.5", + "vue-scroll-reveal": "^2.1.0", "vue-social-sharing": "^4.0.0-alpha4", "vue-svgicon": "^4.0.0-alpha.3", - "vue-timeago3": "^2.3.0", + "vue-timeago3": "^2.3.2", "vue2-dragula": "^2.5.5", "vuex": "^4.1.0", "vuex-router-sync": "^6.0.0-rc.1" }, "devDependencies": { "@quasar/app": "^3.3.3", - "@types/bcryptjs": "^2.4.2", + "@types/bcryptjs": "^2.4.6", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", - "@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.16", - "@typescript-eslint/eslint-plugin": "^6.7.3", - "@typescript-eslint/parser": "^6.7.2", - "eslint": "^8.37.0", - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-import": "^2.27.5", + "@types/jest": "^29.5.10", + "@types/js-cookie": "^3.0.6", + "@types/node": "18.17.0", + "@types/nprogress": "^0.2.3", + "@types/vue-tel-input": "^2.1.6", + "@types/vuelidate": "^0.7.21", + "@typescript-eslint/eslint-plugin": "^6.13.1", + "@typescript-eslint/parser": "^6.13.1", + "eslint": "^8.54.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-import": "^2.29.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^6.1.1", - "eslint-plugin-vue": "^9.10.0", + "eslint-plugin-vue": "^9.19.2", "file-loader": "^6.2.0", - "html-webpack-plugin": "^5.5.0", + "html-webpack-plugin": "^5.5.3", "http-proxy-middleware": "^2.0.6", - "jest": "^29.5.0", + "jest": "^29.7.0", "json-loader": "^0.5.7", "node-sass": "^9.0.0", - "npm-check-updates": "^16.10.7", + "npm-check-updates": "^16.14.11", "optimize-css-assets-webpack-plugin": "^6.0.1", - "postcss": "^8.4.21", - "postcss-loader": "^7.2.4", - "sass-loader": "^13.2.2", - "strip-ansi": "=7.0.1", - "ts-jest": "^29.1.0", - "ts-loader": "^9.4.2", + "postcss": "^8.4.31", + "postcss-loader": "^7.3.3", + "sass-loader": "^13.3.2", + "strip-ansi": "=7.1.0", + "ts-jest": "^29.1.1", + "ts-loader": "^9.5.1", "tslint": "^6.1.3", "tslint-config-standard": "^9.0.0", "tslint-loader": "^3.5.4", - "typescript": "^5.2.2", + "typescript": "^5.3.2", "vue-cli-plugin-element-ui": "^1.1.4", "vueify": "^9.4.1", - "webpack": "^5.78.0", - "workbox-webpack-plugin": "^6.5.4" + "webpack": "^5.89.0", + "workbox-webpack-plugin": "^7.0.0" }, "browser": { "crypto": false diff --git a/src/components/CCurrencyValue/CCurrencyValue.ts b/src/components/CCurrencyValue/CCurrencyValue.ts index da03a5eb..062e5f68 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.ts +++ b/src/components/CCurrencyValue/CCurrencyValue.ts @@ -30,6 +30,11 @@ export default defineComponent({ required: false, default: '', }, + before_str: { + type: String, + required: false, + default: '', + }, strfido: { type: String, required: false, diff --git a/src/components/CCurrencyValue/CCurrencyValue.vue b/src/components/CCurrencyValue/CCurrencyValue.vue index 94e7e16e..844dfc9d 100755 --- a/src/components/CCurrencyValue/CCurrencyValue.vue +++ b/src/components/CCurrencyValue/CCurrencyValue.vue @@ -81,6 +81,9 @@