From 49b12399715de59cd051352101bd997ff2052177 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-login/user-login.component.css | 12 ++++++++++++ .../ClientApp/src/app/user-login/user-login.component.html | 5 +++++ .../ClientApp/src/app/user-login/user-login.component.ts | 7 ++++++- 3 files changed, 23 insertions(+), 1 deletion(-) (limited to 'Timeline/ClientApp/src/app/user-login') diff --git a/Timeline/ClientApp/src/app/user-login/user-login.component.css b/Timeline/ClientApp/src/app/user-login/user-login.component.css index 4cdd865f..8bf6b408 100644 --- a/Timeline/ClientApp/src/app/user-login/user-login.component.css +++ b/Timeline/ClientApp/src/app/user-login/user-login.component.css @@ -10,3 +10,15 @@ div.w-100 { .login-button { margin-left: auto; } + +.no-login-message { + color: blue; +} + +.invalid-login-message { + color: red; +} + +.error-message { + color: red; +} diff --git a/Timeline/ClientApp/src/app/user-login/user-login.component.html b/Timeline/ClientApp/src/app/user-login/user-login.component.html index 6fed6bb5..b1dd289d 100644 --- a/Timeline/ClientApp/src/app/user-login/user-login.component.html +++ b/Timeline/ClientApp/src/app/user-login/user-login.component.html @@ -1,4 +1,9 @@
+ + + +

{{ message }}

+
Username diff --git a/Timeline/ClientApp/src/app/user-login/user-login.component.ts b/Timeline/ClientApp/src/app/user-login/user-login.component.ts index 072f04af..da642cb8 100644 --- a/Timeline/ClientApp/src/app/user-login/user-login.component.ts +++ b/Timeline/ClientApp/src/app/user-login/user-login.component.ts @@ -1,6 +1,8 @@ -import { Component, Output, OnInit, EventEmitter } from '@angular/core'; +import { Component, Output, OnInit, EventEmitter, Input } from '@angular/core'; import { FormGroup, FormControl } from '@angular/forms'; +export type LoginMessage = 'nologin' | 'invalidlogin' | string; + export class LoginEvent { username: string; password: string; @@ -13,6 +15,9 @@ export class LoginEvent { }) export class UserLoginComponent { + @Input() + message: LoginMessage; + @Output() login = new EventEmitter(); -- cgit v1.2.3