-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #154 from computas/standalone-components
Standalone components
- Loading branch information
Showing
29 changed files
with
459 additions
and
448 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,14 @@ | ||
| import { Injectable } from '@angular/core'; | ||
| import { Router } from '@angular/router'; | ||
| import { inject } from '@angular/core'; | ||
| import { CanActivateFn, Router } from '@angular/router'; | ||
| import { LoginService } from './login.service'; | ||
| import { CanActivate } from '@angular/router'; | ||
|
|
||
| @Injectable() | ||
| export class AuthGuard implements CanActivate { | ||
| constructor(private loginService: LoginService, private router: Router) {} | ||
| canActivate() { | ||
| if (!this.loginService.isLoggedIn()) { | ||
| this.router.navigate(['admin']); | ||
| return false; | ||
| } | ||
| return true; | ||
| export const authGuard: CanActivateFn = () => { | ||
| const loginService = inject(LoginService); | ||
| const router = inject(Router); | ||
|
|
||
| if (!loginService.isLoggedIn()) { | ||
| router.navigate(['admin']); | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,66 @@ | ||
| import { Component, HostListener, OnInit } from '@angular/core'; | ||
| import { Subject } from 'rxjs'; | ||
| import { Router } from '@angular/router'; | ||
| import { MatDialog } from '@angular/material/dialog'; | ||
| import { RouterOutlet } from '@angular/router'; | ||
|
|
||
| import { IdleTimeoutComponent } from './idle-timeout/idle-timeout.component'; | ||
| import { routeTransitionAnimations } from './route-transition-animations'; | ||
| import { environment } from '../environments/environment'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-root', | ||
| templateUrl: './app.component.html', | ||
| styleUrls: ['./app.component.scss'], | ||
| animations: [routeTransitionAnimations], | ||
| }) | ||
| export class AppComponent implements OnInit { | ||
| title = 'Teknisk Museum'; | ||
|
|
||
| userActivity = 0; | ||
| userInactive = new Subject<any>(); | ||
|
|
||
| isDialogOpen = false; | ||
| inactivityTime = environment.inactivityTime; | ||
|
|
||
| constructor(private router: Router, public dialog: MatDialog) {} | ||
|
|
||
| ngOnInit(): void { | ||
| this.setDialogTimeout(); | ||
| this.userInactive.subscribe(() => { | ||
| if (this.router.url !== '/' && this.router.url !== '/admin') { | ||
| this.openDialog(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| openDialog() { | ||
| if (!this.isDialogOpen) { | ||
| this.dialog | ||
| .open(IdleTimeoutComponent) | ||
| .afterClosed() | ||
| .subscribe(() => { | ||
| this.isDialogOpen = false; | ||
| }); | ||
| this.isDialogOpen = true; | ||
| } | ||
| } | ||
|
|
||
| setDialogTimeout() { | ||
| this.userActivity = window.setTimeout(() => this.userInactive.next(undefined), this.inactivityTime); | ||
| } | ||
|
|
||
| prepareRoute(outlet: RouterOutlet) { | ||
| const animationState = 'animationState'; | ||
| return outlet && outlet.activatedRouteData && outlet.activatedRouteData[animationState]; | ||
| } | ||
|
|
||
| @HostListener('window:mousemove') | ||
| @HostListener('document:touchmove') | ||
| refreshUserState() { | ||
| clearTimeout(this.userActivity); | ||
| this.setDialogTimeout(); | ||
| } | ||
| } | ||
| import { Component, HostListener, OnInit } from '@angular/core'; | ||
| import { Subject } from 'rxjs'; | ||
| import { Router } from '@angular/router'; | ||
| import { MatDialog } from '@angular/material/dialog'; | ||
| import { RouterOutlet } from '@angular/router'; | ||
|
|
||
| import { IdleTimeoutComponent } from './idle-timeout/idle-timeout.component'; | ||
| import { routeTransitionAnimations } from './route-transition-animations'; | ||
| import { environment } from '../environments/environment'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-root', | ||
| templateUrl: './app.component.html', | ||
| styleUrls: ['./app.component.scss'], | ||
| animations: [routeTransitionAnimations], | ||
| standalone: true, | ||
| imports: [RouterOutlet], | ||
| }) | ||
| export class AppComponent implements OnInit { | ||
| title = 'Teknisk Museum'; | ||
|
|
||
| userActivity = 0; | ||
| userInactive = new Subject<any>(); | ||
|
|
||
| isDialogOpen = false; | ||
| inactivityTime = environment.inactivityTime; | ||
|
|
||
| constructor(private router: Router, public dialog: MatDialog) {} | ||
|
|
||
| ngOnInit(): void { | ||
| this.setDialogTimeout(); | ||
| this.userInactive.subscribe(() => { | ||
| if (this.router.url !== '/' && this.router.url !== '/admin') { | ||
| this.openDialog(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| openDialog() { | ||
| if (!this.isDialogOpen) { | ||
| this.dialog | ||
| .open(IdleTimeoutComponent) | ||
| .afterClosed() | ||
| .subscribe(() => { | ||
| this.isDialogOpen = false; | ||
| }); | ||
| this.isDialogOpen = true; | ||
| } | ||
| } | ||
|
|
||
| setDialogTimeout() { | ||
| this.userActivity = window.setTimeout(() => this.userInactive.next(undefined), this.inactivityTime); | ||
| } | ||
|
|
||
| prepareRoute(outlet: RouterOutlet) { | ||
| const animationState = 'animationState'; | ||
| return outlet && outlet.activatedRouteData && outlet.activatedRouteData[animationState]; | ||
| } | ||
|
|
||
| @HostListener('window:mousemove') | ||
| @HostListener('document:touchmove') | ||
| refreshUserState() { | ||
| clearTimeout(this.userActivity); | ||
| this.setDialogTimeout(); | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.