diff --git a/.env.development b/.env.development index c6d79f66..68c3cf88 100755 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ -APP_VERSION="1.0.29" +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/_ALL_SITES/riso.app/db/static_data.ts b/_ALL_SITES/riso.app/db/static_data.ts index 18a81e86..efd77ed1 100755 --- a/_ALL_SITES/riso.app/db/static_data.ts +++ b/_ALL_SITES/riso.app/db/static_data.ts @@ -133,6 +133,17 @@ function getDynamicPages(site: ISites): IListRoutes[] { 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'), + meta: { requiresAuth: true }, + inmenu: false, + infooter: false, + }, { active: true, order: 120, diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json index ad32c04d..56c1d45a 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -25,7 +25,7 @@ "dependencies": { "@cubejs-client/core": "^0.31.0", "@quasar/extras": "^1.16.9", - "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.16", + "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.19", "@vue-leaflet/vue-leaflet": "^0.10.1", "@vue/compat": "^3.3.9", "@vue/compiler-sfc": "^3.3.9", @@ -68,6 +68,7 @@ "vue-echarts": "^6.6.1", "vue-i18n": "^9.8.0", "vue-idb": "^0.2.0", + "vue-image-zoomer": "^2.2.3", "vue-loader": "^17.3.1", "vue-property-decorator": "^10.0.0-rc.3", "vue-router": "^4.2.5", @@ -81,7 +82,7 @@ "vuex-router-sync": "^6.0.0-rc.1" }, "devDependencies": { - "@quasar/app": "^3.3.3", + "@quasar/app-webpack": "^3.12.3", "@types/bcryptjs": "^2.4.6", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", 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 56c1d45a..d5f912c2 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": [], @@ -25,7 +25,7 @@ "dependencies": { "@cubejs-client/core": "^0.31.0", "@quasar/extras": "^1.16.9", - "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.19", + "@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", @@ -68,7 +68,6 @@ "vue-echarts": "^6.6.1", "vue-i18n": "^9.8.0", "vue-idb": "^0.2.0", - "vue-image-zoomer": "^2.2.3", "vue-loader": "^17.3.1", "vue-property-decorator": "^10.0.0-rc.3", "vue-router": "^4.2.5", @@ -82,7 +81,7 @@ "vuex-router-sync": "^6.0.0-rc.1" }, "devDependencies": { - "@quasar/app-webpack": "^3.12.3", + "@quasar/app": "^3.3.3", "@types/bcryptjs": "^2.4.6", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", 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/foto1.jpg b/public/images/foto1.jpg old mode 100755 new mode 100644 index 6a0644be..195e9448 Binary files a/public/images/foto1.jpg and b/public/images/foto1.jpg differ diff --git a/public/images/foto2.jpg b/public/images/foto2.jpg old mode 100755 new mode 100644 index 6a0644be..940baa89 Binary files a/public/images/foto2.jpg and b/public/images/foto2.jpg differ diff --git a/public/images/foto3.jpg b/public/images/foto3.jpg old mode 100755 new mode 100644 index 6a0644be..effb7a77 Binary files a/public/images/foto3.jpg and b/public/images/foto3.jpg differ diff --git a/public/images/kolibrilab-logo-full.png b/public/images/kolibrilab-logo-full.png new file mode 100755 index 00000000..6915ebba Binary files /dev/null and b/public/images/kolibrilab-logo-full.png differ diff --git a/public/images/marocco_foto1.png b/public/images/marocco_foto1.png new file mode 100644 index 00000000..7dceb8eb Binary files /dev/null and b/public/images/marocco_foto1.png differ diff --git a/_ALL_SITES/riso.app/images/noi4.jpg b/public/images/noi4.jpg similarity index 100% rename from _ALL_SITES/riso.app/images/noi4.jpg rename to public/images/noi4.jpg diff --git a/public/images/nuda_e_cruda.jpeg b/public/images/nuda_e_cruda.jpeg new file mode 100644 index 00000000..d7912a1e Binary files /dev/null and b/public/images/nuda_e_cruda.jpeg differ diff --git a/public/images/pcb-android-icon-144x144.png b/public/images/pcb-android-icon-144x144.png new file mode 100644 index 00000000..fdea5eb1 Binary files /dev/null and b/public/images/pcb-android-icon-144x144.png differ diff --git a/public/images/pcb-android-icon-192x192.png b/public/images/pcb-android-icon-192x192.png new file mode 100644 index 00000000..93bb5fb7 Binary files /dev/null and b/public/images/pcb-android-icon-192x192.png differ diff --git a/public/images/pcb-android-icon-36x36.png b/public/images/pcb-android-icon-36x36.png new file mode 100644 index 00000000..f700c0d2 Binary files /dev/null and b/public/images/pcb-android-icon-36x36.png differ diff --git a/public/images/pcb-android-icon-48x48.png b/public/images/pcb-android-icon-48x48.png new file mode 100644 index 00000000..4018b080 Binary files /dev/null and b/public/images/pcb-android-icon-48x48.png differ diff --git a/public/images/pcb-android-icon-72x72.png b/public/images/pcb-android-icon-72x72.png new file mode 100644 index 00000000..fdaff445 Binary files /dev/null and b/public/images/pcb-android-icon-72x72.png differ diff --git a/public/images/pcb-android-icon-96x96.png b/public/images/pcb-android-icon-96x96.png new file mode 100644 index 00000000..74ae0a32 Binary files /dev/null and b/public/images/pcb-android-icon-96x96.png differ diff --git a/public/images/pcb-apple-icon-114x114.png b/public/images/pcb-apple-icon-114x114.png new file mode 100644 index 00000000..de67dfff Binary files /dev/null and b/public/images/pcb-apple-icon-114x114.png differ diff --git a/public/images/pcb-apple-icon-120x120.png b/public/images/pcb-apple-icon-120x120.png new file mode 100644 index 00000000..5864c9c8 Binary files /dev/null and b/public/images/pcb-apple-icon-120x120.png differ diff --git a/public/images/pcb-apple-icon-144x144.png b/public/images/pcb-apple-icon-144x144.png new file mode 100644 index 00000000..fdea5eb1 Binary files /dev/null and b/public/images/pcb-apple-icon-144x144.png differ diff --git a/public/images/pcb-apple-icon-152x152.png b/public/images/pcb-apple-icon-152x152.png new file mode 100644 index 00000000..6e92509a Binary files /dev/null and b/public/images/pcb-apple-icon-152x152.png differ diff --git a/public/images/pcb-apple-icon-180x180.png b/public/images/pcb-apple-icon-180x180.png new file mode 100644 index 00000000..4d59cedc Binary files /dev/null and b/public/images/pcb-apple-icon-180x180.png differ diff --git a/public/images/pcb-apple-icon-57x57.png b/public/images/pcb-apple-icon-57x57.png new file mode 100644 index 00000000..fb201a9d Binary files /dev/null and b/public/images/pcb-apple-icon-57x57.png differ diff --git a/public/images/pcb-apple-icon-60x60.png b/public/images/pcb-apple-icon-60x60.png new file mode 100644 index 00000000..3b5f1c33 Binary files /dev/null and b/public/images/pcb-apple-icon-60x60.png differ diff --git a/public/images/pcb-apple-icon-72x72.png b/public/images/pcb-apple-icon-72x72.png new file mode 100644 index 00000000..fdaff445 Binary files /dev/null and b/public/images/pcb-apple-icon-72x72.png differ diff --git a/public/images/pcb-apple-icon-76x76.png b/public/images/pcb-apple-icon-76x76.png new file mode 100644 index 00000000..2882992b Binary files /dev/null and b/public/images/pcb-apple-icon-76x76.png differ diff --git a/public/images/pcb-apple-icon.png b/public/images/pcb-apple-icon.png new file mode 100644 index 00000000..422a8dca Binary files /dev/null and b/public/images/pcb-apple-icon.png differ diff --git a/public/images/piuchebuono-logo-full.png b/public/images/piuchebuono-logo-full.png new file mode 100644 index 00000000..5465d80c Binary files /dev/null and b/public/images/piuchebuono-logo-full.png differ diff --git a/public/images/piuchebuono.jpg b/public/images/piuchebuono.jpg new file mode 100644 index 00000000..88e9bab0 Binary files /dev/null and b/public/images/piuchebuono.jpg 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 e2e4c5d1..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 f8572648..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 640a0360..20184824 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -94,6 +94,7 @@ module.exports = configure((ctx) => ({ transpileDependencies: [ /quasar-ui-qcalendar[\\/]src/ ], + devtool: 'source-map', chainWebpack(chain, { isServer, isClient }) { chain.resolve.alias @@ -147,9 +148,8 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8084, + port: 8088, 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: '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', @@ -318,54 +318,54 @@ module.exports = configure((ctx) => ({ start_url: "/?homescreen=1", icons: [ { - src: 'images/riso-android-icon-512x512.png', + src: 'images/pcb-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, { - src: 'images/riso-android-icon-384x384.png', + src: 'images/pcb-android-icon-384x384.png', sizes: '384x384', type: 'image/png', }, { - src: 'images/riso-android-icon-192x192.png', + src: 'images/pcb-android-icon-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'images/riso-android-icon-144x144.png', + src: 'images/pcb-android-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/riso-android-icon-96x96.png', + src: 'images/pcb-android-icon-96x96.png', sizes: '96x96', type: 'image/png', }, { - src: 'images/riso-apple-icon-120x120.png', + src: 'images/pcb-apple-icon-120x120.png', sizes: '120x120', type: 'image/png', }, { - src: 'images/riso-apple-icon-144x144.png', + src: 'images/pcb-apple-icon-144x144.png', sizes: '144x144', type: 'image/png', }, { - src: 'images/riso-apple-icon-152x152.png', + src: 'images/pcb-apple-icon-152x152.png', sizes: '152x152', type: 'image/png', }, { - src: 'images/riso-apple-icon-180x180.png', + src: 'images/pcb-apple-icon-180x180.png', sizes: '180x180', type: 'image/png', }, ], related_applications: [{ "platform": "webapp", - "url": "https://www.riso.app/manifest.json" + "url": "https://www.piuchebuono.app/manifest.json" }] }, }, @@ -400,7 +400,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/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index e59e8513..e5943c6b 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -30,6 +30,7 @@ export const shared_consts = { LITRI: 3, MILLILITRI: 4, PEZZI: 10, + UOVA: 15, }, TYPECASH: { @@ -89,6 +90,11 @@ export const shared_consts = { short: 'p', value: 10, }, + { + label: 'Uova', + short: 'uova', + value: 15, + }, ], CallFunz: { diff --git a/src/components/CGallery/CGallery.ts b/src/components/CGallery/CGallery.ts index 55e38004..5899d89e 100755 --- a/src/components/CGallery/CGallery.ts +++ b/src/components/CGallery/CGallery.ts @@ -96,7 +96,7 @@ export default defineComponent({ } } else { gallerylist.value = [ - ] + ] } } @@ -229,12 +229,16 @@ export default defineComponent({ function uploaded(info: any) { console.log('uploaded', info) if (gallerylist.value) { - for (const file of info.files) { - gallerylist.value.push({ imagefile: file.name }) + if (props.single && info.files) { + console.log('gallerylist.value[0]', info.files[0].name) + gallerylist.value[0] = { imagefile: info.files[0].name } + } else { + for (const file of info.files) { + gallerylist.value.push({ imagefile: file.name }) + } } - if (!props.single) - save() + save() console.log('gallerylist', gallerylist.value) } @@ -260,9 +264,7 @@ export default defineComponent({ console.log('single', props.single) - if (!props.single) { - save() - } + save() } } @@ -280,8 +282,7 @@ export default defineComponent({ tools.copyStringToClipboard($q, filename, true) } - function deleteFile(rec: any) - { + function deleteFile(rec: any) { console.log('deleteFile....') const filename = getfullname(rec) const filenamerel = filename.replace(/^.*[\\\/]/, '') @@ -353,7 +354,7 @@ export default defineComponent({ fullscreensrc.value = getfullname(mygallery) } - function onRejected (rejectedEntries: any) { + function onRejected(rejectedEntries: any) { // Notify plugin needs to be installed // https://quasar.dev/quasar-plugins/notify#Installation console.log('rejectedEntries', rejectedEntries) diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue index 9e5b1d02..f71462b0 100755 --- a/src/components/CGallery/CGallery.vue +++ b/src/components/CGallery/CGallery.vue @@ -116,12 +116,12 @@
null) + const mypath = ref('') /* const myrow = computed(() => { return props.rec && props.isrec ? props.rec : props.row @@ -328,6 +329,13 @@ export default defineComponent({ } } + if (props.path) { + mypath.value = props.path + } else { + if (col.value.hasOwnProperty('path')) + mypath.value = col.value.path ? col.value.path : '' + } + // console.log('CMyFieldDb crea', myvalue) } @@ -612,6 +620,9 @@ export default defineComponent({ } else if (col.value.fieldtype === costanti.FieldType.imgcard) { console.log('newVal.imagefile', newVal) myvalue.value = newVal + } else if (col.value.fieldtype === costanti.FieldType.image_and_filename) { + console.log('newVal.imagefile', newVal) + myvalue.value = newVal } if (col.value.fieldtype === costanti.FieldType.listobj) { @@ -855,6 +866,7 @@ export default defineComponent({ shared_consts, nameKeydown, gotoPage, + mypath, } } }) diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue index 6a1a9368..93eafe47 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.vue +++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue @@ -377,7 +377,7 @@ : '' " :title="tools.getTitleGall(table)" - :directory="tools.getDirectoryGall(myrow, table, path)" + :directory="tools.getDirectoryGall(myrow, table, mypath)" :imgGall="myvalue" :isInModif="isInModif" :edit="isviewfield() && isInModif" @@ -409,7 +409,71 @@ : '' " :title="tools.getTitleGall(table)" - :directory="tools.getDirectoryGall(myrow, table, path)" + :directory="tools.getDirectoryGall(myrow, table, mypath)" + :imgGall="[{ imagefile: myvalue }]" + :edit="isviewfield()" + :canModify="canModify" + :isInModif="isInModif" + :single="true" + @update:imgGall="changevalRec" + @showandsave="Savedb" + > + +
+
+
+ + +
+
+ + +
+ +
+
+
+
+ {{ $t('reg.photo') }} + + + - + > - +
@@ -1488,6 +1551,35 @@
+
+
+ {{ $t('reg.photo') }} + + + + +
+
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,6 +43,17 @@ function getDynamicPages(site: ISites): IListRoutes[] { 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'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, }, { active: true, @@ -145,18 +67,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { infooter: false, }, { - 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, + active: site.confpages && site.confpages.showProfile, order: 120, path: '/editprofile', materialIcon: 'fas fa-user', @@ -167,7 +78,7 @@ function getDynamicPages(site: ISites): IListRoutes[] { infooter: false, }, { - active: true, + active: site.confpages && site.confpages.showiscrittiMenu, order: 130, path: '/friends', materialIcon: 'fas fa-user-friends', @@ -177,6 +88,19 @@ function getDynamicPages(site: ISites): IListRoutes[] { 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, + onlyAdmin: true, + onlyManager: true, + }, { active: site.confpages && site.confpages.enableGroups, order: 132, @@ -187,6 +111,8 @@ function getDynamicPages(site: ISites): IListRoutes[] { meta: { requiresAuth: true }, inmenu: true, infooter: false, + onlyAdmin: true, + onlyManager: true, }, { active: true, diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 5cd85749..26903a81 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -781,6 +781,7 @@ export interface IColGridTable { showpicprofile_ifnotset?: boolean extrafield?: string tipoconto?: number + path?: string } export interface ITableRec { diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts index 12a64bdf..e2324097 100755 --- a/src/rootgen/admin/importdata/importdata.ts +++ b/src/rootgen/admin/importdata/importdata.ts @@ -358,7 +358,8 @@ export default defineComponent({ if (opt.iseuro) { valstr = tools.convertPriceEurToValue(valstr) } - valstr = tools.removeescape(tools.addslashes(valstr)) + valstr = tools.removeescape(valstr) + // valstr = tools.addslashes(valstr) if (!opt.primo) risultato += ', ' diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index aa209c59..ff8b9e53 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -374,6 +374,7 @@ export const costanti = { listimages: 1024, exact: 2048, image: 3000, + image_and_filename: 3100, imgcard: 3500, select_by_server: 4000, multiselect_by_server: 4010, diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index f8f1702a..276af3d0 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -101,6 +101,7 @@ function AddCol(params: IColGridTable) { minlength: (params.minlength === undefined) ? 0 : params.minlength, filter_field: (params.filter_field === undefined) ? '' : params.filter_field, isadvanced_field: (params.isadvanced_field === undefined) ? false : params.isadvanced_field, + path: (params.path === undefined) ? '' : params.path, } } @@ -2040,7 +2041,7 @@ export const colTableProductInfos = [ 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' }), - AddCol({ name: 'img', label_trans: 'products.img' }), + AddCol({ name: 'img', label_trans: 'products.img', fieldtype: costanti.FieldType.image_and_filename, path: 'upload/products/' }), AddCol({ name: 'department', label_trans: 'products.department', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 848e870b..d4818a1c 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -8363,6 +8363,15 @@ export const tools = { return inputString.replace(/[^\d.,]/g, '').replace(',', '.'); }, + escapeQuotes(stringa: string) { + return stringa.replace(/"/g, '\\"'); + }, + + replaceQuotesWithSingleQuotes(jsonString: string) { + return jsonString.replace(/"/g, "'"); + }, + + removeescape(inputString: string): string { return inputString.replace('\\', '').replace(/"/g, '') },