From f2560944d5e4abcd8018f1d083352ba7a0fce0f6 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Jun 2024 17:33:36 +0530 Subject: [PATCH 01/11] disabled button --- src/main.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.html b/src/main.html index 4a30c39..50ceee4 100644 --- a/src/main.html +++ b/src/main.html @@ -27,6 +27,7 @@ type="button" @click.prevent="resendVerificationEmail" :disabled="apiInProgress" + :disabled="!isButtonDisabled" > {{ t("email-recovery", "Resend Verification Email") }} -- GitLab From b4cb8170507398e876513b07e0d0191b6ff2eed8 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Jun 2024 17:40:14 +0530 Subject: [PATCH 02/11] disabled button --- src/main.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.html b/src/main.html index 50ceee4..c5955cc 100644 --- a/src/main.html +++ b/src/main.html @@ -26,7 +26,6 @@ v-if="recoveryEmailVerificationStatus !== true && recoveryEmail !== ''" type="button" @click.prevent="resendVerificationEmail" - :disabled="apiInProgress" :disabled="!isButtonDisabled" > {{ t("email-recovery", "Resend Verification Email") }} -- GitLab From bfab54ca6a27d37ec938dff8af0521555b22d7eb Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Jun 2024 17:57:15 +0530 Subject: [PATCH 03/11] disabled button --- src/App.vue | 6 ++++++ src/main.html | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/App.vue b/src/App.vue index 0eb764f..3c45b2b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -28,6 +28,12 @@ export default { isButtonDisabled() { return this.recoveryEmail === this.unverifiedRecoveryEmail || this.recoveryEmail === loadState('email-recovery', 'recoveryEmail') || this.recoveryEmail.trim() === '' || this.apiInProgress }, + isResendButtonDisabled() { + return !(this.recoveryEmail === this.unverifiedRecoveryEmail || this.recoveryEmail === loadState('email-recovery', 'recoveryEmail') || this.recoveryEmail.trim() === '' || this.apiInProgress) + }, + isResendButtonVisible() { + return (this.recoveryEmailVerificationStatus !== true && this.recoveryEmail !== '' && this.recoveryEmail !== loadState('email-recovery', 'recoveryEmail')) + }, }, methods: { updateRecoveryEmail() { diff --git a/src/main.html b/src/main.html index c5955cc..3e42f24 100644 --- a/src/main.html +++ b/src/main.html @@ -23,10 +23,10 @@ -- GitLab From cabc9b6275606563d835b5bbcc05b82edc91d408 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Jun 2024 18:03:39 +0530 Subject: [PATCH 04/11] disabled button --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 3c45b2b..8a8dcf6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -32,7 +32,7 @@ export default { return !(this.recoveryEmail === this.unverifiedRecoveryEmail || this.recoveryEmail === loadState('email-recovery', 'recoveryEmail') || this.recoveryEmail.trim() === '' || this.apiInProgress) }, isResendButtonVisible() { - return (this.recoveryEmailVerificationStatus !== true && this.recoveryEmail !== '' && this.recoveryEmail !== loadState('email-recovery', 'recoveryEmail')) + return ((this.recoveryEmailVerificationStatus !== true && this.recoveryEmail !== '') || this.recoveryEmail === loadState('email-recovery', 'recoveryEmail')) }, }, methods: { -- GitLab From 44667c9365165f5fcce22efc31461845835b07cb Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Jun 2024 18:08:18 +0530 Subject: [PATCH 05/11] disabled button --- src/App.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.vue b/src/App.vue index 8a8dcf6..e318c94 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,7 +21,7 @@ export default { placeholder: t('email-recovery', 'Recovery Email'), value: t('email-recovery', 'Change Recovery Email'), recoveryEmailVerificationStatus: loadState('email-recovery', 'recoveryEmailVerificationStatus'), - apiInProgress: false, + apiInProgress: false } }, computed: { @@ -32,7 +32,7 @@ export default { return !(this.recoveryEmail === this.unverifiedRecoveryEmail || this.recoveryEmail === loadState('email-recovery', 'recoveryEmail') || this.recoveryEmail.trim() === '' || this.apiInProgress) }, isResendButtonVisible() { - return ((this.recoveryEmailVerificationStatus !== true && this.recoveryEmail !== '') || this.recoveryEmail === loadState('email-recovery', 'recoveryEmail')) + return (this.recoveryEmailVerificationStatus === false) }, }, methods: { -- GitLab From 4d772cf9e71973ca87954d8cd8908fe21b3162bd Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Jun 2024 18:17:41 +0530 Subject: [PATCH 06/11] disabled button --- src/App.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.vue b/src/App.vue index e318c94..9fec116 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,7 +21,7 @@ export default { placeholder: t('email-recovery', 'Recovery Email'), value: t('email-recovery', 'Change Recovery Email'), recoveryEmailVerificationStatus: loadState('email-recovery', 'recoveryEmailVerificationStatus'), - apiInProgress: false + apiInProgress: false, } }, computed: { @@ -32,7 +32,7 @@ export default { return !(this.recoveryEmail === this.unverifiedRecoveryEmail || this.recoveryEmail === loadState('email-recovery', 'recoveryEmail') || this.recoveryEmail.trim() === '' || this.apiInProgress) }, isResendButtonVisible() { - return (this.recoveryEmailVerificationStatus === false) + return (this.recoveryEmailVerificationStatus !== true && this.unverifiedRecoveryEmail !== '') }, }, methods: { -- GitLab From 97c923461be8d7de598da2a95bbc7eeed6d8c8f4 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Jun 2024 18:34:27 +0530 Subject: [PATCH 07/11] cange --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 9fec116..9968eb0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ export default { }, isResendButtonVisible() { return (this.recoveryEmailVerificationStatus !== true && this.unverifiedRecoveryEmail !== '') - }, + } }, methods: { updateRecoveryEmail() { -- GitLab From 27788e92b5d3e76344b092480955497bcfdd7e0e Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 11 Jun 2024 18:34:42 +0530 Subject: [PATCH 08/11] cange --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 9968eb0..9fec116 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ export default { }, isResendButtonVisible() { return (this.recoveryEmailVerificationStatus !== true && this.unverifiedRecoveryEmail !== '') - } + }, }, methods: { updateRecoveryEmail() { -- GitLab From db8df59a0d878b2fc9ca575868a8e352e9981c96 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Wed, 12 Jun 2024 14:04:31 +0530 Subject: [PATCH 09/11] added unverifiedRecoveryEmail --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 9fec116..a69af07 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,7 +14,7 @@ export default { return { recoveryEmail: recoveryEmail || unverifiedRecoveryEmail, - unverifiedRecoveryEmail, + unverifiedRecoveryEmail: unverifiedRecoveryEmail, errorKey: '', showConfirmation: false, showError: false, -- GitLab From b4c5b2f0ab81ef8c171155fe62e00a96de445c37 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Wed, 12 Jun 2024 14:19:45 +0530 Subject: [PATCH 10/11] change --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index a69af07..9fec116 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,7 +14,7 @@ export default { return { recoveryEmail: recoveryEmail || unverifiedRecoveryEmail, - unverifiedRecoveryEmail: unverifiedRecoveryEmail, + unverifiedRecoveryEmail, errorKey: '', showConfirmation: false, showError: false, -- GitLab From e8acc889c30aae44ee7ae22d752d9b6b33c69715 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Wed, 12 Jun 2024 14:26:07 +0530 Subject: [PATCH 11/11] added verifiedRecoveryEmail --- src/App.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/App.vue b/src/App.vue index 9fec116..49573a6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,8 +11,10 @@ export default { data() { const recoveryEmail = loadState('email-recovery', 'recoveryEmail') const unverifiedRecoveryEmail = loadState('email-recovery', 'unverifiedRecoveryEmail') + const recoveryEmailVerificationStatus = loadState('email-recovery', 'recoveryEmailVerificationStatus') return { + verifiedRecoveryEmail: recoveryEmail, recoveryEmail: recoveryEmail || unverifiedRecoveryEmail, unverifiedRecoveryEmail, errorKey: '', @@ -20,16 +22,16 @@ export default { showError: false, placeholder: t('email-recovery', 'Recovery Email'), value: t('email-recovery', 'Change Recovery Email'), - recoveryEmailVerificationStatus: loadState('email-recovery', 'recoveryEmailVerificationStatus'), + recoveryEmailVerificationStatus, apiInProgress: false, } }, computed: { isButtonDisabled() { - return this.recoveryEmail === this.unverifiedRecoveryEmail || this.recoveryEmail === loadState('email-recovery', 'recoveryEmail') || this.recoveryEmail.trim() === '' || this.apiInProgress + return this.recoveryEmail === this.unverifiedRecoveryEmail || this.recoveryEmail === this.verifiedRecoveryEmail || this.recoveryEmail.trim() === '' || this.apiInProgress }, isResendButtonDisabled() { - return !(this.recoveryEmail === this.unverifiedRecoveryEmail || this.recoveryEmail === loadState('email-recovery', 'recoveryEmail') || this.recoveryEmail.trim() === '' || this.apiInProgress) + return !(this.recoveryEmail === this.unverifiedRecoveryEmail || this.recoveryEmail === this.verifiedRecoveryEmail || this.recoveryEmail.trim() === '' || this.apiInProgress) }, isResendButtonVisible() { return (this.recoveryEmailVerificationStatus !== true && this.unverifiedRecoveryEmail !== '') -- GitLab