Aggiungere "San Marino" e suoi comuni

Corretto Filtro a mano della ricerca
Creare filtro ricerca per trovare la sottocategoria o categoria -> Skill e SubSkill

src/root/home_freeplanet/home_freeplanet.ts

@@ -7,6 +7,7 @@ import { CSkill } from '@/components/CSkill'
 import { CFinder } from '@/components/CFinder'
 import { CDashboard } from '@/components/CDashboard'
 import { CChartMap } from '@src/components/CChartMap'
+import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { CMapsEsempio } from '@src/components/CMapsEsempio'
 import { CVerifyEmail } from '@src/components/CVerifyEmail'
 import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
@@ -14,28 +15,22 @@ import { useGlobalStore } from '@store/globalStore'
 import { useUserStore } from '@store/UserStore'
 import { static_data } from '@/db/static_data'
 import MixinBase from '@/mixins/mixin-base'
+import MixinUsers from '@/mixins/mixin-users'
 
 
 export default defineComponent({
   name: 'Home',
-  components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard },
+  components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif },
   setup() {
     const globalStore = useGlobalStore()
     const userStore = useUserStore()
     const { getValDb } = MixinBase()
-
-    function isEmailVerified() {
-      return userStore.my.verified_email
-    }
+    const { isEmailVerified, TelegVerificato } = MixinUsers()
 
     function TelegCode() {
       return userStore.my.profile.teleg_checkcode
     }
 
-    function TelegVerificato(): boolean {
-      return userStore.my.profile ? userStore.my.profile.teleg_id! > 0 : false
-    }
-
     function openrighttoolbar() {
       globalStore.rightDrawerOpen = true
     }

src/root/home_freeplanet/home_freeplanet.vue

@@ -13,14 +13,14 @@
 
 
     <div v-if="isLogged()">
-      <CVerifyEmail v-if="!isEmailVerified()">
-
-      </CVerifyEmail>
-
       <CVerifyTelegram v-if="TelegCode() || !TelegVerificato()">
 
       </CVerifyTelegram>
 
+      <CVerifyEmail v-if="!isEmailVerified()">
+
+      </CVerifyEmail>
+
       <div v-if="isUserOk()">
 
         <CFinder>
@@ -30,6 +30,9 @@
         <CDashboard></CDashboard>
 
       </div>
+      <div v-else>
+        <CUserNonVerif></CUserNonVerif>
+      </div>
 
     </div>
     <div v-else>

src/root/home_insiemesipuo/home_insiemesipuo.ts

@@ -7,6 +7,7 @@ import { CSkill } from '@/components/CSkill'
 import { CFinder } from '@/components/CFinder'
 import { CChartMap } from '@src/components/CChartMap'
 import { CDashboard } from '@/components/CDashboard'
+import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { CMapsEsempio } from '@src/components/CMapsEsempio'
 import { CVerifyEmail } from '@src/components/CVerifyEmail'
 import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
@@ -14,19 +15,17 @@ import { useGlobalStore } from '@store/globalStore'
 import { useUserStore } from '@store/UserStore'
 import { static_data } from '@/db/static_data'
 import MixinBase from '@/mixins/mixin-base'
+import MixinUsers from '@/mixins/mixin-users'
 
 
 export default defineComponent({
   name: 'Home',
-  components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard },
+  components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif },
   setup() {
     const globalStore = useGlobalStore()
     const userStore = useUserStore()
     const { getValDb } = MixinBase()
-
-    function isEmailVerified() {
-      return userStore.my.verified_email
-    }
+    const { isEmailVerified } = MixinUsers()
 
     function TelegCode() {
       return userStore.my.profile.teleg_checkcode

src/root/home_insiemesipuo/home_insiemesipuo.vue

@@ -13,14 +13,14 @@
 
 
     <div v-if="isLogged()">
-      <CVerifyEmail v-if="!isEmailVerified()">
-
-      </CVerifyEmail>
-
       <CVerifyTelegram v-if="TelegCode() || !TelegVerificato()">
 
       </CVerifyTelegram>
 
+      <CVerifyEmail v-if="!isEmailVerified() && !TelegVerificato()">
+
+      </CVerifyEmail>
+
       <div v-if="isUserOk()">
         <div v-if="isUserOk()">
 
@@ -32,6 +32,9 @@
 
         </div>
       </div>
+      <div v-else>
+        <CUserNonVerif></CUserNonVerif>
+      </div>
 
     </div>
     <div v-else>

src/root/home_pdnm/home_pdnm.ts

@@ -7,6 +7,7 @@ import { CSkill } from '@/components/CSkill'
 import { CFinder } from '@/components/CFinder'
 import { CChartMap } from '@src/components/CChartMap'
 import { CDashboard } from '@/components/CDashboard'
+import { CUserNonVerif } from '@/components/CUserNonVerif'
 import { CMapsEsempio } from '@src/components/CMapsEsempio'
 import { CVerifyEmail } from '@src/components/CVerifyEmail'
 import { CVerifyTelegram } from '@src/components/CVerifyTelegram'
@@ -14,28 +15,23 @@ import { useGlobalStore } from '@store/globalStore'
 import { useUserStore } from '@store/UserStore'
 import { static_data } from '@/db/static_data'
 import MixinBase from '@/mixins/mixin-base'
+import MixinUsers from '@/mixins/mixin-users'
 
 
 export default defineComponent({
   name: 'Home',
-  components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard },
+  components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif },
   setup() {
     const globalStore = useGlobalStore()
     const userStore = useUserStore()
     const { getValDb } = MixinBase()
+    const { isEmailVerified, TelegVerificato } = MixinUsers()
 
-    function isEmailVerified() {
-      return userStore.my.verified_email
-    }
 
     function TelegCode() {
       return userStore.my.profile.teleg_checkcode
     }
 
-    function TelegVerificato(): boolean {
-      return userStore.my.profile ? userStore.my.profile.teleg_id! > 0 : false
-    }
-
     function openrighttoolbar() {
       globalStore.rightDrawerOpen = true
     }

src/root/home_pdnm/home_pdnm.vue

@@ -12,14 +12,12 @@
     <!--<CMapsEsempio></CMapsEsempio>-->
 
     <div v-if="isLogged()">
-      <CVerifyEmail v-if="!isEmailVerified()">
-
-      </CVerifyEmail>
-
       <CVerifyTelegram v-if="TelegCode() || !TelegVerificato()">
 
       </CVerifyTelegram>
+      <CVerifyEmail v-if="!isEmailVerified() && !TelegVerificato()">
 
+      </CVerifyEmail>
 
 
       <div v-if="isUserOk()">
@@ -39,6 +37,9 @@
           </template>
         </q-banner>
       </div>
+      <div v-else>
+        <CUserNonVerif></CUserNonVerif>
+      </div>
 
     </div>
     <div v-else>