fix: non riuscivi ad acquistare i RIS al gruppo

- lista linkREG

src/components/CFindUsers/CFindUsers.ts

@@ -53,6 +53,7 @@ export default defineComponent({
 
     const receiveRislist = computed(() => globalStore.datastat ? globalStore.datastat.receiveRislist : [])
     const receiveRislistgroup = computed(() => globalStore.datastat ? globalStore.datastat.receiveRislistgroup : [])
+    const listlinksreg = computed(() => globalStore.datastat ? globalStore.datastat.listlinksreg : [])
 
     const arrfilterand: any = ref([])
     const filtercustom: any = ref([])
@@ -107,6 +108,8 @@ export default defineComponent({
 
     function mounted() {
 
+      usersList.value.listlinkreg = listlinksreg
+
       searchList.value = [
         {
           visible: true,
@@ -190,6 +193,7 @@ export default defineComponent({
 
       usersList.value.list = receiveRislist
       usersList.value.listgroup = receiveRislistgroup
+      // usersList.value.listlinkreg = listlinksreg
 
       loading.value = false
     }

src/components/CFindUsers/CFindUsers.vue

@@ -41,7 +41,7 @@
       </CGridTableRec>
     </q-tab-panel>
     <q-tab-panel name="receivers">
-      <div class="row centeritems">
+      <div class="column centeritems">
         <q-btn-toggle
           v-if="arrTypesAccounts.length > 0"
           v-model="tipoConto"
@@ -69,7 +69,7 @@
                 :myuser="rec"
                 :showBtnActivities="false"
                 :sendRIS="tools.isUserOk() ? sendRIS : false"
-                :actionType="actionType"                
+                :actionType="actionType"
               />
             </div>
           </div>
@@ -83,6 +83,7 @@
           </div>
         </div>
       </div>
+      <div class="column">&nbsp;</div>
       <br />
       <div class="row centeritems justify-evenly items-center">
         <q-btn

src/components/CMyElem/CMyElem.ts

@@ -277,6 +277,8 @@ export default defineComponent({
     }
 
     async function clickshare() {
+      tools.addToTemporaryLinkReg()
+
       const mytext = await tools.sendMsgTelegramCmd(
         $q,
         t,

src/components/CMyUser/CMyUser.ts

@@ -1,7 +1,7 @@
-import type { PropType} from 'vue';
+import type { PropType } from 'vue';
 import { defineComponent, onMounted, ref, watch } from 'vue'
 import { useUserStore } from '@store/UserStore'
-import type { ICircuit, IUserFields} from 'model';
+import type { ICircuit, IUserFields } from 'model';
 import { IImgGallery, IUserProfile } from 'model'
 import { costanti } from '@costanti'
 import { shared_consts } from '@src/common/shared_vuejs'
@@ -123,6 +123,15 @@ export default defineComponent({
       emit('showInnerDialog', showsendCoinTo.value)
     }
 
+    function clickToUser(username: string) {
+      if (props.actionType === costanti.ACTIONTYPE.SEND_RIS)
+        naviga(`/my/` + username + '?sr=0')
+      else if (props.actionType === costanti.ACTIONTYPE.LINK_REG)
+        naviga(`/registrati/` + username)
+      else
+        naviga(`/my/` + username)
+    }
+
     onMounted(mounted)
 
     return {
@@ -138,6 +147,7 @@ export default defineComponent({
       showAccountInfo,
       showsendCoinTo,
       showsendCoin,
+      clickToUser,
     }
   },
 })

src/components/CMyUser/CMyUser.vue

@@ -3,11 +3,7 @@
     <q-item class="q-my-sm" clickable>
       <q-item-section
         avatar
-        @click="
-          actionType === costanti.ACTIONTYPE.SEND_RIS
-            ? naviga(`/my/` + contact.username + '?sr=0')
-            : naviga(`/my/` + contact.username)
-        "
+        @click="clickToUser(contact.username)"
       >
         <q-avatar size="60px">
           <q-img
@@ -20,11 +16,7 @@
       </q-item-section>
 
       <q-item-section
-        @click="
-          actionType === costanti.ACTIONTYPE.SEND_RIS
-            ? naviga(`/my/` + contact.username + '?sr=0')
-            : naviga(`/my/` + contact.username)
-        "
+      @click="clickToUser(contact.username)"
       >
         <q-item-label v-if="labelextra && labelextra !== contact.username"
           ><strong>{{ labelextra }}</strong></q-item-label

src/components/CRegistration/CRegistration.ts

@@ -1,7 +1,10 @@
 import { tools } from '@tools'
+import { costanti } from '@costanti'
 import { computed, defineComponent, onMounted, reactive, ref, watch } from 'vue'
 import { useQuasar } from 'quasar'
 import { useI18n } from 'vue-i18n'
+import { CContactUser } from '@src/components/CContactUser'
+import { CMyUser } from '@src/components/CMyUser'
 import { DefaultProfile, useUserStore } from '@store/UserStore'
 
 import { useRoute, useRouter } from 'vue-router'
@@ -11,7 +14,7 @@ import { useGlobalStore } from '@store/globalStore'
 export default defineComponent({
   name: 'CRegistration',
   emits: ['regEventEmail'],
-  components: {},
+  components: { CMyUser, CContactUser },
   props: {
     invited: {
       type: String,
@@ -43,8 +46,12 @@ export default defineComponent({
     const noInvited = ref(false)
     const start = ref(false)
 
+    const listlinksreg = computed(() => globalStore.datastat ? globalStore.datastat.listlinksreg : [])
+
     const slide = ref('start')
 
+    const actionType = ref(costanti.ACTIONTYPE.LINK_REG)
+
     function clickToRegister() {
 
       //if (site.value.confpages.enableRegByBot) {
@@ -59,6 +66,8 @@ export default defineComponent({
       const invitante = tools.getInvitante()
       console.log('invitante', invitante)
 
+
+
       if (props.invited) {
         start.value = true
         chooseReg.value = true
@@ -99,6 +108,9 @@ export default defineComponent({
       slide,
       regEventEmail,
       buttRegistrati,
+      costanti,
+      listlinksreg,
+      actionType,
     }
   },
 })

src/components/CRegistration/CRegistration.vue

@@ -4,7 +4,6 @@
     class="row q-ma-sm centermydiv2 q-pa-sm justify-center align-center"
   >
     <div v-if="!start">
-      
       <q-btn
         rounded
         glossy
@@ -28,8 +27,14 @@
       height="500px"
       :class="`text-white bg-primary shadow-1 rounded-borders`"
     >
-      <q-carousel-slide name="start" class="column no-wrap flex-center">
-        <q-icon name="fas fa-user-plus" size="56px" />
+      <q-carousel-slide
+        name="start"
+        class="column no-wrap flex-center"
+      >
+        <q-icon
+          name="fas fa-user-plus"
+          size="56px"
+        />
         <div class="q-mt-md text-center">
           <span class="text-h6 text-white"> {{ $t('reg.invitante') }}</span>
           <q-card class="dialog_card q-mb-lg">
@@ -40,7 +45,7 @@
                 size="lg"
                 color="positive"
                 @click="
-                  slide = 'second';
+                  listlinksreg.length > 0 ? slide = 'sceglilink' : slide = 'second';
                   noInvited = false;
                   chooseReg = true;
                 "
@@ -65,11 +70,49 @@
           </q-card>
         </div>
       </q-carousel-slide>
+      <q-carousel-slide name="sceglilink">
+        <q-card class="dialog_card q-mb-lg">
+          <q-card-section class="column q-ma-sm q-pa-sm q-col-gutter-sm">
+            <div
+              v-for="(rec, i) in listlinksreg"
+              :key="i"
+            >
+              <div class="q-pa-xs q-ma-xs q-border q-rounded my-custom-border">
+                <CMyUser
+                  :mycontact="rec"
+                  :visu="costanti.FIND_PEOPLE"
+                  @setCmd="tools.setCmd"
+                  :actionType="actionType"
+                >
+                </CMyUser>
+                <!--<CContactUser
+                  :myuser="rec"
+                  :showBtnActivities="false"
+                  :sendRIS="false"
+                  :actionType="actionType"
+                />
+              </div>-->
+              </div>
+
+              <q-btn
+                rounded
+                glossy
+                size="md"
+                color="primary"
+                @click="slide = 'start'"
+                :label="$t('dialog.indietro')"
+              >
+              </q-btn>
+            </div>
+          </q-card-section>
+        </q-card>
+      </q-carousel-slide>
       <q-carousel-slide name="second">
-        <div v-if="noInvited" class="text-h7">
-          <div class="text-center text-bold text-h6">
-            Se ancora non sei stato invitato:
-          </div>
+        <div
+          v-if="noInvited"
+          class="text-h7"
+        >
+          <div class="text-center text-bold text-h6">Se ancora non sei stato invitato:</div>
           <br />
           1️⃣ 👉🏻 Entra nei gruppi Territoriali su Telegram:<br />
           <div class="text-center">
@@ -86,14 +129,17 @@
           </div>
           <br />
 
-          2️⃣ 👉🏻 sul post del canale fissato in alto, troverai tutte le info sul
-          progetto e su come entrare nel gruppo della tua provincia.<br />
-          Potrai cosi richiedere il link una volta entrato nella chat di
-          gruppo.<br />
+          2️⃣ 👉🏻 sul post del canale fissato in alto, troverai tutte le info sul progetto e su come entrare nel gruppo
+          della tua provincia.<br />
+          Potrai cosi richiedere il link una volta entrato nella chat di gruppo.<br />
         </div>
         <div v-else-if="chooseReg">
           <div class="row justify-center items-center">
-            <q-icon name="fas fa-user-plus" size="27px" class="q-mx-md" />
+            <q-icon
+              name="fas fa-user-plus"
+              size="27px"
+              class="q-mx-md"
+            />
             <span class="text-h6 text-white"> {{ $t('reg.page_title') }}</span>
             <q-card class="q-mt-sm dialog_card q-mb-sm">
               <q-card-section>
@@ -109,31 +155,22 @@
                     icon="fab fa-telegram"
                     size="md"
                     color="primary"
-                    :href="
-                      invited
-                        ? tools.getLinkBotTelegram(invited, regexpire)
-                        : `/bot`
-                    "
+                    :href="invited ? tools.getLinkBotTelegram(invited, regexpire) : `/bot`"
                     :label="$t('reg.bytelegram')"
                   >
-                    <q-badge color="red" align="bottom" floating
+                    <q-badge
+                      color="red"
+                      align="bottom"
+                      floating
                       >Consigliato</q-badge
                     >
                   </q-btn>
-                  <br>
-                  <div
-                    :class="
-                      $q.dark.isActive
-                        ? `text-white`
-                        : `text-black` + ` col-12 text-center`
-                    "
-                  >
+                  <br />
+                  <div :class="$q.dark.isActive ? `text-white` : `text-black` + ` col-12 text-center`">
                     <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
-                      >.
+                      <span style="text-decoration: underline">non potrai contattare gli iscritti</span>.
                       <q-btn
                         rounded
                         class="flex-item-btn col-xs-12 col-sm-6"
@@ -149,7 +186,10 @@
                     </div>
                   </div>
                 </div>
-                <div v-else style="margin-top: 10px; text-align: center">
+                <div
+                  v-else
+                  style="margin-top: 10px; text-align: center"
+                >
                   Registrati<br />
                   <q-btn
                     rounded
@@ -169,8 +209,7 @@
   </div>
 </template>
 
-<script lang="ts" src="./CRegistration.ts">
-</script>
+<script lang="ts" src="./CRegistration.ts"></script>
 <style lang="scss" scoped>
 @import './CRegistration.scss';
 </style>

src/components/CSendCoins/CSendCoins.ts

@@ -297,7 +297,6 @@ export default defineComponent({
         await aggiorna()
 
         showpage.value = true
-        loading.value = false
 
       }
 
@@ -305,6 +304,8 @@ export default defineComponent({
         console.log('group', props.to_group)
         bothcircuits.value = userStore.getMyCircuitsInCommonByGroup(props.to_group)
 
+        console.log('bothcircuits', bothcircuits.value)
+
         if (props.circuitname) {
           circuitsel.value = props.circuitname
         } else {
@@ -318,6 +319,7 @@ export default defineComponent({
 
         showpage.value = true
       }
+
       if (props.to_contocom) {
         bothcircuits.value = userStore.getMyCircuits()
 

src/components/MyHeader/MyHeader.vue

@@ -125,7 +125,7 @@
           <q-img ratio="1" fit="cover" :src="getMyImg()" :alt="Username()" img-class="imgprofile_small"
             stretch="false" />
         </q-avatar>
-        <q-btn v-else-if="$q.screen.gt.sm" class="q-mx-xs iconprofile_small" round dense flat
+        <q-btn v-else-if="$q.screen.gt.xs" class="q-mx-xs iconprofile_small" round dense flat
           @click="rightDrawerOpen = !rightDrawerOpen" :icon="getMyImgforIcon()" :color="getcolormenu()">
         </q-btn>
       </q-toolbar>

src/components/logo/logo.ts

@@ -16,12 +16,14 @@ export default defineComponent({
   },
 
   setup() {
+    const { t } = useI18n()
+    
     function logoimg() {
       return `${tools.getimglogo()}`
     }
 
     function logoalt() {
-      const { t } = useI18n();
+
       return t('ws.sitename')
     }