Merge branch 'Dev' of http://www.origtek.com:2999/nelson.kai/ShowEasyFrontEnd into Dev

FrontEnd/pages/user/signUp.vue

@@ -33,15 +33,15 @@
         {{ $t("Welcome to ShowEasy!") }}
       </p>
       <v-form v-model="valid">
-        <v-text-field v-model="userData.first_name" background-color="neutrals darken-1"
+        <v-text-field v-model="userData.FirstName" background-color="neutrals darken-1"
           :label="this.$t('First Name') + '*'" placeholder="" filled rounded dense single-line :rules="[rules.require]">
         </v-text-field>
-        <v-text-field v-model="userData.last_name" background-color="neutrals darken-1"
+        <v-text-field v-model="userData.LastName" background-color="neutrals darken-1"
           :label="this.$t('Last Name') + '*'" placeholder="" filled rounded dense single-line :rules="[rules.require]">
         </v-text-field>
-        <v-text-field v-model="userData.email" background-color="neutrals darken-1" :label="this.$t('Email') + '*'"
+        <v-text-field v-model="userData.Email" background-color="neutrals darken-1" :label="this.$t('Email') + '*'"
           filled rounded dense single-line :rules="[rules.email, rules.require]" validate-on-blur></v-text-field>
-        <v-text-field v-model="userData.password" background-color="neutrals darken-1"
+        <v-text-field v-model="userData.Password" background-color="neutrals darken-1"
           :label="this.$t('Password') + '*'" :type="showPass ? 'text' : 'password'" placeholder="" filled rounded dense
           single-line :rules="[rules.checkPassword, rules.require]" :hint="
             this.$t(
@@ -55,7 +55,7 @@
           :append-icon="showConfirmPass ? 'mdi-eye' : 'mdi-eye-off'" @click:append="showConfirmPass = !showConfirmPass"
           validate-on-blur></v-text-field>
       </v-form>
-      <v-checkbox v-model="subscribe" class="mt-n2 ml-1"><template v-slot:label><span
+      <v-checkbox v-model="userData.Subscribe" class="mt-n2 ml-1"><template v-slot:label><span
             class="neutrals--text text--darken-4 text-size-14">{{
             $t("Subscribe to ShowEasy\’s newsletter")
             }}</span></template></v-checkbox>
@@ -76,7 +76,7 @@
           </v-spacer>
           <v-spacer class="text-size-16 my-7 neutrals--text text--darken-4">{{ $t("We've sent a verification email to")
           }}<br />
-            <span class="primary--text">{{ userData.email }}</span>{{
+            <span class="primary--text">{{ userData.Email }}</span>{{
             $t(". Please click the link within to activate your account.")
             }}
           </v-spacer>
@@ -140,7 +140,7 @@ export default {
       showPass: false,
       showConfirmPass: false,
       emailSignUp: true,
-      subscribe: true,
+      Subscribe: true,
       dialog: false,
       errorDialog: false,
       btnText: "Sign up",
@@ -161,26 +161,29 @@ export default {
             "Passwords must be 8-20 characters with at least 1 number, 1 lower case letter and 1 upper case letter"
           ),
         checkConfirmPassword: (v) =>
-          this.confirmPasswordText === this.userData.password ||
+          this.confirmPasswordText === this.userData.Password ||
           this.$t("Your password and confirmation password do not match"),
       },
       userData: {
-        first_name: "",
-        last_name: "",
-        email: "",
-        password: "",
+        FirstName: "",
+        LastName: "",
+        Account: "",
+        Password: "",
+        Email: "",
+        Subscribe: true
       },
     };
   },
   methods: {
     userRegister() {
       const postUserData = { ...this.userData };
-      if (this.valid && this.userData.password === this.confirmPasswordText) {
         this.isPageLoading = true;
         this.$axios
-          .post(`/member/users?lang=${this.$i18n.locale}`, postUserData)
+          .post(
+            `/trending/api/Signup/SignupWithEmail`, postUserData
+          )
           .then((res) => {
-            console.log(res);
+            console.log(JSON.stringify(res));
             this.timer = setInterval(() => {
               if (this.countdown > 0) {
                 this.countdown--;
@@ -193,33 +196,40 @@ export default {
             this.dialog = !this.dialog;
           })
           .catch((err) => {
-            if (err.response.status === 401) {
-              this.errorDialog = true;
-              this.isPageLoading = false;
-            }
+
+            console.log(err);
+            this.errorDialog = true;
+            this.isPageLoading = false;
+
           });
-      }
     },
+
+    
     resendVerifyEmail() {
       this.countdown = 60;
       this.$axios
-        .get(
-          `/member/users/resend/${this.userData.email}?lang=${this.$i18n.locale}`
-        )
-        .then((res) => {
-          clearInterval(this.timer);
-          this.timer = setInterval(() => {
-            if (this.countdown > 0) {
-              this.countdown--;
-            }
-            if (this.countdown === 0) {
-              clearInterval(this.timer);
-            }
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+          .post(
+            `/trending/api/Signup/ReSendVerifyMail?Email=${this.userData.Email}`
+          )
+          .then((res) => {
+            console.log(JSON.stringify(res));
+            clearInterval(this.timer);
+            this.timer = setInterval(() => {
+              if (this.countdown > 0) {
+                this.countdown--;
+              }
+              if (this.countdown === 0) {
+                clearInterval(this.timer);
+              }
+            }, 1000);
+          })
+          .catch((err) => {
+
+            console.log(err);
+
+          });
+
+          
     },
     async facebookLogin() {
       try {
@@ -238,7 +248,7 @@ export default {
   },
   computed: {
     validFormat() {
-      if (this.valid && this.userData.password === this.confirmPasswordText) {
+      if (this.valid && this.userData.Password === this.confirmPasswordText) {
         return true;
       } else {
         return false;