-<h3>Login</h3>
+<div class="row">
+ <div class="content-padding">
+ <h3>Login</h3>
-<div *ngIf="error" class="alert alert-danger">{{ error }}</div>
+ <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" 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>
+ <form role="form" (ngSubmit)="login()" [formGroup]="form">
+ <div class="form-group">
+ <label for="username">Username</label>
+ <input
+ type="text" class="form-control" id="username" placeholder="Username" required
+ formControlName="username"
+ >
+ <div *ngIf="formErrors.username" class="alert alert-danger">
+ {{ 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" required
- ngControl="password" #password="ngForm"
- >
- <div [hidden]="password.valid || password.pristine" class="alert alert-danger">
- Password is required
- </div>
- </div>
+ <div class="form-group">
+ <label for="password">Password</label>
+ <input
+ type="password" class="form-control" name="password" id="password" placeholder="Password" required
+ formControlName="password"
+ >
+ <div *ngIf="formErrors.password" class="alert alert-danger">
+ {{ formErrors.password }}
+ </div>
+ </div>
- <input type="submit" value="Login" class="btn btn-default" [disabled]="!loginForm.form.valid">
-</form>
+ <input type="submit" value="Login" class="btn btn-default" [disabled]="!form.valid">
+ </form>
+ </div>
+</div>