Ver 0.5.55

Strette di Mano OK
2023-01-09 02:39:53 +01:00
parent 815ca0d565
commit d684d7a46f
18 changed files with 341 additions and 407 deletions
--- a/src/components/CMyFriends/CMyFriends.ts
+++ b/src/components/CMyFriends/CMyFriends.ts
@@ -75,12 +75,8 @@ export default defineComponent({
          arr = userStore.my.profile.req_friends
        } else if (props.modelValue === costanti.HANDSHAKE) {
          arr = userStore.my.profile.handshake
-        } else if (props.modelValue === costanti.REQ_HANDSHAKE) {
-          arr = userStore.my.profile.req_handshake
        } else if (props.modelValue === costanti.ASK_SENT_FRIENDS) {
          arr = userStore.my.profile.asked_friends
-        } else if (props.modelValue === costanti.ASK_SENT_HANDSHAKE) {
-          arr = userStore.my.profile.asked_handshake
        } else if (props.modelValue === costanti.ASK_TRUST) {
          arr = listTrusted.value.filter((user: IUserFields) => user.verified_by_aportador === undefined)
        } else if (props.modelValue === costanti.TRUSTED) {
@@ -110,12 +106,6 @@ export default defineComponent({
      if (numHandShake.value > 0 || props.modelValue === costanti.HANDSHAKE)
        mybutt.push({ label: t('mypages.handshake') + ' (' + numHandShake.value + ')', value: costanti.HANDSHAKE })

-      if (numReqHandShake.value > 0 || props.modelValue === costanti.REQ_HANDSHAKE)
-        mybutt.push({
-          label: t('mypages.requesthandshake') + ' (' + numReqHandShake.value + ')',
-          value: costanti.REQ_HANDSHAKE
-        })
-
      if (numAskSentFriends.value > 0 || props.modelValue === costanti.ASK_SENT_FRIENDS)
        mybutt.push({
          label: t('mypages.request_sent') + ' (' + numAskSentFriends.value + ')',
@@ -146,10 +136,6 @@ export default defineComponent({
      return (arr) ? arr.length : 0
    })

-    const numReqHandShake = computed(() => {
-      const arr = userStore.my.profile.req_handshake
-      return (arr) ? arr.length : 0
-    })

    const numAskSentFriends = computed(() => {
      const arr = userStore.my.profile.asked_friends
--- a/src/components/CMyUser/CMyUser.vue
+++ b/src/components/CMyUser/CMyUser.vue
@@ -83,7 +83,7 @@
          </q-btn>
        </q-item-label>
      </q-item-section>
-      <q-item-section side v-else-if="visu === costanti.REQ_HANDSHAKE">
+      <q-item-section side v-else-if="visu === costanti.SETHANDSHAKE">
        <q-item-label>
          <q-btn rounded icon="fas fa-ellipsis-h">
            <q-menu>
@@ -92,12 +92,6 @@
                  <q-item-section>{{ $t('friends.accept_handshake') }}</q-item-section>
                </q-item>
              </q-list>
-              <q-list style="min-width: 150px">
-                <q-item clickable icon="fas fa-user-minus" v-close-popup
-                        @click="setCmd($q, shared_consts.FRIENDSCMD.REQ_HANDSHAKE, userStore.my.username, false, contact.username, false)">
-                  <q-item-section>{{ $t('friends.reject_ask_handshake') }}</q-item-section>
-                </q-item>
-              </q-list>
            </q-menu>
          </q-btn>
        </q-item-label>
@@ -278,7 +272,7 @@
                  <q-item-section>{{ $t('friends.ask_friend') }}</q-item-section>
                </q-item>
                <q-item v-if="!userStore.IsHandShakeByUsername(contact.username)" clickable icon="far fa-handshake" v-close-popup
-                        @click="setCmd($q, shared_consts.FRIENDSCMD.REQ_HANDSHAKE, userStore.my.username, true, contact.username)">
+                        @click="setCmd($q, shared_consts.FRIENDSCMD.SETHANDSHAKE, userStore.my.username, true, contact.username)">
                  <q-item-section>{{ $t('handshake.ask_handshake') }}</q-item-section>
                </q-item>
              </q-list>
@@ -323,21 +317,14 @@
                  <q-item-section>{{ $t('friends.remove_from_myfriends') }}</q-item-section>
                </q-item>

-                <q-item v-if="(!userStore.IsHandShakeByUsername(contact.username) && !userStore.IsAskedHandShakeByUsername(contact.username))"
-                        clickable v-close-popup @click="setCmd($q, shared_consts.FRIENDSCMD.REQ_HANDSHAKE, userStore.my.username, true, contact.username)">
+                <q-item v-if="!userStore.IsHandShakeByUsername(contact.username)"
+                        clickable v-close-popup @click="setCmd($q, shared_consts.FRIENDSCMD.SETHANDSHAKE, userStore.my.username, true, contact.username)">
                  <q-item-section avatar>
                    <q-icon color="positive" name="far fa-handshake"/>
                  </q-item-section>
                  <q-item-section>{{ $t('handshake.ask_handshake') }}</q-item-section>
                </q-item>
-                <q-item v-else-if="(!userStore.IsHandShakeByUsername(contact.username) && userStore.IsAskedHandShakeByUsername(contact.username))"
-                        clickable v-close-popup @click="setCmd($q, shared_consts.FRIENDSCMD.REQ_HANDSHAKE, userStore.my.username, false, contact.username)">
-                  <q-item-section avatar>
-                    <q-icon color="negative" name="far fa-handshake-alt-slash"/>
-                  </q-item-section>
-                  <q-item-section>{{ $t('handshake.cancel_ask_handshake') }}</q-item-section>
-                </q-item>
-                <q-item v-else-if="userStore.IsHandShakeByUsername(contact.username)" style="min-width: 200px"
+                <q-item v-else style="min-width: 200px"
                        clickable v-close-popup
                        @click="setCmd($q, shared_consts.FRIENDSCMD.REMOVE_FROM_MYHANDSHAKE, userStore.my.username, '', contact.username)">
                  <q-item-section avatar>
--- a/src/components/CStatusReg/CStatusReg.vue
+++ b/src/components/CStatusReg/CStatusReg.vue
@@ -78,44 +78,46 @@

            <q-tab-panels v-model="mytab" animated>
              <q-tab-panel name="reg">
-                <transition-group
-                  name="fade"
-                  mode="out-in"
-                  appear
-                  enter-active-class="animazione fadeIn"
-                  leave-active-class="animazione fadeOut"
-                >
-                  <q-item
-                    v-for="(user, index) in lastsreg"
-                    :key="index"
-                    class="animated"
-                    v-ripple
+                <div class="q-pa-md" style="max-width: 350px; margin: auto;">
+                  <transition-group
+                    name="fade"
+                    mode="out-in"
+                    appear
+                    enter-active-class="animazione fadeIn"
+                    leave-active-class="animazione fadeOut"
                  >
-                    <q-item-section>
-                      <q-item-label lines="1">
-                        <CMyFieldRec
-                          table="users"
-                          :id="user._id"
-                          :rec="user"
-                          field="username"
-                          :canEdit="false"
-                          :canModify="false"
-                          :fieldtype="costanti.FieldType.username_chip"
-                        >
-                        </CMyFieldRec>
-                      </q-item-label>
-                    </q-item-section>
+                    <q-item
+                      v-for="(user, index) in lastsreg"
+                      :key="index"
+                      class="animated"
+                      v-ripple
+                    >
+                      <q-item-section>
+                        <q-item-label lines="1">
+                          <CMyFieldRec
+                            table="users"
+                            :id="user._id"
+                            :rec="user"
+                            field="username"
+                            :canEdit="false"
+                            :canModify="false"
+                            :fieldtype="costanti.FieldType.username_chip"
+                          >
+                          </CMyFieldRec>
+                        </q-item-label>
+                      </q-item-section>

-                    <q-item-section side>
-                      <q-item-label>{{
-                        tools.getstrDateTimeShort(user.date_reg)
-                      }}</q-item-label>
-                    </q-item-section>
-                  </q-item>
-                </transition-group>
+                      <q-item-section side>
+                        <q-item-label>{{
+                          tools.getstrDateTimeShort(user.date_reg)
+                        }}</q-item-label>
+                      </q-item-section>
+                    </q-item>
+                  </transition-group>
+                </div>
              </q-tab-panel>
              <q-tab-panel name="online">
-                <div class="q-pa-md" style="max-width: 300px">
+                <div class="q-pa-md" style="max-width: 350px; margin: auto;">
                  <q-list bordered>
                    <transition-group
                      name="fade"
@@ -169,7 +171,7 @@
                </div>
              </q-tab-panel>
              <q-tab-panel name="diffusori">
-                <div class="q-pa-md" style="max-width: 300px">
+                <div class="q-pa-md" style="max-width: 350px; margin: auto;">
                  <div class="text-center text-bold text-h6">
                    Aiuta RISO a crescere
                  </div>
@@ -219,10 +221,12 @@
                        <q-item-section side
                          ><div
                            :class="
-                              `text-h6 q-mx-sm q-px-sm text-bold ` + ($q.dark.isActive ? `text-white`: `text-black`)
+                              `text-h6 q-mx-sm q-px-sm text-bold ` +
+                              ($q.dark.isActive ? `text-white` : `text-black`)
                            "
-                            >{{ user.count }}
-                            </div></q-item-section
+                          >
+                            {{ user.count }}
+                          </div></q-item-section
                        >
                      </q-item>
                    </transition-group>
@@ -230,12 +234,13 @@
                </div>
              </q-tab-panel>
              <q-tab-panel name="strettelist">
-                <div class="q-pa-md" style="max-width: 300px">
+                <div class="q-pa-md" style="max-width: 350px; margin: auto;">
                  <div class="text-center text-bold text-h6">
                    Strette di Mano
                  </div>
                  <div class="text-center">
-                    Più persone conoscerai di persona e maggiore aumenterà la Rete di fiducia.
+                    Più persone conoscerai di persona e maggiore aumenterà la
+                    Rete di fiducia.
                  </div>
                  <q-list bordered>
                    <transition-group
@@ -279,10 +284,12 @@
                        <q-item-section side
                          ><div
                            :class="
-                              `text-h6 q-mx-sm q-px-sm text-bold ` + ($q.dark.isActive ? `text-white`: `text-black`)
+                              `text-h6 q-mx-sm q-px-sm text-bold ` +
+                              ($q.dark.isActive ? `text-white` : `text-black`)
                            "
-                            >{{ user.count }}
-                            </div></q-item-section
+                          >
+                            {{ user.count }}
+                          </div></q-item-section
                        >
                      </q-item>
                    </transition-group>