diff --git a/src/app/guards/inactivity.guard.ts b/src/app/guards/inactivity.guard.ts index ea87df0d3..a00a13a3f 100644 --- a/src/app/guards/inactivity.guard.ts +++ b/src/app/guards/inactivity.guard.ts @@ -16,14 +16,10 @@ export class InactivityGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { - alert(SessionStore.exist +' '+SessionStore.user.Inactivity + ' '+ !SessionStore.hasPin) - - if(SessionStore.exist && SessionStore.user.Inactivity && !SessionStore.hasPin) { - // alert('stay set pin') - return true + if(SessionStore.exist && SessionStore.user.Inactivity && !SessionStore.hasPin) { + return true } else if(SessionStore.exist && !SessionStore.user.Inactivity) { - // alert('stay conform') return true } else { this.router.navigate(['/home/events']); diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 2961bff97..a6f15c07a 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -161,9 +161,9 @@ export class HomePage implements OnInit { } ) - synchro.registerCallback('Notification', (DataArray)=> { - alert('nice') - }, 'any') + // synchro.registerCallback('Notification', (DataArray)=> { + + // }, 'any') } diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index f438c36fb..3f374b699 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -10,6 +10,7 @@ import { EditProfilePage } from './edit-profile/edit-profile.page'; import { JsonStore } from '../../services/jsonStore.service'; import { StorageService } from '../../services/storage.service'; import { NotificationsService } from '../../services/notifications.service'; +import { SessionStore } from 'src/app/store/session.service'; @Component({ selector: 'app-profile', @@ -212,6 +213,7 @@ export class ProfilePage implements OnInit { logout() { window.localStorage.clear(); + SessionStore.delete(); setTimeout(() => { this.router.navigateByUrl('/', { replaceUrl: true }); diff --git a/src/app/services/network.service.spec.ts b/src/app/services/network.service.spec.ts deleted file mode 100644 index 2c8c63926..000000000 --- a/src/app/services/network.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { NetworkService } from './network.service'; - -describe('NavigationService', () => { - let service: NetworkService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(NetworkService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); \ No newline at end of file diff --git a/src/app/services/network.service.ts b/src/app/services/network.service.ts deleted file mode 100644 index 78b32ba50..000000000 --- a/src/app/services/network.service.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Network } from '@ionic-native/network/ngx'; -import { Platform } from '@ionic/angular'; -import { fromEvent, merge, of, Observable } from 'rxjs'; -import { mapTo } from 'rxjs/operators'; - -@Injectable({ - providedIn: 'root' -}) -export class NetworkService { - - constructor( - private network: Network) { } - - checkNetworkConnection(){ - this.network.onConnect().subscribe((value) => { - - document.body.style.setProperty(`--color`, "#0782C9"); - - console.log('network connected!',value); - }); - } - - checkNetworkDisconnection(){ - this.network.onDisconnect().subscribe((value) => { - document.body.style.setProperty(`--color`, "#eeeb30"); - console.log('network was disconnected :-('),value; - - }); - } -} \ No newline at end of file diff --git a/src/app/store/session.service.ts b/src/app/store/session.service.ts index 9ea6d00f0..d2e8f225e 100644 --- a/src/app/store/session.service.ts +++ b/src/app/store/session.service.ts @@ -72,6 +72,7 @@ class SessionService { return false } return this._user.PIN.length >= 2 + } reset(user) {