aboutsummaryrefslogtreecommitdiff
path: root/Timeline/ClientApp/src/app/user-login
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2019-03-06 17:36:57 +0800
committercrupest <crupest@outlook.com>2019-03-06 17:36:57 +0800
commitb88024ad8ad1d5c0b2cace6cd1a987b3a7e70fe4 (patch)
tree8a748c84ca9badd8e7a9b46024623a590cd77bed /Timeline/ClientApp/src/app/user-login
parentda5666528de84788671b39156de1382c6f27c853 (diff)
downloadtimeline-b88024ad8ad1d5c0b2cace6cd1a987b3a7e70fe4.tar.gz
timeline-b88024ad8ad1d5c0b2cace6cd1a987b3a7e70fe4.tar.bz2
timeline-b88024ad8ad1d5c0b2cace6cd1a987b3a7e70fe4.zip
Move login message into user login component.
Diffstat (limited to 'Timeline/ClientApp/src/app/user-login')
-rw-r--r--Timeline/ClientApp/src/app/user-login/user-login.component.css12
-rw-r--r--Timeline/ClientApp/src/app/user-login/user-login.component.html5
-rw-r--r--Timeline/ClientApp/src/app/user-login/user-login.component.ts7
3 files changed, 23 insertions, 1 deletions
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 @@
<form [formGroup]="form">
+ <ng-container *ngIf="message" [ngSwitch]="message">
+ <p *ngSwitchCase="'nologin'" class="mat-body no-login-message">You haven't login.</p>
+ <p *ngSwitchCase="'invalidlogin'" class="mat-body invalid-login-message">Your login is no longer valid.</p>
+ <p *ngSwitchDefault class="mat-body error-message">{{ message }}</p>
+ </ng-container>
<mat-form-field>
<mat-label>Username</mat-label>
<input formControlName="username" matInput type="text" />
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<LoginEvent>();