|
91 | 91 | <label for="validationSignInPassword">Password</label>
|
92 | 92 | <div class="input-group">
|
93 | 93 | <input class="form-control"
|
94 |
| - [class.is-valid]="sigInPasswordFormControl.valid" |
95 |
| - [class.is-invalid]="sigInPasswordFormControl.errors" |
| 94 | + [class.is-valid]="sigInPasswordFormControl.valid && sigInPasswordFormControl.dirty" |
| 95 | + [class.is-invalid]="sigInPasswordFormControl.errors && (sigInPasswordFormControl.dirty || signInPasswordForm.submitted)" |
| 96 | + |
96 | 97 | id="validationSignInPassword"
|
97 | 98 | type="password"
|
98 | 99 | placeholder="password"
|
|
151 | 152 | <ngb-tab>
|
152 | 153 | <ng-template ngbTabTitle>Register</ng-template>
|
153 | 154 | <ng-template ngbTabContent>
|
154 |
| - <form [formGroup]="signUpFormGroup" (ngSubmit)="signUpFormGroup.valid && |
| 155 | + <form #signUpPasswordForm="ngForm" |
| 156 | + [formGroup]="signUpFormGroup" |
| 157 | + (ngSubmit)="signUpFormGroup.valid && |
155 | 158 | authProcess.signUp
|
156 | 159 | (signUpFormGroup.value.name,signUpFormGroup.value.email,signUpFormGroup.value.password)">
|
157 | 160 | <div class="form-group">
|
158 | 161 | <label for="validationName">First name</label>
|
159 | 162 | <input class="form-control"
|
160 | 163 | [class.is-valid]="sigUpNameFormControl.valid && sigUpNameFormControl.dirty"
|
161 |
| - [class.is-invalid]="sigUpNameFormControl.errors && sigUpNameFormControl.dirty" |
| 164 | + [class.is-invalid]="sigUpNameFormControl.errors |
| 165 | + && (sigUpNameFormControl.dirty || signUpPasswordForm.submitted)" |
162 | 166 | id="validationName"
|
163 | 167 | type="text"
|
164 | 168 | minlength="2"
|
|
167 | 171 | placeholder="Name"
|
168 | 172 | required>
|
169 | 173 | <div class="invalid-feedback"
|
170 |
| - *ngIf="sigUpNameFormControl.errors && (sigUpNameFormControl.dirty || sigUpNameFormControl.touched)"> |
| 174 | + *ngIf="sigUpNameFormControl.errors |
| 175 | + && (sigUpNameFormControl.dirty || sigUpNameFormControl.touched || signUpPasswordForm.submitted)"> |
171 | 176 | <p *ngIf="sigUpNameFormControl.hasError('required')">
|
172 | 177 | Name is required
|
173 | 178 | </p>
|
|
184 | 189 | <div class="input-group">
|
185 | 190 | <input class="form-control"
|
186 | 191 | [class.is-valid]="sigUpEmailFormControl.valid && sigUpEmailFormControl.dirty"
|
187 |
| - [class.is-invalid]="sigUpEmailFormControl.errors && sigUpEmailFormControl.dirty" |
| 192 | + [class.is-invalid]="sigUpEmailFormControl.errors |
| 193 | + && (sigUpEmailFormControl.dirty || signUpPasswordForm.submitted)" |
188 | 194 | id="validationRegisterEmail"
|
189 | 195 | [formControl]="sigUpEmailFormControl"
|
190 | 196 | placeholder="E-mail"
|
|
194 | 200 |
|
195 | 201 | <!--error msgs-->
|
196 | 202 | <div class="invalid-feedback"
|
197 |
| - *ngIf="sigUpEmailFormControl.errors && (sigUpEmailFormControl.dirty || sigUpEmailFormControl.touched)"> |
| 203 | + *ngIf="sigUpEmailFormControl.errors |
| 204 | + && (sigUpEmailFormControl.dirty || sigUpEmailFormControl.touched || signUpPasswordForm.submitted)"> |
198 | 205 | <p *ngIf="sigUpEmailFormControl.hasError('required')">
|
199 | 206 | E-mail is required
|
200 | 207 | </p>
|
|
210 | 217 | <label for="validationRegisterPassword">Password</label>
|
211 | 218 | <div class="input-group">
|
212 | 219 | <input class="form-control"
|
213 |
| - [class.is-valid]="sigUpPasswordFormControl.valid" |
214 |
| - [class.is-invalid]="sigUpPasswordFormControl.errors" |
| 220 | + [class.is-valid]="sigUpPasswordFormControl.valid && sigUpPasswordFormControl.dirty" |
| 221 | + [class.is-invalid]="sigUpPasswordFormControl.errors |
| 222 | + && (sigUpPasswordFormControl.dirty || signUpPasswordForm.submitted)" |
215 | 223 | id="validationRegisterPassword"
|
216 | 224 | type="password"
|
217 | 225 | placeholder="password"
|
|
226 | 234 | <!--</small>-->
|
227 | 235 |
|
228 | 236 | <div class="invalid-feedback"
|
229 |
| - *ngIf="sigUpPasswordFormControl.errors && (sigUpPasswordFormControl.dirty || sigUpPasswordFormControl.touched)"> |
| 237 | + *ngIf="sigUpPasswordFormControl.errors |
| 238 | + && (sigUpPasswordFormControl.dirty || sigUpPasswordFormControl.touched) || signUpPasswordForm.submitted"> |
230 | 239 | <p *ngIf="sigUpPasswordFormControl.hasError('required')">
|
231 | 240 | Please do not forget the password
|
232 | 241 | </p>
|
|
0 commit comments