diff --git a/.env.development b/.env.development index c01258c0..888efcae 100755 --- a/.env.development +++ b/.env.development @@ -1,17 +1,18 @@ APP_VERSION="1.1.4" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="13" +APP_ID="18" 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='riso-logo-full.png' +LOGO_REG='gruppomacro-logo-full.png' TEST_NAME="Paolo" TEST_SURNAME="Arena" TEST_EMAIL="" @@ -24,5 +25,5 @@ DEBUG="1" TELEGRAM_SUPPORT="" PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" TEST_CELL="" -VUE_APP_ISTEST="1" -VUE_APP_INLOCALE="1" +VUE_APP_ISTEST=1 +VUE_APP_INLOCALE=1 \ No newline at end of file diff --git a/_ALL_SITES/riso.app/db/lang/ws_it.js b/_ALL_SITES/riso.app/db/lang/ws_it.js index b4958ae8..9cd59a3d 100755 --- a/_ALL_SITES/riso.app/db/lang/ws_it.js +++ b/_ALL_SITES/riso.app/db/lang/ws_it.js @@ -127,7 +127,6 @@ const msg_website_it = { keywords: 'Parole Chiave', desctiption: 'Descrizione', heightimg: 'Altezza Immagine', - heightcarousel: 'Altezza Carosello', }, msg: { myAppName: 'Riso', diff --git a/_ALL_SITES/riso.app/quasar.conf.js b/_ALL_SITES/riso.app/quasar.conf.js index 2f86a52b..652989b2 100755 --- a/_ALL_SITES/riso.app/quasar.conf.js +++ b/_ALL_SITES/riso.app/quasar.conf.js @@ -154,7 +154,7 @@ module.exports = configure((ctx) => ({ https: false, 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': '*', 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 5d281b29..143e04ec 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "riso", + "name": "gruppomacro", "version": "1.1.4", - "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", + "description": "GruppoMacro", + "productName": "Gruppo Macro", "author": "Paolo Arena", "private": true, "keywords": [], @@ -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", @@ -127,7 +129,6 @@ "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 deleted file mode 100644 index b4615a3a..00000000 Binary files a/public/images/ferrara.jpg and /dev/null differ diff --git a/public/images/freeplanet-logo-full.odg b/public/images/freeplanet-logo-full.odg deleted file mode 100755 index 854da650..00000000 Binary files a/public/images/freeplanet-logo-full.odg and /dev/null differ diff --git a/public/images/freeplanet-logo-full.svg b/public/images/freeplanet-logo-full.svg deleted file mode 100755 index b9c10df3..00000000 --- a/public/images/freeplanet-logo-full.svg +++ /dev/null @@ -1,1186 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/images/gm-android-icon-192x192.png b/public/images/gm-android-icon-192x192.png new file mode 100644 index 00000000..cd503622 Binary files /dev/null and b/public/images/gm-android-icon-192x192.png differ diff --git a/public/images/gm-android-icon-512x512.png b/public/images/gm-android-icon-512x512.png new file mode 100644 index 00000000..1669de97 Binary files /dev/null and b/public/images/gm-android-icon-512x512.png differ diff --git a/public/images/gm-apple-touch-icon.png b/public/images/gm-apple-touch-icon.png new file mode 100644 index 00000000..9626b275 Binary files /dev/null and b/public/images/gm-apple-touch-icon.png differ diff --git a/public/images/gruppomacro-logo-full.png b/public/images/gruppomacro-logo-full.png new file mode 100644 index 00000000..d6e578b8 Binary files /dev/null and b/public/images/gruppomacro-logo-full.png differ diff --git a/public/images/riso-android-icon-144x144.png b/public/images/riso-android-icon-144x144.png deleted file mode 100644 index 37dcd661..00000000 Binary files a/public/images/riso-android-icon-144x144.png and /dev/null differ diff --git a/public/images/riso-android-icon-192x192.png b/public/images/riso-android-icon-192x192.png deleted file mode 100644 index 95b960e9..00000000 Binary files a/public/images/riso-android-icon-192x192.png and /dev/null differ diff --git a/public/images/riso-android-icon-36x36.png b/public/images/riso-android-icon-36x36.png deleted file mode 100644 index c78a13a3..00000000 Binary files a/public/images/riso-android-icon-36x36.png and /dev/null differ diff --git a/public/images/riso-android-icon-384x384.png b/public/images/riso-android-icon-384x384.png deleted file mode 100644 index ce1ffc47..00000000 Binary files a/public/images/riso-android-icon-384x384.png and /dev/null differ diff --git a/public/images/riso-android-icon-48x48.png b/public/images/riso-android-icon-48x48.png deleted file mode 100644 index 499e8674..00000000 Binary files a/public/images/riso-android-icon-48x48.png and /dev/null differ diff --git a/public/images/riso-android-icon-512x512.png b/public/images/riso-android-icon-512x512.png deleted file mode 100644 index e1c31acd..00000000 Binary files a/public/images/riso-android-icon-512x512.png and /dev/null differ diff --git a/public/images/riso-android-icon-72x72.png b/public/images/riso-android-icon-72x72.png deleted file mode 100644 index f95f7320..00000000 Binary files a/public/images/riso-android-icon-72x72.png and /dev/null differ diff --git a/public/images/riso-android-icon-96x96.png b/public/images/riso-android-icon-96x96.png deleted file mode 100644 index 98dbf9d9..00000000 Binary files a/public/images/riso-android-icon-96x96.png and /dev/null differ diff --git a/public/images/riso-apple-icon-114x114.png b/public/images/riso-apple-icon-114x114.png deleted file mode 100644 index 882dd21c..00000000 Binary files a/public/images/riso-apple-icon-114x114.png and /dev/null differ diff --git a/public/images/riso-apple-icon-120x120.png b/public/images/riso-apple-icon-120x120.png deleted file mode 100644 index 734b0503..00000000 Binary files a/public/images/riso-apple-icon-120x120.png and /dev/null differ diff --git a/public/images/riso-apple-icon-144x144.png b/public/images/riso-apple-icon-144x144.png deleted file mode 100644 index 923da7be..00000000 Binary files a/public/images/riso-apple-icon-144x144.png and /dev/null differ diff --git a/public/images/riso-apple-icon-152x152.png b/public/images/riso-apple-icon-152x152.png deleted file mode 100644 index 84fd455d..00000000 Binary files a/public/images/riso-apple-icon-152x152.png and /dev/null differ diff --git a/public/images/riso-apple-icon-180x180.png b/public/images/riso-apple-icon-180x180.png deleted file mode 100644 index e457d906..00000000 Binary files a/public/images/riso-apple-icon-180x180.png and /dev/null differ diff --git a/public/images/riso-apple-icon-57x57.png b/public/images/riso-apple-icon-57x57.png deleted file mode 100644 index f5f538db..00000000 Binary files a/public/images/riso-apple-icon-57x57.png and /dev/null differ diff --git a/public/images/riso-apple-icon-60x60.png b/public/images/riso-apple-icon-60x60.png deleted file mode 100644 index 4121f834..00000000 Binary files a/public/images/riso-apple-icon-60x60.png and /dev/null differ diff --git a/public/images/riso-apple-icon-72x72.png b/public/images/riso-apple-icon-72x72.png deleted file mode 100644 index 5efd872d..00000000 Binary files a/public/images/riso-apple-icon-72x72.png and /dev/null differ diff --git a/public/images/riso-apple-icon-76x76.png b/public/images/riso-apple-icon-76x76.png deleted file mode 100644 index 6db4b76f..00000000 Binary files a/public/images/riso-apple-icon-76x76.png and /dev/null differ diff --git a/public/images/riso-apple-icon.png b/public/images/riso-apple-icon.png deleted file mode 100644 index cfaeb3c0..00000000 Binary files a/public/images/riso-apple-icon.png and /dev/null differ diff --git a/public/images/riso-logo-full.png b/public/images/riso-logo-full.png deleted file mode 100644 index 38a9695f..00000000 Binary files a/public/images/riso-logo-full.png and /dev/null differ diff --git a/public/images/riso_home.png b/public/images/riso_home.png deleted file mode 100644 index 3d065405..00000000 Binary files a/public/images/riso_home.png and /dev/null differ diff --git a/public/images/riso_home_dark.png b/public/images/riso_home_dark.png deleted file mode 100644 index fe6b8225..00000000 Binary files a/public/images/riso_home_dark.png and /dev/null differ diff --git a/public/images/riso_services.png b/public/images/riso_services.png deleted file mode 100644 index 85a940bc..00000000 Binary files a/public/images/riso_services.png and /dev/null differ diff --git a/quasar.conf.js b/quasar.conf.js index 652989b2..a9d1c456 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -17,8 +17,6 @@ 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) => ({ @@ -89,7 +87,6 @@ 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 @@ -152,9 +149,9 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8084, + port: 8089, open: false, // opens browser window automatically - hot: false, // Disable hot module replacement + hot: true, // Disable hot module replacement headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Headers': '*', @@ -251,8 +248,6 @@ module.exports = configure((ctx) => ({ 'Cookies', 'Loading', 'AppVisibility', - 'LocalStorage', - 'SessionStorage', ], get plugins_1() { return this._plugins; @@ -313,9 +308,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: 'Gruppo Macro', + short_name: 'GruppoMacro', + description: '', display: 'standalone', orientation: 'portrait', background_color: '#fff', @@ -325,54 +320,24 @@ module.exports = configure((ctx) => ({ start_url: "/?homescreen=1", icons: [ { - src: 'images/riso-android-icon-512x512.png', + src: 'images/gm-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/riso-android-icon-384x384.png', - sizes: '384x384', - type: 'image/png', - }, - { - src: 'images/riso-android-icon-192x192.png', + src: 'images/gm-android-icon-192x192.png', sizes: '192x192', type: 'image/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', + src: 'images/gm-apple-touch-icon.png', sizes: '180x180', type: 'image/png', }, ], related_applications: [{ "platform": "webapp", - "url": "https://www.riso.app/manifest.json" + "url": "https://www.gruppomacro.app/manifest.json" }] }, }, @@ -407,7 +372,7 @@ module.exports = configure((ctx) => ({ builder: { // https://www.electron.build/configuration/configuration - appId: 'Riso', + appId: 'GruppoMacro', }, // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 43c91b73..97b1ad62 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -168,6 +168,7 @@ export const shared_consts = { MAPPAGETCOORDINATE: 380, EDITADDRESSBYCOORD: 390, GRID_ORIZ: 400, + QRCODE: 410, }, QUERYTYPE_MYGROUP: 1, @@ -1673,6 +1674,10 @@ export const shared_consts = { value: 400, label: 'Visualizzatore Tabelle', }, + { + value: 410, + label: 'Qr Code', + }, ], TypesElemAdminTools: [ diff --git a/src/components/CCatalogo/CCatalogo.ts b/src/components/CCatalogo/CCatalogo.ts index df0492fe..dd6db883 100755 --- a/src/components/CCatalogo/CCatalogo.ts +++ b/src/components/CCatalogo/CCatalogo.ts @@ -19,6 +19,7 @@ export default defineComponent({ Categoria: [], Editore: [], pdf: false, + backgroundimage: '', }), }, }, diff --git a/src/components/CCatalogoCard/CCatalogoCard.scss b/src/components/CCatalogoCard/CCatalogoCard.scss index a8a371b8..f72e09b3 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.scss +++ b/src/components/CCatalogoCard/CCatalogoCard.scss @@ -159,7 +159,7 @@ .book-title { margin: 8px; - font-family: 'Poppins,sans-serif'; + font-family: 'Arial, Poppins,sans-serif'; font-weight: bold; color: #333; display: block; @@ -258,6 +258,10 @@ } .colfix_prodotti_2 { + width: 240px; +} + +.colfix_prodotti_3 { width: 170px; } @@ -312,10 +316,10 @@ .scheda-book { text-align: center; - margin-left: 20px; + //margin-left: 20px; @media (max-width: 718px) { - margin-left: 5px; + //margin-left: 5px; } } diff --git a/src/components/CCatalogoCard/CCatalogoCard.ts b/src/components/CCatalogoCard/CCatalogoCard.ts index 74c6405f..6d5fdb6b 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.ts +++ b/src/components/CCatalogoCard/CCatalogoCard.ts @@ -66,6 +66,7 @@ export default defineComponent({ Categoria: [], Editore: [], pdf: false, + backgroundimage: '', }), }, }, diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index d61f059e..1c1432ea 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -1,21 +1,27 @@