fix: messages and notif Friends Accepteded

2022-12-17 22:12:18 +01:00
parent 3c2fc4c806
commit 3aaa94c33e
16 changed files with 505 additions and 402 deletions
--- a/src/components/CSignIn/CSignIn.ts
+++ b/src/components/CSignIn/CSignIn.ts
@@ -40,6 +40,8 @@ export default defineComponent({

    const myForm = ref(null)

+    const typePassword = ref('password')
+
    const iswaitingforRes = ref(false)
    const signin = ref(<ISigninOptions>{
      username: process.env.TEST_USERNAME || '',
@@ -144,6 +146,11 @@ export default defineComponent({
      // console.log('   END submit')
    }

+    function showPassword() {
+      //
+      typePassword.value = typePassword.value === 'password' ? 'text' : 'password'
+    }
+
    created()

    return {
@@ -155,6 +162,8 @@ export default defineComponent({
      getlinkforgetpwd,
      myForm,
      site,
+      showPassword,
+      typePassword,
    }
  },
 })
--- a/src/components/CSignIn/CSignIn.vue
+++ b/src/components/CSignIn/CSignIn.vue
@@ -7,77 +7,112 @@
    </div>

    <!--Prova URL :  {{env('PROVA_PAOLO')}}-->
-    <q-form
-      ref="myForm"
-      @submit="onSubmit"
-      @reset="onReset"
-    >
+    <q-form ref="myForm" @submit="onSubmit" @reset="onReset">
      <div class="q-gutter-xs">
-
        <q-input
          ref="refUsername"
          v-model="signin.username"
-          rounded outlined dense
+          rounded
+          outlined
+          dense
          lazy-rules
          :label="$t('reg.username_login')"
          :rules="[
-            val => !!val || $t('reg.err.required'),
-            val => val.length >= 6 || $t('reg.err.atleast') + ' 6 ' + $t('reg.err.char'),
-          ]">
-
+            (val) => !!val || $t('reg.err.required'),
+            (val) =>
+              val.length >= 6 ||
+              $t('reg.err.atleast') + ' 6 ' + $t('reg.err.char'),
+          ]"
+        >
          <template v-slot:prepend>
-            <q-icon name="person"/>
+            <q-icon name="person" />
          </template>
-
        </q-input>
        <q-input
          ref="refPassword"
          v-model="signin.password"
-          type="password"
-          rounded outlined dense
+          :type="typePassword"
+          rounded
+          outlined
+          dense
          lazy-rules
          v-on:keyup.enter="onSubmit()"
          :label="$t('reg.password')"
          :rules="[
-            val => !!val || $t('reg.err.required'),
-            val => val.length >= 8 || $t('reg.err.atleast') + ' 8 ' + $t('reg.err.char'),
-          ]">
-
-          <template v-slot:prepend>
-            <q-icon name="vpn_key"/>
+            (val) => !!val || $t('reg.err.required'),
+            (val) =>
+              val.length >= 8 ||
+              $t('reg.err.atleast') + ' 8 ' + $t('reg.err.char'),
+          ]"
+        >
+          <template v-slot:append>
+            <q-btn
+              tabindex="-1"
+              :icon="
+                typePassword === `password` ? `fas fa-eye-slash` : `fas fa-eye`
+              "
+              @click="showPassword"
+            >
+            </q-btn>
+          </template>
+          <template v-slot:prepend>
+            <q-icon name="vpn_key" />
          </template>
-
        </q-input>

-        <div style="text-align: center;">
+        <div style="text-align: center">
          <q-btn
            type="submit"
-            rounded size="md" color="primary"
-            :label="$t('login.enter')">
+            rounded
+            size="md"
+            color="primary"
+            :label="$t('login.enter')"
+          >
          </q-btn>
        </div>

-        <br>
+        <br />

-        <div class="text-center" style="margin-bottom: 10px;">
-          <a :href="getlinkforgetpwd()" style="color:gray;">{{ $t('reg.forgetpassword') }}</a>
+        <div class="text-center" style="margin-bottom: 10px">
+          <a :href="getlinkforgetpwd()" style="color: gray">{{
+            $t('reg.forgetpassword')
+          }}</a>
        </div>

        <div
-          v-if="site.confpages && site.confpages.enableReg && showregbutt && site.confpages.enableRegByBot"
-          style="margin-top:10px; text-align: center;">
-          Se non sei ancora Registrato:<br>
-          <q-btn type="a" rounded size="md" color="primary" href="/bot" :label="$t('reg.submit')">
+          v-if="
+            site.confpages &&
+            site.confpages.enableReg &&
+            showregbutt &&
+            site.confpages.enableRegByBot
+          "
+          style="margin-top: 10px; text-align: center"
+        >
+          Se non sei ancora Registrato:<br />
+          <q-btn
+            type="a"
+            rounded
+            size="md"
+            color="primary"
+            href="/bot"
+            :label="$t('reg.submit')"
+          >
          </q-btn>
        </div>
        <div
          v-else-if="site.confpages && site.confpages.enableReg && showregbutt"
-          style="margin-top:10px; text-align: center;">
-          Se non sei ancora Registrato:<br>
-          <q-btn rounded size="md" color="primary" to="/signup" :label="$t('reg.submit')">
+          style="margin-top: 10px; text-align: center"
+        >
+          Se non sei ancora Registrato:<br />
+          <q-btn
+            rounded
+            size="md"
+            color="primary"
+            to="/signup"
+            :label="$t('reg.submit')"
+          >
          </q-btn>
        </div>
-
      </div>
    </q-form>
  </div>
--- a/src/components/CSignUp/CSignUp.ts
+++ b/src/components/CSignUp/CSignUp.ts
@@ -89,6 +89,8 @@ export default defineComponent({
    const slide = ref('1')
    const inputEmail = ref(<any>null)
    const inputUsername = ref(<any>null)
+    const inputName = ref(<any>null)
+    const inputSurname = ref(<any>null)
    const inputPassword = ref(<any>null)
    const inputPassword2 = ref(<any>null)

@@ -391,6 +393,8 @@ export default defineComponent({
      checkifDisabled,
      inputEmail,
      inputUsername,
+      inputName,
+      inputSurname,
      inputPassword,
      inputPassword2,
    }
--- a/src/components/CSignUp/CSignUp.vue
+++ b/src/components/CSignUp/CSignUp.vue
@@ -102,7 +102,7 @@
                  icon="arrow_right"
                  label="Avanti"
                  :disabled="checkifDisabled"
-                  @click="$refs.carousel.next()"
+                  @click="!checkifDisabled ? $refs.carousel.next() : null"
                />
              </q-carousel-control>
            </template>
@@ -118,6 +118,11 @@
                  v-model="signup.aportador_solidario"
                  rounded
                  outlined
+                  @keyup.enter="
+                    v$.aportador_solidario.$touch && !v$.aportador_solidario.$error
+                      ? $refs.inputEmail.focus()
+                      : null
+                  "
                  @blur="v$.aportador_solidario.$touch"
                  :error="v$.aportador_solidario.$error"
                  :error-message="
@@ -134,7 +139,7 @@
                    <q-icon name="person" />
                  </template>
                </q-input>
-                <div style="margin-top:5px;"></div>
+                <div style="margin-top: 5px"></div>

                <q-input
                  ref="inputEmail"
@@ -143,6 +148,9 @@
                  outlined
                  @update:model-value="changeemail()"
                  maxlength="50"
+                  v-on:keyup.enter="
+                    !checkifDisabled ? $refs.carousel.next() : null
+                  "
                  debounce="2000"
                  :rules="[myRuleEmail]"
                  :label="$t('reg.email_reg')"
@@ -168,6 +176,9 @@
                @update:model-value="changeusername"
                :error="v$.username.$error"
                @keydown.space="(event) => event.preventDefault()"
+                @keyup.enter="
+                  !v$.username.$error ? $refs.inputName.focus() : null
+                "
                maxlength="20"
                debounce="500"
                :error-message="
@@ -183,6 +194,7 @@

              <div v-if="show_namesurname">
                <q-input
+                  ref="inputName"
                  v-model="signup.name"
                  rounded
                  outlined
@@ -190,6 +202,7 @@
                  :error="v$.name.$error"
                  maxlength="30"
                  debounce="1000"
+                  @keyup.enter="$refs.inputSurname.focus()"
                  :error-message="tools.errorMsg('name', v$.name)"
                  :label="$t('reg.name_opt')"
                >
@@ -199,6 +212,7 @@
                </q-input>

                <q-input
+                  ref="inputSurname"
                  v-model="signup.surname"
                  rounded
                  outlined
@@ -206,6 +220,9 @@
                  @blur="v$.surname.$touch"
                  maxlength="30"
                  debounce="1000"
+                  v-on:keyup.enter="
+                    !checkifDisabled ? $refs.carousel.next() : null
+                  "
                  :error-message="tools.errorMsg('surname', v$.surname)"
                  :label="$t('reg.surname_opt')"
                >
@@ -226,6 +243,9 @@
                @blur="v$.password.$touch"
                :error="v$.password.$error"
                :error-message="`${tools.errorMsg('password', v$.password)}`"
+                @keyup.enter="
+                  !v$.password.$error ? $refs.inputPassword2.focus() : null
+                "
                maxlength="30"
                debounce="1000"
                :label="$t('reg.password_reg')"
@@ -260,6 +280,9 @@
                  'repeatpassword',
                  v$.repeatPassword
                )}`"
+                v-on:keyup.enter="
+                  !checkifDisabled ? $refs.carousel.next() : null
+                "
                :label="$t('reg.repeatPassword')"
              >
                <template v-slot:append>
--- a/src/components/CUserNonVerif/CUserNonVerif.vue
+++ b/src/components/CUserNonVerif/CUserNonVerif.vue
@@ -1,4 +1,5 @@
 <template>
+
  <div v-if="!globalStore.serverError" class="q-ma-md">
    <!--
    <CVerifyTelegram v-if="!tools.TelegVerificato() || !tools.isUsernameTelegOk()">
@@ -11,66 +12,8 @@
      </CVerifyEmail>
    </div>

-    <div v-if="tools.isTelegOk()" class="centeritems">
-      <q-banner
-        v-if="!tools.isUsernameTelegOk()"
-        inline-actions
-        rounded
-        class="bg-green-4 text-black"
-      >
-        <div class="text-subtitle1">
-          🔑 E' necessario ora impostare un <b>Username su Telegram</b>:
-        </div>
-
-        💬 In questo modo le persone potranno contattarti (sia su Telegram sia
-        dalla APP)
-        <strong
-          >senza aver bisogno di condividere il tuo numero di cellulare</strong
-        >.<br />
-        <br />
-        👉🏻 1. Vai su Telegram, e nella pagina iniziale (dove vedi tutte le
-        chat), premi sull'icona (tre linee orizzontali) del menu principale in
-        alto a sinistra (sull'iPhone si chiama "Impostazioni").<br />
-        👉🏻 2. Seleziona la voce <b>Impostazioni</b> nel menu.<br />
-        👉🏻 3. Premi su <b>Username</b> nella sezione account.<br />
-        👉🏻 4. Digita un <strong>username qualsiasi</strong> a tua scelta (deve
-        essere un nome ancora libero e non già usato da altri,
-        <u
-          >non deve per forza coincidere con l'username che hai scelto per la
-          APP</u
-        >).<br />
-        👉🏻 5. Per confermare premi sull'icona con la spunta (V) in alto a
-        destra.<br />
-
-        🏁 Infine vai sul <b>BOT RISO</b> Telegram e scrivi OK nel messaggio. Ti
-        comparirà un <strong>messaggio di Benvenuto</strong>.
-        <q-btn
-          rounded
-          color="primary"
-          icon="fab fa-telegram"
-          label="Apri il BOT"
-          type="a"
-          :href="tools.getLinkBotTelegram('')"
-          target="_blank"
-        ></q-btn>
-        <br /><br />
-
-        Se non ci riesci vedi la
-        <a
-          href="https://www.nigiara.it/telegram/come-impostare-uno-username-su-telegram.htm"
-          target="_blank"
-          >GUIDA PER IMPOSTARE L'USERNAME SU TELEGRAM</a
-        ><br />
-        <br />
-
-        Se hai difficoltà, contatta la Chat del Supporto Tecnico: "Help - RISO"
-        <br /><strong>CLICCANDO QUI</strong> 👉🏻
-        <a href="https://t.me/+dTHFNIwkc_phNmQ8" target="_blank"
-          ><strong>Help - RISO</strong></a
-        >
-        <br /><br />
-      </q-banner>
-      <q-banner v-else inline-actions rounded class="bg-orange text-black">
+    <div v-if="userStore.isUserWaitingVerifAportador()" class="centeritems">
+      <q-banner inline-actions rounded class="bg-orange text-black">
        <template v-slot:avatar>
          <q-icon name="info" color="primary" />
        </template>
@@ -93,36 +36,6 @@
        </q-btn>
      </q-banner>
    </div>
-    <div v-else-if="userStore.isOldRegNotFinished()">
-      <div
-        v-if="
-          site.confpages.enabledRegNeedTelegram &&
-          !site.confpages.enableRegMultiChoice &&
-          !tools.isTelegOk()
-        "
-      >
-        <h3>
-          La Verifica su Telegram non è stata completata, pertanto se ancora non
-          avete inserito nessun annuncio (Bene, Servizio, ecc...), è consigliato
-          cancellare la vecchia registrazione per ripetere con una nuova
-          registrazione.
-        </h3>
-        <br />
-        <h3>
-          Per contattare il supporto tecnico e farvi cancellare la
-          registrazione: "Help - RISO", clicca qui sotto:
-        </h3>
-        <br />
-        <h4>
-          <a href="https://t.me/+dTHFNIwkc_phNmQ8" target="_blank"
-            ><strong
-              >Entra in Supporto Tecnico su Telegram: (Help - RISO)</strong
-            ></a
-          >
-        </h4>
-        <br /><br />
-      </div>
-    </div>
  </div>
 </template>

--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -5027,7 +5027,7 @@ export const tools = {
  Verificato() {
    const userStore = useUserStore()
    const globalStore = useGlobalStore()
-    return this.isVerified() && (userStore.my.verified_by_aportador || globalStore.site.confpages.enableRegMultiChoice)
+    return this.isVerified()
  },


--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -395,13 +395,17 @@ export const useUserStore = defineStore('UserStore', {
      const globalStore = useGlobalStore()

      if (globalStore.site.confpages.enableRegMultiChoice) {
-        return (this.my.profile.teleg_id! > 0 && this.my.verified_by_aportador! && this.isUsernameTelegOk()) || this.my.verified_email!
+        return ((this.my.profile.teleg_id! > 0 && this.isUsernameTelegOk()) || this.my.verified_email!) && this.my.verified_by_aportador!
      } else {
        return this.my.profile.teleg_id! > 0 && this.my.verified_by_aportador! && this.isUsernameTelegOk()
      }
      // return this.my.verified_email! && this.my.profile.teleg_id! > 0 && this.my.verified_by_aportador!
    },

+    isUserWaitingVerifAportador(): boolean {
+      return !this.my.verified_by_aportador
+    },
+
    isOldRegNotFinished(): boolean {
      return tools.isLogged() && ((!this.my.profile.teleg_id || this.my.profile.teleg_id <= 0) || !this.isUsernameTelegOk())
      // return this.my.verified_email! && this.my.profile.teleg_id! > 0 && this.my.verified_by_aportador!
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -278,7 +278,7 @@

                outline
                icon="fas fa-envelope"
-                color="black"
+                :color="$q.dark.isActive ? `shite` : `black`"
                type="a"
                size="md"
                :label="$t('msgs.send_email')"