2 files changed, 26 insertions, 6 deletions

diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 940694515..5848fcba3 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -1,14 +1,30 @@
 <h3>Login</h3>
-<form role="form" (submit)="login(username.value, password.value)">
+
+
+<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
+
+<form role="form" (ngSubmit)="login(username.value, password.value)" #loginForm="ngForm">
   <div class="form-group">
     <label for="username">Username</label>
-    <input type="text" #username class="form-control" id="username" placeholder="Username">
+    <input
+      type="text" class="form-control" name="username" id="username" placeholder="Username" required
+      ngControl="username" #username="ngForm"
+    >
+    <div [hidden]="username.valid || username.pristine" class="alert alert-danger">
+      Username is required
+    </div>
   </div>
 
   <div class="form-group">
     <label for="password">Password</label>
-    <input type="password" #password class="form-control" id="password" placeholder="Password">
+    <input
+      type="password" class="form-control" name="password" id="password" placeholder="Password" required
+      ngControl="password" #password="ngForm"
+    >
+    <div [hidden]="password.valid || password.pristine" class="alert alert-danger">
+      Password is required
+    </div>
   </div>
 
-  <input type="submit" value="Login" class="btn btn-default">
+  <input type="submit" value="Login" class="btn btn-default" [disabled]="!loginForm.form.valid">
 </form>
diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index 9d88536ca..768594ac4 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -9,6 +9,8 @@ import { AuthService, AuthStatus, User } from '../shared';
 })
 
 export class LoginComponent {
+  error: string = null;
+
   constructor(
     private authService: AuthService,
     private router: Router
@@ -17,6 +19,8 @@ export class LoginComponent {
   login(username: string, password: string) {
     this.authService.login(username, password).subscribe(
       result => {
+        this.error = null;
+
         const user = new User(username, result);
         user.save();
 
@@ -26,9 +30,9 @@ export class LoginComponent {
       },
       error => {
         if (error.error === 'invalid_grant') {
-          alert('Credentials are invalid.');
+          this.error = 'Credentials are invalid.';
         } else {
-          alert(`${error.error}: ${error.error_description}`);
+          this.error = `${error.error}: ${error.error_description}`;
         }
       }
     );