Fix Registration

src/components/CSignUp/CSignUp.ts

@@ -86,6 +86,27 @@ export default defineComponent({
     const visubuttBOT = ref(false)
     const isalreadyReg = ref(false)
     const needTelegram = ref(false)
+    const slide = ref('1')
+    const inputEmail = ref(<any>null)
+    const inputUsername = ref(<any>null)
+    const inputPassword = ref(<any>null)
+    const inputPassword2 = ref(<any>null)
+
+    const checkifDisabled = computed(() => {
+      let ret = true
+      if (slide.value === '1') {
+        // Invitante + Email
+        ret = !signup.email || !v$.value.aportador_solidario || v$.value.aportador_solidario.$invalid || (inputEmail.value && inputEmail.value.hasError)
+      } else if (slide.value === '2') {
+        // Username
+        ret = !signup.username || (inputUsername.value && inputUsername.value.hasError)
+      } else if (slide.value === '3') {
+        // Password
+        ret = !signup.password || (!inputPassword.value && inputPassword.value.hasError) || (!inputPassword2.value && inputPassword2.value.hasError)
+      }
+
+      return ret
+    })
 
     const typePassword = ref('password')
 
@@ -253,9 +274,6 @@ export default defineComponent({
       countryname.value = name
     }
 
-    function inputUsername(value: string) {
-      signup.username = value.trim()
-    }
 
     async function created() {
 
@@ -308,11 +326,16 @@ export default defineComponent({
         //     --> content is NOT valid, no error message
         //  resolve(error_message)
         //     --> content is NOT valid, we have error message
-        tools.registeredemail(val).then((ris) => {
-          let risp = !!ris || t('reg.err.duplicate_email')
-          if (ris) {
+        tools.registeredemail(val).then((emailOk) => {
+          let risp = !!emailOk || t('reg.err.duplicate_email')
+          if (emailOk) {
             risp = tools.isEmail(val) || t('reg.err.invalid_email')
+            emailOk = emailOk && tools.isEmail(val)
           }
+          if (emailOk) {
+            risp = !tools.isEmailNoMicroZozz(val) || t('reg.err.invalid_email_micro')
+          }
+
           resolve(risp)
 
         })
@@ -330,7 +353,8 @@ export default defineComponent({
       typePassword.value = typePassword.value === 'password' ? 'text' : 'password'
     }
 
-    function regEventEmail() {
+    function regEventEmail(invited: boolean) {
+      console.log('EVENT RECEIVED: regEventEmail', invited)
       // reg
       visubuttBOT.value = false
       needTelegram.value = false
@@ -343,7 +367,6 @@ export default defineComponent({
       changeemail,
       changeusername,
       submitOk,
-      inputUsername,
       selectcountry,
       intcode_change,
       tools,
@@ -364,6 +387,12 @@ export default defineComponent({
       ap_iniziale,
       regEventEmail,
       needTelegram,
+      slide,
+      checkifDisabled,
+      inputEmail,
+      inputUsername,
+      inputPassword,
+      inputPassword2,
     }
   },
 })