1 files changed, 10 insertions, 10 deletions
diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 636872942..94a405405 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -2,28 +2,28 @@
 <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
-<form role="form" (ngSubmit)="login()" [formGroup]="loginForm">
+<form role="form" (ngSubmit)="login()" [formGroup]="form">
  <div class="form-group">
    <label for="username">Username</label>
    <input
-      type="text" class="form-control" name="username" id="username" placeholder="Username"
+      type="text" class="form-control" id="username" placeholder="Username" required
-      [(ngModel)]="username"
+      formControlName="username"
    >
-    <div [hidden]="loginForm.controls.username.valid || loginForm.controls.username.pristine" class="alert alert-danger">
+    <div *ngIf="formErrors.username" class="alert alert-danger">
-      Username is required
+      {{ formErrors.username }}
    </div>
  </div>
  <div class="form-group">
    <label for="password">Password</label>
    <input
-      type="password" class="form-control" name="password" id="password" placeholder="Password"
+      type="password" class="form-control" name="password" id="password" placeholder="Password" required
-      [(ngModel)]="password"
+      formControlName="password"
    >
-    <div [hidden]="loginForm.controls.password.valid || loginForm.controls.password.pristine" class="alert alert-danger">
+    <div *ngIf="formErrors.password" class="alert alert-danger">
-      Password is required
+      {{ formErrors.password }}
    </div>
  </div>
-  <input type="submit" value="Login" class="btn btn-default" [disabled]="!loginForm.valid">
+  <input type="submit" value="Login" class="btn btn-default" [disabled]="!form.valid">
 </form>

diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html index 636872942..94a405405 100644 --- a/client/src/app/login/login.component.html +++ b/client/src/app/login/login.component.html
@@ -2,28 +2,28 @@
2		2
3	<div *ngIf="error" class="alert alert-danger">{{ error }}</div>	3	<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
4		4
5	<form role="form" (ngSubmit)="login()" [formGroup]="loginForm">	5	<form role="form" (ngSubmit)="login()" [formGroup]="form">
6	<div class="form-group">	6	<div class="form-group">
7	<label for="username">Username</label>	7	<label for="username">Username</label>
8	<input	8	<input
9	type="text" class="form-control" name="username" id="username" placeholder="Username"	9	type="text" class="form-control" id="username" placeholder="Username" required
10	[(ngModel)]="username"	10	formControlName="username"
11	>	11	>
12	<div [hidden]="loginForm.controls.username.valid \|\| loginForm.controls.username.pristine" class="alert alert-danger">	12	<div *ngIf="formErrors.username" class="alert alert-danger">
13	Username is required	13	{{ formErrors.username }}
14	</div>	14	</div>
15	</div>	15	</div>
16		16
17	<div class="form-group">	17	<div class="form-group">
18	<label for="password">Password</label>	18	<label for="password">Password</label>
19	<input	19	<input
20	type="password" class="form-control" name="password" id="password" placeholder="Password"	20	type="password" class="form-control" name="password" id="password" placeholder="Password" required
21	[(ngModel)]="password"	21	formControlName="password"
22	>	22	>
23	<div [hidden]="loginForm.controls.password.valid \|\| loginForm.controls.password.pristine" class="alert alert-danger">	23	<div *ngIf="formErrors.password" class="alert alert-danger">
24	Password is required	24	{{ formErrors.password }}
25	</div>	25	</div>
26	</div>	26	</div>
27		27
28	<input type="submit" value="Login" class="btn btn-default" [disabled]="!loginForm.valid">	28	<input type="submit" value="Login" class="btn btn-default" [disabled]="!form.valid">
29	</form>	29	</form>