From b88024ad8ad1d5c0b2cace6cd1a987b3a7e70fe4 Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 6 Mar 2019 17:36:57 +0800 Subject: Move login message into user login component. --- .../ClientApp/src/app/user-dialog/user-dialog.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Timeline/ClientApp/src/app/user-dialog/user-dialog.component.ts') diff --git a/Timeline/ClientApp/src/app/user-dialog/user-dialog.component.ts b/Timeline/ClientApp/src/app/user-dialog/user-dialog.component.ts index 6fe5b6d9..368a1775 100644 --- a/Timeline/ClientApp/src/app/user-dialog/user-dialog.component.ts +++ b/Timeline/ClientApp/src/app/user-dialog/user-dialog.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { UserService, UserInfo } from './user.service'; -import { LoginEvent } from '../user-login/user-login.component'; +import { LoginEvent, LoginMessage } from '../user-login/user-login.component'; @Component({ selector: 'app-user-dialog', @@ -13,7 +13,7 @@ export class UserDialogComponent implements OnInit { state: 'loading' | 'login' | 'success' = 'loading'; - loginMessage: string; + loginMessage: LoginMessage; userInfo: UserInfo; @@ -24,9 +24,9 @@ export class UserDialogComponent implements OnInit { this.state = 'success'; } else { if (result.state === 'invalid') { - this.loginMessage = 'Your login is no longer valid'; - } else { - this.loginMessage = 'You haven\'t logged in.'; + this.loginMessage = 'invalidlogin'; + } else if (result.state === 'nologin') { + this.loginMessage = 'nologin'; } this.state = 'login'; } -- cgit v1.2.3