Icons

_ALL_SITES/riso.app/.env.development

@@ -5,13 +5,13 @@ DIRECTORY_LOCAL="newfreeplanet"
 DIRECTORY_SERVER="freeplanet_serverside"
 SERVERDIR_WEBSITE=""
 SERVERPW_WEBSITE=""
-APP_URL="http://localhost"
+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="http://localhost:3000"
+MONGODB_HOST="https://localhost:3000"
 LOGO_REG='riso-logo-full.png'
 TEST_NAME="Paolo"
 TEST_SURNAME="Arena"
@@ -26,4 +26,5 @@ TELEGRAM_SUPPORT=""
 PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
 TEST_CELL=""
 ISTEST=1
+INLOCALE=1
 BAK_MONGODB_HOST="http://192.168.0.200:3000"

_ALL_SITES/riso.app/.env.test

@@ -19,7 +19,7 @@ TEST_EMAIL=""
 TEST_USERNAME=""
 TEST_PASSWORD=""
 TEST_APORTADOR=""
-PUBLICKEY_PUSH="BNRBtL3iaLVGW-aQckwQBmh5uKKzcizOZsMjnzCtSuHkssEhbyioEN2E_CwItDLDShMO-OQ1uhK51ty6zG_gCT8"
+PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs"
 IN_CONSTRUCTION="0"
 DEBUG="1"
 TELEGRAM_SUPPORT=""

_ALL_SITES/riso.app/db/lang/ws_it.js

@@ -30,6 +30,7 @@ const msg_website_it = {
     myhosps2: 'myhosps2',
     mygood2: 'mygood2',
     fundraising: 'Sostieni il Progetto',
+    notifs: 'Configura le Notifiche',
     test: 'Test',
     projects: 'Progetti',
     report: 'Report Ore',
@@ -206,8 +207,8 @@ const msg_website_it = {
         + '<li>📱<strong>Condividendo la APP</strong> a tutti coloro che vogliono far parte insieme della crescita e sviluppo di una Nuova Era</li>'
         + '<li>👥 Aiutando a creare Gruppi Territoriali nella vostra città, impegnandosi a realizzare progetti per il Bene Comune, in onore ai principi Amorevoli e di condivisione.</li>'
         + '<li>🌱 Sostenendo le persone attorno a voi, e rispettando la nostra vera Casa: Madre Natura e Tutti gli Esseri Viventi. ❤️</li>'
-        + '<li>👨🏻‍💻 Con una <strong>piccola donazione</strong> per le spese dei Server</li></ul>' +
-        '<strong>Tramite Paypal:</strong><br>' +
+        + '<li>👨🏻‍💻 Con una <strong>piccola donazione</strong> per le spese dei Server, manutenzione e per i continui sviluppi e miglioramenti</li></ul>' +
+        '1) Tramite <strong>Paypal</strong>:<br>' +
         '<div style="font-size: 1.5rem; background-color: white; color: blue; border: solid 2px #f00; margin: 10px; padding: 10px; border-radius: 10px; " ' +
         'class="row justify-around">' +
         '<span><a href="https://paypal.me/paoloarena/1" target="_blank">1€</a></span>' +
@@ -216,9 +217,19 @@ const msg_website_it = {
         '<span><a href="https://paypal.me/paoloarena/10" target="_blank">10€</a></span>' +
         '<span><a href="https://paypal.me/paoloarena" target="_blank">scegli</a></span>' +
         '</div><em>clicca sull\'importo per fare una <strong>donazione</strong> </em><br>' +
-        'In alternativa inventati una forma di scambio da donare a Paolo (soprannome <a href="https://t.me/surya1977" target="_blank">Surya</a>)<br />' +
+        '<br>2) Tramite <strong>Satispay</strong>: <a href="https://www.satispay.com/app/match/link/money-box/S6Y-SVN--62712D42-35B0-4BB9-8511-410C2AB8CD45" target="_blank">Clicca qui</a><br>' +
+        '<div style="font-size: 1rem; background-color: white; color: blue; border: solid 2px #f00; margin: 5px; padding: 5px; border-radius: 10px; " ' +
+        'class="row justify-around">' +
+        'Se ancora non hai Satispay <a href="https://www.satispay.com/promo/PAOLOARENA4">Richiedila cliccando qui</a></br>' +
+        'E\' consigliata se hai un conto bancario come alternativa alla costosa carta di credito/debito</br>' +
+        '👉🏻 <strong>Registrandoti entrambi riceviamo un Bonus di 5 €</strong></br>' +
+        '</div>' +
+        '<br>3) Tramite <strong>Bonifico Bancario</strong>:<br>' +
+        '(Scrivi a Surya (<a href="mailto:surya@riso.app">surya@riso.app</a>) per ricevere le coordinate</br>' +
+        '' +
+        '4) In alternativa scegli tu una forma di scambio da donare a Paolo (per scrivergli su Telegram: <a href="https://t.me/surya1977" target="_blank">Surya Paolo</a>)<br />' +
         '<span style="color: red; font-size: 2rem;">❤</span> Sono graditi messaggi sia di suggerimenti che di apprezzamenti.<br>' +
-        'Grazie Mille per l\'Aiuto' +
+        'Grazie Mille per l\'Aiuto ed il Supporto' +
         '<br>',
     },
     multiplatform: {

_ALL_SITES/riso.app/db/static_data.ts

@@ -25,6 +25,7 @@ const functionality: IFunctionality = {
   ENABLE_ECOMMERCE: false,
   ENABLE_REG_ISP: true,
   ENABLE_GROUPS: true,
+  ENABLE_CIRCUITS: true,
   SHOW_COMPETENZE: true,
   ENABLE_VIEW_GROUPS: true,
   ENABLE_VIEW_USERS: true,
@@ -254,6 +255,20 @@ const routes_manager: IListRoutes[] = [
     onlyManager: true,
     onlyFacilitatore: true
   },
+  {
+    active: true,
+    order: 10,
+    path: '/admin/userpanel',
+    materialIcon: 'fas fa-users',
+    name: 'otherpages.admin.userpanel',
+    component: () => import('@/rootgen/admin/userPanel/userPanel.vue'),
+    inmenu: true,
+    submenu: true,
+    level_parent: 0,
+    level_child: 0.5,
+    onlyManager: true,
+    onlyFacilitatore: true
+  },
   /*
   {
     active: true,
@@ -487,6 +502,17 @@ const baseroutes: IListRoutes[] = [
     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,
@@ -564,6 +590,17 @@ const baseroutes: IListRoutes[] = [
     inmenu: true,
     infooter: true,
   },
+  {
+    active: functionality.ENABLE_CIRCUITS,
+    order: 133,
+    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: 135,
@@ -585,6 +622,16 @@ const baseroutes: 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,
@@ -640,6 +687,17 @@ const baseroutes: IListRoutes[] = [
     inmenu: true,
     infooter: true,
   },
+  {
+    active: true,
+    order: 200,
+    path: '/notifs',
+    materialIcon: 'fas fa-user',
+    name: 'pages.notifs',
+    component: () => import('@/views/user/usernotifs/usernotifs.vue'),
+    meta: { requiresAuth: true },
+    inmenu: false,
+    infooter: false,
+  },
   {
     active: true,
     order: 400,
@@ -807,11 +865,11 @@ const baseroutes: IListRoutes[] = [
     order: 80,
     path: '/calendario-eventi',
     materialIcon: 'event',
-    name: 'pages.calendarioeventi',
+    name: 'ris.calendario_eventi_riso',
     component: () => import('@/root/calendarioeventi/calendarioeventi.vue'),
     extraclass: 'isCalendar',
-    inmenu: false,
-    infooter: false
+    inmenu: true,
+    infooter: true
   },
   {
     active: true,

_ALL_SITES/riso.app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "riso",
-  "version": "0.3.23",
+  "version": "0.5.3",
   "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",
@@ -22,52 +22,52 @@
     "generate-sw": "workbox generateSW workbox-config.js"
   },
   "dependencies": {
-    "@quasar/extras": "^1.13.6",
+    "@quasar/extras": "^1.15.2",
     "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.13",
     "@vue-leaflet/vue-leaflet": "^0.6.1",
-    "@vue/compat": "^3.2.33",
-    "@vue/compiler-sfc": "^3.2.33",
-    "@vue/eslint-config-standard": "6.1.0",
-    "@vuelidate/core": "^2.0.0-alpha.41",
-    "@vuelidate/validators": "^2.0.0-alpha.29",
-    "acorn": "^8.7.1",
-    "autoprefixer": "^10.4.7",
-    "axios": "^0.26.0",
+    "@vue/compat": "^3.2.38",
+    "@vue/compiler-sfc": "^3.2.38",
+    "@vue/eslint-config-standard": "7.0.0",
+    "@vuelidate/core": "^2.0.0-alpha.44",
+    "@vuelidate/validators": "^2.0.0-alpha.31",
+    "acorn": "^8.8.0",
+    "autoprefixer": "^10.4.8",
+    "axios": "^0.27.2",
     "bcryptjs": "^2.4.3",
-    "chart.js": "^3.7.1",
-    "core-js": "^3.22.4",
+    "chart.js": "^3.9.1",
+    "core-js": "^3.25.0",
     "crypto": "^1.0.1",
-    "date-fns": "^2.28.0",
-    "dotenv": "^16.0.0",
-    "echarts": "^5.3.2",
+    "date-fns": "^2.29.2",
+    "dotenv": "^16.0.2",
+    "echarts": "^5.3.3",
     "eslint-plugin-quasar": "^1.1.0",
     "eslint-plugin-standard": "^5.0.0",
-    "graphql": "^16.4.0",
+    "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
-    "gsap": "^3.10.4",
-    "jquery": "^3.6.0",
+    "gsap": "^3.11.1",
+    "jquery": "^3.6.1",
     "js-cookie": "^3.0.1",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "normalize.css": "^8.0.1",
-    "npm": "^8.9.0",
+    "npm": "^8.19.1",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.14",
+    "pinia": "^2.0.22",
     "prerender-spa-plugin": "^3.4.0",
-    "quasar": "^2.6.6",
+    "quasar": "^2.7.7",
     "quasar-extras": "^2.0.9",
     "register-service-worker": "^1.7.2",
-    "vee-validate": "^4.5.11",
-    "vue": "^3.2.33",
+    "vee-validate": "^4.6.7",
+    "vue": "^3.2.38",
     "vue-chart-3": "^3.1.8",
     "vue-class-component": "^8.0.0-rc.1",
     "vue-country-code": "^1.1.3",
-    "vue-echarts": "^6.0.2",
-    "vue-i18n": "^9.2.0-beta.26",
+    "vue-echarts": "^6.2.3",
+    "vue-i18n": "^9.2.2",
     "vue-idb": "^0.2.0",
     "vue-loader": "^17.0.0",
     "vue-property-decorator": "^10.0.0-rc.3",
-    "vue-router": "^4.0.15",
+    "vue-router": "^4.1.5",
     "vue-scroll-reveal": "^1.0.11",
     "vue-svgicon": "^4.0.0-alpha.3",
     "vue2-dragula": "^2.5.5",
@@ -79,42 +79,42 @@
     "@types/bcryptjs": "^2.4.2",
     "@types/dotenv": "^8.2.0",
     "@types/googlemaps": "^3.43.3",
-    "@types/jest": "^27.5.0",
+    "@types/jest": "^29.0.0",
     "@types/js-cookie": "^3.0.2",
-    "@types/node": "17.0.31",
+    "@types/node": "18.7.15",
     "@types/nprogress": "^0.2.0",
     "@types/vue-tel-input": "^2.1.2",
     "@types/vuelidate": "^0.7.15",
-    "@typescript-eslint/eslint-plugin": "^5.22.0",
-    "@typescript-eslint/parser": "^5.22.0",
-    "eslint": "^8.14.0",
+    "@typescript-eslint/eslint-plugin": "^5.36.2",
+    "@typescript-eslint/parser": "^5.36.2",
+    "eslint": "^8.23.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-vue": "^8.7.1",
+    "eslint-plugin-promise": "^6.0.1",
+    "eslint-plugin-vue": "^9.4.0",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.5.0",
     "http-proxy-middleware": "^2.0.6",
-    "jest": "^28.0.3",
+    "jest": "^29.0.2",
     "json-loader": "^0.5.7",
     "node-sass": "7.0.1",
-    "npm-check-updates": "^12.5.11",
+    "npm-check-updates": "^16.1.0",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "postcss": "^8.4.13",
-    "postcss-loader": "^6.2.1",
-    "sass-loader": "^12.6.0",
+    "postcss": "^8.4.16",
+    "postcss-loader": "^7.0.1",
+    "sass-loader": "^13.0.2",
     "strip-ansi": "=7.0.1",
-    "ts-jest": "^28.0.1",
-    "ts-loader": "^9.3.0",
+    "ts-jest": "^28.0.8",
+    "ts-loader": "^9.3.1",
     "tslint": "^6.1.3",
     "tslint-config-standard": "^9.0.0",
     "tslint-loader": "^3.5.4",
-    "typescript": "^4.6.4",
+    "typescript": "^4.8.2",
     "vue-cli-plugin-element-ui": "^1.1.4",
     "vueify": "^9.4.1",
-    "webpack": "^5.0.0",
-    "workbox-webpack-plugin": "^6.5.3"
+    "webpack": "^5.74.0",
+    "workbox-webpack-plugin": "^6.5.4"
   },
   "browser": {
     "crypto": false

_ALL_SITES/riso.app/quasar.conf.js

@@ -203,6 +203,7 @@ module.exports = configure((ctx) => ({
       'QBanner',
       'QInnerLoading',
       'QSpinnerGears',
+      'QSpinnerDots',
       'QDate',
       'QTime',
       'QSlideTransition',
@@ -300,13 +301,8 @@ module.exports = configure((ctx) => ({
           type: 'image/png',
         },
         {
-          src: 'images/riso-android-icon-96x96.png',
-          sizes: '96x96',
-          type: 'image/png',
-        },
-        {
-          src: 'images/riso-android-icon-144x144.png',
-          sizes: '144x144',
+          src: 'images/riso-android-icon-384x384.png',
+          sizes: '384x384',
           type: 'image/png',
         },
         {
@@ -315,8 +311,13 @@ module.exports = configure((ctx) => ({
           type: 'image/png',
         },
         {
-          src: 'images/riso-android-icon-384x384.png',
-          sizes: '384x384',
+          src: 'images/riso-android-icon-144x144.png',
+          sizes: '144x144',
+          type: 'image/png',
+        },
+        {
+          src: 'images/riso-android-icon-96x96.png',
+          sizes: '96x96',
           type: 'image/png',
         },
       ],
@@ -353,7 +354,7 @@ module.exports = configure((ctx) => ({
     builder: {
       // https://www.electron.build/configuration/configuration
 
-      appId: 'InsiemeSiPuo',
+      appId: 'Riso',
     },
 
     // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain