From 3c146d7fa0bec2c857fc36d4f99869ee1108747d Mon Sep 17 00:00:00 2001
From: Chneemann <Andre-Ke@gmx.de>
Date: Wed, 22 May 2024 08:13:04 +0200
Subject: [PATCH] bugfixes

---
 src/app/app.routes.ts                                         | 2 +-
 src/app/components/add-task/add-task.component.html           | 2 +-
 .../contacts/contact-delete/contact-delete.component.html     | 4 ++--
 .../contacts/contact-delete/contact-delete.component.scss     | 4 ++--
 src/app/services/login.service.ts                             | 4 ++--
 src/assets/i18n/en.json                                       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index 8859ce7..d852fba 100644
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@@ -16,7 +16,7 @@ import { PwResetComponent } from './components/login/forgot-pw/pw-reset/pw-reset
 export const routes: Routes = [
   { path: '', component: SummaryComponent },
   { path: 'login', component: LoginComponent },
-  { path: 'login/:id', component: LoginComponent },
+  { path: 'login/notice/:id', component: LoginComponent },
   { path: 'login/imprint', component: ImprintComponent },
   { path: 'login/privacy-policy', component: PrivacyPolicyComponent },
   { path: 'register', component: RegisterComponent },
diff --git a/src/app/components/add-task/add-task.component.html b/src/app/components/add-task/add-task.component.html
index f87f279..55ecaf2 100644
--- a/src/app/components/add-task/add-task.component.html
+++ b/src/app/components/add-task/add-task.component.html
@@ -331,7 +331,7 @@
         [img]="'check'"
         [imgFilter]="'none'"
         [value]="
-          ['none', 'todo', 'inprogress', 'awaitfeedback', 'done'].includes(
+          ['', 'none', 'todo', 'inprogress', 'awaitfeedback', 'done'].includes(
             overlayData.toString()
           )
             ? ('addTask.create' | translate)
diff --git a/src/app/components/contacts/contact-delete/contact-delete.component.html b/src/app/components/contacts/contact-delete/contact-delete.component.html
index c1de291..e36ea35 100644
--- a/src/app/components/contacts/contact-delete/contact-delete.component.html
+++ b/src/app/components/contacts/contact-delete/contact-delete.component.html
@@ -5,8 +5,8 @@
     </p>
     <div class="btns">
       <div class="btn">
-        <div class="btn-cancle" (click)="cancelDeleteContact()">
-          {{ "contactDeleteDialog.btnCancle" | translate }}
+        <div class="btn-cancel" (click)="cancelDeleteContact()">
+          {{ "contactDeleteDialog.btnCancel" | translate }}
         </div>
       </div>
       <div class="btn">
diff --git a/src/app/components/contacts/contact-delete/contact-delete.component.scss b/src/app/components/contacts/contact-delete/contact-delete.component.scss
index 973e92a..6245622 100644
--- a/src/app/components/contacts/contact-delete/contact-delete.component.scss
+++ b/src/app/components/contacts/contact-delete/contact-delete.component.scss
@@ -46,7 +46,7 @@ section {
   margin: 0 24px;
 }
 
-.btn-cancle {
+.btn-cancel {
   padding: 12px;
   margin: 12px 12px;
   border-radius: 10px;
@@ -103,7 +103,7 @@ section {
   }
 
   .btn-delete-contact,
-  .btn-cancle {
+  .btn-cancel {
     font-size: 18px;
   }
 }
diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts
index d48c7a4..d4b6cbf 100644
--- a/src/app/services/login.service.ts
+++ b/src/app/services/login.service.ts
@@ -212,7 +212,7 @@ export class LoginService {
     const auth = getAuth();
     sendPasswordResetEmail(auth, email)
       .then(() => {
-        this.router.navigate(['/login/pw-send']);
+        this.router.navigate(['/login/notice/pw-send']);
         this.sharedService.isBtnDisabled = false;
       })
       .catch((error) => {
@@ -226,7 +226,7 @@ export class LoginService {
     const auth = getAuth();
     confirmPasswordReset(auth, oobCode, newPW)
       .then(() => {
-        this.router.navigate(['/login']);
+        this.router.navigate(['/login/notice/pw-change']);
         this.sharedService.isBtnDisabled = false;
       })
       .catch((error) => {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index ced757a..0837c59 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -90,7 +90,7 @@
   },
   "contactDeleteDialog": {
     "deleteContact": "Do you really want to delete the contact?",
-    "btnCancle": "Cancle",
+    "btnCancel": "Cancel",
     "btnDelete": "Delete"
   },
   "summary": {