diff --git a/src/app/components/add-task/add-task.component.html b/src/app/components/add-task/add-task.component.html index 05fcfc0..7a5b80c 100644 --- a/src/app/components/add-task/add-task.component.html +++ b/src/app/components/add-task/add-task.component.html @@ -173,7 +173,7 @@ 'background-color': taskData.priority == 'urgent' ? 'red' : 'white' }" - (click)="tooglePriority('urgent')" + (click)="togglePriority('urgent')" >
{{ "contactDialogForm.invalidMail1" | translate }}
- } @else { @if (existEmailonServer(contactData.email).length > 0 && + } @else { @if (existEmailOnServer(contactData.email).length > 0 && !contactData.email) {{{ "contactDialogForm.invalidMail2" | translate }}
} } } diff --git a/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts index 268937d..8ff26f4 100644 --- a/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts +++ b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.ts @@ -27,7 +27,7 @@ export class ContactFormComponent implements OnInit, OnChanges { @Input() randomColor: string = ''; @Input() newColor: string = ''; @Input() currentColor: string = ''; - @Output() inititalsEmitter = new EventEmitter{{ "login.errorMail0" | translate }}
- } @if (loginSerivce.errorCode == 'auth/invalid-email' && + } @if (loginService.errorCode == 'auth/invalid-email' && !sharedService.isBtnDisabled) {{{ "login.errorMail1" | translate }}
} @if (mail.valid && mail.touched && @@ -49,7 +49,7 @@ id="password" name="password" #password="ngModel" - [type]="loginSerivce.passwordFieldType" + [type]="loginService.passwordFieldType" placeholder="{{ 'login.password' | translate }}" class="custom-input" autocomplete="current-password" @@ -67,15 +67,15 @@{{ "login.errorPassword0" | translate }}
- } @if (loginSerivce.errorCode == 'auth/invalid-credential' && + } @if (loginService.errorCode == 'auth/invalid-credential' && !sharedService.isBtnDisabled) {{{ "login.errorPassword1" | translate }}
} diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts index 9ee46e7..dc6080d 100644 --- a/src/app/components/login/login.component.ts +++ b/src/app/components/login/login.component.ts @@ -38,7 +38,7 @@ export class LoginComponent { constructor( private firebaseService: FirebaseService, - public loginSerivce: LoginService, + public loginService: LoginService, public sharedService: SharedService, private overlayService: OverlayService, private route: ActivatedRoute, @@ -63,7 +63,7 @@ export class LoginComponent { onSubmit(ngForm: NgForm) { this.sharedService.isBtnDisabled = true; if (ngForm.submitted && ngForm.form.valid) { - this.loginSerivce.login(this.loginData); + this.loginService.login(this.loginData); } } @@ -77,7 +77,7 @@ export class LoginComponent { googleLogin() { this.sharedService.isBtnDisabled = true; - this.loginSerivce.googleLogin(); + this.loginService.googleLogin(); } checkIfUserEmailIsValid(emailValue: string) {