From 9f3d3d504420576af6a8eaf79aaf4c6fdacb4ea0 Mon Sep 17 00:00:00 2001 From: Mohit Maroliya Date: Mon, 27 Jan 2020 21:42:49 +0530 Subject: [PATCH 1/9] Adding validation and toggle icon in forgot password section. --- app/components/forms/reset-password-form.js | 4 ++++ app/templates/components/forms/reset-password-form.hbs | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/app/components/forms/reset-password-form.js b/app/components/forms/reset-password-form.js index 412dac04a83..80fd062fa65 100644 --- a/app/components/forms/reset-password-form.js +++ b/app/components/forms/reset-password-form.js @@ -34,6 +34,10 @@ export default Component.extend(FormMixin, { { type : 'empty', prompt : this.l10n.t('Please enter your new password') + }, + { + type : 'minLength[8]', + prompt : this.l10n.t('Your password must have at least {ruleValue} characters') } ] } diff --git a/app/templates/components/forms/reset-password-form.hbs b/app/templates/components/forms/reset-password-form.hbs index 933143cf938..78083367c99 100644 --- a/app/templates/components/forms/reset-password-form.hbs +++ b/app/templates/components/forms/reset-password-form.hbs @@ -21,6 +21,11 @@
{{input type='password' name='password' placeholder=(t 'password') value=password}} +
+ +
{{else}}
From 990d52457f779947e45acc611adff6c1cfadfe2c Mon Sep 17 00:00:00 2001 From: Mohit Maroliya Date: Tue, 28 Jan 2020 19:31:05 +0530 Subject: [PATCH 2/9] Adding toggle icon action --- app/components/forms/reset-password-form.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/components/forms/reset-password-form.js b/app/components/forms/reset-password-form.js index 80fd062fa65..58a0e04ca57 100644 --- a/app/components/forms/reset-password-form.js +++ b/app/components/forms/reset-password-form.js @@ -46,6 +46,9 @@ export default Component.extend(FormMixin, { }, actions: { + showPassword(fieldName) { + this.toggleProperty(`showPass${fieldName}`); + }, submit() { this.onValid(() => { let payload = {}; From baadb686e8ef052ec2ea36c7d5d682a950a2d6e3 Mon Sep 17 00:00:00 2001 From: Mohit Maroliya Date: Tue, 28 Jan 2020 19:55:07 +0530 Subject: [PATCH 3/9] Fixing CI by correcting indentation --- app/templates/components/forms/reset-password-form.hbs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/templates/components/forms/reset-password-form.hbs b/app/templates/components/forms/reset-password-form.hbs index 78083367c99..1412081f866 100644 --- a/app/templates/components/forms/reset-password-form.hbs +++ b/app/templates/components/forms/reset-password-form.hbs @@ -21,11 +21,11 @@
{{input type='password' name='password' placeholder=(t 'password') value=password}} -
- -
+
+ +
{{else}}
From 8fd0be161cbb9ac9ce251f4d0dc68a8650d2bfb6 Mon Sep 17 00:00:00 2001 From: Mohit Maroliya Date: Thu, 30 Jan 2020 22:44:14 +0530 Subject: [PATCH 4/9] Adding confirm password field. --- app/components/forms/reset-password-form.js | 13 +++++++++++++ .../components/forms/reset-password-form.hbs | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/components/forms/reset-password-form.js b/app/components/forms/reset-password-form.js index 58a0e04ca57..64be5d089f7 100644 --- a/app/components/forms/reset-password-form.js +++ b/app/components/forms/reset-password-form.js @@ -40,6 +40,19 @@ export default Component.extend(FormMixin, { prompt : this.l10n.t('Your password must have at least {ruleValue} characters') } ] + }, + repeatPassword: { + identifier : 'password_repeat', + rules : [ + { + type : 'match[password]', + prompt : this.l10n.t('Passwords do not match') + }, + { + type : 'empty', + prompt : this.l10n.t('Please confirm your password') + } + ] } } }; diff --git a/app/templates/components/forms/reset-password-form.hbs b/app/templates/components/forms/reset-password-form.hbs index 1412081f866..a2c267ddc4c 100644 --- a/app/templates/components/forms/reset-password-form.hbs +++ b/app/templates/components/forms/reset-password-form.hbs @@ -23,10 +23,23 @@ {{input type='password' name='password' placeholder=(t 'password') value=password}}
+
+ +
+ {{input type=(if showPassRepeat 'text' 'password') name='password_repeat' placeholder=(t 'Confirm Password') value=passwordRepeat}} +
+ +
+
+
{{else}}
From 47e0cff412abec612de70e56f0e17a76ccd45f34 Mon Sep 17 00:00:00 2001 From: Mohit Maroliya Date: Fri, 31 Jan 2020 00:46:43 +0530 Subject: [PATCH 5/9] Adding confirm password field and toggle action. --- app/components/forms/reset-password-form.js | 6 +---- .../components/forms/reset-password-form.hbs | 24 ++++++++----------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/app/components/forms/reset-password-form.js b/app/components/forms/reset-password-form.js index 64be5d089f7..d6c7c5ac58f 100644 --- a/app/components/forms/reset-password-form.js +++ b/app/components/forms/reset-password-form.js @@ -47,10 +47,6 @@ export default Component.extend(FormMixin, { { type : 'match[password]', prompt : this.l10n.t('Passwords do not match') - }, - { - type : 'empty', - prompt : this.l10n.t('Please confirm your password') } ] } @@ -129,4 +125,4 @@ export default Component.extend(FormMixin, { this.set('session.newUser', null); } } -}); +}); \ No newline at end of file diff --git a/app/templates/components/forms/reset-password-form.hbs b/app/templates/components/forms/reset-password-form.hbs index a2c267ddc4c..4ca2b92139b 100644 --- a/app/templates/components/forms/reset-password-form.hbs +++ b/app/templates/components/forms/reset-password-form.hbs @@ -20,24 +20,20 @@ {{#if token}}
- {{input type='password' name='password' placeholder=(t 'password') value=password}} + {{input type='password' name='password' placeholder=(t 'New password') value=password}}
-
- -
- {{input type=(if showPassRepeat 'text' 'password') name='password_repeat' placeholder=(t 'Confirm Password') value=passwordRepeat}} -
- -
+
+ + {{input type='password' name='password_repeat' placeholder=(t 'Confirm password') value=passwordRepeat}} +
+
{{else}} @@ -59,4 +55,4 @@
-
+
\ No newline at end of file From ca6b855cc17af6e0e5518ef49113da0f9b11f913 Mon Sep 17 00:00:00 2001 From: Mohit Maroliya Date: Fri, 31 Jan 2020 01:42:37 +0530 Subject: [PATCH 6/9] Adding confirm password field and toggle icon action. --- app/components/forms/reset-password-form.js | 8 +++-- .../components/forms/reset-password-form.hbs | 29 +++++++++++++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/app/components/forms/reset-password-form.js b/app/components/forms/reset-password-form.js index d6c7c5ac58f..c958687b26d 100644 --- a/app/components/forms/reset-password-form.js +++ b/app/components/forms/reset-password-form.js @@ -55,8 +55,12 @@ export default Component.extend(FormMixin, { }, actions: { - showPassword(fieldName) { - this.toggleProperty(`showPass${fieldName}`); + showSignupPassword() { + this.toggleProperty('shownewPass'); + }, + + showConfirmPassword() { + this.toggleProperty('showrepeatPass'); }, submit() { this.onValid(() => { diff --git a/app/templates/components/forms/reset-password-form.hbs b/app/templates/components/forms/reset-password-form.hbs index 4ca2b92139b..bde94f359f5 100644 --- a/app/templates/components/forms/reset-password-form.hbs +++ b/app/templates/components/forms/reset-password-form.hbs @@ -20,19 +20,36 @@ {{#if token}}
- {{input type='password' name='password' placeholder=(t 'New password') value=password}} + {{#if shownewPass}} + {{input type='text' name='password' placeholder=(t 'New Password') value=password}} + {{else}} + {{input type='password' name='password' placeholder=(t 'New Password') value=password}} + {{/if}}
-
- {{input type='password' name='password_repeat' placeholder=(t 'Confirm password') value=passwordRepeat}} + {{#if showrepeatPass}} + {{input type='text' name='password' placeholder=(t 'Confirm Password') value=passwordrepeat}} + {{else}} + {{input type='password' name='password' placeholder=(t 'Confirm Password') value=passwordrepeat}} + {{/if}}
-
From 21752bfa9fbb7688c8a478b60b49987c37abb84d Mon Sep 17 00:00:00 2001 From: Mohit Maroliya Date: Wed, 19 Feb 2020 20:02:38 +0530 Subject: [PATCH 7/9] Adding validations only --- app/components/forms/reset-password-form.js | 8 +++--- .../components/forms/reset-password-form.hbs | 28 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/components/forms/reset-password-form.js b/app/components/forms/reset-password-form.js index c958687b26d..55cbd9c42b5 100644 --- a/app/components/forms/reset-password-form.js +++ b/app/components/forms/reset-password-form.js @@ -55,12 +55,12 @@ export default Component.extend(FormMixin, { }, actions: { - showSignupPassword() { - this.toggleProperty('shownewPass'); + showNewPassword() { + this.toggleProperty('showNewPass'); }, - showConfirmPassword() { - this.toggleProperty('showrepeatPass'); + showRepeatPassword() { + this.toggleProperty('showRepeatPass'); }, submit() { this.onValid(() => { diff --git a/app/templates/components/forms/reset-password-form.hbs b/app/templates/components/forms/reset-password-form.hbs index bde94f359f5..8c39abc6ea0 100644 --- a/app/templates/components/forms/reset-password-form.hbs +++ b/app/templates/components/forms/reset-password-form.hbs @@ -20,15 +20,15 @@ {{#if token}}
- {{#if shownewPass}} - {{input type='text' name='password' placeholder=(t 'New Password') value=password}} + {{#if showNewPass}} + {{input type='text' name='password' placeholder=(t 'New Password') value=data.password}} {{else}} - {{input type='password' name='password' placeholder=(t 'New Password') value=password}} + {{input type='password' name='password' placeholder=(t 'New Password') value=data.password}} {{/if}}
-
- {{#if showrepeatPass}} - {{input type='text' name='password' placeholder=(t 'Confirm Password') value=passwordrepeat}} + {{#if showRepeatPass}} + {{input type='text' name='password_repeat' placeholder=(t 'Confirm Password') value=password_repeat}} {{else}} - {{input type='password' name='password' placeholder=(t 'Confirm Password') value=passwordrepeat}} + {{input type='password' name='password_repeat' placeholder=(t 'Confirm Password') value=password_repeat}} {{/if}}
-
From d324b8d9244f4d85568f3caad2e13b2ace57fa55 Mon Sep 17 00:00:00 2001 From: Mohit Maroliya Date: Thu, 20 Feb 2020 00:30:31 +0530 Subject: [PATCH 8/9] Adding validations in Forget Password Section. --- .../components/forms/reset-password-form.hbs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/templates/components/forms/reset-password-form.hbs b/app/templates/components/forms/reset-password-form.hbs index 8c39abc6ea0..e05ceeb10a4 100644 --- a/app/templates/components/forms/reset-password-form.hbs +++ b/app/templates/components/forms/reset-password-form.hbs @@ -21,13 +21,12 @@
{{#if showNewPass}} - {{input type='text' name='password' placeholder=(t 'New Password') value=data.password}} + {{input type='text' name='password' placeholder=(t 'New Password') value=password}} {{else}} - {{input type='password' name='password' placeholder=(t 'New Password') value=data.password}} + {{input type='password' name='password' placeholder=(t 'New Password') value=password}} {{/if}}
+ {{else}} +
+ + {{input name='email' placeholder=(t 'Email ID') value=identification}} +
+ {{/if}} +
+
+ {{#if token}}
{{#if showRepeatPass}} From f54877f330c7106852f00a0b2f9f9b5cad1a4946 Mon Sep 17 00:00:00 2001 From: Mohit Maroliya Date: Thu, 20 Feb 2020 00:45:54 +0530 Subject: [PATCH 9/9] Fixing travis build. --- app/components/forms/reset-password-form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/forms/reset-password-form.js b/app/components/forms/reset-password-form.js index 55cbd9c42b5..1b0fbbf24ed 100644 --- a/app/components/forms/reset-password-form.js +++ b/app/components/forms/reset-password-form.js @@ -129,4 +129,4 @@ export default Component.extend(FormMixin, { this.set('session.newUser', null); } } -}); \ No newline at end of file +});