corretto abiltiazione fiducia concessa

2023-12-12 00:56:48 +01:00
parent 1ce6d765ee
commit 49578b6773
13 changed files with 203 additions and 100 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
-APP_VERSION="1.0.21"
+APP_VERSION="1.0.22"
 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=""
--- a/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js
+++ b/_ALL_SITES/piuchebuono.app/db/lang/ws_enUs.js
@@ -8,6 +8,7 @@ const msg_website_enUs = {
  products: {
    quantity: 'Quantità',
    quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
    weight: 'Peso',
    stars: 'Voto',
    color: 'Colore',
--- a/_ALL_SITES/piuchebuono.app/db/lang/ws_es.js
+++ b/_ALL_SITES/piuchebuono.app/db/lang/ws_es.js
@@ -8,6 +8,7 @@ const msg_website_es = {
  products: {
    quantity: 'Quantità',
    quantityAvailable: 'Disponibili',
+    stockQty: 'In Magazzino',
    weight: 'Peso',
    stars: 'Voto',
    color: 'Colore',
--- a/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js
+++ b/_ALL_SITES/piuchebuono.app/db/lang/ws_it.js
@@ -16,6 +16,7 @@ const msg_website_it = {
  pages: {
    home: 'Home',
    profile: 'Profilo',
+    install_site: 'Installa Sito',
    profile2: 'ProfiloU',
    mypage2: 'mypage2',
    myservice2: 'myservice2',
--- a/_ALL_SITES/piuchebuono.app/db/static_data.ts
+++ b/_ALL_SITES/piuchebuono.app/db/static_data.ts
@@ -45,7 +45,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: true,
    },*/
    {
-      active: true,
+      active: site.confpages && site.confpages.showProfile,
      order: 120,
      path: '/myprofile',
      materialIcon: 'fas fa-user',
@@ -58,6 +58,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
    {
      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: site.confpages && site.confpages.showProfile,
+      order: 120,
      path: '/editprofile',
      materialIcon: 'fas fa-user',
      name: 'pages.profile3',
@@ -67,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',
--- a/now.txt
+++ b/now.txt
@@ -1 +1 @@
-TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !)
+TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo !)
--- 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": [],
@@ -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
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -147,7 +147,7 @@ module.exports = configure((ctx) => ({
  },
  devServer: {
    https: false,
-    port: 8088,
+    port: 8084,
    open: false, // opens browser window automatically
    headers: {
      'Access-Control-Allow-Origin': '*',
@@ -305,9 +305,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',
@@ -317,47 +317,47 @@ module.exports = configure((ctx) => ({
      start_url: "/?homescreen=1",
      icons: [
        {
-          src: 'images/fv-android-icon-512x512.png',
+          src: 'images/riso-android-icon-512x512.png',
          sizes: '512x512',
          type: 'image/png',
        },
        {
-          src: 'images/fv-android-icon-384x384.png',
+          src: 'images/riso-android-icon-384x384.png',
          sizes: '384x384',
          type: 'image/png',
        },
        {
-          src: 'images/fv-android-icon-192x192.png',
+          src: 'images/riso-android-icon-192x192.png',
          sizes: '192x192',
          type: 'image/png',
        },
        {
-          src: 'images/fv-android-icon-144x144.png',
+          src: 'images/riso-android-icon-144x144.png',
          sizes: '144x144',
          type: 'image/png',
        },
        {
-          src: 'images/fv-android-icon-96x96.png',
+          src: 'images/riso-android-icon-96x96.png',
          sizes: '96x96',
          type: 'image/png',
        },
        {
-          src: 'images/fv-apple-icon-120x120.png',
+          src: 'images/riso-apple-icon-120x120.png',
          sizes: '120x120',
          type: 'image/png',
        },
        {
-          src: 'images/fv-apple-icon-144x144.png',
+          src: 'images/riso-apple-icon-144x144.png',
          sizes: '144x144',
          type: 'image/png',
        },
        {
-          src: 'images/fv-apple-icon-152x152.png',
+          src: 'images/riso-apple-icon-152x152.png',
          sizes: '152x152',
          type: 'image/png',
        },
        {
-          src: 'images/fv-apple-icon-180x180.png',
+          src: 'images/riso-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: 'PiuCheBuono',
+      appId: 'Riso',
    },

    // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
--- a/src/db/lang/ws_enUs.js
+++ b/src/db/lang/ws_enUs.js
@@ -8,7 +8,6 @@ const msg_website_enUs = {
  products: {
    quantity: 'Quantità',
    quantityAvailable: 'Disponibili',
-    stockQty: 'In Magazzino',
    weight: 'Peso',
    stars: 'Voto',
    color: 'Colore',
--- 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',
--- 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,7 +16,6 @@ const msg_website_it = {
  pages: {
    home: 'Home',
    profile: 'Profilo',
-    install_site: 'Installa Sito',
    profile2: 'ProfiloU',
    mypage2: 'mypage2',
    myservice2: 'myservice2',
@@ -33,7 +32,6 @@ const msg_website_it = {
    products: 'Prodotti',
    productslist: 'Lista Prodotti',
    collabora: 'Collabora',
-    categories: 'Categorie',
    storehouses: 'Magazzino',
    departments: 'Uffici',
    orders: 'Ordini Ricevuti',
@@ -125,7 +123,7 @@ const msg_website_it = {
    color: 'Colore',
  },
  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: '',
--- 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,7 +57,72 @@ 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',
@@ -43,9 +132,9 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      meta: { requiresAuth: true },
      inmenu: true,
      infooter: true,
-    },*/
+    },
    {
-      active: site.confpages && site.confpages.showProfile,
+      active: true,
      order: 120,
      path: '/myprofile',
      materialIcon: 'fas fa-user',
@@ -58,17 +147,6 @@ function getDynamicPages(site: ISites): IListRoutes[] {
    {
      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: site.confpages && site.confpages.showProfile,
-      order: 120,
      path: '/editprofile',
      materialIcon: 'fas fa-user',
      name: 'pages.profile3',
@@ -78,7 +156,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
      infooter: false,
    },
    {
-      active: site.confpages && site.confpages.showiscrittiMenu,
+      active: true,
      order: 130,
      path: '/friends',
      materialIcon: 'fas fa-user-friends',
@@ -109,6 +187,16 @@ 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,
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -5826,7 +5826,12 @@ export const tools = {
      title: t('db.domanda')
    }).onOk(() => {

-      userStore.setCircuitCmd($q, t, username, circuitname, shared_consts.CIRCUITCMD.SETFIDO, true)
+      let extrarec = {
+        groupname: '',
+        circuitnameDest: circuitname,
+      }
+    
+      userStore.setCircuitCmd($q, t, username, circuitname, shared_consts.CIRCUITCMD.SETFIDO, true, extrarec)
        .then((res: any) => {
          if (res && res.result) {
            this.updateMyData(res)