From 7851c5a78e9305f7f2608c10ea6b30de652607c3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 19 Jan 2023 10:24:19 +0100 Subject: [PATCH] fixe routes --- src/app/guards/login.guard.ts | 6 ++++-- tsconfig.worker.json | 14 ++++++++++++++ version/git-version.ts | 12 ++++++------ 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 tsconfig.worker.json diff --git a/src/app/guards/login.guard.ts b/src/app/guards/login.guard.ts index 2987806a8..a8f1790f3 100644 --- a/src/app/guards/login.guard.ts +++ b/src/app/guards/login.guard.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs'; import { SessionStore } from '../store/session.service'; import { Platform } from '@ionic/angular'; import { RouteService } from 'src/app/services/route.service' +import { FirstEnterService } from 'src/app/services/first-enter.service' @Injectable({ providedIn: 'root' @@ -12,7 +13,8 @@ export class LoginGuard implements CanActivate { constructor( private router:Router, private platform: Platform, - private RouteService: RouteService ) { + private RouteService: RouteService, + private FirstEnterService: FirstEnterService ) { } canActivate( @@ -24,7 +26,7 @@ export class LoginGuard implements CanActivate { if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) { // enter app - this.router.navigate(['/home/events']); + this.FirstEnterService.enter() return false } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && this.platform.is('mobile')) { // login with password while has pin diff --git a/tsconfig.worker.json b/tsconfig.worker.json new file mode 100644 index 000000000..39ec19374 --- /dev/null +++ b/tsconfig.worker.json @@ -0,0 +1,14 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/worker", + "lib": [ + "es2018", + "webworker" + ], + "types": [] + }, + "include": [ + "src/**/*.worker.ts" + ] + } \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 4f6b9f534..b3783d722 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "6195400e0", - "SHA": "6195400e08d52057dbf000709fab5a00a9bf39fa", + "shortSHA": "e56e00c6f", + "SHA": "e56e00c6fa665f6b3246d8fc0fcb038010ae218b", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jan 18 17:18:08 2023 +0100'", - "lastCommitMessage": "all process", - "lastCommitNumber": "4656", + "lastCommitTime": "'Thu Jan 19 10:05:21 2023 +0100'", + "lastCommitMessage": "comment develop stuff", + "lastCommitNumber": "4657", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/guards/login.guard.ts\n\tnew file: tsconfig.worker.json", "changeAuthor": "peter.maquiran" } \ No newline at end of file