* update v4 -> v7 done

This commit is contained in:
Danyi Dávid
2018-11-11 13:50:37 +01:00
parent 3a86fe09ab
commit 1eccb8de8c
19 changed files with 7312 additions and 7714 deletions

View File

@@ -8,14 +8,14 @@ import { User } from "./shared/user";
import { AuthService } from "../auth/auth.service";
@Injectable()
export class ProfileResolverService implements Resolve<User> {
export class ProfileResolverService implements Resolve<false|User> {
private apiEndpoint = environment.apiUrl + '/api/user';
constructor(private httpClient: HttpClient,
private authService: AuthService) {
}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<User> {
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<false|User> {
return this.getProfile().toPromise().then(result => result ? result : false);
}

View File

@@ -8,7 +8,7 @@ import { User } from "./shared/user";
import { AuthService } from "../auth/auth.service";
@Injectable()
export class UserService implements Resolve<Array<User>> {
export class UserService implements Resolve<false|Array<User>> {
private apiEndpoint = environment.apiUrl + '/api/user';
private apiEndpointPassword = environment.apiUrl + '/api/user/password';
@@ -16,7 +16,7 @@ export class UserService implements Resolve<Array<User>> {
private authService: AuthService) {
}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<Array<User>> {
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<false|Array<User>> {
return this.getUsers().toPromise().then(result => result ? result : false);
}