- Non funziona l'ammetti il nuovo registrato, sulla App.
- All'interno di una Organizzazione, mostrare se non si è ancora entrati in un Circuito, mettere bottone per Entrare.
This commit is contained in:
Surya Paolo
@@ -1,12 +1,13 @@
|
||||
VITE_APP_ID="18"
|
||||
VITE_APP_URL="https://localhost"
|
||||
VITE_MONGODB_HOST="https://localhost:3000"
|
||||
VITE_LOGO_REG='gruppomacro-logo-full.png'
|
||||
VITE_PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8'
|
||||
VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
|
||||
VITE_VUE_APP_ISTEST="1"
|
||||
VITE_VUE_APP_INLOCALE="1"
|
||||
VITE_DEBUG="1"
|
||||
VITE_VUE_APP_ISTEST=0
|
||||
VITE_VUE_APP_INLOCALE=1
|
||||
DIRECTORY_LOCAL="newfreeplanet"
|
||||
DIRECTORY_SERVER="freeplanet_serverside"
|
||||
VITE_APP_ID="13"
|
||||
VITE_LOGO_REG='riso-logo-full.png'
|
||||
VITE_APP_URL="https://localhost"
|
||||
DIRECTORY_LOCAL=myprojplanet_vite
|
||||
DIRECTORY_SERVER=freeplanet_serverside
|
||||
SERVERDIR_WEBSITE=""
|
||||
SERVERPW_WEBSITE=""
|
||||
@@ -1,13 +1,11 @@
|
||||
VITE_APP_ID="18"
|
||||
VITE_APP_URL="https://gruppomacro.app"
|
||||
VITE_MONGODB_HOST="https://api.gruppomacro.app"
|
||||
VITE_LOGO_REG='gruppomacro-logo-full.png'
|
||||
VITE_PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc"
|
||||
VITE_APP_ID="13"
|
||||
VITE_APP_URL="https://riso.app"
|
||||
VITE_MONGODB_HOST="https://api.riso.app"
|
||||
VITE_LOGO_REG='riso-logo-full.png'
|
||||
VITE_PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs"
|
||||
VITE_DEBUG="0"
|
||||
VITE_VUE_APP_ISTEST="0"
|
||||
DIRECTORY_LOCAL="myprojplanet_vite"
|
||||
DIRECTORY_SERVER="/var/www/nodejs_piuchebuono_server"
|
||||
SERVERDIR_WEBSITE="/var/www/gruppomacro.app"
|
||||
DIRECTORY_LOCAL=myprojplanet_vite
|
||||
DIRECTORY_SERVER=/var/www/nodejs_riso_server
|
||||
SERVERDIR_WEBSITE="/var/www/riso.app"
|
||||
SERVERPW_WEBSITE="pwdadmin@1AOK"
|
||||
PORT_SPA="8089"
|
||||
PORT_PWA="8099"
|
||||
94
package.json
94
package.json
@@ -1,61 +1,62 @@
|
||||
{
|
||||
"name": "gruppomacro",
|
||||
"name": "riso",
|
||||
"version": "1.2.62",
|
||||
"description": "Gruppo Macro",
|
||||
"productName": "Gruppo Macro",
|
||||
"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": "Surya",
|
||||
"private": true,
|
||||
"keywords": [],
|
||||
"license": "MIT",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "PORT=8089 APP_VERSION='1.2.62' quasar dev",
|
||||
"dev": "APP_VERSION='1.2.62' PORT=8084 quasar dev",
|
||||
"dev_noCheck": "SKIP_TSC=true quasar dev",
|
||||
"build": "quasar build",
|
||||
"buildpwa": "NODE_ENV=production APP_VERSION='1.2.62' quasar build -m pwa",
|
||||
"buildpwatest": "NODE_ENV=production APP_VERSION='1.2.62' quasar build -m pwa",
|
||||
"type-check": "vue-tsc --noEmit",
|
||||
"type-check:watch": "vue-tsc --noEmit --watch",
|
||||
"buildspa": "APP_VERSION='1.2.62' quasar build -m spa",
|
||||
"buildspa": "quasar build -m spa",
|
||||
"lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"",
|
||||
"lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt",
|
||||
"lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt",
|
||||
"fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt",
|
||||
"pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.62' quasar dev -m pwa",
|
||||
"spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.62' quasar dev",
|
||||
"pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.62' quasar dev -m pwa",
|
||||
"spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.62' quasar dev",
|
||||
"debug": "quasar dev --mode debug",
|
||||
"test": "echo \"No test specified\" && exit 0",
|
||||
"generate-sw": "workbox generateSW workbox-config.js",
|
||||
"postinstall": "quasar prepare"
|
||||
},
|
||||
"dependencies": {
|
||||
"@cubejs-client/core": "^1.3.21",
|
||||
"@quasar/extras": "^1.17.0",
|
||||
"@cubejs-client/core": "^1.2.26",
|
||||
"@quasar/extras": "^1.16.17",
|
||||
"@quasar/quasar-ui-qcalendar": "^4.1.2",
|
||||
"@types/jsbarcode": "^3.11.4",
|
||||
"@types/leaflet": "^1.9.18",
|
||||
"@vue/compat": "^3.5.16",
|
||||
"@vue/compiler-sfc": "^3.5.16",
|
||||
"@types/leaflet": "^1.9.17",
|
||||
"@vue/compat": "^3.5.13",
|
||||
"@vue/compiler-sfc": "^3.5.13",
|
||||
"@vuelidate/core": "^2.0.3",
|
||||
"@vuelidate/validators": "^2.0.4",
|
||||
"acorn": "^8.15.0",
|
||||
"acorn": "^8.14.1",
|
||||
"animate.css": "^4.1.1",
|
||||
"apexcharts": "^4.7.0",
|
||||
"autoprefixer": "^10.4.21",
|
||||
"axios": "^1.9.0",
|
||||
"axios": "^1.8.4",
|
||||
"bcryptjs": "^3.0.2",
|
||||
"chart.js": "^4.4.9",
|
||||
"core-js": "^3.43.0",
|
||||
"chart.js": "^4.4.8",
|
||||
"core-js": "^3.41.0",
|
||||
"crypto-browserify": "^3.12.1",
|
||||
"date-fns": "^4.1.0",
|
||||
"echarts": "5.6.0",
|
||||
"eslint-plugin-n": "^17.19.0",
|
||||
"eslint-plugin-n": "^17.16.2",
|
||||
"eslint-plugin-quasar": "^1.1.0",
|
||||
"gsap": "^3.13.0",
|
||||
"graphql": "^16.10.0",
|
||||
"graphql-tag": "^2.12.6",
|
||||
"gsap": "^3.12.7",
|
||||
"html2pdf.js": "^0.10.3",
|
||||
"jquery": "^3.7.1",
|
||||
"js-cookie": "^3.0.5",
|
||||
"jsbarcode": "^3.12.1",
|
||||
"jsbarcode": "^3.11.6",
|
||||
"leaflet": "^1.9.4",
|
||||
"leaflet-routing-machine": "^3.2.12",
|
||||
"leaflet.markercluster": "^1.5.3",
|
||||
@@ -63,29 +64,30 @@
|
||||
"lodash": "^4.17.21",
|
||||
"normalize.css": "^8.0.1",
|
||||
"nprogress": "^0.2.0",
|
||||
"pinia": "^3.0.3",
|
||||
"pinia": "^3.0.1",
|
||||
"qrcode-vue3": "^1.7.1",
|
||||
"quasar": "^2.18.1",
|
||||
"quasar-extras": "^2.0.9",
|
||||
"register-service-worker": "^1.7.2",
|
||||
"scrollreveal": "^4.0.9",
|
||||
"typescript-eslint": "^8.34.0",
|
||||
"vee-validate": "^4.15.1",
|
||||
"vue": "^3.5.16",
|
||||
"typescript-eslint": "^8.27.0",
|
||||
"vee-validate": "^4.15.0",
|
||||
"vue": "^3.5.13",
|
||||
"vue-class-component": "^8.0.0-rc.1",
|
||||
"vue-country-code": "^1.1.3",
|
||||
"vue-echarts": "^7.0.3",
|
||||
"vue-i18n": "^11.1.5",
|
||||
"vue-i18n": "^11.1.2",
|
||||
"vue-idb": "^0.2.0",
|
||||
"vue-image-zoomer": "^2.4.4",
|
||||
"vue-property-decorator": "^10.0.0-rc.3",
|
||||
"vue-router": "^4.5.1",
|
||||
"vue-router": "^4.5.0",
|
||||
"vue-scroll-reveal": "^2.1.0",
|
||||
"vue-social-sharing": "^4.0.0-alpha4",
|
||||
"vue-svgicon": "^4.0.0-alpha.3",
|
||||
"vue-timeago3": "^2.3.2",
|
||||
"vue2-dragula": "^2.5.5",
|
||||
"vue3-apexcharts": "^1.8.0",
|
||||
"vue3-pdf-app": "^1.0.3",
|
||||
"vue3-qr-reader": "^1.0.0",
|
||||
"vuedraggable": "^4.1.0",
|
||||
"vuex": "^4.1.0",
|
||||
"vuex-router-sync": "^6.0.0-rc.1",
|
||||
"workbox-core": "^7.3.0",
|
||||
@@ -95,41 +97,41 @@
|
||||
"workbox-window": "^7.3.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.28.0",
|
||||
"@intlify/unplugin-vue-i18n": "^6.0.8",
|
||||
"@quasar/app-vite": "^2.2.1",
|
||||
"@eslint/js": "^9.23.0",
|
||||
"@intlify/unplugin-vue-i18n": "^6.0.5",
|
||||
"@quasar/app-vite": "^2.1.4",
|
||||
"@types/google.maps": "^3.58.1",
|
||||
"@types/jest": "^29.5.14",
|
||||
"@types/js-cookie": "^3.0.6",
|
||||
"@types/node": "^24.0.1",
|
||||
"@types/node": "^22.13.11",
|
||||
"@types/nprogress": "^0.2.3",
|
||||
"@types/vue-tel-input": "^2.1.7",
|
||||
"@types/vuelidate": "^0.7.22",
|
||||
"@vue/devtools": "^7.7.6",
|
||||
"@vue/devtools": "^7.7.2",
|
||||
"@vue/eslint-config-prettier": "^10.2.0",
|
||||
"@vue/eslint-config-typescript": "^14.5.0",
|
||||
"autoprefixer": "^10.4.21",
|
||||
"eslint": "9",
|
||||
"eslint-plugin-import": "^2.31.0",
|
||||
"eslint-plugin-vue": "^10.2.0",
|
||||
"eslint-plugin-vue": "^10.0.0",
|
||||
"file-loader": "^6.2.0",
|
||||
"globals": "^16.2.0",
|
||||
"http-proxy-middleware": "^3.0.5",
|
||||
"jest": "^30.0.0",
|
||||
"globals": "^16.0.0",
|
||||
"http-proxy-middleware": "^3.0.3",
|
||||
"jest": "^29.7.0",
|
||||
"json-loader": "^0.5.7",
|
||||
"nodemon": "^3.1.10",
|
||||
"npm-check-updates": "^18.0.1",
|
||||
"parcel": "^2.15.2",
|
||||
"postcss": "^8.5.5",
|
||||
"nodemon": "^3.1.9",
|
||||
"npm-check-updates": "^17.1.16",
|
||||
"parcel": "^2.14.1",
|
||||
"postcss": "^8.5.3",
|
||||
"postcss-loader": "^8.1.1",
|
||||
"prettier": "3",
|
||||
"strip-ansi": "=7.1.0",
|
||||
"ts-jest": "^29.4.0",
|
||||
"typescript": "5.8.3",
|
||||
"vite-plugin-checker": "^0.9.3",
|
||||
"ts-jest": "^29.2.6",
|
||||
"typescript": "5.7.3",
|
||||
"vite-plugin-checker": "^0.9.1",
|
||||
"vue-cli-plugin-element-ui": "^1.1.4",
|
||||
"vue-eslint-parser": "^10.1.3",
|
||||
"vue-tsc": "^2.2.10",
|
||||
"vue-eslint-parser": "^10.1.1",
|
||||
"vue-tsc": "^2.2.8",
|
||||
"vueify": "^9.4.1",
|
||||
"workbox-build": "^7.3.0"
|
||||
},
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 158 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 27 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 81 KiB |
BIN
public/images/layers-2x.png
Normal file
BIN
public/images/layers-2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
public/images/layers.png
Normal file
BIN
public/images/layers.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 696 B |
BIN
public/images/logo.png
Normal file
BIN
public/images/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 424 KiB |
BIN
public/images/marker-icon-2x.png
Normal file
BIN
public/images/marker-icon-2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
BIN
public/images/marker-icon.png
Normal file
BIN
public/images/marker-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB |
BIN
public/images/riso-android-icon-144x144.png
Normal file
BIN
public/images/riso-android-icon-144x144.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
BIN
public/images/riso-android-icon-192x192.png
Normal file
BIN
public/images/riso-android-icon-192x192.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 43 KiB |
BIN
public/images/riso-android-icon-384x384.png
Normal file
BIN
public/images/riso-android-icon-384x384.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 138 KiB |
BIN
public/images/riso-android-icon-48x48.png
Normal file
BIN
public/images/riso-android-icon-48x48.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.8 KiB |
BIN
public/images/riso-android-icon-512x512.png
Normal file
BIN
public/images/riso-android-icon-512x512.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 185 KiB |
BIN
public/images/riso-android-icon-96x96.png
Normal file
BIN
public/images/riso-android-icon-96x96.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
BIN
public/images/riso-apple-icon-114x114.png
Normal file
BIN
public/images/riso-apple-icon-114x114.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
BIN
public/images/riso-apple-icon-120x120.png
Normal file
BIN
public/images/riso-apple-icon-120x120.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
BIN
public/images/riso-apple-icon-144x144.png
Normal file
BIN
public/images/riso-apple-icon-144x144.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
BIN
public/images/riso-apple-icon-152x152.png
Normal file
BIN
public/images/riso-apple-icon-152x152.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
BIN
public/images/riso-apple-icon-180x180.png
Normal file
BIN
public/images/riso-apple-icon-180x180.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
BIN
public/images/riso-apple-icon-57x57.png
Normal file
BIN
public/images/riso-apple-icon-57x57.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.6 KiB |
BIN
public/images/riso-apple-icon-60x60.png
Normal file
BIN
public/images/riso-apple-icon-60x60.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.1 KiB |
BIN
public/images/riso-apple-icon-72x72.png
Normal file
BIN
public/images/riso-apple-icon-72x72.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
public/images/riso-apple-icon-76x76.png
Normal file
BIN
public/images/riso-apple-icon-76x76.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
BIN
public/images/riso-apple-icon.png
Normal file
BIN
public/images/riso-apple-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 44 KiB |
BIN
public/images/riso-logo-full.png
Normal file
BIN
public/images/riso-logo-full.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 424 KiB |
BIN
public/images/riso_home.png
Normal file
BIN
public/images/riso_home.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 279 KiB |
BIN
public/images/riso_home_dark.png
Normal file
BIN
public/images/riso_home_dark.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 258 KiB |
BIN
public/images/riso_services.png
Normal file
BIN
public/images/riso_services.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 124 KiB |
@@ -1,2 +0,0 @@
|
||||
!function(){'use strict';try{self['workbox:sw:6.1.0']&&_()}catch(t){}const t={backgroundSync:'background-sync',broadcastUpdate:'broadcast-update',cacheableResponse:'cacheable-response',core:'core',expiration:'expiration',googleAnalytics:'offline-ga',navigationPreload:'navigation-preload',precaching:'precaching',rangeRequests:'range-requests',routing:'routing',strategies:'strategies',streams:'streams',recipes:'recipes'};self.workbox=new class{constructor(){return this.v={},this.Pt={debug:'localhost'===self.location.hostname,modulePathPrefix:null,modulePathCb:null},this.$t=this.Pt.debug?'dev':'prod',this.jt=!1,new Proxy(this,{get(e,s){if(e[s])return e[s];const o=t[s];return o&&e.loadModule('workbox-'+o),e[s]}})}setConfig(t={}){if(this.jt)throw new Error('Config must be set before accessing workbox.* modules');Object.assign(this.Pt,t),this.$t=this.Pt.debug?'dev':'prod'}loadModule(t){const e=this.St(t);try{importScripts(e),this.jt=!0}catch(s){throw console.error(`Unable to import module '${t}' from '${e}'.`),s}}St(t){if(this.Pt.modulePathCb)return this.Pt.modulePathCb(t,this.Pt.debug);let e=['https://storage.googleapis.com/workbox-cdn/releases/6.1.0'];const s=`${t}.${this.$t}.js`,o=this.Pt.modulePathPrefix;return o&&(e=o.split('/'),''===e[e.length-1]&&e.splice(e.length-1,1)),e.push(s),e.join('/')}}}();
|
||||
//# sourceMappingURL=workbox-sw.js.map
|
||||
@@ -1,2 +0,0 @@
|
||||
!function(){"use strict";try{self["workbox:sw:5.1.4"]&&_()}catch(t){}const t={backgroundSync:"background-sync",broadcastUpdate:"broadcast-update",cacheableResponse:"cacheable-response",core:"core",expiration:"expiration",googleAnalytics:"offline-ga",navigationPreload:"navigation-preload",precaching:"precaching",rangeRequests:"range-requests",routing:"routing",strategies:"strategies",streams:"streams"};self.workbox=new class{constructor(){return this.v={},this.t={debug:"localhost"===self.location.hostname,modulePathPrefix:null,modulePathCb:null},this.s=this.t.debug?"dev":"prod",this.o=!1,new Proxy(this,{get(e,s){if(e[s])return e[s];const o=t[s];return o&&e.loadModule("workbox-"+o),e[s]}})}setConfig(t={}){if(this.o)throw new Error("Config must be set before accessing workbox.* modules");Object.assign(this.t,t),this.s=this.t.debug?"dev":"prod"}loadModule(t){const e=this.i(t);try{importScripts(e),this.o=!0}catch(s){throw console.error(`Unable to import module '${t}' from '${e}'.`),s}}i(t){if(this.t.modulePathCb)return this.t.modulePathCb(t,this.t.debug);let e=["https://storage.googleapis.com/workbox-cdn/releases/5.1.4"];const s=`${t}.${this.s}.js`,o=this.t.modulePathPrefix;return o&&(e=o.split("/"),""===e[e.length-1]&&e.splice(e.length-1,1)),e.push(s),e.join("/")}}}();
|
||||
//# sourceMappingURL=workbox-sw.js.map
|
||||
BIN
public/myicons/favicon-16x16.png
Normal file
BIN
public/myicons/favicon-16x16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
public/myicons/favicon-32x32.png
Normal file
BIN
public/myicons/favicon-32x32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
BIN
public/myicons/favicon-96x96.png
Normal file
BIN
public/myicons/favicon-96x96.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
@@ -1,2 +1,2 @@
|
||||
!function(){"use strict";try{self["workbox:sw:5.1.4"]&&_()}catch(t){}const t={backgroundSync:"background-sync",broadcastUpdate:"broadcast-update",cacheableResponse:"cacheable-response",core:"core",expiration:"expiration",googleAnalytics:"offline-ga",navigationPreload:"navigation-preload",precaching:"precaching",rangeRequests:"range-requests",routing:"routing",strategies:"strategies",streams:"streams"};self.workbox=new class{constructor(){return this.v={},this.t={debug:"localhost"===self.location.hostname,modulePathPrefix:null,modulePathCb:null},this.s=this.t.debug?"dev":"prod",this.o=!1,new Proxy(this,{get(e,s){if(e[s])return e[s];const o=t[s];return o&&e.loadModule("workbox-"+o),e[s]}})}setConfig(t={}){if(this.o)throw new Error("Config must be set before accessing workbox.* modules");Object.assign(this.t,t),this.s=this.t.debug?"dev":"prod"}loadModule(t){const e=this.i(t);try{importScripts(e),this.o=!0}catch(s){throw console.error(`Unable to import module '${t}' from '${e}'.`),s}}i(t){if(this.t.modulePathCb)return this.t.modulePathCb(t,this.t.debug);let e=["https://storage.googleapis.com/workbox-cdn/releases/5.1.4"];const s=`${t}.${this.s}.js`,o=this.t.modulePathPrefix;return o&&(e=o.split("/"),""===e[e.length-1]&&e.splice(e.length-1,1)),e.push(s),e.join("/")}}}();
|
||||
!function(){"use strict";try{self["workbox:sw:7.3.0"]&&_()}catch(t){}const t={backgroundSync:"background-sync",broadcastUpdate:"broadcast-update",cacheableResponse:"cacheable-response",core:"core",expiration:"expiration",googleAnalytics:"offline-ga",navigationPreload:"navigation-preload",precaching:"precaching",rangeRequests:"range-requests",routing:"routing",strategies:"strategies",streams:"streams",recipes:"recipes"};self.workbox=new class{constructor(){return this.v={},this.Pt={debug:"localhost"===self.location.hostname,modulePathPrefix:null,modulePathCb:null},this.$t=this.Pt.debug?"dev":"prod",this.jt=!1,new Proxy(this,{get(e,s){if(e[s])return e[s];const o=t[s];return o&&e.loadModule(`workbox-${o}`),e[s]}})}setConfig(t={}){if(this.jt)throw new Error("Config must be set before accessing workbox.* modules");Object.assign(this.Pt,t),this.$t=this.Pt.debug?"dev":"prod"}loadModule(t){const e=this.St(t);try{importScripts(e),this.jt=!0}catch(s){throw console.error(`Unable to import module '${t}' from '${e}'.`),s}}St(t){if(this.Pt.modulePathCb)return this.Pt.modulePathCb(t,this.Pt.debug);let e=["https://storage.googleapis.com/workbox-cdn/releases/7.3.0"];const s=`${t}.${this.$t}.js`,o=this.Pt.modulePathPrefix;return o&&(e=o.split("/"),""===e[e.length-1]&&e.splice(e.length-1,1)),e.push(s),e.join("/")}}}();
|
||||
//# sourceMappingURL=workbox-sw.js.map
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "Gruppo Macro",
|
||||
"short_name": "GruppoMacro",
|
||||
"description": "",
|
||||
"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",
|
||||
@@ -11,17 +11,47 @@
|
||||
"start_url": "/?homescreen=1",
|
||||
"icons": [
|
||||
{
|
||||
"src": "/images/gm-android-icon-512x512.png",
|
||||
"src:": "/images/riso-android-icon-512x512.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "/images/gm-android-icon-192x192.png",
|
||||
"src:": "/images/riso-android-icon-384x384.png",
|
||||
"sizes": "384x384",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src:": "/images/riso-android-icon-192x192.png",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png"
|
||||
},
|
||||
{
|
||||
"src": "/images/gm-apple-touch-icon.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",
|
||||
"sizes": "180x180",
|
||||
"type": "image/png"
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<div class="">
|
||||
<q-avatar size="140px">
|
||||
<q-img
|
||||
:src="myuser.profile ? getImgUser(myuser.profile) : ''"
|
||||
:src="myuser.profile ? getImgUser() : ''"
|
||||
:alt="username"
|
||||
img-class="imgprofile"
|
||||
height="140px"
|
||||
@@ -142,6 +142,7 @@
|
||||
:visu="costanti.USER_CIRCUITS"
|
||||
:noaut="true"
|
||||
:username="myuser.username"
|
||||
:myuser="myuser"
|
||||
>
|
||||
</CMyCircuit>
|
||||
</span>
|
||||
|
||||
@@ -16,6 +16,7 @@ import { CSaldo } from '@src/components/CSaldo'
|
||||
import { CTitleBanner } from '@src/components/CTitleBanner'
|
||||
import { toolsext } from '@store/Modules/toolsext'
|
||||
import { useGlobalStore } from '@store/globalStore'
|
||||
import { userPanel } from 'app/src/rootgen/admin/userPanel';
|
||||
|
||||
export default defineComponent({
|
||||
name: 'CMyCircuit',
|
||||
@@ -50,6 +51,11 @@ export default defineComponent({
|
||||
type: String,
|
||||
required: false,
|
||||
default: '',
|
||||
},
|
||||
myuser: {
|
||||
type: Object as PropType<IUserFields | null>,
|
||||
required: false,
|
||||
default: null,
|
||||
}
|
||||
},
|
||||
|
||||
@@ -71,6 +77,8 @@ export default defineComponent({
|
||||
const saldo_pend = computed(() => account.value ? account.value.saldo_pend : 0)
|
||||
const saldo = computed(() => account.value ? account.value.saldo : 0)
|
||||
|
||||
const fidoConcessoUtente = computed(() => circuitStore.getFidoConcessoByUsername(props.myuser, circuit.value._id, props.username))
|
||||
|
||||
const table = ref(shared_consts.TABLES_CIRCUITS)
|
||||
|
||||
const showingtooltip = ref(false)
|
||||
@@ -167,6 +175,7 @@ export default defineComponent({
|
||||
showrules,
|
||||
requestToEnterCircuit,
|
||||
groupnameSel,
|
||||
fidoConcessoUtente,
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
@@ -24,14 +24,19 @@
|
||||
</q-avatar>
|
||||
<div :class="`q-ma-xs q-px-xs shadow-2 rounded-borders `">
|
||||
<span
|
||||
:class="
|
||||
`q-ma-sm ` + ($q.dark.isActive ? `text-white` : `text-black`)
|
||||
"
|
||||
:class="`q-ma-sm ` + ($q.dark.isActive ? `text-white` : `text-black`)"
|
||||
>{{ circuit.numMembers }}</span
|
||||
>
|
||||
<q-icon name="fas fa-users" size="xs" color="blue"></q-icon>
|
||||
<q-icon
|
||||
name="fas fa-users"
|
||||
size="xs"
|
||||
color="blue"
|
||||
></q-icon>
|
||||
</div>
|
||||
<div v-if="circuit.link_group" :class="` `">
|
||||
<div
|
||||
v-if="circuit.link_group"
|
||||
:class="` `"
|
||||
>
|
||||
<q-btn
|
||||
icon="fab fa-telegram"
|
||||
size="xs"
|
||||
@@ -57,7 +62,10 @@
|
||||
lines="3"
|
||||
><em>{{ circuit.longdescr }}</em>
|
||||
</q-item-label>-->
|
||||
<q-item-label v-if="visu === costanti.ENTER_TO_THE_CIRCUIT" caption>
|
||||
<q-item-label
|
||||
v-if="visu === costanti.ENTER_TO_THE_CIRCUIT"
|
||||
caption
|
||||
>
|
||||
<span>Membri: {{ circuit.numMembers }}</span>
|
||||
</q-item-label>
|
||||
<!--<q-item-label caption lines="3">
|
||||
@@ -101,8 +109,7 @@
|
||||
<q-item-label
|
||||
v-if="
|
||||
!circuit.transactionsEnabled &&
|
||||
circuit.status ===
|
||||
shared_consts.CIRCUIT_STATUS.FASE3_MONETA_ABILITATA
|
||||
circuit.status === shared_consts.CIRCUIT_STATUS.FASE3_MONETA_ABILITATA
|
||||
"
|
||||
caption
|
||||
lines="1"
|
||||
@@ -145,11 +152,13 @@
|
||||
inline-actions
|
||||
class="bg-blue text-white"
|
||||
>
|
||||
<span
|
||||
v-html="$t('circuit.entra_italia_solo_dopo_aver_fido')"
|
||||
></span>
|
||||
<span v-html="$t('circuit.entra_italia_solo_dopo_aver_fido')"></span>
|
||||
</q-banner>
|
||||
<q-banner v-else inline-actions class="bg-blue text-white">
|
||||
<q-banner
|
||||
v-else
|
||||
inline-actions
|
||||
class="bg-blue text-white"
|
||||
>
|
||||
<span v-html="$t('circuit.non_entrato')"></span>
|
||||
<template v-slot:action>
|
||||
<q-btn
|
||||
@@ -160,9 +169,7 @@
|
||||
"
|
||||
color="positive"
|
||||
:label="
|
||||
circuit.askManagerToEnter
|
||||
? $t('circuit.ask')
|
||||
: $t('circuit.apri')
|
||||
circuit.askManagerToEnter ? $t('circuit.ask') : $t('circuit.apri')
|
||||
"
|
||||
@click="
|
||||
requestToEnterCircuit = true;
|
||||
@@ -179,6 +186,8 @@
|
||||
side
|
||||
v-if="visu === costanti.USER_CIRCUITS && tools.isUserOk()"
|
||||
>
|
||||
fidoConcessoUtente: {{ fidoConcessoUtente }}
|
||||
myuser: {{ myuser }}
|
||||
<q-item-label>
|
||||
<q-btn
|
||||
rounded
|
||||
@@ -211,9 +220,7 @@
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
circuit.askManagerToEnter
|
||||
? $t('circuit.ask')
|
||||
: $t('circuit.enter')
|
||||
circuit.askManagerToEnter ? $t('circuit.ask') : $t('circuit.enter')
|
||||
}}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
@@ -262,8 +269,7 @@
|
||||
</q-list>
|
||||
<q-list
|
||||
v-else-if="
|
||||
userStore.IsMyCircuitByName(circuit.name) &&
|
||||
(saldo === 0 || !saldo)
|
||||
userStore.IsMyCircuitByName(circuit.name) && (saldo === 0 || !saldo)
|
||||
"
|
||||
style="min-width: 200px"
|
||||
>
|
||||
@@ -283,7 +289,10 @@
|
||||
<q-item-section>{{ $t('circuit.exit') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-list v-if="userStore.isAdmin" style="min-width: 200px">
|
||||
<q-list
|
||||
v-if="userStore.isAdmin"
|
||||
style="min-width: 200px"
|
||||
>
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@@ -302,6 +311,16 @@
|
||||
</q-list>
|
||||
</q-menu>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="fidoConcessoUtente !== ''"
|
||||
icon="fas fa-house-user"
|
||||
class="q-ml-sm"
|
||||
:color="Number(fidoConcessoUtente) > 0 ? 'primary' : 'grey'"
|
||||
text-color="white"
|
||||
round
|
||||
size="sm"
|
||||
>
|
||||
</q-btn>
|
||||
</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section
|
||||
@@ -309,7 +328,10 @@
|
||||
v-if="visu === costanti.REQ_CIRCUIT && tools.isUserOk()"
|
||||
>
|
||||
<q-item-label>
|
||||
<q-btn rounded icon="fas fa-ellipsis-h">
|
||||
<q-btn
|
||||
rounded
|
||||
icon="fas fa-ellipsis-h"
|
||||
>
|
||||
<q-menu>
|
||||
<q-list style="min-width: 150px">
|
||||
<q-item
|
||||
@@ -341,7 +363,10 @@
|
||||
v-if="visu === costanti.ASK_SENT_CIRCUIT && tools.isUserOk()"
|
||||
>
|
||||
<q-item-label>
|
||||
<q-btn rounded icon="fas fa-ellipsis-h">
|
||||
<q-btn
|
||||
rounded
|
||||
icon="fas fa-ellipsis-h"
|
||||
>
|
||||
<q-menu>
|
||||
<q-list style="min-width: 150px">
|
||||
<q-item
|
||||
@@ -401,9 +426,7 @@
|
||||
"
|
||||
icon="fas fa-user-plus"
|
||||
color="primary"
|
||||
:label="
|
||||
circuit.askManagerToEnter ? $t('circuit.ask') : $t('circuit.enter')
|
||||
"
|
||||
:label="circuit.askManagerToEnter ? $t('circuit.ask') : $t('circuit.enter')"
|
||||
rounded
|
||||
@click="
|
||||
requestToEnterCircuit = true;
|
||||
@@ -416,19 +439,21 @@
|
||||
icon="fas fa-ellipsis-h"
|
||||
>
|
||||
<q-menu>
|
||||
<q-list v-if="true" style="min-width: 150px">
|
||||
<q-list
|
||||
v-if="true"
|
||||
style="min-width: 150px"
|
||||
>
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
v-if="true"
|
||||
@click="
|
||||
(saldo < 0)
|
||||
saldo < 0
|
||||
? tools.showNegativeNotif(
|
||||
$q,
|
||||
t(
|
||||
'circuit.per_uscire_dal_circuito_occorre_essere_a_zero',
|
||||
{ symbol: circuit.symbol }
|
||||
),
|
||||
t('circuit.per_uscire_dal_circuito_occorre_essere_a_zero', {
|
||||
symbol: circuit.symbol,
|
||||
}),
|
||||
30000
|
||||
)
|
||||
: tools.removeFromMyCircuits(
|
||||
@@ -443,14 +468,20 @@
|
||||
"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="negative" name="fas fa-user-minus" />
|
||||
<q-icon
|
||||
color="negative"
|
||||
name="fas fa-user-minus"
|
||||
/>
|
||||
</q-item-section>
|
||||
<q-item-section>
|
||||
{{ $t('circuit.exit_circuit') }}
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
|
||||
<q-list v-if="userStore.isAdmin" style="min-width: 200px">
|
||||
<q-list
|
||||
v-if="userStore.isAdmin"
|
||||
style="min-width: 200px"
|
||||
>
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@@ -465,7 +496,10 @@
|
||||
"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="negative" name="fas fa-trash-alt" />
|
||||
<q-icon
|
||||
color="negative"
|
||||
name="fas fa-trash-alt"
|
||||
/>
|
||||
</q-item-section>
|
||||
<q-item-section>{{ $t('circuit.delete') }}</q-item-section>
|
||||
</q-item>
|
||||
@@ -483,9 +517,7 @@
|
||||
flat
|
||||
outline
|
||||
:label="$t('shared.cancel_ask_short')"
|
||||
@click="
|
||||
tools.cancelReqCircuit($q, userStore.my.username, circuit.name)
|
||||
"
|
||||
@click="tools.cancelReqCircuit($q, userStore.my.username, circuit.name)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@@ -495,17 +527,32 @@
|
||||
transition-show="slide-up"
|
||||
transition-hide="slide-down"
|
||||
>
|
||||
<q-card v-if="circuit" class="dialog_card">
|
||||
<q-toolbar class="bg-primary text-white" dense>
|
||||
<q-card
|
||||
v-if="circuit"
|
||||
class="dialog_card"
|
||||
>
|
||||
<q-toolbar
|
||||
class="bg-primary text-white"
|
||||
dense
|
||||
>
|
||||
<!--<q-toolbar :class="tools.displayClasses(myevent)"-->
|
||||
<!--:style="tools.displayStyles(myevent) + ` min-width: `+ tools.myheight_dialog() + `px;`">-->
|
||||
<q-toolbar-title>
|
||||
{{ circuit.name }}
|
||||
<div v-if="groupnameSel">Gruppo: {{ groupnameSel.groupname }}</div>
|
||||
</q-toolbar-title>
|
||||
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
color="white"
|
||||
icon="close"
|
||||
v-close-popup
|
||||
></q-btn>
|
||||
</q-toolbar>
|
||||
<q-card-section v-if="circuit.symbol === 'RIS'" class="inset-shadow">
|
||||
<q-card-section
|
||||
v-if="circuit.symbol === 'RIS'"
|
||||
class="inset-shadow"
|
||||
>
|
||||
<div v-html="t('circuit.disclaimer')"></div>
|
||||
</q-card-section>
|
||||
<q-card-section class="inset-shadow">
|
||||
@@ -551,8 +598,7 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" src="./CMyCircuit.ts">
|
||||
</script>
|
||||
<script lang="ts" src="./CMyCircuit.ts"></script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import './CMyCircuit.scss';
|
||||
|
||||
@@ -221,7 +221,7 @@ export default defineComponent({
|
||||
listTrusted.value = listTrusted.value.filter((rec: IUserFields) => rec.username !== usernameDest)
|
||||
}
|
||||
}
|
||||
tools.showPositiveNotif($q, t('db.trusted'))
|
||||
tools.showPositiveNotif($q, t('db.trusted', { username: username.value }))
|
||||
|
||||
} else {
|
||||
tools.showNegativeNotif($q, t('db.recfailed'))
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
<template>
|
||||
<div v-if="tools.isUserOk()">
|
||||
<div v-if="grp">
|
||||
<q-item class="q-my-sm" clickable>
|
||||
<q-item-section avatar @click="naviga(tools.getPathByGroup(grp))">
|
||||
<q-item
|
||||
class="q-my-sm"
|
||||
clickable
|
||||
>
|
||||
<q-item-section
|
||||
avatar
|
||||
@click="naviga(tools.getPathByGroup(grp))"
|
||||
>
|
||||
<q-avatar size="60px">
|
||||
<q-img
|
||||
:src="getImgGroup(grp)"
|
||||
@@ -17,10 +23,17 @@
|
||||
<q-item-label
|
||||
><strong>{{ grp.title }}</strong> ({{ grp.groupname }})
|
||||
</q-item-label>
|
||||
<q-item-label v-if="grp.descr" caption lines="3"
|
||||
<q-item-label
|
||||
v-if="grp.descr"
|
||||
caption
|
||||
lines="3"
|
||||
><em>{{ grp.descr }}</em></q-item-label
|
||||
>
|
||||
<q-item-label v-if="grp.account && circuitname" caption lines="2">
|
||||
<q-item-label
|
||||
v-if="grp.account && circuitname"
|
||||
caption
|
||||
lines="2"
|
||||
>
|
||||
<CSaldo
|
||||
:small="true"
|
||||
:account="grp.account"
|
||||
@@ -45,7 +58,10 @@
|
||||
</q-item-label>
|
||||
<q-item-section side>
|
||||
<q-item-label v-if="visu === costanti.MY_GROUPS">
|
||||
<q-btn rounded icon="fas fa-ellipsis-h">
|
||||
<q-btn
|
||||
rounded
|
||||
icon="fas fa-ellipsis-h"
|
||||
>
|
||||
<q-menu>
|
||||
<q-list style="min-width: 150px">
|
||||
<q-item
|
||||
@@ -85,9 +101,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('groups.delete_group')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.delete_group') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-list style="min-width: 150px">
|
||||
@@ -106,16 +120,17 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('groups.block_group')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.block_group') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
</q-btn>
|
||||
</q-item-label>
|
||||
<q-item-label v-if="visu === costanti.REQ_ADD_USER_TO_CIRCUIT">
|
||||
<q-btn rounded icon="fas fa-ellipsis-h">
|
||||
<q-btn
|
||||
rounded
|
||||
icon="fas fa-ellipsis-h"
|
||||
>
|
||||
<q-menu>
|
||||
<q-list style="min-width: 150px">
|
||||
<q-item
|
||||
@@ -125,11 +140,12 @@
|
||||
@click="showsendCoinTo = true"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="positive" name="img: /images/1ris_rosso_100.png" />
|
||||
<q-icon
|
||||
color="positive"
|
||||
name="img: /images/1ris_rosso_100.png"
|
||||
/>
|
||||
</q-item-section>
|
||||
<q-item-section>{{
|
||||
$t('circuit.sendcoins')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
|
||||
</q-item>
|
||||
<q-item
|
||||
v-if="tools.iAmAdminGroup(grp.groupname)"
|
||||
@@ -139,11 +155,12 @@
|
||||
@click="tools.receiveRisGroup(grp.groupname, $q, $t)"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="positive" name="fas fa-download" />
|
||||
<q-icon
|
||||
color="positive"
|
||||
name="fas fa-download"
|
||||
/>
|
||||
</q-item-section>
|
||||
<q-item-section>{{
|
||||
$t('circuit.receive_coins')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('circuit.receive_coins') }}</q-item-section>
|
||||
</q-item>
|
||||
<q-item
|
||||
clickable
|
||||
@@ -153,9 +170,30 @@
|
||||
<q-item-section avatar>
|
||||
<q-icon name="fas fa-info" />
|
||||
</q-item-section>
|
||||
<q-item-section>{{
|
||||
$t('groups.infoaccount')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.infoaccount') }}</q-item-section>
|
||||
</q-item>
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="
|
||||
tools.removeFromMyCircuits(
|
||||
$q,
|
||||
userStore.my.username,
|
||||
circuitname,
|
||||
grp.groupname,
|
||||
$t('circuit.domanda_exit_fromcircuit', {
|
||||
circuitname,
|
||||
})
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon
|
||||
color="negative"
|
||||
name="fas fa-user-minus"
|
||||
/>
|
||||
</q-item-section>
|
||||
<q-item-section>{{ $t('circuit.exit_circuit') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
@@ -192,9 +230,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('groups.ask_group')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.ask_group') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-list
|
||||
@@ -218,9 +254,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('shared.refuse_ask')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('shared.refuse_ask') }}</q-item-section>
|
||||
</q-item>
|
||||
<q-item
|
||||
clickable
|
||||
@@ -235,9 +269,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('shared.cancel_ask')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('shared.cancel_ask') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-list
|
||||
@@ -257,9 +289,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('groups.exit_group')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.exit_group') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-list
|
||||
@@ -279,16 +309,17 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('groups.delete_group')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.delete_group') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
</q-btn>
|
||||
</q-item-label>
|
||||
<q-item-label v-else-if="visu === costanti.REQ_GROUP">
|
||||
<q-btn rounded icon="fas fa-ellipsis-h">
|
||||
<q-btn
|
||||
rounded
|
||||
icon="fas fa-ellipsis-h"
|
||||
>
|
||||
<q-menu>
|
||||
<q-list style="min-width: 150px">
|
||||
<q-item
|
||||
@@ -306,16 +337,17 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('groups.reject_ask_group')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.reject_ask_group') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
</q-btn>
|
||||
</q-item-label>
|
||||
<q-item-label v-else-if="visu === costanti.ASK_SENT_GROUP">
|
||||
<q-btn rounded icon="fas fa-ellipsis-h">
|
||||
<q-btn
|
||||
rounded
|
||||
icon="fas fa-ellipsis-h"
|
||||
>
|
||||
<q-menu>
|
||||
<q-list style="min-width: 150px">
|
||||
<q-item
|
||||
@@ -333,9 +365,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('shared.refuse_ask')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('shared.refuse_ask') }}</q-item-section>
|
||||
</q-item>
|
||||
<q-item
|
||||
clickable
|
||||
@@ -352,9 +382,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('shared.cancel_ask')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('shared.cancel_ask') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
@@ -378,11 +406,12 @@
|
||||
@click="showsendCoinTo = true"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="positive" name="img: /images/1ris_rosso_100.png" />
|
||||
<q-icon
|
||||
color="positive"
|
||||
name="img: /images/1ris_rosso_100.png"
|
||||
/>
|
||||
</q-item-section>
|
||||
<q-item-section>{{
|
||||
$t('circuit.sendcoins')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-list
|
||||
@@ -405,9 +434,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('groups.ask_group')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.ask_group') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-list
|
||||
@@ -430,9 +457,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('shared.refuse_ask')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('shared.refuse_ask') }}</q-item-section>
|
||||
</q-item>
|
||||
<q-item
|
||||
clickable
|
||||
@@ -447,9 +472,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('shared.cancel_ask')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('shared.cancel_ask') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-list
|
||||
@@ -469,9 +492,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('groups.exit_group')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.exit_group') }}</q-item-section>
|
||||
</q-item>
|
||||
|
||||
<q-item
|
||||
@@ -490,11 +511,12 @@
|
||||
"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="negative" name="fas fa-user-minus" />
|
||||
<q-icon
|
||||
color="negative"
|
||||
name="fas fa-user-minus"
|
||||
/>
|
||||
</q-item-section>
|
||||
<q-item-section>{{
|
||||
$t('circuit.exit_circuit')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('circuit.exit_circuit') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
<q-list
|
||||
@@ -514,27 +536,32 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<q-item-section>{{
|
||||
$t('groups.delete_group')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('groups.delete_group') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
</q-btn>
|
||||
</q-item-label>
|
||||
<q-item-label v-else-if="visu === costanti.REQ_ADD_GROUP_TO_CIRCUIT">
|
||||
<q-btn rounded icon="fas fa-ellipsis-h">
|
||||
<q-btn
|
||||
rounded
|
||||
icon="fas fa-ellipsis-h"
|
||||
>
|
||||
<q-menu>
|
||||
<q-list v-if="true" style="min-width: 150px">
|
||||
<q-list
|
||||
v-if="true"
|
||||
style="min-width: 150px"
|
||||
>
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="
|
||||
tools.addGroupToMyCircuits($q, grp.groupname, circuitname)
|
||||
"
|
||||
@click="tools.addGroupToMyCircuits($q, grp.groupname, circuitname)"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="positive" name="fas fa-user-plus" />
|
||||
<q-icon
|
||||
color="positive"
|
||||
name="fas fa-user-plus"
|
||||
/>
|
||||
</q-item-section>
|
||||
<q-item-section>
|
||||
{{ $t('circuit.accept') }}
|
||||
@@ -544,15 +571,14 @@
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="
|
||||
tools.addFidoGroupToMyCircuits(
|
||||
$q,
|
||||
grp.groupname,
|
||||
circuitname
|
||||
)
|
||||
tools.addFidoGroupToMyCircuits($q, grp.groupname, circuitname)
|
||||
"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="positive" name="img: /images/1ris_rosso_100.png" />
|
||||
<q-icon
|
||||
color="positive"
|
||||
name="img: /images/1ris_rosso_100.png"
|
||||
/>
|
||||
</q-item-section>
|
||||
<q-item-section>
|
||||
{{ $t('circuit.enablefido') }}
|
||||
@@ -564,41 +590,33 @@
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="
|
||||
tools.refuseReqCircuit(
|
||||
$q,
|
||||
myusername(),
|
||||
circuitname,
|
||||
grp.groupname
|
||||
)
|
||||
tools.refuseReqCircuit($q, myusername(), circuitname, grp.groupname)
|
||||
"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="negative" name="fas fa-user-minus" />
|
||||
<q-icon
|
||||
color="negative"
|
||||
name="fas fa-user-minus"
|
||||
/>
|
||||
</q-item-section>
|
||||
|
||||
<q-item-section>{{
|
||||
$t('shared.refuse_ask')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('shared.refuse_ask') }}</q-item-section>
|
||||
</q-item>
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="
|
||||
tools.cancelReqCircuit(
|
||||
$q,
|
||||
myusername(),
|
||||
circuitname,
|
||||
grp.groupname
|
||||
)
|
||||
tools.cancelReqCircuit($q, myusername(), circuitname, grp.groupname)
|
||||
"
|
||||
>
|
||||
<q-item-section avatar>
|
||||
<q-icon color="negative" name="fas fa-user-minus" />
|
||||
<q-icon
|
||||
color="negative"
|
||||
name="fas fa-user-minus"
|
||||
/>
|
||||
</q-item-section>
|
||||
|
||||
<q-item-section>{{
|
||||
$t('shared.cancel_ask_short')
|
||||
}}</q-item-section>
|
||||
<q-item-section>{{ $t('shared.cancel_ask_short') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
@@ -620,13 +638,23 @@
|
||||
>
|
||||
</CSendCoins>
|
||||
</div>
|
||||
<q-dialog v-model="showAccountInfo" full-height full-width>
|
||||
<q-dialog
|
||||
v-model="showAccountInfo"
|
||||
full-height
|
||||
full-width
|
||||
>
|
||||
<q-card v-if="circuit">
|
||||
<q-toolbar class="bg-primary text-white">
|
||||
<q-toolbar-title>
|
||||
{{ grp.title }}
|
||||
</q-toolbar-title>
|
||||
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
color="white"
|
||||
icon="close"
|
||||
v-close-popup
|
||||
></q-btn>
|
||||
</q-toolbar>
|
||||
<CInfoAccount
|
||||
:grp="grp"
|
||||
@@ -637,8 +665,7 @@
|
||||
</q-dialog>
|
||||
</template>
|
||||
|
||||
<script lang="ts" src="./CMyGroup.ts">
|
||||
</script>
|
||||
<script lang="ts" src="./CMyGroup.ts"></script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import './CMyGroup.scss';
|
||||
|
||||
@@ -428,12 +428,14 @@ export default defineComponent({
|
||||
|
||||
myarrvalue.value = []
|
||||
const myarr = props.arrvalue
|
||||
for (const val of myarr) {
|
||||
rec = arrtempOpt.value.find((myrec: any) => val === (myrec[`${props.optval}`]))
|
||||
if (rec) {
|
||||
myarrvalue.value.push(rec[`${props.optval}`])
|
||||
} else {
|
||||
myarrvalue.value.push(val)
|
||||
if (tools.isArray(myarr)) {
|
||||
for (const val of myarr) {
|
||||
rec = arrtempOpt.value.find((myrec: any) => val === (myrec[`${props.optval}`]))
|
||||
if (rec) {
|
||||
myarrvalue.value.push(rec[`${props.optval}`])
|
||||
} else {
|
||||
myarrvalue.value.push(val)
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -115,11 +115,11 @@ export default defineComponent({
|
||||
$router.push(path)
|
||||
}
|
||||
|
||||
function setCmd($q: any, cmd: number, myusername: string, value: any, dest: string) {
|
||||
function setCmd($qpar: any, cmd: number, myusername: string, value: any, dest: string) {
|
||||
if (props.notsetcmd) {
|
||||
tools.setCmd($q, cmd, myusername, value, dest)
|
||||
tools.setCmd($qpar, cmd, myusername, value, dest)
|
||||
} else {
|
||||
emit('setCmd', $q, cmd, myusername, value, dest)
|
||||
emit('setCmd', $qpar, cmd, myusername, value, dest)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,6 +153,7 @@ export default defineComponent({
|
||||
showsendCoinTo,
|
||||
showsendCoin,
|
||||
clickToUser,
|
||||
$q,
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
@@ -221,7 +221,6 @@
|
||||
userStore.my.username,
|
||||
false,
|
||||
contact.username,
|
||||
false
|
||||
)
|
||||
"
|
||||
>
|
||||
@@ -701,7 +700,6 @@
|
||||
userStore.my.username,
|
||||
'',
|
||||
contact.username,
|
||||
''
|
||||
)
|
||||
"
|
||||
>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
const msg_website_it = {
|
||||
ws: {
|
||||
sitename: 'Gruppo Macro',
|
||||
siteshortname: 'Gruppo Macro',
|
||||
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,20 +16,29 @@ 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',
|
||||
productslist: 'Lista Prodotti',
|
||||
collabora: 'Collabora',
|
||||
storehouses: 'Magazzino',
|
||||
departments: 'Uffici',
|
||||
orders: 'Ordini Ricevuti',
|
||||
orders2: 'Ordini Ricevuti',
|
||||
sharewithus: 'Condividi con Noi',
|
||||
checkout: 'Carrello',
|
||||
payment: 'Pagamenti',
|
||||
regok: 'Registrazione Confermata',
|
||||
presentazione: 'Presentazione',
|
||||
presentazione2: 'Presentazione',
|
||||
@@ -75,12 +84,14 @@ const msg_website_it = {
|
||||
eventodef: 'Evento:',
|
||||
prova: 'prova',
|
||||
dbop: 'Operazioni',
|
||||
dbopmacro: 'Operazioni Macro',
|
||||
projall: 'Comunitari',
|
||||
groups: 'Lista Gruppi',
|
||||
projectsShared: 'Condivisi da me',
|
||||
myprojects: 'Privati',
|
||||
favproj: 'Favoriti',
|
||||
admin_ecommerce: 'ECommerce',
|
||||
ecommerce: 'Prodotti',
|
||||
ecommerce_menu: 'ECommerce1',
|
||||
hours: 'Ore',
|
||||
department: 'Uffici',
|
||||
title: 'Titolo',
|
||||
@@ -109,11 +120,16 @@ const msg_website_it = {
|
||||
onlyif_logged: 'Solo se Loggati',
|
||||
only_residenti: 'Solo Residenti',
|
||||
only_consiglio: 'Solo Consiglieri',
|
||||
only_collab: 'Solo Collaboratori',
|
||||
color: 'Colore',
|
||||
mainMenu: 'Menu Principale',
|
||||
subtitle: 'Sottotitolo',
|
||||
lang: 'Lingua',
|
||||
keywords: 'Parole Chiave',
|
||||
desctiption: 'Descrizione',
|
||||
heightimg: 'Altezza Immagine',
|
||||
},
|
||||
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: '',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* GRUPPOMACRO APP
|
||||
/* RISO APP
|
||||
*/
|
||||
import {
|
||||
import type {
|
||||
IListRoutes,
|
||||
ILang,
|
||||
IPreloadImages,
|
||||
@@ -44,7 +44,6 @@ const firstPage = {
|
||||
infooter: true,
|
||||
}
|
||||
|
||||
|
||||
function getDynamicPages(site: ISites): IListRoutes[] {
|
||||
|
||||
const baseroutes: IListRoutes[] = [
|
||||
@@ -71,11 +70,34 @@ function getDynamicPages(site: ISites): IListRoutes[] {
|
||||
},
|
||||
{
|
||||
active: true,
|
||||
order: 400,
|
||||
path: '/test-lungo',
|
||||
materialIcon: 'fas fa-test',
|
||||
name: 'mypages.test_lungo',
|
||||
component: () => import('@src/views/testLungo/testLungo.vue'),
|
||||
order: 12,
|
||||
path: '/goods',
|
||||
materialIcon: 'fas fa-tshirt',
|
||||
name: 'mypages.goods',
|
||||
component: () => import('@src/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('@src/root/services/services.vue'),
|
||||
meta: { requiresAuth: true },
|
||||
inmenu: true,
|
||||
infooter: true,
|
||||
},
|
||||
{
|
||||
active: true,
|
||||
order: 15,
|
||||
path: '/activities',
|
||||
materialIcon: 'fas fa-house-user',
|
||||
name: 'mypages.activities',
|
||||
component: () => import('@src/root/activities/activities.vue'),
|
||||
meta: { requiresAuth: true },
|
||||
inmenu: false,
|
||||
infooter: false,
|
||||
},
|
||||
@@ -90,6 +112,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
|
||||
inmenu: false,
|
||||
infooter: false,
|
||||
},
|
||||
{
|
||||
active: true,
|
||||
order: 15,
|
||||
path: '/hosps',
|
||||
materialIcon: 'fas fa-bed',
|
||||
name: 'mypages.hosp',
|
||||
component: () => import('@src/root/hosp/hosp.vue'),
|
||||
meta: { requiresAuth: true },
|
||||
inmenu: true,
|
||||
infooter: true,
|
||||
},
|
||||
{
|
||||
active: site.confpages && site.confpages.enableCircuits,
|
||||
order: 16,
|
||||
@@ -102,7 +135,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
|
||||
infooter: true,
|
||||
},
|
||||
{
|
||||
active: site.confpages && site.confpages.enableEvents,
|
||||
active: true,
|
||||
order: 20,
|
||||
path: '/events',
|
||||
materialIcon: 'fas fa-bullhorn',
|
||||
@@ -124,7 +157,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
|
||||
infooter: false,
|
||||
},
|
||||
{
|
||||
active: site.confpages && site.confpages.showProfile,
|
||||
active: true,
|
||||
order: 120,
|
||||
path: '/myprofile',
|
||||
materialIcon: 'fas fa-user',
|
||||
@@ -135,7 +168,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
|
||||
infooter: true,
|
||||
},
|
||||
{
|
||||
active: site.confpages && site.confpages.showProfile,
|
||||
active: true,
|
||||
order: 120,
|
||||
path: '/editprofile',
|
||||
materialIcon: 'fas fa-user',
|
||||
@@ -146,7 +179,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',
|
||||
@@ -241,6 +274,16 @@ function getDynamicPages(site: ISites): IListRoutes[] {
|
||||
inmenu: false,
|
||||
infooter: false,
|
||||
},
|
||||
{
|
||||
active: true,
|
||||
order: 150,
|
||||
path: '/sostieniilprogetto',
|
||||
materialIcon: 'fas fa-hand-holding-heart',
|
||||
name: 'pages.fundraising',
|
||||
component: () => import('@src/root/fundraising/fundraising.vue'),
|
||||
inmenu: false,
|
||||
infooter: false,
|
||||
},
|
||||
{
|
||||
active: true,
|
||||
order: 80,
|
||||
@@ -259,7 +302,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
|
||||
|
||||
export function firstimagehome() {
|
||||
|
||||
let img = 'statics/images/background.jpg'
|
||||
const img = 'statics/images/background.jpg'
|
||||
return img
|
||||
}
|
||||
|
||||
|
||||
@@ -224,6 +224,7 @@ export interface IUserFields {
|
||||
password?: string
|
||||
ipaddr?: string
|
||||
perm?: number
|
||||
lang?: string
|
||||
verified_email?: boolean
|
||||
verified_by_aportador?: boolean
|
||||
idMyGroup?: string
|
||||
|
||||
@@ -193,8 +193,8 @@ const msg_enUs = {
|
||||
domanda_addtogroup: 'Aggiungi {username} al gruppo {groupname}?',
|
||||
addedfriend: 'Aggiunto alla lista di Amici',
|
||||
addedgroup: 'Aggiunto al Gruppo',
|
||||
domanda_trusted: 'Accettare la Fiducia a {username}?',
|
||||
trusted: 'Accettato la Fiducia',
|
||||
domanda_trusted: 'Ammetti {username}?',
|
||||
trusted: '{username} Ammesso',
|
||||
domanda_ask_friend: 'Chiedere l\'Amicizia a {username}?',
|
||||
domanda_ask_group: 'Chiedere l\'invito al Gruppo {groupname}?',
|
||||
askedtofriend: 'Chiesto l\'Amicizia a {username}',
|
||||
|
||||
@@ -357,7 +357,7 @@ const msg_it = {
|
||||
addedgroup: 'Aggiunto all\'Organizzazione',
|
||||
addedfidocircuit: 'Fiducia abilitata al {circuitname}',
|
||||
addedcircuit: 'Aggiunto al {circuitname}',
|
||||
domanda_trusted: 'Accettare la Fiducia a {username}?',
|
||||
domanda_trusted: 'Ammetti {username}?',
|
||||
domanda_reject: 'Non lo conosci? Vuoi rifiutare l\'accesso a {username}?',
|
||||
trusted: 'Hai Accettato la Fiducia a {username}',
|
||||
domanda_ask_friend: 'Chiedere l\'Amicizia a {username}?',
|
||||
@@ -1454,6 +1454,9 @@ const msg_it = {
|
||||
preferences: 'Preferenze',
|
||||
},
|
||||
circuit: {
|
||||
add_circuit: 'Entra nel Circuito',
|
||||
select_circuit: 'Scegli il Circuito cui abilitare il conto RIS',
|
||||
select_circuit_hint: '',
|
||||
show_next_mov: 'Vedi altri ...',
|
||||
nessun_movimento_ricevuto: 'Nessun movimento ricevuto. Proponi uno scambio in RIS e conosci altre persone!',
|
||||
nessun_movimento_inviato: 'Nessun movimento Inviato. Sperimenta l\'utilizzo dei RIS proponendoti in qualcosa!',
|
||||
|
||||
@@ -2,7 +2,8 @@ import { defineStore } from 'pinia'
|
||||
|
||||
import type {
|
||||
IAccount,
|
||||
ICircuit, ICircuitState, IGroupShort, IMyCircuit, IMyGroup, IUserFields
|
||||
ICircuit, ICircuitState, IGroupShort, IMyCircuit, IMyGroup, IUserFields,
|
||||
IUserProfile
|
||||
} from '@src/model';
|
||||
import {
|
||||
IGlobalState
|
||||
@@ -126,6 +127,16 @@ export const useCircuitStore = defineStore('CircuitStore', {
|
||||
|
||||
},
|
||||
|
||||
getFidoConcessoByUsername(myuser: IUserFields, circuitId: string, username: string): number|string {
|
||||
const userStore = useUserStore()
|
||||
if (myuser && myuser.profile.useraccounts) {
|
||||
const account = myuser.profile.useraccounts.find((rec: IAccount) => rec.username === username || (rec.groupname === username && username !== '') && rec.circuitId === circuitId)
|
||||
return account ? account.fidoConcesso : 0
|
||||
} else {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
|
||||
SonoDentroAdAlmeno1CircuitoConFido(): boolean {
|
||||
const userStore = useUserStore()
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,261 +1,313 @@
|
||||
import { CGridTableRec } from '@src/components/CGridTableRec'
|
||||
import { CMyFriends } from '@src/components/CMyFriends'
|
||||
import { CMyUser } from '@src/components/CMyUser'
|
||||
import { CNotifAtTop } from '@src/components/CNotifAtTop'
|
||||
import { CTitleBanner } from '@src/components/CTitleBanner'
|
||||
import { CProfile } from '@src/components/CProfile'
|
||||
import { CCheckIfIsLogged } from '@src/components/CCheckIfIsLogged'
|
||||
import { CMyFieldRec } from '@src/components/CMyFieldRec'
|
||||
import { CSkill } from '@src/components/CSkill'
|
||||
import { CDateTime } from '@src/components/CDateTime'
|
||||
import { CInfoAccount } from '@src/components/CInfoAccount'
|
||||
import { CSendCoins } from '@src/components/CSendCoins'
|
||||
import { tools } from '@tools'
|
||||
import { computed, defineComponent, onMounted, ref, watch } from 'vue'
|
||||
import { useUserStore } from '@store/UserStore'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { useGlobalStore } from '@store/globalStore'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import { toolsext } from '@store/Modules/toolsext'
|
||||
import { useQuasar } from 'quasar'
|
||||
import { costanti } from '@costanti'
|
||||
import { CGridTableRec } from '@src/components/CGridTableRec';
|
||||
import { CMyFriends } from '@src/components/CMyFriends';
|
||||
import { CMyUser } from '@src/components/CMyUser';
|
||||
import { CNotifAtTop } from '@src/components/CNotifAtTop';
|
||||
import { CTitleBanner } from '@src/components/CTitleBanner';
|
||||
import { CProfile } from '@src/components/CProfile';
|
||||
import { CCheckIfIsLogged } from '@src/components/CCheckIfIsLogged';
|
||||
import { CMyFieldRec } from '@src/components/CMyFieldRec';
|
||||
import { CSkill } from '@src/components/CSkill';
|
||||
import { CMyCircuit } from '@src/components/CMyCircuit';
|
||||
import { CDateTime } from '@src/components/CDateTime';
|
||||
import { CInfoAccount } from '@src/components/CInfoAccount';
|
||||
import { CSendCoins } from '@src/components/CSendCoins';
|
||||
import { tools } from '@tools';
|
||||
import { computed, defineComponent, onMounted, ref, watch } from 'vue';
|
||||
import { useUserStore } from '@store/UserStore';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { useGlobalStore } from '@store/globalStore';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { toolsext } from '@store/Modules/toolsext';
|
||||
import { useQuasar } from 'quasar';
|
||||
import { costanti } from '@costanti';
|
||||
import type { ICircuit, ICity, IFriends, IMyCircuit, IMyGroup, ISearchList } from 'model';
|
||||
import { IUserFields } from 'model'
|
||||
import { shared_consts } from '@src/common/shared_vuejs'
|
||||
import { colmyUserPeople, colmyUserGroup, colmyMovementTable, colmyMovement } from '@store/Modules/fieldsTable'
|
||||
import { useNotifStore } from '@store/NotifStore'
|
||||
import { useCircuitStore } from '@src/store/CircuitStore'
|
||||
|
||||
import { IUserFields } from 'model';
|
||||
import { shared_consts } from '@src/common/shared_vuejs';
|
||||
import {
|
||||
colmyUserPeople,
|
||||
colmyUserGroup,
|
||||
colmyMovementTable,
|
||||
colmyMovement,
|
||||
} from '@store/Modules/fieldsTable';
|
||||
import { useNotifStore } from '@store/NotifStore';
|
||||
import { useCircuitStore } from '@src/store/CircuitStore';
|
||||
|
||||
export default defineComponent({
|
||||
name: 'mygroup',
|
||||
components: {
|
||||
CProfile, CTitleBanner, CMyFieldRec,
|
||||
CInfoAccount, CSkill, CDateTime, CMyFriends, CGridTableRec, CMyUser, CCheckIfIsLogged,
|
||||
CNotifAtTop, CSendCoins
|
||||
CProfile,
|
||||
CTitleBanner,
|
||||
CMyFieldRec,
|
||||
CInfoAccount,
|
||||
CSkill,
|
||||
CDateTime,
|
||||
CMyFriends,
|
||||
CGridTableRec,
|
||||
CMyUser,
|
||||
CCheckIfIsLogged,
|
||||
CNotifAtTop,
|
||||
CSendCoins,
|
||||
CMyCircuit,
|
||||
},
|
||||
props: {},
|
||||
setup() {
|
||||
const userStore = useUserStore()
|
||||
const notifStore = useNotifStore()
|
||||
const circuitStore = useCircuitStore()
|
||||
const $route = useRoute()
|
||||
const $q = useQuasar()
|
||||
const { t } = useI18n()
|
||||
const userStore = useUserStore();
|
||||
const notifStore = useNotifStore();
|
||||
const circuitStore = useCircuitStore();
|
||||
const $route = useRoute();
|
||||
const $q = useQuasar();
|
||||
const { t } = useI18n();
|
||||
|
||||
const animation = ref(<any>'fade')
|
||||
const tabevents = ref('new')
|
||||
const animation = ref(<any>'fade');
|
||||
const tabevents = ref('new');
|
||||
|
||||
const circuitSel = ref('');
|
||||
|
||||
const showrules = ref(false);
|
||||
|
||||
const requestToEnterCircuit = ref(false);
|
||||
|
||||
const mycards = computed(() => {
|
||||
return costanti.MAINCARDS.filter((rec: any) => rec.table && rec.showinprofile)
|
||||
})
|
||||
return costanti.MAINCARDS.filter((rec: any) => rec.table && rec.showinprofile);
|
||||
});
|
||||
|
||||
const groupname = computed(() => $route.params?.groupname ? $route.params?.groupname.toString() : '')
|
||||
const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
|
||||
const groupname = computed(() =>
|
||||
$route.params?.groupname ? $route.params?.groupname.toString() : ''
|
||||
);
|
||||
const idnotif = computed(() =>
|
||||
$route.query.idnotif ? $route.query.idnotif.toString() : ''
|
||||
);
|
||||
|
||||
const filtroutente = ref(<any[]>[])
|
||||
const showPic = ref(false)
|
||||
const filtroutente = ref(<any[]>[]);
|
||||
const showPic = ref(false);
|
||||
|
||||
const showsendCoinTo = ref(false)
|
||||
const showsendCoinTo = ref(false);
|
||||
|
||||
const tabcircuit = ref('info')
|
||||
const filtro_eventi = ref(<any[]>[])
|
||||
const tabcircuit = ref('info');
|
||||
const filtro_eventi = ref(<any[]>[]);
|
||||
|
||||
const mygrp = ref(<IMyGroup>{})
|
||||
const mystatus = ref(<number>0)
|
||||
const users_in_group = ref(<IFriends[]>[])
|
||||
const mygrp = ref(<IMyGroup>{});
|
||||
const mystatus = ref(<number>0);
|
||||
const users_in_group = ref(<IFriends[]>[]);
|
||||
|
||||
const tabellare = ref(false)
|
||||
const circuitIndex = ref(0)
|
||||
const tabellare = ref(false);
|
||||
const circuitIndex = ref(0);
|
||||
|
||||
const loading = ref(false)
|
||||
const loading = ref(false);
|
||||
|
||||
const tabgrp = ref('info')
|
||||
const tabmembers = ref('all')
|
||||
const tab = ref('membri')
|
||||
const tabgrp = ref('info');
|
||||
const tabmembers = ref('all');
|
||||
const tab = ref('membri');
|
||||
|
||||
const arrfilterand: any = ref([])
|
||||
const filtercustom: any = ref([])
|
||||
const filtercustom_rich: any = ref([])
|
||||
const searchList = ref(<ISearchList[]>[])
|
||||
const arrfilterand: any = ref([]);
|
||||
const filtercustom: any = ref([]);
|
||||
const filtercustom_rich: any = ref([]);
|
||||
const searchList = ref(<ISearchList[]>[]);
|
||||
|
||||
const cities = ref(<ICity[]>[])
|
||||
const cities = ref(<ICity[]>[]);
|
||||
|
||||
const circuitslist = ref(<ICircuit[]>[])
|
||||
const circuitslistOpt = ref(<any[]>[])
|
||||
const circuitslist = ref(<ICircuit[]>[]);
|
||||
const circuitslistOpt = ref(<any[]>[]);
|
||||
|
||||
const circuit = ref(<ICircuit>{});
|
||||
|
||||
function profile() {
|
||||
return userStore.my.profile
|
||||
return userStore.my.profile;
|
||||
}
|
||||
|
||||
function mygrpname() {
|
||||
return userStore.my.username
|
||||
return userStore.my.username;
|
||||
}
|
||||
|
||||
async function loadGroup() {
|
||||
console.log('loadGroup')
|
||||
console.log('loadGroup');
|
||||
// Carica il profilo di quest'utente
|
||||
if (groupname.value) {
|
||||
await userStore.loadGroup(groupname.value, idnotif.value).then(({ data, status }: { data: any, status: number }) => {
|
||||
// console.log('data', data)
|
||||
circuitslist.value = []
|
||||
if (data) {
|
||||
mygrp.value = data.mygroup
|
||||
cities.value = data.cities
|
||||
notifStore.setAsRead(idnotif.value)
|
||||
users_in_group.value = data.users_in_group
|
||||
await userStore
|
||||
.loadGroup(groupname.value, idnotif.value)
|
||||
.then(({ data, status }: { data: any; status: number }) => {
|
||||
// console.log('data', data)
|
||||
circuitslist.value = [];
|
||||
if (data) {
|
||||
mygrp.value = data.mygroup;
|
||||
cities.value = data.cities;
|
||||
notifStore.setAsRead(idnotif.value);
|
||||
users_in_group.value = data.users_in_group;
|
||||
|
||||
if (mygrp.value)
|
||||
circuitslist.value = circuitStore.getCircuitsListByGroup(mygrp.value)
|
||||
if (mygrp.value)
|
||||
circuitslist.value = circuitStore.getCircuitsListByGroup(mygrp.value);
|
||||
|
||||
/*if (mygrp.value && tools.iAmAdminGroup(groupname.value)) {
|
||||
/*if (mygrp.value && tools.iAmAdminGroup(groupname.value)) {
|
||||
}*/
|
||||
if (circuitslist.value) {
|
||||
circuitslistOpt.value = []
|
||||
for (let i = 0; i < circuitslist.value.length; i++) {
|
||||
circuitslistOpt.value.push({ label: circuitslist.value[i].name, value: i })
|
||||
const myc = data.mygroup.mycircuits.find((circ: IMyCircuit) => circ.circuitname === circuitslist.value[i].name)
|
||||
if (myc) {
|
||||
circuitslist.value[i].account = myc.account
|
||||
if (circuitslist.value) {
|
||||
circuitslistOpt.value = [];
|
||||
for (let i = 0; i < circuitslist.value.length; i++) {
|
||||
circuitslistOpt.value.push({
|
||||
label: circuitslist.value[i].name,
|
||||
value: i,
|
||||
});
|
||||
const myc = data.mygroup.mycircuits.find(
|
||||
(circ: IMyCircuit) => circ.circuitname === circuitslist.value[i].name
|
||||
);
|
||||
if (myc) {
|
||||
circuitslist.value[i].account = myc.account;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
mygrp.value = null;
|
||||
users_in_group.value = [];
|
||||
}
|
||||
} else {
|
||||
mygrp.value = null
|
||||
users_in_group.value = []
|
||||
}
|
||||
|
||||
mystatus.value = status
|
||||
|
||||
loading.value = false
|
||||
// filtroutente.value = [{ userId: userStore.my._id }]
|
||||
})
|
||||
mystatus.value = status;
|
||||
|
||||
loading.value = false;
|
||||
// filtroutente.value = [{ userId: userStore.my._id }]
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
watch(() => groupname.value, (to: any, from: any) => {
|
||||
loadGroup()
|
||||
})
|
||||
watch(
|
||||
() => groupname.value,
|
||||
(to: any, from: any) => {
|
||||
loadGroup();
|
||||
}
|
||||
);
|
||||
|
||||
watch(
|
||||
() => circuitSel.value,
|
||||
(to: any, from: any) => {
|
||||
circuit.value = circuitStore.getCircuitByName(circuitSel.value);
|
||||
}
|
||||
);
|
||||
|
||||
async function mounted() {
|
||||
loading.value = true
|
||||
await loadGroup()
|
||||
loading.value = true;
|
||||
await loadGroup();
|
||||
|
||||
searchList.value = []
|
||||
filtercustom.value = [{ 'profile.mygroups': { $elemMatch: { groupname: { $eq: groupname.value } } } }]
|
||||
searchList.value = [];
|
||||
filtercustom.value = [
|
||||
{ 'profile.mygroups': { $elemMatch: { groupname: { $eq: groupname.value } } } },
|
||||
];
|
||||
|
||||
arrfilterand.value = []
|
||||
filtercustom_rich.value = []
|
||||
arrfilterand.value = [];
|
||||
filtercustom_rich.value = [];
|
||||
|
||||
//++TODO: sistemare la filtercustom ... richieste...
|
||||
}
|
||||
|
||||
function getImgGrp() {
|
||||
if (mygrp.value)
|
||||
return userStore.getImgByGroup(mygrp.value)
|
||||
else
|
||||
return ''
|
||||
if (mygrp.value) return userStore.getImgByGroup(mygrp.value);
|
||||
else return '';
|
||||
}
|
||||
|
||||
function checkifShow(col: string) {
|
||||
//++Todo: checkifShow Permessi !
|
||||
return true
|
||||
return true;
|
||||
}
|
||||
|
||||
function getLinkGrpTelegram() {
|
||||
|
||||
if (mygrp.value) {
|
||||
if (mygrp.value.link_telegram) {
|
||||
return (!mygrp.value.link_telegram.startsWith('http') ? 'https://' : '') + mygrp.value.link_telegram
|
||||
return (
|
||||
(!mygrp.value.link_telegram.startsWith('http') ? 'https://' : '') +
|
||||
mygrp.value.link_telegram
|
||||
);
|
||||
}
|
||||
} else {
|
||||
return ''
|
||||
return '';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function getLinkWebSite() {
|
||||
if (!mygrp.value) {
|
||||
return ''
|
||||
return '';
|
||||
}
|
||||
|
||||
let site = mygrp.value.website!
|
||||
let site = mygrp.value.website!;
|
||||
if (site) {
|
||||
if (!site.startsWith('http')) {
|
||||
site = 'https://' + site
|
||||
site = 'https://' + site;
|
||||
}
|
||||
}
|
||||
return site
|
||||
return site;
|
||||
}
|
||||
function extraparams_rich() {
|
||||
return {
|
||||
querytype: shared_consts.QUERYTYPE_MYGROUP,
|
||||
myid: mygrp.value ? mygrp.value._id : '',
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function extraparams_refused() {
|
||||
return {
|
||||
querytype: shared_consts.QUERYTYPE_REFUSED_USER_GRP,
|
||||
myid: mygrp.value ? mygrp.value._id : '',
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function numUsers() {
|
||||
return users_in_group.value ? users_in_group.value.length : 0
|
||||
return users_in_group.value ? users_in_group.value.length : 0;
|
||||
}
|
||||
function numAdmins() {
|
||||
return (mygrp.value && mygrp.value.admins) ? mygrp.value.admins.length : 0
|
||||
return mygrp.value && mygrp.value.admins ? mygrp.value.admins.length : 0;
|
||||
}
|
||||
function listaAdmins() {
|
||||
return (mygrp.value && mygrp.value.admins) ? mygrp.value.admins.map((rec) => rec.username).join(', ') : ''
|
||||
return mygrp.value && mygrp.value.admins
|
||||
? mygrp.value.admins.map((rec) => rec.username).join(', ')
|
||||
: '';
|
||||
}
|
||||
|
||||
|
||||
function getExtraparams_movs_grp(circuit: ICircuit): any {
|
||||
return {
|
||||
querytype: shared_consts.QUERYTYPE_LIST_MOVEMENTS_GROUPNAME,
|
||||
myid: circuit ? circuit._id : '',
|
||||
groupname: mygrp.value ? mygrp.value.groupname : '',
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function filtrotables(table: string, quale: string) {
|
||||
const out = []
|
||||
if (mygrp.value)
|
||||
out.push({ groupname: mygrp.value.groupname })
|
||||
const out = [];
|
||||
if (mygrp.value) out.push({ groupname: mygrp.value.groupname });
|
||||
|
||||
if (table === shared_consts.TABLES_MYBACHECAS) {
|
||||
let mydate = tools.addDays(tools.getDateNow(), -1)
|
||||
let mydateend = tools.addDays(mydate, 180)
|
||||
mydate = tools.getstrYYMMDDDate(mydate)
|
||||
mydateend = tools.getstrYYMMDDDate(mydateend)
|
||||
let mydate = tools.addDays(tools.getDateNow(), -1);
|
||||
let mydateend = tools.addDays(mydate, 180);
|
||||
mydate = tools.getstrYYMMDDDate(mydate);
|
||||
mydateend = tools.getstrYYMMDDDate(mydateend);
|
||||
|
||||
if (quale === 'new') {
|
||||
filtro_eventi.value = [{ dateTimeStart: { $gte: mydate, $lte: mydateend } }]
|
||||
filtro_eventi.value = [{ dateTimeStart: { $gte: mydate, $lte: mydateend } }];
|
||||
} else {
|
||||
mydate = tools.addDays(tools.getDateNow(), -365)
|
||||
mydateend = tools.addDays(tools.getDateNow(), 0)
|
||||
mydate = tools.getstrYYMMDDDate(mydate)
|
||||
mydateend = tools.getstrYYMMDDDate(mydateend)
|
||||
filtro_eventi.value = [{ dateTimeStart: { $gte: mydate, $lte: mydateend } }]
|
||||
mydate = tools.addDays(tools.getDateNow(), -365);
|
||||
mydateend = tools.addDays(tools.getDateNow(), 0);
|
||||
mydate = tools.getstrYYMMDDDate(mydate);
|
||||
mydateend = tools.getstrYYMMDDDate(mydateend);
|
||||
filtro_eventi.value = [{ dateTimeStart: { $gte: mydate, $lte: mydateend } }];
|
||||
}
|
||||
|
||||
filtro_eventi.value.forEach((rec: any) => [
|
||||
out.push({ ...rec })
|
||||
])
|
||||
|
||||
filtro_eventi.value.forEach((rec: any) => [out.push({ ...rec })]);
|
||||
}
|
||||
|
||||
return out
|
||||
return out;
|
||||
}
|
||||
|
||||
function getlinkpage() {
|
||||
return tools.getFullCurrentUrl()
|
||||
return tools.getFullCurrentUrl();
|
||||
}
|
||||
|
||||
onMounted(mounted)
|
||||
function getRegulation(reg: string) {
|
||||
const strreg = reg + '';
|
||||
if (!reg) {
|
||||
let name = CircuitSel.value
|
||||
const mystringa = t('circuit.regolamento', { nomecircuito: name });
|
||||
return mystringa;
|
||||
} else {
|
||||
return reg;
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(mounted);
|
||||
|
||||
return {
|
||||
groupname,
|
||||
@@ -306,6 +358,12 @@ export default defineComponent({
|
||||
showsendCoinTo,
|
||||
mycards,
|
||||
tabevents,
|
||||
}
|
||||
}
|
||||
})
|
||||
requestToEnterCircuit,
|
||||
circuitSel,
|
||||
loadGroup,
|
||||
showrules,
|
||||
circuit,
|
||||
getRegulation,
|
||||
};
|
||||
},
|
||||
});
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user