diff --git a/.env.development b/.env.development index bb7b9f12..68c3cf88 100755 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ APP_VERSION="1.0.21" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="13" +APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" @@ -12,7 +12,7 @@ LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="https://localhost:3000" -LOGO_REG='riso-logo-full.png' +LOGO_REG='piuchebuono-logo-full.png' TEST_NAME="Paolo" TEST_SURNAME="Arena" TEST_EMAIL="" diff --git a/.env.example.production b/.env.example.production index abe4a5d3..d58eb56e 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.21" +APP_VERSION="1.0.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index de591653..f069e6d8 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,16 +1,16 @@ -APP_VERSION="1.0.21" +APP_VERSION="1.0.22" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="13" +APP_ID="17" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="/var/customers/webs/paolouser/testriso/" -APP_URL="https://testriso.piuchebuono.app" +SERVERDIR_WEBSITE="/var/customers/webs/paolouser/test.piuchebuono.app/" +APP_URL="https://test.piuchebuono.app" URL_FACEBOOK="" PROVA_PAOLO="" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -MONGODB_HOST="https://testriso.piuchebuono.app:3001" +MONGODB_HOST="https://65.108.222.97:3001" LOGO_REG='riso-logo-full.png' TEST_NAME="" TEST_SURNAME="" diff --git a/.env.test.risosrv b/.env.test.risosrv index 77466d0f..5e30204f 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.0.21" +APP_VERSION="1.0.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb new file mode 100755 index 00000000..733f826f --- /dev/null +++ b/.env.test_riso.pcb @@ -0,0 +1,27 @@ +APP_VERSION="1.0.22" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="13" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=test.freeplanet_serverside +SERVERDIR_WEBSITE="/var/customers/webs/paolouser/testriso/" +APP_URL="https://testriso.piuchebuono.app" +URL_FACEBOOK="" +PROVA_PAOLO="" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://testriso.piuchebuono.app:3001" +LOGO_REG='riso-logo-full.png' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="" +PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc" +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 5324bf5c..c314ff80 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.20" +APP_VERSION="1.0.22" 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 b78ba923..a14c3a54 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.21" +APP_VERSION="1.0.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/db/static_data.ts b/_ALL_SITES/riso.app/db/static_data.ts index 9fab8506..4e61cf8c 100755 --- a/_ALL_SITES/riso.app/db/static_data.ts +++ b/_ALL_SITES/riso.app/db/static_data.ts @@ -57,6 +57,16 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: true, infooter: true, }, + { + active: true, + order: 400, + path: '/test', + materialIcon: 'fas fa-test', + name: 'mypages.test', + component: () => import('@/views/testServer/testServer.vue'), + inmenu: false, + infooter: false, + }, { active: true, order: 12, diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json index e760c1ab..8cff5ca4 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/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/deploy_on_test_pcb.sh b/deploy_on_test_pcb.sh new file mode 100755 index 00000000..dce9955f --- /dev/null +++ b/deploy_on_test_pcb.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +source ./.env.test.pcb + +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.pcb .env.production + +sleep 1 + +npm run buildpwa + +echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..." +rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE + +cp .env.prod.bak .env.production + +sleep 1 + +echo "Finito $SERVERDIR_WEBSITE" diff --git a/now.txt b/now.txt index 9bc58f3e..e5f5d4ff 100644 --- a/now.txt +++ b/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo !) +TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !) diff --git a/package.json b/package.json index 8cff5ca4..0e270b75 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "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", + "name": "piuchebuono", + "version": "2.0.1", + "description": "PiuCheBuono", + "productName": "PiuCheBuono", "author": "Paolo Arena", "private": true, "keywords": [], @@ -22,102 +22,102 @@ "generate-sw": "workbox generateSW workbox-config.js" }, "dependencies": { - "@quasar/extras": "^1.16.9", + "@quasar/extras": "^1.16.7", "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.16", - "@vue-leaflet/vue-leaflet": "^0.10.1", - "@vue/compat": "^3.3.9", - "@vue/compiler-sfc": "^3.3.9", + "@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.3", - "@vuelidate/validators": "^2.0.4", - "acorn": "^8.11.2", + "@vuelidate/core": "^2.0.2", + "@vuelidate/validators": "^2.0.2", + "acorn": "^8.8.2", "animate.css": "^4.1.1", - "autoprefixer": "^10.4.16", - "axios": "^1.6.2", + "autoprefixer": "^10.4.14", + "axios": "^1.3.5", "bcryptjs": "^2.4.3", "chart.js": "3.9.1", - "core-js": "^3.33.3", + "core-js": "^3.30.0", "crypto": "^1.0.1", - "date-fns": "^2.30.0", - "dotenv": "^16.3.1", + "date-fns": "^2.29.3", + "dotenv": "^16.0.3", "echarts": "5.4.2", "eslint-plugin-quasar": "^1.1.0", - "graphql": "^16.8.1", + "graphql": "^16.6.0", "graphql-tag": "^2.12.6", - "gsap": "^3.12.3", - "jquery": "^3.7.1", - "js-cookie": "^3.0.5", + "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": "^10.2.4", + "npm": "^9.6.4", "nprogress": "^0.2.0", - "pinia": "^2.1.7", + "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.12.2", - "vue": "^3.3.9", + "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.6.1", - "vue-i18n": "^9.8.0", + "vue-echarts": "^6.5.4", + "vue-i18n": "^9.2.2", "vue-idb": "^0.2.0", - "vue-loader": "^17.3.1", + "vue-loader": "^17.0.1", "vue-property-decorator": "^10.0.0-rc.3", - "vue-router": "^4.2.5", - "vue-scroll-reveal": "^2.1.0", + "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.2", + "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.6", + "@types/bcryptjs": "^2.4.2", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", - "@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", + "@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.19.2", + "eslint-plugin-vue": "^9.10.0", "file-loader": "^6.2.0", - "html-webpack-plugin": "^5.5.3", + "html-webpack-plugin": "^5.5.0", "http-proxy-middleware": "^2.0.6", - "jest": "^29.7.0", + "jest": "^29.5.0", "json-loader": "^0.5.7", "node-sass": "^9.0.0", - "npm-check-updates": "^16.14.11", + "npm-check-updates": "^16.10.7", "optimize-css-assets-webpack-plugin": "^6.0.1", - "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", + "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.3.2", + "typescript": "^5.2.2", "vue-cli-plugin-element-ui": "^1.1.4", "vueify": "^9.4.1", - "webpack": "^5.89.0", - "workbox-webpack-plugin": "^7.0.0" + "webpack": "^5.78.0", + "workbox-webpack-plugin": "^6.5.4" }, "browser": { "crypto": false diff --git a/quasar.conf.js b/quasar.conf.js index 4fe00ed6..b4bf3510 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -147,7 +147,7 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8084, + port: 8088, open: false, // opens browser window automatically headers: { 'Access-Control-Allow-Origin': '*', @@ -305,9 +305,9 @@ module.exports = configure((ctx) => ({ }, manifest: { - 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.', + name: 'Più che Buono', + short_name: 'PiuCheBuono', + description: 'PiuCheBuono è un GAS e Bottega', display: 'standalone', orientation: 'portrait', background_color: '#fff', @@ -317,47 +317,47 @@ module.exports = configure((ctx) => ({ start_url: "/?homescreen=1", icons: [ { - src: 'images/riso-android-icon-512x512.png', + src: 'images/fv-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/riso-android-icon-384x384.png', + src: 'images/fv-android-icon-384x384.png', sizes: '384x384', type: 'image/png', }, { - src: 'images/riso-android-icon-192x192.png', + src: 'images/fv-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/riso-android-icon-144x144.png', + src: 'images/fv-android-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/riso-android-icon-96x96.png', + src: 'images/fv-android-icon-96x96.png', sizes: '96x96', type: 'image/png', }, { - src: 'images/riso-apple-icon-120x120.png', + src: 'images/fv-apple-icon-120x120.png', sizes: '120x120', type: 'image/png', }, { - src: 'images/riso-apple-icon-144x144.png', + src: 'images/fv-apple-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/riso-apple-icon-152x152.png', + src: 'images/fv-apple-icon-152x152.png', sizes: '152x152', type: 'image/png', }, { - src: 'images/riso-apple-icon-180x180.png', + src: 'images/fv-apple-icon-180x180.png', sizes: '180x180', type: 'image/png', }, @@ -399,7 +399,7 @@ module.exports = configure((ctx) => ({ builder: { // https://www.electron.build/configuration/configuration - appId: 'Riso', + appId: 'PiuCheBuono', }, // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain diff --git a/send_pwa_to_test_pcb.sh b/send_pwa_to_test_pcb.sh new file mode 100755 index 00000000..5eb017d1 --- /dev/null +++ b/send_pwa_to_test_pcb.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +source .env.test.pcb + +cp .env.test.pcb .env.production + +echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." +rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE +echo "Finito $SERVERDIR_WEBSITE" + +cp .env.prod.bak .env.production diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index c7366e95..65ee5f22 100755 --- a/src/db/lang/ws_it.js +++ b/src/db/lang/ws_it.js @@ -1,9 +1,9 @@ const msg_website_it = { ws: { - sitename: 'Riso', - siteshortname: '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.', - keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS', + sitename: 'Più che Buono', + siteshortname: 'Più che Buono', + description: '', + keywords: '', }, hours: { descr: 'Descrizione', @@ -32,6 +32,7 @@ const msg_website_it = { products: 'Prodotti', productslist: 'Lista Prodotti', collabora: 'Collabora', + categories: 'Categorie', storehouses: 'Magazzino', departments: 'Uffici', orders: 'Ordini Ricevuti', @@ -123,7 +124,7 @@ const msg_website_it = { color: 'Colore', }, msg: { - myAppName: 'Riso', + myAppName: 'Più che Buono', myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito', underconstruction: 'App in costruzione...', myDescriz: '', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 4e61cf8c..5b666e55 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -7,30 +7,6 @@ import { import { func } from '@store/Modules/fieldsTable' -// const SHOW_PROJINTHEMENU = false -// -// let arrlistafavourite = [] -// let arrlistaprojtutti = [] -// let arrlistaprojmiei = [] -// if (SHOW_PROJINTHEMENU) { -// arrlistaprojtutti = Projects.getters.listaprojects(RouteNames.projectsall) -// arrlistaprojmiei = Projects.getters.listaprojects(RouteNames.myprojects) -// arrlistafavourite = Projects.getters.listaprojects(RouteNames.favouriteprojects) -// } -// PROGETTI -> FAVORITI : - -// if (arrlistafavourite.length > 0) { -// arrMenu.push({ -// icon: 'favorite_border', -// nametranslate: 'pages.' + RouteNames.favouriteprojects, -// urlroute: RouteNames.favouriteprojects, -// level_parent: 0.0, -// level_child: 0.5, -// routes2: arrlistafavourite, -// idelem: '' -// }) -// } - const firstPage = { active: true, order: 5, @@ -57,72 +33,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: true, infooter: true, }, - { - active: true, - order: 400, - path: '/test', - materialIcon: 'fas fa-test', - name: 'mypages.test', - component: () => import('@/views/testServer/testServer.vue'), - inmenu: false, - infooter: false, - }, - { - active: true, - order: 12, - path: '/goods', - materialIcon: 'fas fa-tshirt', - name: 'mypages.goods', - component: () => import('@/root/goods/goods.vue'), - meta: { requiresAuth: true }, - inmenu: true, - infooter: true, - }, - { - active: true, - order: 15, - path: '/services', - materialIcon: 'fas fa-house-user', - name: 'mypages.services', - component: () => import('@/root/services/services.vue'), - meta: { requiresAuth: true }, - inmenu: true, - infooter: true, - }, - { - active: true, - order: 15, - path: '/provapao', - materialIcon: 'fas fa-house-user', - name: 'mypages.provapao', - component: () => import('@/root/provapao/provapao.vue'), - meta: { requiresAuth: true }, - inmenu: false, - infooter: false, - }, - { - active: true, - order: 15, - path: '/hosps', - materialIcon: 'fas fa-bed', - name: 'mypages.hosp', - component: () => import('@/root/hosp/hosp.vue'), - meta: { requiresAuth: true }, - inmenu: true, - infooter: true, - }, - { - active: site.confpages && site.confpages.enableCircuits, - order: 16, - path: '/circuits', - materialIcon: 'fas fa-coins', - name: 'mypages.circuits', - component: () => import('@/views/user/mycircuits/mycircuits.vue'), - meta: { requiresAuth: true }, - inmenu: true, - infooter: true, - }, - { + /*{ active: true, order: 20, path: '/events', @@ -132,7 +43,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true }, inmenu: true, infooter: true, - }, + },*/ { active: true, order: 120, @@ -187,16 +98,6 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true, newpage: true }, inmenu: false, infooter: false, - }, { - active: true, - order: 137, - path: '/circuit/:path', - materialIcon: 'fas fa-user', - name: 'proj.circuit2', - component: () => import('@/views/user/mycircuit/mycircuit.vue'), - meta: { requiresAuth: true, newpage: true }, - inmenu: false, - infooter: false, }, { active: true, diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 470ac316..fbd1ab41 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -70,6 +70,9 @@ const msg_it = { magazzino: 'Magazzino', addcart: 'Aggiungi {qta} al Carrello', origine: 'Origine', + ingredienti: 'ingredienti', + valori_nutrizionali: 'Valori Nutrizionali', + note: 'Note', }, storehouses: { name: 'Magazzino', diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index a71f41cc..7f8601c0 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -1912,6 +1912,8 @@ export const colTableIscrittiArcadei = [ export const colTableProducts = [ AddCol({ name: 'active', label_trans: 'products.active', fieldtype: costanti.FieldType.boolean }), AddCol({ name: 'code', label_trans: 'products.code' }), + AddCol({ name: 'codice_EAN', label_trans: 'products.codice_EAN' }), + AddCol({ name: 'barcode', label_trans: 'products.barcode' }), AddCol({ name: 'name', label_trans: 'products.name' }), AddCol({ name: 'description', label_trans: 'products.description', fieldtype: costanti.FieldType.html }), AddCol({ name: 'icon', label_trans: 'products.icon' }), @@ -1954,10 +1956,14 @@ export const colTableProducts = [ AddCol({ name: 'canBeShipped', label_trans: 'products.canBeShipped', fieldtype: costanti.FieldType.boolean }), AddCol({ name: 'canBeBuyOnline', label_trans: 'products.canBeBuyOnline', fieldtype: costanti.FieldType.boolean }), AddCol({ name: 'weight', label_trans: 'products.weight', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'vegan', label_trans: 'products.vegan', fieldtype: costanti.FieldType.boolean }), AddCol({ name: 'unit', label_trans: 'products.unit', fieldtype: costanti.FieldType.select, jointable: 'units', }), AddCol({ name: 'stars', label_trans: 'products.stars', fieldtype: costanti.FieldType.number }), AddCol({ name: 'date', label_trans: 'products.date', fieldtype: costanti.FieldType.date }), + AddCol({ name: 'ingredienti', label_trans: 'products.ingredienti' }), + AddCol({ name: 'valori_nutrizionali', label_trans: 'products.valori_nutrizionali' }), + AddCol({ name: 'note', label_trans: 'products.note' }), AddCol(DeleteRec), AddCol(DuplicateRec), ] diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 4f09aed4..f0dc1c09 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -638,7 +638,7 @@ export const useUserStore = defineStore('UserStore', { isUserOk(): boolean { const globalStore = useGlobalStore() - if (globalStore.site.confpages.enableRegMultiChoice) { + if (globalStore.site.confpages && globalStore.site.confpages.enableRegMultiChoice) { return ((this.isTelegIdOk() && this.isUsernameTelegOk()) || this.my.verified_email!) && this.my.verified_by_aportador! } else { return this.isTelegIdOk() && this.my.verified_by_aportador! && this.isUsernameTelegOk()