- Versione 1.0.33

- Aggiornato le varie librerie package

.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

.env.example.production

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

.env.prod.pcb

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="17"
 DIRECTORY_LOCAL=newfreeplanet

.env.test.pcb

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="17"
 DIRECTORY_LOCAL=newfreeplanet

.env.test.risosrv

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

.env.test_riso.pcb

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/fioredellavita.riso.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="15"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/fioredellavita.riso.app/.env.test

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="15"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/gruppomacro.app/.env.test

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/piuchebuono.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="17"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/piuchebuono.app/.env.test

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/riso.app/.env.production

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.test

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="16"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.31"
+APP_VERSION="1.0.33"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

package.json

@@ -16,36 +16,43 @@
     "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 --ext .ts,.vue --ignore-path .gitignore ./ --fix > file.out.txt",
-    "pwa": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m pwa",
+    "pwa": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=6096 DEBUG=v8:* quasar dev -m pwa",
     "spa": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev --debug",
     "debug": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev --mode debug",
     "test": "echo \"No test specified\" && exit 0",
     "generate-sw": "workbox generateSW workbox-config.js"
   },
   "dependencies": {
-    "@cubejs-client/core": "^0.31.0",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+    "@babel/plugin-proposal-json-strings": "^7.18.6",
+    "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+    "@cubejs-client/core": "^0.35.0",
     "@quasar/extras": "^1.16.9",
     "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.19",
-    "@vue/compat": "^3.3.9",
+    "@types/leaflet": "^1.9.8",
-    "@vue/compiler-sfc": "^3.3.9",
+    "@vue/compat": "^3.4.21",
-    "@vue/eslint-config-standard": "7.0.0",
+    "@vue/compiler-sfc": "^3.4.21",
+    "@vue/eslint-config-standard": "^7.0.0",
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
-    "acorn": "^8.11.2",
+    "acorn": "^8.11.3",
     "animate.css": "^4.1.1",
-    "autoprefixer": "^10.4.16",
+    "autoprefixer": "^10.4.19",
-    "axios": "^1.6.2",
+    "axios": "^1.6.8",
     "bcryptjs": "^2.4.3",
-    "chart.js": "^4.0.0",
+    "chart.js": "^4.4.2",
-    "core-js": "^3.33.3",
+    "core-js": "^3.36.1",
     "crypto": "^1.0.1",
-    "date-fns": "^2.30.0",
+    "crypto-browserify": "^3.12.0",
-    "dotenv": "^16.3.1",
+    "date-fns": "^3.6.0",
-    "echarts": "5.4.2",
+    "dotenv": "^16.4.5",
+    "echarts": "5.5.0",
+    "eslint-plugin-n": "^15.0.0",
     "eslint-plugin-quasar": "^1.1.0",
     "graphql": "^16.8.1",
     "graphql-tag": "^2.12.6",
-    "gsap": "^3.12.3",
+    "gsap": "^3.12.5",
     "jquery": "^3.7.1",
     "js-cookie": "^3.0.5",
     "leaflet": "^1.9.4",
@@ -53,25 +60,25 @@
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "normalize.css": "^8.0.1",
-    "npm": "^10.2.4",
+    "npm": "^10.5.0",
     "nprogress": "^0.2.0",
     "pinia": "^2.1.7",
     "prerender-spa-plugin": "^3.4.0",
     "quasar": "^2.15.1",
     "quasar-extras": "^2.0.9",
     "register-service-worker": "^1.7.2",
-    "typescript-eslint": "^0.0.1-alpha.0",
+    "typescript-eslint": "^7.3.1",
-    "vee-validate": "^4.12.2",
+    "vee-validate": "^4.12.6",
-    "vue": "^3.3.9",
+    "vue": "^3.4.21",
     "vue-class-component": "^8.0.0-rc.1",
     "vue-country-code": "^1.1.3",
-    "vue-echarts": "^6.6.1",
+    "vue-echarts": "^6.6.9",
-    "vue-i18n": "^9.8.0",
+    "vue-i18n": "^9.10.2",
     "vue-idb": "^0.2.0",
     "vue-image-zoomer": "^2.2.3",
-    "vue-loader": "^17.3.1",
+    "vue-loader": "^17.4.2",
     "vue-property-decorator": "^10.0.0-rc.3",
-    "vue-router": "^4.2.5",
+    "vue-router": "^4.3.0",
     "vue-scroll-reveal": "^2.1.0",
     "vue-social-sharing": "^4.0.0-alpha4",
     "vue-svgicon": "^4.0.0-alpha.3",
@@ -82,51 +89,44 @@
     "vuex-router-sync": "^6.0.0-rc.1"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/core": "^7.24.3",
-    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-    "@babel/plugin-proposal-json-strings": "^7.18.6",
-    "@babel/plugin-proposal-numeric-separator": "^7.18.6",
     "@quasar/app-webpack": "^3.12.4",
     "@types/bcryptjs": "^2.4.6",
     "@types/dotenv": "^8.2.0",
     "@types/googlemaps": "^3.43.3",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^29.5.12",
-    "@types/js-cookie": "^3.0.3",
+    "@types/js-cookie": "^3.0.6",
-    "@types/leaflet": "^1.9.8",
+    "@types/node": "20.11.30",
-    "@types/node": "18.15.11",
+    "@types/nprogress": "^0.2.3",
-    "@types/nprogress": "^0.2.0",
+    "@types/vue-tel-input": "^2.1.6",
-    "@types/vue-tel-input": "^2.1.2",
+    "@types/vuelidate": "^0.7.21",
-    "@types/vuelidate": "^0.7.16",
+    "@typescript-eslint/eslint-plugin": "^7.3.1",
-    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^7.3.1",
-    "@typescript-eslint/parser": "^6.7.2",
     "eslint": "^8.37.0",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-vue": "^9.19.2",
+    "eslint-plugin-vue": "^8.7.1",
     "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.5.3",
+    "html-webpack-plugin": "^5.6.0",
     "http-proxy-middleware": "^2.0.6",
     "jest": "^29.7.0",
     "json-loader": "^0.5.7",
     "node-sass": "^9.0.0",
-    "npm-check-updates": "^16.14.11",
+    "npm-check-updates": "^16.14.17",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "parcel": "^2.6.2",
+    "parcel": "^2.12.0",
-    "postcss": "^8.4.31",
+    "postcss": "^8.4.38",
-    "postcss-loader": "^7.3.3",
+    "postcss-loader": "^8.1.1",
-    "sass-loader": "^13.3.2",
+    "sass-loader": "^14.1.1",
     "strip-ansi": "=7.1.0",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
     "ts-loader": "^9.5.1",
-    "tslint": "^6.1.3",
+    "typescript": "5.3.2",
-    "tslint-config-standard": "^9.0.0",
-    "tslint-loader": "^3.5.4",
-    "typescript": "^5.3.2",
     "vue-cli-plugin-element-ui": "^1.1.4",
     "vueify": "^9.4.1",
-    "webpack": "^5.89.0",
+    "webpack": "^5.91.0",
     "workbox-webpack-plugin": "^6.5.4"
   },
   "browser": {

src/common/shared_vuejs.ts

@@ -162,6 +162,7 @@ export const shared_consts = {
     TOOLSAI: 320,
     MAPPA: 350,
     MAPPAUTENTI: 360,
+    MAPPACOMUNI: 370,
   },
 
   QUERYTYPE_MYGROUP: 1,
@@ -1714,6 +1715,10 @@ export const shared_consts = {
       value: 360,
       label: 'MAPPAUTENTI',
     },
+    {
+      value: 370,
+      label: 'MAPPACOMUNI',
+    },
 
   ],
 

src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue

@@ -2,44 +2,8 @@
   <div v-if="showalways || (!showalways && !tools.isLogged())">
     <div class="q-pa-md q-gutter-sm">
       <div class=" text-center">
-        <transition-group
-          name="fade"
-          mode="out-in"
-          appear
-          enter-active-class="animazione fadeIn"
-          leave-active-class="animazione fadeOut"
-        >
-          <q-banner
-            :key="1"
-            rounded
-            class="text-white bg-red"
-            color="primary q-title"
-            style="text-align: center"
-          >
-            <template v-slot:avatar>
-              <q-icon :key="2" name="fas fa-sign-in-alt" color="white" />
-            </template>
-            <div :key="3">
-              Accedi con le tue credenziali per utilizzare la APP e per unirti
-              al Circuito di scambio RIS del tuo territorio
-            </div>
-            <template v-slot:action>
-              <div>
-                <q-btn
-                  flat
-                  color="white"
-                  @click="tools.openrighttoolbar()"
-                  >{{ $t('login.enter') }}
-                </q-btn>
-              </div>
-
-              <!--<CRegistration />-->
-            </template>
-          </q-banner>
-        </transition-group>
-        <q-separator inset />
-        <br>
         <q-banner
+          v-if="false"
           rounded
           dense
           size="lg"
@@ -56,7 +20,7 @@
               rounded
               icon="fab fa-telegram"
               color="primary"
-              href="https://t.me/+pZ40VpmL1NhkZjE0"
+              href="https://t.me/riso_canale/3"
               target="_blank"
               label="Progetto RISO"
             >

src/components/CMapUsers/CMapUsers.scss

@@ -1,3 +0,0 @@
-.map-container {
-  height: 400px;
-}

src/components/CMapUsers/CMapUsers.ts

@@ -1,146 +0,0 @@
-import { tools } from '@store/Modules/tools'
-import { useQuasar } from 'quasar'
-import { PropType, defineComponent, onMounted, ref, computed } from 'vue'
-
-import 'leaflet/dist/leaflet.css'
-// @ts-ignore
-import * as L from 'leaflet'
-import 'leaflet.markercluster/dist/MarkerCluster.css'
-import 'leaflet.markercluster/dist/MarkerCluster.Default.css'
-import 'leaflet.markercluster'
-
-import { useUserStore } from '@src/store/UserStore'
-
-export default defineComponent({
-  name: 'CMapUsers',
-  setup(props, { emit }) {
-    const $q = useQuasar()
-    const userStore = useUserStore()
-
-    const iconWidth = ref(25)
-    const iconHeight = ref(40)
-    const map = ref(<any>null)
-    const zoom = ref(6)
-    const arrprovince = ref(<any>[])
-
-    const initialMap = ref(<any>null);
-
-    const myIcon = L.icon({
-      iconUrl: 'images/icon.png',
-      iconSize: [30, 30],
-      iconAnchor: [22, 35],
-      popupAnchor: [-6, -36],
-      shadowUrl: 'images/marker-shadow.png',
-      shadowSize: [60, 30],
-      shadowAnchor: [22, 35]
-    });
-
-
-    function mywidth() {
-      return tools.getwidth($q) - 20
-    }
-
-    function myheight() {
-      return $q.screen.height - 50
-    }
-
-    const iconUrl = computed(() => {
-      return `https://placekitten.com/${iconWidth.value}/${iconHeight.value}`;
-    })
-
-    const iconSize = computed(() => {
-      return [iconWidth.value, iconHeight.value];
-    })
-
-    function changeIcon() {
-      iconWidth.value += 2;
-      if (iconWidth.value > iconHeight.value) {
-        iconWidth.value = Math.floor(iconHeight.value / 2);
-      }
-    }
-
-    function getColor(d: any) {
-      return d > 1000 ? '#800026' :
-        d > 500 ? '#BD0026' :
-          d > 200 ? '#E31A1C' :
-            d > 100 ? '#FC4E2A' :
-              d > 50 ? '#FD8D3C' :
-                d > 20 ? '#FEB24C' :
-                  d > 10 ? '#FED976' :
-                    '#FFEDA0';
-    }
-    
-    function style(feature: any) {
-      return {
-        fillColor: getColor(feature.properties.density),
-        weight: 2,
-        opacity: 1,
-        color: 'white',
-        dashArray: '3',
-        fillOpacity: 0.7
-      };
-    }
-
-    onMounted(async () => {
-      // Ottengo la lista degli utenti con i lat e long
-      arrprovince.value = await userStore.getProvincesForMap()
-
-      initialMap.value = L.map('map',
-        {
-          zoomControl: true, zoom: zoom.value, zoomAnimation: false,
-          fadeAnimation: true, markerZoomAnimation: true,
-          center: [42.71, 12.934],
-        }
-      );
-      L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
-        maxZoom: 13,
-        attribution: ''
-      }).addTo(initialMap.value);
-
-      // @ts-ignore
-      const markers = L.markerClusterGroup();
-
-      for (const provincia of arrprovince.value) {
-        if (provincia.lat && provincia.long && provincia.userCount > 1) {
-          // @ts-ignore
-          let each_marker = new L.marker(
-            [provincia.lat, provincia.long], { icon: myIcon })
-            .bindPopup(`<strong> ${provincia.descr}:
-          ${provincia.userCount} utenti </strong>`);
-          markers.addLayer(each_marker);
-        }
-      }
-
-      initialMap.value.addLayer(markers);
-
-    });
-
-    function log(str: string) {
-      console.log(str)
-    }
-
-    function getCoordinates(e: any) {
-      // Ottieni la latitudine e la longitudine dal click
-      const lat = e.latlng.lat
-      const lng = e.latlng.lng
-
-      // Fai qualcosa con le coordinate, ad esempio stamparle in console
-      console.log(`Latitudine: ${lat}, Longitudine: ${lng}`)
-    }
-
-    return {
-      mywidth,
-      myheight,
-      map,
-      iconWidth,
-      iconHeight,
-      iconUrl,
-      iconSize,
-      changeIcon,
-      zoom,
-      log,
-      getCoordinates,
-      arrprovince,
-    }
-  }
-})

src/components/CMapUsers/CMapUsers.vue

@@ -1,44 +0,0 @@
-<template>
-  <div>
-    <div v-if="arrprovince" id="map" :style="`height:${myheight()}px; width:99%`">
-    </div>
-
-    <!--
-    <div :style="`height:${myheight()}px; width:99%`">
-      <l-map
-        v-model="zoom"
-        v-model:zoom="zoom"
-        :center="[42.71, 12.934]"
-        @move="log('move')"
-        @click="getCoordinates"
-      >
-        <l-tile-layer
-          url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-        ></l-tile-layer>
-        <l-control-layers />
-        <span v-for="provincia in arrprovince" :key="provincia.nome">
-          <l-marker-cluster :options="clusterOptions">
-            <l-marker
-              v-if="provincia.userCount > 0"
-              :lat-lng="[provincia.lat, provincia.long]"
-            >
-              <l-popup
-                >{{ provincia.descr }}:
-                {{ provincia.userCount }} utenti</l-popup
-              >
-            </l-marker>
-          </l-marker-cluster>
-        </span>
-
-      </l-map>
-      <button @click="changeIcon">New kitten icon</button>
-    </div>
-    -->
-  </div>
-</template>
-<script lang="ts" src="./CMapUsers.ts">
-</script>
-
-<style lang="scss" scoped>
-@import './CMapUsers.scss';
-</style>

src/components/CMapUsers/index.ts

@@ -1 +0,0 @@
-export {default as CMapUsers} from './CMapUsers.vue'

src/components/CMyElem/CMyElem.ts

@@ -17,7 +17,8 @@ import { CECommerce } from '@/components/CECommerce'
 import { CAITools } from '@/components/CAITools'
 import { CCatalogo } from '@/components/CCatalogo'
 // import { CMapMarker } from '@src/components/CMapMarker.off'
-import { CMapUsers } from '@/components/CMapUsers'
+// import { CMapUsers } from '@/components/CMapUsers'
+// import { CMapComuni } from '@/components/CMapComuni'
 import { COpenStreetMap } from '@src/components/COpenStreetMap'
 import { CCardCarousel } from '@src/components/CCardCarousel'
 import { CMyPage } from '@src/components/CMyPage'
@@ -59,7 +60,7 @@ export default defineComponent({
     CMyProfileTutorial, CSendRISTo,
     CTitleBanner, CShareSocial, CCheckAppRunning, CRegistration,
     CVisuVideoPromoAndPDF, CECommerce, CCatalogo, CAITools,
-    CMapUsers, //CMapMarker, 
+    // CMapUsers, CMapComuni, //CMapMarker, 
   },
   emits: ['selElemClick'],
   props: {

src/components/CMyElem/CMyElem.vue

@@ -559,14 +559,19 @@
       </div>
       <div v-else-if="myel.type === shared_consts.ELEMTYPE.MAPPA">
         <div v-if="editOn" class="elemEdit">MAPPA:</div>
-        <CMapMarker :coord_center="{lat: 47.41322, long: -1.219482}"
+        <!--<CMapMarker :coord_center="{lat: 47.41322, long: -1.219482}"
         
-        ></CMapMarker>
+        ></CMapMarker>-->
       </div>
       <div v-else-if="myel.type === shared_consts.ELEMTYPE.MAPPAUTENTI">
         <div v-if="editOn" class="elemEdit">MAPPA UTENTI:</div>
-        <CMapUsers    
+        <!--<CMapUsers    
-        ></CMapUsers>
+        ></CMapUsers>-->
+      </div>
+      <div v-else-if="myel.type === shared_consts.ELEMTYPE.MAPPACOMUNI">
+        <div v-if="editOn" class="elemEdit">MAPPA COMUNI:</div>
+        <!--<CMapComuni    
+        ></CMapComuni>-->
       </div>
       <div v-else-if="myel.type === shared_consts.ELEMTYPE.TOOLSAI">
         <div v-if="editOn" class="elemEdit">STRUMENTI AI:</div>
@@ -631,7 +636,7 @@
           rounded
           size="md"
           color="primary"
-          to="/registrati"
+          to="/registrati/" + tools.getInvitante()
           :label="$t('reg.submit')"
         >
         </q-btn>

src/components/CPresentazione/CPresentazione.vue

@@ -187,14 +187,6 @@
 
       <section :class="`padding `+ ($q.dark.isActive ? `text-white bg-black ` : `text-grey-10 bg-white`) + ` text-center`">
         <div class="landing__features row items-start q-col-gutter-sm">
-          <div class="col-12 text-center">
-            <div class="feature-item q-mx-md">
-              <img
-                src="images/group-together.jpg"
-                alt="together"
-                class="doc-img">
-            </div>
-          </div>
           <div class="col-12 text-center"><h4>{{ t('homepage.descrapp_title1') }}</h4>
             <p v-html="t('homepage.descrapp_pag1')"></p>
             <p v-html="t('homepage.descrapp_pag2')"></p>

src/components/CRegistration/CRegistration.ts

@@ -47,15 +47,18 @@ export default defineComponent({
 
     function clickToRegister() {
 
-      if (site.value.confpages.enableRegByBot) {
+      //if (site.value.confpages.enableRegByBot) {
-        $router.push('/bot')
+        //$router.push('/bot')
-      } else {
+      //} else {
-        $router.push('/registrati')
+        $router.push('/registrati/'+ tools.getInvitante())
-      }
+      //}
 
     }
 
     function mounted() {
+      const invitante = tools.getInvitante()
+      console.log('invitante', invitante)
+
       if (props.invited) {
         start.value = true
         chooseReg.value = true
@@ -71,6 +74,19 @@ export default defineComponent({
       }
     }
 
+    function buttRegistrati() {
+      const invitante = tools.getCookie(tools.APORTADOR_SOLIDARIO)
+
+      if (invitante) {
+        start.value = true
+        slide.value = 'second';
+        noInvited.value = false;
+        chooseReg.value = true;
+      } else {
+        start.value = true
+      }
+    }
+
     onMounted(mounted)
 
     return {
@@ -82,6 +98,7 @@ export default defineComponent({
       noInvited,
       slide,
       regEventEmail,
+      buttRegistrati,
     }
   },
 })

src/components/CRegistration/CRegistration.vue

@@ -4,13 +4,14 @@
     class="row q-ma-sm centermydiv2 q-pa-sm justify-center align-center"
   >
     <div v-if="!start">
+      
       <q-btn
         rounded
         glossy
         icon="fas fa-user-plus"
-        size="lg"
+        size="md"
         color="primary"
-        @click="start = true"
+        @click="buttRegistrati()"
         :label="$t('reg.submit')"
       >
       </q-btn>
@@ -70,14 +71,14 @@
             Se ancora non sei stato invitato:
           </div>
           <br />
-          1️⃣ 👉🏻 Entra nel canale Telegram "Progetto RISO" cliccando qui:<br />
+          1️⃣ 👉🏻 Entra nei gruppi Territoriali su Telegram:<br />
           <div class="text-center">
             <q-btn
               type="a"
               rounded
               icon="fab fa-telegram"
               color="positive"
-              href="https://t.me/+pZ40VpmL1NhkZjE0"
+              href="https://t.me/riso_canale/3"
               target="_blank"
               label="Progetto RISO"
             >
@@ -104,7 +105,7 @@
                   <q-btn
                     rounded
                     type="a"
-                    class="col-xs-12 col-sm-6 flex-item-btn items-center"
+                    class="col-xs-12 col-sm-6 flex-item-btn items-center q-my-md"
                     icon="fab fa-telegram"
                     size="md"
                     color="primary"
@@ -119,6 +120,7 @@
                       >Consigliato</q-badge
                     >
                   </q-btn>
+                  <br>
                   <div
                     :class="
                       $q.dark.isActive
@@ -126,20 +128,26 @@
                         : `text-black` + ` col-12 text-center`
                     "
                   >
-                    se non riesci ad installare Telegram:
+                    <div class="bg-grey-4">
+                      <br />
+                      se non hai Telegram puoi registrarti con solo l'email ma
+                      <span style="text-decoration: underline"
+                        >non potrai contattare gli iscritti</span
+                      >.
+                      <q-btn
+                        rounded
+                        class="flex-item-btn col-xs-12 col-sm-6"
+                        outline
+                        icon="fas fa-envelope"
+                        size="0.75rem"
+                        :color="$q.dark.isActive ? `black` : `white`"
+                        :text-color="$q.dark.isActive ? `white` : `black`"
+                        @click="regEventEmail"
+                        :label="$t('reg.byemail')"
+                      >
+                      </q-btn>
+                    </div>
                   </div>
-                  <q-btn
-                    rounded
-                    class="flex-item-btn col-xs-12 col-sm-6"
-                    outline
-                    icon="fas fa-envelope"
-                    size="md"
-                    :color="$q.dark.isActive ? `black` : `white`"
-                    :text-color="$q.dark.isActive ? `white` : `black`"
-                    @click="regEventEmail"
-                    :label="$t('reg.byemail')"
-                  >
-                  </q-btn>
                 </div>
                 <div v-else style="margin-top: 10px; text-align: center">
                   Registrati<br />

src/components/CSignUp/CSignUp.vue

@@ -292,6 +292,7 @@
               </template>
             </q-input>
 
+
             <div class="column">
               <q-btn
                 rounded

src/css/app.scss

@@ -1929,3 +1929,17 @@ h3 {
   font-size: 1rem;
   line-height: normal !important;
 }
+
+.aspect-ratio-box {
+  position: relative;
+  width: 100%;
+  padding-top: 56.25%; /* 16:9 Aspect Ratio */
+}
+
+.aspect-ratio-box iframe {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}

src/root/eventi/eventi.ts

@@ -11,7 +11,6 @@ import { CDashboard } from '@/components/CDashboard'
 import { CChartMap } from '@src/components/CChartMap'
 import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { CTitlePage } from '@/components/CTitlePage'
-import { CMapsEsempio } from '@src/components/CMapsEsempio'
 import { CVerifyEmail } from '@src/components/CVerifyEmail'
 import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
 import { useGlobalStore } from '@store/globalStore'
@@ -24,7 +23,7 @@ import { colmyBachecas } from '@store/Modules/fieldsTable'
 
 export default defineComponent({
   name: 'eventi',
-  components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif, CTitlePage, LandingFooter },
+  components: { CSkill, CChartMap, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif, CTitlePage, LandingFooter },
   setup() {
     return {
       colmyBachecas,

src/root/goods/goods.ts

@@ -10,7 +10,7 @@ import { CDashboard } from '@/components/CDashboard'
 import { CChartMap } from '@src/components/CChartMap'
 import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { CTitlePage } from '@/components/CTitlePage'
-import { CMapsEsempio } from '@src/components/CMapsEsempio'
+// import { CMapsEsempio } from '@src/components/CMapsEsempio'
 import { CVerifyEmail } from '@src/components/CVerifyEmail'
 import { CNotifAtTop } from '@src/components/CNotifAtTop'
 import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
@@ -23,7 +23,7 @@ import MixinUsers from '@/mixins/mixin-users'
 
 export default defineComponent({
   name: 'Goods',
-  components: { CSkill, CChartMap, CMapsEsempio, CFinder,
+  components: { CSkill, CChartMap, CFinder,
     CNotifAtTop, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif, CTitlePage, LandingFooter },
   setup() {
 

src/root/services/services.ts

@@ -11,7 +11,7 @@ import { CTitlePage } from '@/components/CTitlePage'
 import { CChartMap } from '@src/components/CChartMap'
 import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { CNotifAtTop } from '@src/components/CNotifAtTop'
-import { CMapsEsempio } from '@src/components/CMapsEsempio'
+// import { CMapsEsempio } from '@src/components/CMapsEsempio'
 import { CVerifyEmail } from '@src/components/CVerifyEmail'
 import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
 import { LandingFooter } from '@/components/LandingFooter'
@@ -24,7 +24,7 @@ import { costanti } from '@costanti'
 
 export default defineComponent({
   name: 'Services',
-  components: { CSkill, CChartMap, CNotifAtTop, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif, CTitlePage, LandingFooter },
+  components: { CSkill, CChartMap, CNotifAtTop, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif, CTitlePage, LandingFooter },
   setup() {
     return {
       tools,

src/store/Modules/tools.ts

@@ -4270,7 +4270,7 @@ export const tools = {
 
   getCookie(mytok: any, def?: any, convertint: any = false, convertbool: any = false) {
     const ris = Cookies.get(mytok)
-    // console.log('getCookie', mytok, ris)
+    console.log('getCookie', mytok, ris)
     if (ris === 'null')
       return def
 
@@ -8502,6 +8502,11 @@ export const tools = {
     }
   },
 
+  getInvitante() {
+    const invitante = tools.getCookie(tools.APORTADOR_SOLIDARIO)
+    return invitante ? invitante : ''
+  }
+
 
   // FINE !