diff --git a/.env.development b/.env.development index 68c3cf88..b909d09f 100755 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ -APP_VERSION="1.0.21" +APP_VERSION="1.0.25" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="17" +APP_ID="13" 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='piuchebuono-logo-full.png' +LOGO_REG='riso-logo-full.png' TEST_NAME="Paolo" TEST_SURNAME="Arena" TEST_EMAIL="" diff --git a/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js b/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js index 7885f071..6f0a25b5 100755 --- a/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js +++ b/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js @@ -26,6 +26,7 @@ const msg_website_it = { fundraising: 'Sostieni il Progetto', notifs: 'Configura le Notifiche', unsubscribe: 'Disiscriviti', + unsubscribe_user: 'Disiscriviti User', test: 'Test', projects: 'Progetti', report: 'Report Ore', diff --git a/public/images/marocco_foto1.png b/_ALL_SITES/piuchebuono.app/images/marocco_foto1.png similarity index 100% rename from public/images/marocco_foto1.png rename to _ALL_SITES/piuchebuono.app/images/marocco_foto1.png diff --git a/_ALL_SITES/piuchebuono.app/upload/products/fuji.jpg b/_ALL_SITES/piuchebuono.app/upload/products/fuji.jpg new file mode 100644 index 00000000..2e57fffe Binary files /dev/null and b/_ALL_SITES/piuchebuono.app/upload/products/fuji.jpg differ diff --git a/_ALL_SITES/piuchebuono.app/upload/products/inored.jpg b/_ALL_SITES/piuchebuono.app/upload/products/inored.jpg new file mode 100644 index 00000000..b7845a12 Binary files /dev/null and b/_ALL_SITES/piuchebuono.app/upload/products/inored.jpg differ diff --git a/_ALL_SITES/piuchebuono.app/upload/products/pdf/Marocco_BROCHURE.pdf b/_ALL_SITES/piuchebuono.app/upload/products/pdf/Marocco_BROCHURE.pdf new file mode 100644 index 00000000..50357a4a Binary files /dev/null and b/_ALL_SITES/piuchebuono.app/upload/products/pdf/Marocco_BROCHURE.pdf differ diff --git a/_ALL_SITES/piuchebuono.app/upload/products/pdf/Marocco_BROCHURE_2.pdf b/_ALL_SITES/piuchebuono.app/upload/products/pdf/Marocco_BROCHURE_2.pdf new file mode 100644 index 00000000..2a63611e Binary files /dev/null and b/_ALL_SITES/piuchebuono.app/upload/products/pdf/Marocco_BROCHURE_2.pdf differ diff --git a/_ALL_SITES/piuchebuono.app/upload/products/pdf/Marocco_Cultura.pdf b/_ALL_SITES/piuchebuono.app/upload/products/pdf/Marocco_Cultura.pdf new file mode 100644 index 00000000..2deb181c Binary files /dev/null and b/_ALL_SITES/piuchebuono.app/upload/products/pdf/Marocco_Cultura.pdf differ diff --git a/_ALL_SITES/piuchebuono.app/upload/products/pdf/SCHEDA-TECNICA-olio-di-cactus_aachab-naama.pdf b/_ALL_SITES/piuchebuono.app/upload/products/pdf/SCHEDA-TECNICA-olio-di-cactus_aachab-naama.pdf new file mode 100644 index 00000000..9fe555e7 Binary files /dev/null and b/_ALL_SITES/piuchebuono.app/upload/products/pdf/SCHEDA-TECNICA-olio-di-cactus_aachab-naama.pdf differ diff --git a/_ALL_SITES/piuchebuono.app/upload/products/pink_lady.jpg b/_ALL_SITES/piuchebuono.app/upload/products/pink_lady.jpg new file mode 100644 index 00000000..1881182b Binary files /dev/null and b/_ALL_SITES/piuchebuono.app/upload/products/pink_lady.jpg differ diff --git a/now.txt b/now.txt index e5f5d4ff..9bc58f3e 100644 --- a/now.txt +++ b/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !) +TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo !) diff --git a/package.json b/package.json index 91a80122..dd32bf35 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "piuchebuono", - "version": "2.0.1", - "description": "PiuCheBuono", - "productName": "PiuCheBuono", + "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": [], @@ -17,108 +17,109 @@ "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 --debug", + "spa": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js" }, "dependencies": { - "@quasar/extras": "^1.16.7", + "@cubejs-client/core": "^0.31.0", + "@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", + "chart.js": "^4.0.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", + "leaflet": "^1.9.4", "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", - "vue-chart-3": "^3.1.8", + "vee-validate": "^4.12.2", + "vue": "^3.3.9", "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", - "vue3-pdf-app": "^1.0.3", "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", + "parcel": "^2.6.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/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/foto1.jpg b/public/images/foto1.jpg deleted file mode 100644 index 195e9448..00000000 Binary files a/public/images/foto1.jpg and /dev/null differ diff --git a/public/images/foto2.jpg b/public/images/foto2.jpg deleted file mode 100644 index 940baa89..00000000 Binary files a/public/images/foto2.jpg and /dev/null differ diff --git a/public/images/foto3.jpg b/public/images/foto3.jpg deleted file mode 100644 index effb7a77..00000000 Binary files a/public/images/foto3.jpg and /dev/null differ diff --git a/public/images/kolibrilab-logo-full.png b/public/images/kolibrilab-logo-full.png deleted file mode 100755 index 6915ebba..00000000 Binary files a/public/images/kolibrilab-logo-full.png and /dev/null differ diff --git a/public/images/nuda_e_cruda.jpeg b/public/images/nuda_e_cruda.jpeg deleted file mode 100644 index d7912a1e..00000000 Binary files a/public/images/nuda_e_cruda.jpeg and /dev/null differ diff --git a/public/images/pcb-android-icon-144x144.png b/public/images/pcb-android-icon-144x144.png deleted file mode 100644 index fdea5eb1..00000000 Binary files a/public/images/pcb-android-icon-144x144.png and /dev/null differ diff --git a/public/images/pcb-android-icon-192x192.png b/public/images/pcb-android-icon-192x192.png deleted file mode 100644 index 93bb5fb7..00000000 Binary files a/public/images/pcb-android-icon-192x192.png and /dev/null differ diff --git a/public/images/pcb-android-icon-36x36.png b/public/images/pcb-android-icon-36x36.png deleted file mode 100644 index f700c0d2..00000000 Binary files a/public/images/pcb-android-icon-36x36.png and /dev/null differ diff --git a/public/images/pcb-android-icon-48x48.png b/public/images/pcb-android-icon-48x48.png deleted file mode 100644 index 4018b080..00000000 Binary files a/public/images/pcb-android-icon-48x48.png and /dev/null differ diff --git a/public/images/pcb-android-icon-72x72.png b/public/images/pcb-android-icon-72x72.png deleted file mode 100644 index fdaff445..00000000 Binary files a/public/images/pcb-android-icon-72x72.png and /dev/null differ diff --git a/public/images/pcb-android-icon-96x96.png b/public/images/pcb-android-icon-96x96.png deleted file mode 100644 index 74ae0a32..00000000 Binary files a/public/images/pcb-android-icon-96x96.png and /dev/null differ diff --git a/public/images/pcb-apple-icon-114x114.png b/public/images/pcb-apple-icon-114x114.png deleted file mode 100644 index de67dfff..00000000 Binary files a/public/images/pcb-apple-icon-114x114.png and /dev/null differ diff --git a/public/images/pcb-apple-icon-120x120.png b/public/images/pcb-apple-icon-120x120.png deleted file mode 100644 index 5864c9c8..00000000 Binary files a/public/images/pcb-apple-icon-120x120.png and /dev/null differ diff --git a/public/images/pcb-apple-icon-144x144.png b/public/images/pcb-apple-icon-144x144.png deleted file mode 100644 index fdea5eb1..00000000 Binary files a/public/images/pcb-apple-icon-144x144.png and /dev/null differ diff --git a/public/images/pcb-apple-icon-152x152.png b/public/images/pcb-apple-icon-152x152.png deleted file mode 100644 index 6e92509a..00000000 Binary files a/public/images/pcb-apple-icon-152x152.png and /dev/null differ diff --git a/public/images/pcb-apple-icon-180x180.png b/public/images/pcb-apple-icon-180x180.png deleted file mode 100644 index 4d59cedc..00000000 Binary files a/public/images/pcb-apple-icon-180x180.png and /dev/null differ diff --git a/public/images/pcb-apple-icon-57x57.png b/public/images/pcb-apple-icon-57x57.png deleted file mode 100644 index fb201a9d..00000000 Binary files a/public/images/pcb-apple-icon-57x57.png and /dev/null differ diff --git a/public/images/pcb-apple-icon-60x60.png b/public/images/pcb-apple-icon-60x60.png deleted file mode 100644 index 3b5f1c33..00000000 Binary files a/public/images/pcb-apple-icon-60x60.png and /dev/null differ diff --git a/public/images/pcb-apple-icon-72x72.png b/public/images/pcb-apple-icon-72x72.png deleted file mode 100644 index fdaff445..00000000 Binary files a/public/images/pcb-apple-icon-72x72.png and /dev/null differ diff --git a/public/images/pcb-apple-icon-76x76.png b/public/images/pcb-apple-icon-76x76.png deleted file mode 100644 index 2882992b..00000000 Binary files a/public/images/pcb-apple-icon-76x76.png and /dev/null differ diff --git a/public/images/pcb-apple-icon.png b/public/images/pcb-apple-icon.png deleted file mode 100644 index 422a8dca..00000000 Binary files a/public/images/pcb-apple-icon.png and /dev/null differ diff --git a/public/images/piuchebuono-logo-full.png b/public/images/piuchebuono-logo-full.png deleted file mode 100644 index 5465d80c..00000000 Binary files a/public/images/piuchebuono-logo-full.png and /dev/null differ diff --git a/public/images/piuchebuono.jpg b/public/images/piuchebuono.jpg deleted file mode 100644 index 88e9bab0..00000000 Binary files a/public/images/piuchebuono.jpg 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..e2e4c5d1 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..f8572648 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 20184824..640a0360 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -94,7 +94,6 @@ module.exports = configure((ctx) => ({ transpileDependencies: [ /quasar-ui-qcalendar[\\/]src/ ], - devtool: 'source-map', chainWebpack(chain, { isServer, isClient }) { chain.resolve.alias @@ -148,8 +147,9 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8088, + port: 8084, open: false, // opens browser window automatically + hot: false, // Disable hot module replacement headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Headers': '*', @@ -306,9 +306,9 @@ module.exports = configure((ctx) => ({ }, manifest: { - name: 'Più che Buono', - short_name: 'PiuCheBuono', - description: 'PiuCheBuono è un GAS e Bottega', + 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', @@ -318,54 +318,54 @@ module.exports = configure((ctx) => ({ start_url: "/?homescreen=1", icons: [ { - src: 'images/pcb-android-icon-512x512.png', + src: 'images/riso-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/pcb-android-icon-384x384.png', + src: 'images/riso-android-icon-384x384.png', sizes: '384x384', type: 'image/png', }, { - src: 'images/pcb-android-icon-192x192.png', + src: 'images/riso-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/pcb-android-icon-144x144.png', + src: 'images/riso-android-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/pcb-android-icon-96x96.png', + src: 'images/riso-android-icon-96x96.png', sizes: '96x96', type: 'image/png', }, { - src: 'images/pcb-apple-icon-120x120.png', + src: 'images/riso-apple-icon-120x120.png', sizes: '120x120', type: 'image/png', }, { - src: 'images/pcb-apple-icon-144x144.png', + src: 'images/riso-apple-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/pcb-apple-icon-152x152.png', + src: 'images/riso-apple-icon-152x152.png', sizes: '152x152', type: 'image/png', }, { - src: 'images/pcb-apple-icon-180x180.png', + src: 'images/riso-apple-icon-180x180.png', sizes: '180x180', type: 'image/png', }, ], related_applications: [{ "platform": "webapp", - "url": "https://www.piuchebuono.app/manifest.json" + "url": "https://www.riso.app/manifest.json" }] }, }, @@ -400,7 +400,7 @@ module.exports = configure((ctx) => ({ builder: { // https://www.electron.build/configuration/configuration - appId: 'PiuCheBuono', + appId: 'Riso', }, // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain diff --git a/src/components/CCart/CCart.vue b/src/components/CCart/CCart.vue index 0f17a10b..9944b642 100755 --- a/src/components/CCart/CCart.vue +++ b/src/components/CCart/CCart.vue @@ -55,7 +55,7 @@
{{ globalStore.site.ecomm.NoteExtraOnCart }} diff --git a/src/db/lang/ws_enUs.js b/src/db/lang/ws_enUs.js index 25b51103..4b20853c 100755 --- a/src/db/lang/ws_enUs.js +++ b/src/db/lang/ws_enUs.js @@ -8,8 +8,6 @@ const msg_website_enUs = { products: { quantity: 'Quantità', quantityAvailable: 'Disponibili', - stockQty: 'In Magazzino', - stockBloccatiQty: 'Bloccati In Magazzino', weight: 'Peso', stars: 'Voto', color: 'Colore', @@ -38,7 +36,6 @@ const msg_website_enUs = { productslist: 'Lista Prodotti', collabora: 'Collabora', storehouses: 'Magazzino', - providers: 'Fornitori', departments: 'Uffici', orders: 'Ordini Ricevuti', orders2: 'Ordini Ricevuti', diff --git a/src/db/lang/ws_es.js b/src/db/lang/ws_es.js index f143f859..66a384d3 100755 --- a/src/db/lang/ws_es.js +++ b/src/db/lang/ws_es.js @@ -8,7 +8,6 @@ const msg_website_es = { products: { quantity: 'Quantità', quantityAvailable: 'Disponibili', - stockQty: 'In Magazzino', weight: 'Peso', stars: 'Voto', color: 'Colore', diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 6f0a25b5..c7366e95 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: 'Più che Buono', - siteshortname: 'Più che Buono', - description: '', - keywords: '', + 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', }, hours: { descr: 'Descrizione', @@ -16,35 +16,23 @@ const msg_website_it = { pages: { home: 'Home', profile: 'Profilo', - install_site: 'Installa Sito', profile2: 'ProfiloU', mypage2: 'mypage2', myservice2: 'myservice2', myhosps2: 'myhosps2', mygood2: 'mygood2', - catalogo: 'Catalogo', fundraising: 'Sostieni il Progetto', notifs: 'Configura le Notifiche', unsubscribe: 'Disiscriviti', - unsubscribe_user: 'Disiscriviti User', test: 'Test', projects: 'Progetti', report: 'Report Ore', producer: 'Produttore', orderinfo: 'Ordini Effettuati', products: 'Prodotti', - cash: 'Cassa', - productInfos: 'Info Prodotti', - listinoprodotti: 'Listino Prodotti', productslist: 'Lista Prodotti', collabora: 'Collabora', - categories: 'Categorie', storehouses: 'Magazzino', - providers: 'Fornitori', - catprods: 'Categorie', - subcatprods: 'Sotto-Categorie', - gasordine: 'Gas Ordine', - scontisticas: 'Scontistica', departments: 'Uffici', orders: 'Ordini Ricevuti', orders2: 'Ordini Ricevuti', @@ -133,10 +121,9 @@ const msg_website_it = { only_residenti: 'Solo Residenti', only_consiglio: 'Solo Consiglieri', color: 'Colore', - gasordini: 'Gas Ordini', }, msg: { - myAppName: 'Più che Buono', + myAppName: 'Riso', 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 799d1f4a..18a81e86 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -7,6 +7,30 @@ 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, @@ -33,57 +57,56 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: true, infooter: true, }, - /*{ - active: true, - order: 20, - path: '/events', - materialIcon: 'fas fa-bullhorn', - name: 'mypages.events', - component: () => import('@/root/eventi/eventi.vue'), - meta: { requiresAuth: true }, - inmenu: true, - infooter: true, - },*/ { - active: site.confpages && site.confpages.showProfile, - order: 120, - path: '/myprofile', - materialIcon: 'fas fa-user', - name: 'pages.profile', - component: () => import('@/views/user/myprofile/myprofile.vue'), + 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: 120, - path: '/install_site', - materialIcon: 'fas fa-user', - name: 'pages.install_site', - component: () => import('@/views/admin/install_site/install_site.vue'), + 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: site.confpages && site.confpages.showProfile, - order: 120, - path: '/editprofile', - materialIcon: 'fas fa-user', - name: 'pages.profile3', - component: () => import('@/views/user/editprofile/editprofile.vue'), - meta: { requiresAuth: true }, - inmenu: false, - infooter: false, - }, - { - active: site.confpages && site.confpages.showiscrittiMenu, - order: 130, - path: '/friends', - materialIcon: 'fas fa-user-friends', - name: 'mypages.iscritti', - component: () => import('@/views/user/myfriends/myfriends.vue'), + 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, @@ -98,8 +121,50 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true }, inmenu: true, infooter: true, - onlyAdmin: true, - onlyManager: true, + }, + { + active: true, + order: 20, + path: '/events', + materialIcon: 'fas fa-bullhorn', + name: 'mypages.events', + component: () => import('@/root/eventi/eventi.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, + { + active: true, + order: 120, + path: '/myprofile', + materialIcon: 'fas fa-user', + name: 'pages.profile', + component: () => import('@/views/user/myprofile/myprofile.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + }, + { + active: true, + order: 120, + path: '/editprofile', + materialIcon: 'fas fa-user', + name: 'pages.profile3', + component: () => import('@/views/user/editprofile/editprofile.vue'), + meta: { requiresAuth: true }, + inmenu: false, + infooter: false, + }, + { + active: true, + order: 130, + path: '/friends', + materialIcon: 'fas fa-user-friends', + name: 'mypages.iscritti', + component: () => import('@/views/user/myfriends/myfriends.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, }, { active: site.confpages && site.confpages.enableGroups, @@ -111,8 +176,6 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true }, inmenu: true, infooter: false, - onlyAdmin: true, - onlyManager: true, }, { active: true,