From b542badbdd3db4f1f52fdfe1b09dccab8bfd54e6 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 21 Feb 2024 12:28:04 +0530 Subject: [PATCH 1/5] Fixed: screen halt on logging by showing a loader until succesfully logged in (#81) --- src/locales/en.json | 1 + src/views/Login.vue | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/locales/en.json b/src/locales/en.json index 67b8a28..648b9bc 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -3,6 +3,7 @@ "Launch Pad": "Launch Pad", "Login": "Login", "Logout": "Logout", + "Logging in": "Loggin in", "Next": "Next", "OMS": "OMS", "Password": "Password", diff --git a/src/views/Login.vue b/src/views/Login.vue index 631448b..37334ea 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -236,6 +236,7 @@ export default defineComponent({ return } + this.presentLoader('Logging in') try { await this.authStore.login(username.trim(), password) if (this.authStore.getRedirectUrl) { @@ -249,6 +250,7 @@ export default defineComponent({ } catch (error) { console.error(error) } + this.dismissLoader() }, async samlLogin() { try { From 7006b34d5402084635e96a46748657f6e19a8582 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 21 Feb 2024 12:40:35 +0530 Subject: [PATCH 2/5] Fixed: entry in locale file for loader messgae while logging (#81) --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 648b9bc..96b2e7b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -3,7 +3,7 @@ "Launch Pad": "Launch Pad", "Login": "Login", "Logout": "Logout", - "Logging in": "Loggin in", + "Logging in": "Logging in", "Next": "Next", "OMS": "OMS", "Password": "Password", From 1e3a4ee76c04f257c0ddcb8d34084bc517795e6d Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Thu, 22 Aug 2024 16:01:44 +0530 Subject: [PATCH 3/5] Improved: used spinner instead of loader while logging in (#81) --- src/locales/en.json | 1 - src/views/Login.vue | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 0ff1df7..851679e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -3,7 +3,6 @@ "Launch Pad": "Launch Pad", "Login": "Login", "Logout": "Logout", - "Logging in...": "Logging in...", "Logging out...": "Logging out...", "Next": "Next", "Not configured": "Not configured", diff --git a/src/views/Login.vue b/src/views/Login.vue index 581e1b7..8defa3b 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -34,9 +34,10 @@
- + {{ $t("Login") }} - + +
@@ -64,6 +65,7 @@ import { IonInput, IonItem, IonPage, + IonSpinner, loadingController } from "@ionic/vue"; import { defineComponent } from "vue"; @@ -88,6 +90,7 @@ export default defineComponent({ IonInput, IonItem, IonPage, + IonSpinner, Logo }, data () { @@ -102,7 +105,8 @@ export default defineComponent({ hideBackground: true, isConfirmingForActiveSession: false, loader: null as any, - loginOption: {} as any + loginOption: {} as any, + isLoggingIn: false }; }, ionViewWillEnter() { @@ -242,7 +246,7 @@ export default defineComponent({ return } - this.presentLoader('Logging in...') + this.isLoggingIn = true; try { await this.authStore.login(username.trim(), password) if (this.authStore.getRedirectUrl) { @@ -256,7 +260,7 @@ export default defineComponent({ } catch (error) { console.error(error) } - this.dismissLoader() + this.isLoggingIn = false; }, async samlLogin() { try { From 8831741b05c921703dd8a210bebe3a222702e062 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Thu, 22 Aug 2024 16:10:08 +0530 Subject: [PATCH 4/5] Improved: added margin at between login text and spinner (#81) --- src/views/Login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Login.vue b/src/views/Login.vue index 8defa3b..162ba56 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -36,7 +36,7 @@
{{ $t("Login") }} - +
From e84bf4488c765fa531d5e65949716dc4c6625564 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Thu, 22 Aug 2024 16:25:11 +0530 Subject: [PATCH 5/5] Improved: removed margin from the spinner and added size attribute (#81) --- src/views/Login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Login.vue b/src/views/Login.vue index 162ba56..7b9fe48 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -36,7 +36,7 @@
{{ $t("Login") }} - +