|
2 | 2 | <!--Reset password tab-->
|
3 | 3 | <ngb-tab *ngIf="passwordResetWished" title="Reset Password" id="reset_password">
|
4 | 4 | <ng-template ngbTabContent>
|
5 |
| - <form #formDir="ngForm" [formGroup]="resetPasswordFormGroup" |
| 5 | + <form #resetPasswordForm="ngForm" |
| 6 | + [formGroup]="resetPasswordFormGroup" |
6 | 7 | (ngSubmit)="resetPasswordFormGroup.valid && resetPassword()">
|
7 | 8 |
|
8 | 9 | <div class="form-group is-invalid">
|
9 | 10 | <label for="validationResetEmail">E-mail</label>
|
10 | 11 | <input class="form-control"
|
11 | 12 | [class.is-valid]="resetPasswordEmailFormControl.valid && resetPasswordEmailFormControl.dirty"
|
12 |
| - [class.is-invalid]="resetPasswordEmailFormControl.errors && (resetPasswordEmailFormControl.dirty || formDir.submitted)" |
| 13 | + [class.is-invalid]="resetPasswordEmailFormControl.errors && (resetPasswordEmailFormControl.dirty || resetPasswordForm.submitted)" |
13 | 14 | id="validationResetEmail"
|
14 | 15 | [formControl]="resetPasswordEmailFormControl"
|
15 | 16 | placeholder="E-mail"
|
|
19 | 20 |
|
20 | 21 | <!--error msgs-->
|
21 | 22 | <div class="invalid-feedback"
|
22 |
| - *ngIf="resetPasswordEmailFormControl.errors && (resetPasswordEmailFormControl.dirty || resetPasswordEmailFormControl.touched || formDir.submitted)"> |
| 23 | + *ngIf="resetPasswordEmailFormControl.errors |
| 24 | + && (resetPasswordEmailFormControl.dirty || resetPasswordEmailFormControl.touched || resetPasswordForm.submitted)"> |
23 | 25 | <p *ngIf="resetPasswordEmailFormControl.hasError('required')">
|
24 | 26 | E-mail is required
|
25 | 27 | </p>
|
|
51 | 53 | <ngb-tab>
|
52 | 54 | <ng-template ngbTabTitle>Sign in</ng-template>
|
53 | 55 | <ng-template ngbTabContent>
|
54 |
| - <form [formGroup]="signInFormGroup" |
| 56 | + <form #signInPasswordForm="ngForm" |
| 57 | + [formGroup]="signInFormGroup" |
55 | 58 | (ngSubmit)="signInFormGroup.valid &&
|
56 | 59 | authProcess.signInWith
|
57 | 60 | (authProviders.EmailAndPassword,signInFormGroup.value.email,signInFormGroup.value.password)">
|
|
61 | 64 | <div class="input-group">
|
62 | 65 | <input class="form-control"
|
63 | 66 | [class.is-valid]="signInEmailFormControl.valid && signInEmailFormControl.dirty"
|
64 |
| - [class.is-invalid]="signInEmailFormControl.errors && signInEmailFormControl.dirty" |
| 67 | + [class.is-invalid]="signInEmailFormControl.errors |
| 68 | + && (signInEmailFormControl.dirty || signInPasswordForm.submitted)" |
65 | 69 | id="validationSignInEmail"
|
66 | 70 | [formControl]="signInEmailFormControl"
|
67 | 71 | placeholder="E-mail"
|
|
71 | 75 |
|
72 | 76 | <!--error msgs-->
|
73 | 77 | <div class="invalid-feedback"
|
74 |
| - *ngIf="signInEmailFormControl.errors && (signInEmailFormControl.dirty || signInEmailFormControl.touched)"> |
| 78 | + *ngIf="signInEmailFormControl.errors |
| 79 | + && (signInEmailFormControl.dirty || signInEmailFormControl.touched || signInPasswordForm.submitted)"> |
75 | 80 | <p *ngIf="signInEmailFormControl.hasError('required')">
|
76 | 81 | E-mail is required
|
77 | 82 | </p>
|
|
102 | 107 | <!--</small>-->
|
103 | 108 |
|
104 | 109 | <div class="invalid-feedback"
|
105 |
| - *ngIf="sigInPasswordFormControl.errors && (sigInPasswordFormControl.dirty || sigInPasswordFormControl.touched)"> |
| 110 | + *ngIf="sigInPasswordFormControl.errors |
| 111 | + && (sigInPasswordFormControl.dirty || sigInPasswordFormControl.touched || signInPasswordForm.submitted)"> |
106 | 112 | <p *ngIf="sigInPasswordFormControl.hasError('required')">
|
107 | 113 | Please do not forget the password
|
108 | 114 | </p>
|
|
0 commit comments