From 5091a3c36c3c154b5574f0041be9f05149e9069c Mon Sep 17 00:00:00 2001
From: Vaibhavkumar-tech <vaibhavkumar62078@gmail.com>
Date: Tue, 8 Sep 2026 12:23:01 +0000
Subject: [PATCH 1/2]  update forgetPassword.vue

---
 .../pages/resetPassword/ForgotPassword.vue    | 162 +++++++++++-------
 1 file changed, 101 insertions(+), 61 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ForgotPassword.vue b/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ForgotPassword.vue
index c6581cd722..3ed67451cd 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ForgotPassword.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ForgotPassword.vue
@@ -1,92 +1,132 @@
 <template>
-
-  <MessageLayout
+  <StudioMessageLayout
     :header="$tr('forgotPasswordTitle')"
     :text="$tr('forgotPasswordPrompt')"
   >
-    <VForm
+    <form
       ref="form"
-      lazy-validation
+      novalidate
       @submit.prevent="submit"
     >
-      <Banner
-        :text="$tr('forgotPasswordFailed')"
-        :value="error"
+      <StudioBanner
+        v-if="error"
         error
         class="mb-4"
         data-testid="error-banner"
-      />
-      <EmailField
+      >
+        {{ $tr('forgotPasswordFailed') }}
+      </StudioBanner>
+
+      <StudioEmailField
         v-model="email"
         autofocus
+        :error-messages="emailErrors"
+        @blur="showEmailError"
+        @input="hideEmailError"
+        @click.native="hideEmailError"
       />
+
       <KButton
         primary
         class="w-100"
         :text="$tr('submitButton')"
         type="submit"
       />
-    </VForm>
-  </MessageLayout>
-
+    </form>
+  </StudioMessageLayout>
 </template>
 
-
 <script>
+import { mapActions } from 'vuex';
+import StudioMessageLayout from '../../components/StudioMessageLayout';
+import StudioEmailField from '../../components/form/StudioEmailField';
+import StudioBanner from '../../../shared/views/StudioBanner';
+import { generateFormMixin } from '../../../shared/mixins.js';
 
-  import { mapActions } from 'vuex';
-  import MessageLayout from '../../components/MessageLayout';
-  import EmailField from 'shared/views/form/EmailField';
-  import Banner from 'shared/views/Banner';
-
-  export default {
-    name: 'ForgotPassword',
-    components: {
-      MessageLayout,
-      EmailField,
-      Banner,
-    },
-    data() {
-      return {
-        email: '',
-        error: false,
-      };
+const formFields = {
+  email: {
+    required: true,
+    validator: value => Boolean(value && /.+@.+\..+/.test(value)),
+  },
+};
+
+export default {
+  name: 'ForgotPassword',
+
+  mixins: [generateFormMixin(formFields)],
+
+  components: {
+    StudioMessageLayout,
+    StudioEmailField,
+    StudioBanner,
+  },
+
+  data() {
+    return {
+      error: false,
+      emailValidationVisible: false,
+    };
+  },
+
+  computed: {
+    emailErrors() {
+      if (!this.emailValidationVisible || !this.errors.email) {
+        return [];
+      }
+
+      return [this.$tr('validEmailMessage')];
     },
-    methods: {
-      ...mapActions('account', ['sendPasswordResetLink']),
-      submit() {
-        this.error = false;
-        if (this.$refs.form.validate()) {
-          this.sendPasswordResetLink(this.email)
-            .then(() => {
-              this.$router
-                .push({
-                  name: 'PasswordInstructionsSent',
-                })
-                .catch(() => {});
-            })
-            .catch(() => {
-              this.error = true;
-            });
-        }
-      },
+  },
+
+  methods: {
+    ...mapActions('account', ['sendPasswordResetLink']),
+
+    hideEmailError() {
+      this.emailValidationVisible = false;
     },
-    $trs: {
-      forgotPasswordTitle: 'Reset your password',
-      forgotPasswordPrompt:
-        'Please enter your email address to receive instructions for resetting your password',
-      submitButton: 'Submit',
-      forgotPasswordFailed: 'Failed to send a password reset link. Please try again.',
+
+    showEmailError() {
+      this.emailValidationVisible = true;
     },
-  };
 
-</script>
+    submit() {
+      this.error = false;
 
+      const formData = this.clean();
 
-<style lang="scss" scoped>
+      if (!this.validate(formData)) {
+        this.emailValidationVisible = true;
+        return;
+      }
+
+      this.sendPasswordResetLink(formData.email)
+        .then(() => {
+          this.$router
+            .push({
+              name: 'PasswordInstructionsSent',
+            })
+            .catch(() => {});
+        })
+        .catch(() => {
+          this.error = true;
+        });
+    },
+  },
 
-  .w-100 {
-    width: 100%;
-  }
+  $trs: {
+    forgotPasswordTitle: 'Reset your password',
+    forgotPasswordPrompt:
+      'Please enter your email address to receive instructions for resetting your password',
+    submitButton: 'Submit',
+    forgotPasswordFailed:
+      'Failed to send a password reset link. Please try again.',
+    validEmailMessage: 'Please enter a valid email',
+  },
+};
+</script>
 
-</style>
+<style lang="scss" scoped>
+.w-100 {
+  width: 100%;
+}
+</style>
\ No newline at end of file

From 35cc159e22131bfa019cad8e238aad0aa7a8fa30 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci-lite[bot]"
 <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Date: Thu, 10 Sep 2026 11:58:13 +0000
Subject: [PATCH 2/2] [pre-commit.ci lite] apply automatic fixes

---
 .../pages/resetPassword/ForgotPassword.vue    | 165 +++++++++---------
 1 file changed, 86 insertions(+), 79 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ForgotPassword.vue b/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ForgotPassword.vue
index 3ed67451cd..decb7f6ad4 100644
--- a/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ForgotPassword.vue
+++ b/contentcuration/contentcuration/frontend/accounts/pages/resetPassword/ForgotPassword.vue
@@ -1,4 +1,5 @@
 <template>
+
   <StudioMessageLayout
     :header="$tr('forgotPasswordTitle')"
     :text="$tr('forgotPasswordPrompt')"
@@ -34,99 +35,105 @@
       />
     </form>
   </StudioMessageLayout>
+
 </template>
 
+
 <script>
-import { mapActions } from 'vuex';
-import StudioMessageLayout from '../../components/StudioMessageLayout';
-import StudioEmailField from '../../components/form/StudioEmailField';
-import StudioBanner from '../../../shared/views/StudioBanner';
-import { generateFormMixin } from '../../../shared/mixins.js';
-
-const formFields = {
-  email: {
-    required: true,
-    validator: value => Boolean(value && /.+@.+\..+/.test(value)),
-  },
-};
-
-export default {
-  name: 'ForgotPassword',
-
-  mixins: [generateFormMixin(formFields)],
-
-  components: {
-    StudioMessageLayout,
-    StudioEmailField,
-    StudioBanner,
-  },
-
-  data() {
-    return {
-      error: false,
-      emailValidationVisible: false,
-    };
-  },
-
-  computed: {
-    emailErrors() {
-      if (!this.emailValidationVisible || !this.errors.email) {
-        return [];
-      }
-
-      return [this.$tr('validEmailMessage')];
+
+  import { mapActions } from 'vuex';
+  import StudioMessageLayout from '../../components/StudioMessageLayout';
+  import StudioEmailField from '../../components/form/StudioEmailField';
+  import StudioBanner from '../../../shared/views/StudioBanner';
+  import { generateFormMixin } from '../../../shared/mixins.js';
+
+  const formFields = {
+    email: {
+      required: true,
+      validator: value => Boolean(value && /.+@.+\..+/.test(value)),
     },
-  },
+  };
+
+  export default {
+    name: 'ForgotPassword',
 
-  methods: {
-    ...mapActions('account', ['sendPasswordResetLink']),
+    mixins: [generateFormMixin(formFields)],
 
-    hideEmailError() {
-      this.emailValidationVisible = false;
+    components: {
+      StudioMessageLayout,
+      StudioEmailField,
+      StudioBanner,
     },
 
-    showEmailError() {
-      this.emailValidationVisible = true;
+    data() {
+      return {
+        error: false,
+        emailValidationVisible: false,
+      };
     },
 
-    submit() {
-      this.error = false;
+    computed: {
+      emailErrors() {
+        if (!this.emailValidationVisible || !this.errors.email) {
+          return [];
+        }
+
+        return [this.$tr('validEmailMessage')];
+      },
+    },
 
-      const formData = this.clean();
+    methods: {
+      ...mapActions('account', ['sendPasswordResetLink']),
 
-      if (!this.validate(formData)) {
+      hideEmailError() {
+        this.emailValidationVisible = false;
+      },
+
+      showEmailError() {
         this.emailValidationVisible = true;
-        return;
-      }
-
-      this.sendPasswordResetLink(formData.email)
-        .then(() => {
-          this.$router
-            .push({
-              name: 'PasswordInstructionsSent',
-            })
-            .catch(() => {});
-        })
-        .catch(() => {
-          this.error = true;
-        });
+      },
+
+      submit() {
+        this.error = false;
+
+        const formData = this.clean();
+
+        if (!this.validate(formData)) {
+          this.emailValidationVisible = true;
+          return;
+        }
+
+        this.sendPasswordResetLink(formData.email)
+          .then(() => {
+            this.$router
+              .push({
+                name: 'PasswordInstructionsSent',
+              })
+              .catch(() => {});
+          })
+          .catch(() => {
+            this.error = true;
+          });
+      },
+    },
+
+    $trs: {
+      forgotPasswordTitle: 'Reset your password',
+      forgotPasswordPrompt:
+        'Please enter your email address to receive instructions for resetting your password',
+      submitButton: 'Submit',
+      forgotPasswordFailed: 'Failed to send a password reset link. Please try again.',
+      validEmailMessage: 'Please enter a valid email',
     },
-  },
-
-  $trs: {
-    forgotPasswordTitle: 'Reset your password',
-    forgotPasswordPrompt:
-      'Please enter your email address to receive instructions for resetting your password',
-    submitButton: 'Submit',
-    forgotPasswordFailed:
-      'Failed to send a password reset link. Please try again.',
-    validEmailMessage: 'Please enter a valid email',
-  },
-};
+  };
+
 </script>
 
+
 <style lang="scss" scoped>
-.w-100 {
-  width: 100%;
-}
-</style>
\ No newline at end of file
+
+  .w-100 {
+    width: 100%;
+  }
+
+</style>