diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index 83859aead..b493d2813 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -18,9 +18,9 @@ export class AuthGuard implements CanActivate { state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { if(!SessionStore.user.Inactivity) { - this.router.navigate(['/inactivity']); + this.router.navigate(['/']); } - else if(window.location.pathname != '' && !SessionStore.exist) { + else if(!SessionStore.exist) { this.router.navigate(['/']); return false } else { diff --git a/src/app/guards/login.guard.ts b/src/app/guards/login.guard.ts index 375d80d13..8b7a734d3 100644 --- a/src/app/guards/login.guard.ts +++ b/src/app/guards/login.guard.ts @@ -17,6 +17,7 @@ export class LoginGuard implements CanActivate { // console.log(SessionStore.exist, SessionStore.user.Inactivity, SessionStore.user.LoginPreference) + console.log(SessionStore.exist, SessionStore.user.Inactivity, SessionStore.user.LoginPreference) if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) { this.router.navigate(['/home/events']); return false diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index feca818ee..d3414e37c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -133,6 +133,11 @@ export class GabineteDigitalPage implements OnInit, DoCheck { } }; this.checkRoutes(); + + + // this.eventoaprovacaostore.resetmd([]) + // this.eventoaprovacaostore.resetpr([]) + } ngDoCheck(): void { @@ -158,7 +163,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.segmentVista = "listview"; } else{ - this.segmentVista = "boxview"; + this.segmentVista = "boxview" } const pathname = window.location.pathname diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index b2fd26e37..b453225dc 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -83,7 +83,7 @@ export class LoginPage implements OnInit { if (attempt.UserId == SessionStore.user.UserId) { await this.authService.SetSession(attempt, this.userattempt); - this.authService.loginChat(this.userattempt); + await this.authService.loginChat(this.userattempt); this.getToken(); SessionStore.setInativity(true) @@ -92,6 +92,7 @@ export class LoginPage implements OnInit { SessionStore.delete() window.localStorage.clear(); await this.authService.SetSession(attempt, this.userattempt); + await this.authService.loginChat(this.userattempt); this.router.navigate(['/pin']); }