Skip to content

Commit 539ca8f

Browse files
author
Bernardo-MG
committed
Corrected login failure warning
1 parent 005ef54 commit 539ca8f

3 files changed

Lines changed: 30 additions & 27 deletions

File tree

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
<form [formGroup]="form" (ngSubmit)="onLogin()" class="needs-validation" novalidate>
2-
<div class="text-center">
3-
<!-- Username -->
4-
<div class="mb-2">
5-
<input placeholder="Username" type="text" id="usernameInput" formControlName="username" class="form-control"
6-
[ngClass]="{ 'is-invalid': isFieldInvalid('username') }" />
7-
</div>
8-
<!-- Password -->
9-
<div class="mb-2">
10-
<input placeholder="Password" type="password" id="passwordInput" formControlName="password"
11-
class="form-control" [ngClass]="{ 'is-invalid': isFieldInvalid('password') }" />
12-
</div>
13-
<!-- Remember me check -->
14-
<div class="row mb-2">
15-
<div class="d-flex justify-content-center">
16-
<div class="form-check form-switch mb-3 mb-md-0">
17-
<input id="rememberMe" type="checkbox" (change)="onRememberMe($event.target)" class="form-check-input">
18-
<label for="rememberMe" class="form-check-label">Remember me</label>
19-
</div>
2+
<div *ngIf="failed" class="text-danger text-center">Invalid user</div>
3+
<!-- Username -->
4+
<div class="mb-2">
5+
<input placeholder="Username" type="text" id="usernameInput" formControlName="username" class="form-control"
6+
[ngClass]="{ 'is-invalid': isFieldInvalid('username') }" />
7+
</div>
8+
<!-- Password -->
9+
<div class="mb-2">
10+
<input placeholder="Password" type="password" id="passwordInput" formControlName="password" class="form-control"
11+
[ngClass]="{ 'is-invalid': isFieldInvalid('password') }" />
12+
</div>
13+
<!-- Remember me check -->
14+
<div class="row mb-2">
15+
<div class="d-flex justify-content-center">
16+
<div class="form-check form-switch mb-3 mb-md-0">
17+
<input id="rememberMe" type="checkbox" (change)="onRememberMe($event.target)" class="form-check-input">
18+
<label for="rememberMe" class="form-check-label">Remember me</label>
2019
</div>
2120
</div>
22-
<!-- Login button -->
23-
<div class="d-grid gap-2">
24-
<button [disabled]="!isLoginEnabled()" class="btn btn-primary" [attr.aria-disabled]="!isLoginEnabled()"
25-
aria-label="Login">
26-
<icon-waiting *ngIf="loading"></icon-waiting> Login
27-
</button>
28-
</div>
21+
</div>
22+
<!-- Login button -->
23+
<div class="d-grid gap-2">
24+
<button [disabled]="!isLoginEnabled()" class="btn btn-primary" [attr.aria-disabled]="!isLoginEnabled()"
25+
aria-label="Login">
26+
<icon-waiting *ngIf="loading"></icon-waiting> Login
27+
</button>
2928
</div>
3029
</form>

src/app/core/login/components/login-form/login-form.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ export class LoginFormComponent {
1616
*/
1717
@Input() public loading = false;
1818

19+
/**
20+
* Failed login flag. Shows the failure warning.
21+
*/
22+
@Input() public failed = false;
23+
1924
/**
2025
* Login event. Sent when the user accepts the data in the form.
2126
*/
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div class="card">
22
<div class="card-body">
3-
<authentication-login-form [loading]="loading" (login)="onLogin($event)"
3+
<authentication-login-form [loading]="loading" [failed]="failed" (login)="onLogin($event)"
44
(rememberMe)="onRememberMe($event)"></authentication-login-form>
5-
<div *ngIf="failed" class="alert alert-danger mt-3 mb-0">Invalid user</div>
65
</div>
76
</div>

0 commit comments

Comments
 (0)