From 3effe61608f30b04fbe238dc983121c8ee9b5690 Mon Sep 17 00:00:00 2001 From: gulnaz Date: Thu, 15 May 2025 10:34:27 +0300 Subject: [PATCH] SUPPORT-9173: add progress bar; fix loader css --- frontend/src/resources/css/inbox-lkrp.css | 27 ++++++++++++------- .../ts/modules/security/guard/auth.guard.ts | 5 +++- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/frontend/src/resources/css/inbox-lkrp.css b/frontend/src/resources/css/inbox-lkrp.css index 803a966..2f16945 100644 --- a/frontend/src/resources/css/inbox-lkrp.css +++ b/frontend/src/resources/css/inbox-lkrp.css @@ -81,7 +81,7 @@ body.webbpm.ervu_lkrp_fl { --size-text-title: 36px; --size-text-subtitle: 20px; --size-text-primary: 18px; - --size-text-secondary: 16px; + --size-text-secondary: 16px; --indent-huge: 48px; --indent-big: 40px; @@ -101,7 +101,7 @@ body.webbpm.ervu_lkrp_fl { } .webbpm.ervu_lkrp_fl a { - color: var(--color-link); + color: var(--color-link); text-decoration: none; } .webbpm.ervu_lkrp_fl a:is(:hover, :focus, :active) { @@ -109,7 +109,7 @@ body.webbpm.ervu_lkrp_fl { } .webbpm.ervu_lkrp_fl .header { - font-family: 'Inter'; + font-family: 'Inter'; min-height: var(--h-header); border: 0; background-color: var(--color-text-primary); @@ -138,7 +138,7 @@ body.webbpm.ervu_lkrp_fl { } .webbpm.ervu_lkrp_fl .header .header-logo .header-menu-left { font-family: 'InterL'; - margin-left: 24px; + margin-left: 24px; } .webbpm.ervu_lkrp_fl .header .header-menu { margin-right: var(--w-screen); @@ -210,7 +210,7 @@ body.webbpm.ervu_lkrp_fl { top: auto; bottom: auto; left: auto; - right: auto; + right: auto; height: var(--h-footer); border: 0; background-color: var(--color-text-primary); @@ -226,7 +226,7 @@ body.webbpm.ervu_lkrp_fl { display: flex; flex-direction: column; font-family: 'Inter'; - height: 100%; + height: 100%; padding: 0; overflow: auto; } @@ -296,7 +296,7 @@ body.webbpm.ervu_lkrp_fl { .webbpm.ervu_lkrp_fl #toast-container .toast-error { width: 100%; min-width: auto; - } + } } /*----------------- Login ---------------- */ @@ -384,7 +384,16 @@ body.webbpm.ervu_lkrp_fl { } /*--------------- end Login -------------- */ -.webbpm.ervu_lkrp_fl .loader { +.webbpm.ervu_lkrp_fl .modal.show.loader .modal-content { + background: none; + border: none; +} + +.webbpm.ervu_lkrp_fl .modal.show.loader .modal-dialog { + margin: auto; +} + +.webbpm.ervu_lkrp_fl .loader:not(.modal) { font-size: 15px; left: calc(50% - 0.4em); top: calc(50% - 0.4em); @@ -422,4 +431,4 @@ body.webbpm.ervu_lkrp_fl { 87.5% { box-shadow: 0em -2.6em 0em 0em rgba(198, 78, 27, 0.3), 1.8em -1.8em 0 0em rgba(198, 78, 27, 0.3), 2.5em 0em 0 0em rgba(198, 78, 27, 0.3), 1.75em 1.75em 0 0em rgba(198, 78, 27, 0.3), 0em 2.5em 0 0em rgba(198, 78, 27, 0.3), -1.8em 1.8em 0 0em rgba(198, 78, 27, 0.7), -2.6em 0em 0 0em rgba(198, 78, 27, 1), -1.8em -1.8em 0 0em #ffffff; } -} \ No newline at end of file +} diff --git a/frontend/src/ts/modules/security/guard/auth.guard.ts b/frontend/src/ts/modules/security/guard/auth.guard.ts index 13d4224..427904d 100644 --- a/frontend/src/ts/modules/security/guard/auth.guard.ts +++ b/frontend/src/ts/modules/security/guard/auth.guard.ts @@ -45,6 +45,7 @@ export abstract class AuthGuard implements CanActivate { return false; } if (code && state) { + this.progressIndicationService.showProgressBar(); const params = new HttpParams().set('code', code).set('state', state); this.httpClient.get("esia/auth", { @@ -58,6 +59,7 @@ export abstract class AuthGuard implements CanActivate { .toPromise() .then( () => { + this.progressIndicationService.hideProgressBar(); window.open(url.origin + url.pathname, "_self"); }) .catch(reason => { @@ -65,7 +67,8 @@ export abstract class AuthGuard implements CanActivate { json.messages.forEach((errorMessage) => { this.messageService.error(errorMessage, json); }) - }); + }) + .finally(() => this.progressIndicationService.hideProgressBar()); return false; } else {