From 7e2b04771f46f2c433de865ba79c0caaa97aa53a Mon Sep 17 00:00:00 2001 From: Chneemann Date: Tue, 11 Jun 2024 17:53:05 +0200 Subject: [PATCH] clean code --- src/app/components/add-task/add-task.component.html | 6 +++--- src/app/components/add-task/add-task.component.ts | 6 +++--- .../components/add-task/assigned/assigned.component.ts | 10 +++------- .../contact-edit-new/contact-edit-new.component.html | 4 ++-- .../contact-edit-new/contact-edit-new.component.ts | 2 +- .../contact-form/contact-form.component.html | 2 +- .../contact-form/contact-form.component.ts | 6 +++--- src/app/components/contacts/contacts.component.ts | 4 ++-- src/app/components/login/login.component.html | 10 +++++----- src/app/components/login/login.component.ts | 6 +++--- 10 files changed, 26 insertions(+), 30 deletions(-) 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')" >
{{ "addTask.urgent" | translate }} @@ -190,7 +190,7 @@ 'background-color': taskData.priority == 'medium' ? 'orange' : 'white' }" - (click)="tooglePriority('medium')" + (click)="togglePriority('medium')" >
{{ "addTask.medium" | translate }} @@ -207,7 +207,7 @@ 'background-color': taskData.priority == 'low' ? 'green' : 'white' }" - (click)="tooglePriority('low')" + (click)="togglePriority('low')" >
{{ "addTask.low" | translate }} diff --git a/src/app/components/add-task/add-task.component.ts b/src/app/components/add-task/add-task.component.ts index 9c33455..8887c53 100644 --- a/src/app/components/add-task/add-task.component.ts +++ b/src/app/components/add-task/add-task.component.ts @@ -176,9 +176,9 @@ export class AddTaskComponent implements OnInit { : (this.dateInPast = false); } - tooglePriority(prio: string) { - this.taskData.priority !== prio - ? (this.taskData.priority = prio) + togglePriority(priority: string) { + this.taskData.priority !== priority + ? (this.taskData.priority = priority) : this.taskData.priority; this.saveTaskData(); } diff --git a/src/app/components/add-task/assigned/assigned.component.ts b/src/app/components/add-task/assigned/assigned.component.ts index 8a6465f..65f170d 100644 --- a/src/app/components/add-task/assigned/assigned.component.ts +++ b/src/app/components/add-task/assigned/assigned.component.ts @@ -3,7 +3,6 @@ import { FirebaseService } from '../../../services/firebase.service'; import { CommonModule } from '@angular/common'; import { User } from '../../../interfaces/user.interface'; import { AddTaskComponent } from '../add-task.component'; -import { SharedService } from '../../../services/shared.service'; @Component({ selector: 'app-assigned', @@ -20,11 +19,8 @@ export class AssignedComponent { assigned: string[] = []; - constructor( - public firebaseService: FirebaseService, - private sharedService: SharedService - ) { - this.loadTaskAssigedData(); + constructor(public firebaseService: FirebaseService) { + this.loadTaskAssignedData(); } updateAssigned() { @@ -50,7 +46,7 @@ export class AssignedComponent { } } - loadTaskAssigedData() { + loadTaskAssignedData() { const taskDataString = localStorage.getItem('taskData'); if (taskDataString !== null) { const taskData = JSON.parse(taskDataString); diff --git a/src/app/components/contacts/contact-edit-new/contact-edit-new.component.html b/src/app/components/contacts/contact-edit-new/contact-edit-new.component.html index 74abe33..1a2b247 100644 --- a/src/app/components/contacts/contact-edit-new/contact-edit-new.component.html +++ b/src/app/components/contacts/contact-edit-new/contact-edit-new.component.html @@ -25,7 +25,7 @@ firebaseService.getUserDataFromId(currentUserId); track user) {
diff --git a/src/app/components/contacts/contact-edit-new/contact-edit-new.component.ts b/src/app/components/contacts/contact-edit-new/contact-edit-new.component.ts index 9e593a3..16c9039 100644 --- a/src/app/components/contacts/contact-edit-new/contact-edit-new.component.ts +++ b/src/app/components/contacts/contact-edit-new/contact-edit-new.component.ts @@ -33,7 +33,7 @@ export class ContactEditNewComponent implements OnInit { public sharedService: SharedService ) {} - inititalsEmitter(emitter: string) { + initialsEmitter(emitter: string) { this.userInitials = emitter; } diff --git a/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html index 916b2db..5a3a6a2 100644 --- a/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html +++ b/src/app/components/contacts/contact-edit-new/contact-form/contact-form.component.html @@ -95,7 +95,7 @@ } @else { @if (email.touched && !checkIfUserEmailIsValid(contactData.email)) {

{{ "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(); + @Output() initialsEmitter = new EventEmitter(); constructor( private router: Router, @@ -95,7 +95,7 @@ export class ContactFormComponent implements OnInit, OnChanges { initials: initials, }; } - this.inititalsEmitter.emit(initials); + this.initialsEmitter.emit(initials); } updateUserData() { @@ -129,7 +129,7 @@ export class ContactFormComponent implements OnInit, OnChanges { } } - existEmailonServer(mail: string) { + existEmailOnServer(mail: string) { return this.firebaseService .getAllUsers() .filter((user) => user.email === mail); diff --git a/src/app/components/contacts/contacts.component.ts b/src/app/components/contacts/contacts.component.ts index 16335ed..a989b4b 100644 --- a/src/app/components/contacts/contacts.component.ts +++ b/src/app/components/contacts/contacts.component.ts @@ -61,11 +61,11 @@ export class ContactsComponent { } sortFirstLetter() { - let filteretArray = this.loadAllUserWithoutGuest().sort((a, b) => + let filterteArray = this.loadAllUserWithoutGuest().sort((a, b) => a.firstName.localeCompare(b.firstName) ); let usersFirstLetter = Array.from( - new Set(filteretArray.map((user) => user.firstName[0].toUpperCase())) + new Set(filterteArray.map((user) => user.firstName[0].toUpperCase())) ); return usersFirstLetter; } diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html index d4ab2f3..3259203 100644 --- a/src/app/components/login/login.component.html +++ b/src/app/components/login/login.component.html @@ -35,7 +35,7 @@
@if (!mail.valid && mail.touched && !sharedService.isBtnDisabled) {

{{ "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 @@ }
@if (!password.valid && password.touched && !sharedService.isBtnDisabled) {

{{ "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) {