peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixe routes

Browse Source
This commit is contained in:
Peter Maquiran
2023-01-19 10:24:19 +01:00
parent e56e00c6fa
commit 7851c5a78e
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/guards/login.guard.ts
+4 -2
View File
@@ -4,6 +4,7 @@ import { Observable } from 'rxjs';
import { SessionStore } from '../store/session.service'; import { SessionStore } from '../store/session.service';
import { Platform } from '@ionic/angular'; import { Platform } from '@ionic/angular';
import { RouteService } from 'src/app/services/route.service' import { RouteService } from 'src/app/services/route.service'
import { FirstEnterService } from 'src/app/services/first-enter.service'
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@@ -12,7 +13,8 @@ export class LoginGuard implements CanActivate {
constructor( constructor(
private router:Router, private router:Router,
private platform: Platform, private platform: Platform,
private RouteService: RouteService ) { private RouteService: RouteService,
private FirstEnterService: FirstEnterService ) {
} }
canActivate( canActivate(
@@ -24,7 +26,7 @@ export class LoginGuard implements CanActivate {
if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) { if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) {
// enter app // enter app
this.router.navigate(['/home/events']); this.FirstEnterService.enter()
return false return false
} else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && this.platform.is('mobile')) { } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && this.platform.is('mobile')) {
// login with password while has pin // login with password while has pin
tsconfig.worker.json
+14
View File
@@ -0,0 +1,14 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/worker",
"lib": [
"es2018",
"webworker"
],
"types": []
},
"include": [
"src/**/*.worker.ts"
]
}
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "6195400e0", "shortSHA": "e56e00c6f",
"SHA": "6195400e08d52057dbf000709fab5a00a9bf39fa", "SHA": "e56e00c6fa665f6b3246d8fc0fcb038010ae218b",
"branch": "no_bug_movemente", "branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Jan 18 17:18:08 2023 +0100'", "lastCommitTime": "'Thu Jan 19 10:05:21 2023 +0100'",
"lastCommitMessage": "all process", "lastCommitMessage": "comment develop stuff",
"lastCommitNumber": "4656", "lastCommitNumber": "4657",
"change": "", "change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" 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 <file>...\" to unstage)\n\tmodified: src/app/guards/login.guard.ts\n\tnew file: tsconfig.worker.json",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }