From 90fe3a802f48f8a74bed4ed8612afd26a7e74dd1 Mon Sep 17 00:00:00 2001
From: Chneemann <Andre-Ke@gmx.de>
Date: Sun, 19 May 2024 12:31:51 +0200
Subject: [PATCH] bugfixes

---
 .../contact-detail/contact-detail.component.html         | 4 +++-
 .../contact-form/contact-form.component.html             | 9 +++++++++
 .../contact-form/contact-form.component.ts               | 2 +-
 .../components/buttons/form-btn/form-btn.component.scss  | 3 ++-
 src/assets/i18n/de.json                                  | 1 +
 src/assets/i18n/en.json                                  | 1 +
 6 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/app/components/contacts/contact-detail/contact-detail.component.html b/src/app/components/contacts/contact-detail/contact-detail.component.html
index 1b18e77..cc48963 100644
--- a/src/app/components/contacts/contact-detail/contact-detail.component.html
+++ b/src/app/components/contacts/contact-detail/contact-detail.component.html
@@ -45,7 +45,7 @@
           <p>&nbsp;(du)</p>
           }
         </div>
-        @if(user.uId === "") {
+        @if(user.uId === "" || user.id === firebaseService.getCurrentUserId()) {
         <div class="btns">
           <div class="btn btn-edit">
             <img src="./../../../../assets/img/contact/edit.svg" alt="" />
@@ -53,12 +53,14 @@
               {{ "contacts.btnEdit0" | translate }}
             </p>
           </div>
+          @if (user.id !== firebaseService.getCurrentUserId()) {
           <div class="btn btn-delete">
             <img src="./../../../../assets/img/contact/delete.svg" alt="" />
             <p (click)="deleteContact()">
               {{ "contacts.btnDelete0" | translate }}
             </p>
           </div>
+          }
         </div>
         <div class="btn-mobile" (click)="toggleNav()">
           <img src="./../../../assets/img/contact/points.svg" alt="check" />
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 c2a9e56..75df39a 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
@@ -110,12 +110,21 @@
       }
     </div>
     <div class="btns">
+      @if (currentUserId !== firebaseService.getCurrentUserId()){
       <app-form-btn
         class="btn-delete"
         type="button"
         value="{{ 'contactDialogForm.btnDelete' | translate }}"
         (click)="deleteContact()"
       ></app-form-btn>
+      } @else {
+      <app-form-btn
+        class="btn-cancel"
+        type="button"
+        value="{{ 'contactDialogForm.btnCancel' | translate }}"
+        (click)="closeDialog()"
+      ></app-form-btn>
+      }
       <app-form-btn
         [class]="'btn-submit'"
         [type]="'submit'"
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 53d3a2f..63ade57 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
@@ -31,7 +31,7 @@ export class ContactFormComponent implements OnInit, OnChanges {
 
   constructor(
     private router: Router,
-    private firebaseService: FirebaseService,
+    public firebaseService: FirebaseService,
     public sharedService: SharedService
   ) {
     this.updateContactData();
diff --git a/src/app/shared/components/buttons/form-btn/form-btn.component.scss b/src/app/shared/components/buttons/form-btn/form-btn.component.scss
index 5638e09..37d3d31 100644
--- a/src/app/shared/components/buttons/form-btn/form-btn.component.scss
+++ b/src/app/shared/components/buttons/form-btn/form-btn.component.scss
@@ -24,7 +24,8 @@
   }
 }
 
-.btn-clear {
+.btn-clear,
+.btn-cancel {
   width: fit-content;
   padding: 12px;
   margin: 12px;
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 545548d..fcbf58b 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -56,6 +56,7 @@
     "logout": "Abmelden"
   },
   "contactDialogForm": {
+    "btnCancel": "Abbrechen",
     "btnDelete": "Löschen",
     "btnSave": "Sichern",
     "invalidFirstName": "Ein Vorname ist erforderlich!",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 266feec..6604e60 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -56,6 +56,7 @@
     "logout": "Log out"
   },
   "contactDialogForm": {
+    "btnCancel": "Cancel",
     "btnDelete": "Delete",
     "btnSave": "Save",
     "invalidFirstName": "A first name is required!",