error in form validation fixed

This commit is contained in:
Chneemann 2024-05-23 08:53:36 +02:00
parent 9278ed78a5
commit f6fdf09fca
5 changed files with 25 additions and 16 deletions

View file

@ -52,6 +52,7 @@ export class AppComponent {
this.checkPwResetRoute(); this.checkPwResetRoute();
} else { } else {
this.router.navigate(['/summary']); this.router.navigate(['/summary']);
this.sharedService.isBtnDisabled = false;
} }
} }

View file

@ -33,12 +33,14 @@
<img class="custom-img" alt="" /> <img class="custom-img" alt="" />
} }
<div class="error-msg"> <div class="error-msg">
@if (!mail.valid && mail.touched) { @if (!mail.valid && mail.touched && !sharedService.isBtnDisabled) {
<p>{{ "login.errorMail0" | translate }}</p> <p>{{ "login.errorMail0" | translate }}</p>
} @if (loginSerivce.errorCode == 'auth/invalid-email') { } @if (loginSerivce.errorCode == 'auth/invalid-email' &&
!sharedService.isBtnDisabled) {
<p>{{ "login.errorMail1" | translate }}</p> <p>{{ "login.errorMail1" | translate }}</p>
} @if (mail.valid && mail.touched && } @if (mail.valid && mail.touched &&
!checkIfUserEmailIsValid(loginData.mail.toLowerCase())) { !checkIfUserEmailIsValid(loginData.mail.toLowerCase()) &&
!sharedService.isBtnDisabled) {
<p>{{ "login.errorMail2" | translate }}</p> <p>{{ "login.errorMail2" | translate }}</p>
} }
</div> </div>
@ -69,9 +71,11 @@
/> />
} }
<div class="error-msg"> <div class="error-msg">
@if (!password.valid && password.touched) { @if (!password.valid && password.touched &&
!sharedService.isBtnDisabled) {
<p>{{ "login.errorPassword0" | translate }}</p> <p>{{ "login.errorPassword0" | translate }}</p>
} @if (loginSerivce.errorCode == 'auth/invalid-credential') { } @if (loginSerivce.errorCode == 'auth/invalid-credential' &&
!sharedService.isBtnDisabled) {
<p>{{ "login.errorPassword1" | translate }}</p> <p>{{ "login.errorPassword1" | translate }}</p>
} }
</div> </div>

View file

@ -37,7 +37,7 @@
<img class="custom-img" alt="" /> <img class="custom-img" alt="" />
} }
<div class="error-msg"> <div class="error-msg">
@if (!name.valid && name.touched) { @if (!name.valid && name.touched && !sharedService.isBtnDisabled) {
<p>{{ "register.errorName" | translate }}</p> <p>{{ "register.errorName" | translate }}</p>
} }
</div> </div>
@ -63,13 +63,16 @@
} }
<div class="error-msg"> <div class="error-msg">
@if(!mail.valid && mail.touched && @if(!mail.valid && mail.touched &&
!checkIfUserEmailIsValid(registerData.mail.toLowerCase())) { !checkIfUserEmailIsValid(registerData.mail.toLowerCase()) &&
!sharedService.isBtnDisabled) {
<p>{{ "register.errorMail0" | translate }}</p> <p>{{ "register.errorMail0" | translate }}</p>
} @else { @if (mail.touched && } @else { @if (mail.touched &&
!checkIfUserEmailIsValid(registerData.mail.toLowerCase())) { !checkIfUserEmailIsValid(registerData.mail.toLowerCase()) &&
!sharedService.isBtnDisabled) {
<p>{{ "register.errorMail1" | translate }}</p> <p>{{ "register.errorMail1" | translate }}</p>
} @else { @if } @else { @if
(existEmailonServer(registerData.mail.toLowerCase()).length > 0) { (existEmailonServer(registerData.mail.toLowerCase()).length > 0 &&
!sharedService.isBtnDisabled) {
<p>{{ "register.errorMail2" | translate }}</p> <p>{{ "register.errorMail2" | translate }}</p>
} } } } } }
</div> </div>
@ -99,9 +102,11 @@
/> />
} }
<div class="error-msg"> <div class="error-msg">
@if (!password.valid && password.touched) { @if (!password.valid && password.touched &&
!sharedService.isBtnDisabled) {
<p>{{ "register.errorPassword0" | translate }}</p> <p>{{ "register.errorPassword0" | translate }}</p>
} @else { @if (registerData.password.length < 6 && password.touched) { } @else { @if (registerData.password.length < 6 && password.touched &&
!sharedService.isBtnDisabled) {
<p>{{ "register.errorPassword1" | translate }}</p> <p>{{ "register.errorPassword1" | translate }}</p>
} } } }
</div> </div>
@ -131,10 +136,12 @@
/> />
} }
<div class="error-msg"> <div class="error-msg">
@if (!passwordConfirm.valid && passwordConfirm.touched) { @if (!passwordConfirm.valid && passwordConfirm.touched &&
!sharedService.isBtnDisabled) {
<p>{{ "register.errorPassword0" | translate }}</p> <p>{{ "register.errorPassword0" | translate }}</p>
} @if (registerData.password !== registerData.passwordConfirm && } @if (registerData.password !== registerData.passwordConfirm &&
registerData.password !== "" && registerData.passwordConfirm !== "") { registerData.password !== "" && registerData.passwordConfirm !== "" &&
!sharedService.isBtnDisabled) {
<p>{{ "register.errorPassword2" | translate }}</p> <p>{{ "register.errorPassword2" | translate }}</p>
} }
</div> </div>

View file

@ -68,7 +68,6 @@ export class RegisterComponent {
} }
checkIfUserEmailIsValid(emailValue: string) { checkIfUserEmailIsValid(emailValue: string) {
const channelNameLenght = emailValue.length;
const emailRegex = /^[\w.%+-]+@[\w.-]+\.[a-zA-Z]{2,}$/; const emailRegex = /^[\w.%+-]+@[\w.-]+\.[a-zA-Z]{2,}$/;
if (emailRegex.test(emailValue)) { if (emailRegex.test(emailValue)) {
return true; return true;

View file

@ -47,7 +47,6 @@ export class LoginService {
this.getUserIdInLocalStorage(userData[0].id); this.getUserIdInLocalStorage(userData[0].id);
this.updateUserOnlineStatus(userData[0].id, true); this.updateUserOnlineStatus(userData[0].id, true);
} }
this.sharedService.isBtnDisabled = false;
}) })
.catch((error) => { .catch((error) => {
console.error(error); console.error(error);
@ -128,7 +127,6 @@ export class LoginService {
} else { } else {
this.ifExistUser(user.uid); this.ifExistUser(user.uid);
} }
this.sharedService.isBtnDisabled = false;
}); });
}) })
.catch((error) => { .catch((error) => {