Skip to content
This repository has been archived by the owner on Oct 12, 2023. It is now read-only.

Commit

Permalink
@angular/core migration - migration-v16-guard-and-resolve-interfaces
Browse files Browse the repository at this point in the history
In Angular version 15.2, the guard and resolver interfaces (CanActivate, Resolve, etc) were deprecated. This migration removes imports and 'implements' clauses that contain them.
  • Loading branch information
sarunint committed May 19, 2023
1 parent e23c944 commit 784c9e3
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 64 deletions.
4 changes: 2 additions & 2 deletions src/app/admin.guard.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, CanLoad, Route, Router, RouterStateSnapshot } from '@angular/router';
import { ActivatedRouteSnapshot, Route, Router, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { first, map, switchMap } from 'rxjs/operators';

import { ConfigService } from './core/config/config.service';
import { UserService } from './core/user/user.service';

@Injectable()
export class AdminGuard implements CanLoad, CanActivate {
export class AdminGuard {

constructor(private userService: UserService, private configService: ConfigService, private router: Router) { }

Expand Down
4 changes: 2 additions & 2 deletions src/app/main/accept.guard.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';

import { UserService } from '../core/user/user.service';


@Injectable()
export class AcceptGuard implements CanActivate {
export class AcceptGuard {

constructor(private userService: UserService, private router: Router) { }

Expand Down
9 changes: 2 additions & 7 deletions src/app/main/day.guard.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import { Injectable } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
Router,
RouterStateSnapshot
} from '@angular/router';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';

import { UserService } from '../core/user/user.service';

@Injectable()
export class DayGuard implements CanActivate {
export class DayGuard {
constructor(private userService: UserService, private router: Router) {}

canActivate(
Expand Down
9 changes: 2 additions & 7 deletions src/app/main/pay.guard.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import { Injectable } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
Router,
RouterStateSnapshot
} from '@angular/router';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';

import { UserService } from '../core/user/user.service';

@Injectable()
export class PayGuard implements CanActivate {
export class PayGuard {
constructor(private userService: UserService, private router: Router) {}

canActivate(
Expand Down
9 changes: 2 additions & 7 deletions src/app/main/post-pay.guard.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import { Injectable, Inject, LOCALE_ID } from '@angular/core';
import {
CanActivate,
ActivatedRouteSnapshot,
RouterStateSnapshot,
Router
} from '@angular/router';
import { ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
import { Observable, of } from 'rxjs';
import { UserService } from '../core/user/user.service';
import { ConfigService } from '../core/config/config.service';
Expand All @@ -13,7 +8,7 @@ import { first, switchMap, map } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
})
export class PostPayGuard implements CanActivate {
export class PostPayGuard {
constructor(
@Inject(LOCALE_ID) private locale_id: string,
private router: Router,
Expand Down
9 changes: 2 additions & 7 deletions src/app/main/post-register.guard.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import { Inject, Injectable, LOCALE_ID } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
Router,
RouterStateSnapshot
} from '@angular/router';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
import { Observable, of } from 'rxjs';
import { first, map, switchMap } from 'rxjs/operators';

Expand All @@ -13,7 +8,7 @@ import { ConfigService } from '../core/config/config.service';
import { UserService } from '../core/user/user.service';

@Injectable()
export class PostRegisterGuard implements CanActivate {
export class PostRegisterGuard {
constructor(
private router: Router,
private configService: ConfigService,
Expand Down
9 changes: 2 additions & 7 deletions src/app/main/post-select-day-and-song.guard.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import { Inject, Injectable, LOCALE_ID } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
Router,
RouterStateSnapshot
} from '@angular/router';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
import { Observable, of } from 'rxjs';
import { first, map, switchMap } from 'rxjs/operators';
import { ConfigService } from '../core/config/config.service';
Expand All @@ -13,7 +8,7 @@ import { UserService } from '../core/user/user.service';
@Injectable({
providedIn: 'root'
})
export class PostSelectDayAndSongGuard implements CanActivate {
export class PostSelectDayAndSongGuard {
constructor(
@Inject(LOCALE_ID) private locale_id: string,
private router: Router,
Expand Down
9 changes: 2 additions & 7 deletions src/app/main/profile.guard.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import { Injectable } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
Router,
RouterStateSnapshot
} from '@angular/router';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';

import { UserService } from '../core/user/user.service';

@Injectable()
export class ProfileGuard implements CanActivate {
export class ProfileGuard {
constructor(private userService: UserService, private router: Router) {}

canActivate(
Expand Down
11 changes: 2 additions & 9 deletions src/app/mode.guard.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
import { Injectable } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
CanLoad,
Route,
Router,
RouterStateSnapshot
} from '@angular/router';
import { ActivatedRouteSnapshot, Route, Router, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { first, map } from 'rxjs/operators';

import { environment } from '../environments/environment';
import { ConfigService } from './core/config/config.service';

@Injectable()
export class ModeGuard implements CanActivate, CanLoad {
export class ModeGuard {
constructor(private configService: ConfigService, private router: Router) {}

canActivate(
Expand Down
11 changes: 2 additions & 9 deletions src/app/user.guard.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
import { Injectable } from '@angular/core';
import {
ActivatedRouteSnapshot,
CanActivate,
CanLoad,
Route,
Router,
RouterStateSnapshot
} from '@angular/router';
import { ActivatedRouteSnapshot, Route, Router, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { first, map } from 'rxjs/operators';

import { UserService } from './core/user/user.service';

@Injectable()
export class UserGuard implements CanActivate, CanLoad {
export class UserGuard {
constructor(private userService: UserService, private router: Router) {}

canActivate(
Expand Down

0 comments on commit 784c9e3

Please sign in to comment.