From e3fd11d9dcec67376f31d0f734fc1eca7593a075 Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Tue, 14 Feb 2023 13:37:04 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20User=20Profile=20Setting=20[WHY]=20?=
 =?UTF-8?q?=E9=96=8B=E7=99=BC=20ShowEasy=20=E5=89=8D=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修改密碼欄位判斷
---
 FrontEnd/pages/user/editPersonalInfo.vue |  1 +
 FrontEnd/pages/user/setting.vue          | 39 +++++++++++++++++++++---
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/FrontEnd/pages/user/editPersonalInfo.vue b/FrontEnd/pages/user/editPersonalInfo.vue
index 7024517..366e672 100644
--- a/FrontEnd/pages/user/editPersonalInfo.vue
+++ b/FrontEnd/pages/user/editPersonalInfo.vue
@@ -453,6 +453,7 @@ export default {
             `/trending/api/Members/UploadAvatar`, this.payload
           )
           .then((response) => {
+            //console.log(JSON.stringify(response))
             if(response && response.data){
 
               this.isCropImageDialogActive = !this.isCropImageDialogActive;
diff --git a/FrontEnd/pages/user/setting.vue b/FrontEnd/pages/user/setting.vue
index 67107db..dc33b61 100644
--- a/FrontEnd/pages/user/setting.vue
+++ b/FrontEnd/pages/user/setting.vue
@@ -59,12 +59,30 @@
               {{$t('userProfile.resetPassword')}}
             </div>
             <div class="tw-mb-[20px] md:tw-max-w-[392px] md:tw-mb-[15px]">
+              <div class="tw-mb-[20px] md:tw-max-w-[392px] md:tw-mb-0">
               <div class="tw-text-[16px] tw-text-base-primary tw-mb-[6px] md:tw-text-[14px]">
                 {{$t('userProfile.oldPassword')}}
               </div>
-              <input v-model="userPass.user_old_pass" type="password"
-                class="tw-h-[40px] tw-w-full tw-border tw-border-neutral-200 tw-border-solid tw-px-[20px] tw-py-[10px] tw-rounded-[5px]" />
+              <v-text-field type="password" v-model="userPass.user_old_pass" @blur="checkOldPassword($event)" :rules="[rules.checkPassword, rules.require]"
+                hide-details dense outlined validate-on-blur></v-text-field>
+
+
+              <!-- <input v-model="userPass.user_old_pass" type="password"
+                class="tw-h-[40px] tw-w-full tw-border tw-border-neutral-200 tw-border-solid tw-px-[20px] tw-py-[10px] tw-rounded-[5px]" /> -->
+            </div>
+
+              <div v-show="!isOldPassValid" class="tw-footer-body tw-w-full tw-leading-none tw-pt-1" :class="
+                isOldPassValid
+                  ? 'tw-text-neutrals-400'
+                  : 'tw-text-error-default'
+              ">
+                {{ $t('userProfile.passwordsHint') }}
+              </div>
             </div>
+            
+
+
+            
             <div class="tw-mb-[20px] md:tw-max-w-[392px] md:tw-mb-[15px]">
               <!-- <div
               class="tw-text-[16px] tw-text-base-primary tw-mb-[6px] md:tw-text-[14px]"
@@ -195,6 +213,7 @@ export default {
         user_new_pass: "",
       },
       isNewPassValid: true,
+      isOldPassValid: true,
       firstName: "",
       lastName: "",
       userData: {},
@@ -322,8 +341,9 @@ export default {
     },
     resetPassword() {
       if (
-        this.isNewPassValid &&
-        this.userPass.user_old_pass !== this.userPass.user_new_pass
+        this.isNewPassValid && this.isOldPassValid &&
+        this.userPass.user_new_pass !== this.userPass.user_old_pass &&
+        this.userPass.user_new_pass == this.confirmPass
       ) {
         this.$axios
       .post(
@@ -335,7 +355,9 @@ export default {
             let data = response.data.DATA.rel
             if(data){
               this.$auth.$storage.removeUniversal("userPicture");
-            this.$auth.$storage.removeUniversal("userLastName");
+              this.$auth.$storage.removeUniversal("userLastName");
+              this.$auth.$storage.removeUniversal("userAccount");
+              this.$auth.$storage.removeUniversal("userPassword");
             this.$notify({
               type: "success",
               title: "Awesome!",
@@ -358,6 +380,13 @@ export default {
       this.userPass.user_new_pass = "",
       this.confirmPass = ""
     },
+    checkOldPassword(v) {
+      const pass = v.target.value;
+      this.isOldPassValid =
+        /(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])/.test(pass) &&
+        pass.length >= 8 &&
+        pass.length <= 20;
+    },
     checkPassword(v) {
       const pass = v.target.value;
       this.isNewPassValid =