From 46757b477c1adb5f98060d15998a3852e18902a6 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 16 Jun 2017 11:01:45 +0200 Subject: [PATCH] Fix client compilation --- client/src/app/core/auth/auth-user.model.ts | 5 +++-- client/src/app/shared/users/user.model.ts | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/src/app/core/auth/auth-user.model.ts b/client/src/app/core/auth/auth-user.model.ts index f827bd6ca..1a31a7834 100644 --- a/client/src/app/core/auth/auth-user.model.ts +++ b/client/src/app/core/auth/auth-user.model.ts @@ -1,4 +1,5 @@ // Do not use the barrel (dependency loop) +import { UserRole } from '../../../../../shared/models/user.model' import { User } from '../../shared/users/user.model'; export class AuthUser extends User { @@ -20,7 +21,7 @@ export class AuthUser extends User { id: parseInt(localStorage.getItem(this.KEYS.ID)), username: localStorage.getItem(this.KEYS.USERNAME), email: localStorage.getItem(this.KEYS.EMAIL), - role: localStorage.getItem(this.KEYS.ROLE), + role: localStorage.getItem(this.KEYS.ROLE) as UserRole, displayNSFW: localStorage.getItem(this.KEYS.DISPLAY_NSFW) === 'true' }, Tokens.load() @@ -41,7 +42,7 @@ export class AuthUser extends User { constructor(userHash: { id: number, username: string, - role: string, + role: UserRole, email: string, displayNSFW: boolean }, hashTokens: any) { diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts index 09722704a..d4695ab67 100644 --- a/client/src/app/shared/users/user.model.ts +++ b/client/src/app/shared/users/user.model.ts @@ -1,10 +1,10 @@ -import { User as UserServerModel } from '../../../../../shared'; +import { User as UserServerModel, UserRole } from '../../../../../shared'; export class User implements UserServerModel { id: number; username: string; email: string; - role: string; + role: UserRole; displayNSFW: boolean; createdAt: Date; @@ -12,7 +12,7 @@ export class User implements UserServerModel { id: number, username: string, email: string, - role: string, + role: UserRole, displayNSFW?: boolean, createdAt?: Date, }) { -- 2.41.0