From 41a9a39cf3231954b744112cf9ad2a72334c9070 Mon Sep 17 00:00:00 2001
From: Kuchenpirat <jojow@gmx.net>
Date: Mon, 20 Nov 2023 17:09:16 +0000
Subject: [PATCH 1/5] data management: improve delete prompt

---
 frontend/pages/group/data/foods.vue  |  6 +++++-
 frontend/pages/group/data/labels.vue | 19 ++++++++++++++-----
 frontend/pages/group/data/units.vue  |  6 +++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue
index d722f77e203c..be592f870f7f 100644
--- a/frontend/pages/group/data/foods.vue
+++ b/frontend/pages/group/data/foods.vue
@@ -150,7 +150,10 @@
       @confirm="deleteFood"
     >
       <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
+        <div class="mb-4">
+          {{ $t("general.confirm-delete-generic") }}
+        </div>
+        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>
 
@@ -394,6 +397,7 @@ export default defineComponent({
       deleteEventHandler,
       deleteDialog,
       deleteFood,
+      deleteTarget,
       // Alias Manager
       aliasManagerDialog,
       aliasManagerEventHandler,
diff --git a/frontend/pages/group/data/labels.vue b/frontend/pages/group/data/labels.vue
index c748d448be09..bbf65db00784 100644
--- a/frontend/pages/group/data/labels.vue
+++ b/frontend/pages/group/data/labels.vue
@@ -38,7 +38,10 @@
       @confirm="deleteLabel"
     >
       <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
+        <div class="mb-4">
+          {{ $t("general.confirm-delete-generic") }}
+        </div>
+        <MultiPurposeLabel v-if="deleteTarget" class="ml-4" :label="deleteTarget" />
       </v-card-text>
     </BaseDialog>
 
@@ -231,13 +234,19 @@ export default defineComponent({
       labels: labelStore.labels,
       validators,
 
-      deleteEventHandler,
-      deleteLabel,
+      // create
+      createLabel,
+      createLabelData: labelData.data,
+
+      // edit
       editLabel,
       editEventHandler,
       editSaveLabel,
-      createLabel,
-      createLabelData: labelData.data,
+
+      // delete
+      deleteEventHandler,
+      deleteLabel,
+      deleteTarget,
 
       // Seed
       seedDatabase,
diff --git a/frontend/pages/group/data/units.vue b/frontend/pages/group/data/units.vue
index 919ba6431455..6e99d790ab0a 100644
--- a/frontend/pages/group/data/units.vue
+++ b/frontend/pages/group/data/units.vue
@@ -124,7 +124,10 @@
       @confirm="deleteUnit"
     >
       <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
+        <div class="mb-4">
+          {{ $t("general.confirm-delete-generic") }}
+        </div>
+        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>
 
@@ -421,6 +424,7 @@ export default defineComponent({
       deleteEventHandler,
       deleteDialog,
       deleteUnit,
+      deleteTarget,
       // Alias Manager
       aliasManagerDialog,
       aliasManagerEventHandler,

From 55defdac8c7a8aa19077d18a52276f122a95c1cd Mon Sep 17 00:00:00 2001
From: Kuchenpirat <jojow@gmx.net>
Date: Tue, 21 Nov 2023 14:44:41 +0000
Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=A7=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/pages/group/data/categories.vue | 2 +-
 frontend/pages/group/data/foods.vue      | 2 +-
 frontend/pages/group/data/labels.vue     | 2 +-
 frontend/pages/group/data/recipes.vue    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/pages/group/data/categories.vue b/frontend/pages/group/data/categories.vue
index 856178ba8ed3..16f7f5dcae3e 100644
--- a/frontend/pages/group/data/categories.vue
+++ b/frontend/pages/group/data/categories.vue
@@ -48,7 +48,7 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Recipe Data Table -->
+    <!-- Data Table -->
     <BaseCardSectionTitle :icon="$globals.icons.categories" section :title="$tc('data-pages.categories.category-data')"> </BaseCardSectionTitle>
     <CrudTable
       :table-config="tableConfig"
diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue
index ebdf313b9365..3a019ae3682e 100644
--- a/frontend/pages/group/data/foods.vue
+++ b/frontend/pages/group/data/foods.vue
@@ -157,7 +157,7 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Recipe Data Table -->
+    <!-- Data Table -->
     <BaseCardSectionTitle :icon="$globals.icons.foods" section :title="$tc('data-pages.foods.food-data')"> </BaseCardSectionTitle>
     <CrudTable
       :table-config="tableConfig"
diff --git a/frontend/pages/group/data/labels.vue b/frontend/pages/group/data/labels.vue
index cca9ea98c08d..7a6b2592d4f6 100644
--- a/frontend/pages/group/data/labels.vue
+++ b/frontend/pages/group/data/labels.vue
@@ -82,7 +82,7 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Recipe Data Table -->
+    <!-- Data Table -->
     <BaseCardSectionTitle :icon="$globals.icons.tags" section :title="$tc('data-pages.labels.labels')"> </BaseCardSectionTitle>
     <CrudTable
       :table-config="tableConfig"
diff --git a/frontend/pages/group/data/recipes.vue b/frontend/pages/group/data/recipes.vue
index a5482c885c95..06ca8f24ad8e 100644
--- a/frontend/pages/group/data/recipes.vue
+++ b/frontend/pages/group/data/recipes.vue
@@ -140,7 +140,7 @@
     </section>
 
     <section class="mt-10">
-      <!-- Downloads Data Table -->
+      <!-- Data Table -->
       <BaseCardSectionTitle :icon="$globals.icons.database" section :title="$tc('data-pages.recipes.data-exports')">
         {{ $t('data-pages.recipes.data-exports-description') }}
       </BaseCardSectionTitle>

From dad3b3794600b778f8f9fcf94ab6d4cfac336b39 Mon Sep 17 00:00:00 2001
From: Kuchenpirat <jojow@gmx.net>
Date: Tue, 21 Nov 2023 14:46:34 +0000
Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=A7=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/pages/group/data/tags.vue  | 2 +-
 frontend/pages/group/data/tools.vue | 2 +-
 frontend/pages/group/data/units.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/pages/group/data/tags.vue b/frontend/pages/group/data/tags.vue
index b188d2bef314..cbbaf3592dbd 100644
--- a/frontend/pages/group/data/tags.vue
+++ b/frontend/pages/group/data/tags.vue
@@ -48,7 +48,7 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Recipe Data Table -->
+    <!-- Data Table -->
     <BaseCardSectionTitle :icon="$globals.icons.tags" section :title="$tc('data-pages.tags.tag-data')"> </BaseCardSectionTitle>
     <CrudTable
       :table-config="tableConfig"
diff --git a/frontend/pages/group/data/tools.vue b/frontend/pages/group/data/tools.vue
index c8ee33df1319..b596e40427c6 100644
--- a/frontend/pages/group/data/tools.vue
+++ b/frontend/pages/group/data/tools.vue
@@ -50,7 +50,7 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Tool Data Table -->
+    <!-- Data Table -->
     <BaseCardSectionTitle :icon="$globals.icons.potSteam" section :title="$tc('data-pages.tools.tool-data')"> </BaseCardSectionTitle>
     <CrudTable
       :table-config="tableConfig"
diff --git a/frontend/pages/group/data/units.vue b/frontend/pages/group/data/units.vue
index 9f3f10cbc56d..1e8acd8d3baa 100644
--- a/frontend/pages/group/data/units.vue
+++ b/frontend/pages/group/data/units.vue
@@ -168,7 +168,7 @@
       </v-card-text>
     </BaseDialog>
 
-    <!-- Recipe Data Table -->
+    <!-- Data Table -->
     <BaseCardSectionTitle :icon="$globals.icons.units" section :title="$tc('data-pages.units.unit-data')"> </BaseCardSectionTitle>
     <CrudTable
       :table-config="tableConfig"

From 984953e2ceba03ba9dabe8e45f797ee3db167ad4 Mon Sep 17 00:00:00 2001
From: Kuchenpirat <jojow@gmx.net>
Date: Tue, 21 Nov 2023 14:51:00 +0000
Subject: [PATCH 4/5] add for remaining organizers

---
 frontend/pages/group/data/categories.vue | 5 ++++-
 frontend/pages/group/data/tags.vue       | 5 ++++-
 frontend/pages/group/data/tools.vue      | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/pages/group/data/categories.vue b/frontend/pages/group/data/categories.vue
index 16f7f5dcae3e..08a2a1d4205a 100644
--- a/frontend/pages/group/data/categories.vue
+++ b/frontend/pages/group/data/categories.vue
@@ -44,7 +44,10 @@
       @confirm="deleteCategory"
     >
       <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
+        <div class="mb-4">
+          {{ $t("general.confirm-delete-generic") }}
+        </div>
+        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>
 
diff --git a/frontend/pages/group/data/tags.vue b/frontend/pages/group/data/tags.vue
index cbbaf3592dbd..8e5b39b6b9f5 100644
--- a/frontend/pages/group/data/tags.vue
+++ b/frontend/pages/group/data/tags.vue
@@ -44,7 +44,10 @@
       @confirm="deleteTag"
     >
       <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
+        <div class="mb-4">
+          {{ $t("general.confirm-delete-generic") }}
+        </div>
+        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>
 
diff --git a/frontend/pages/group/data/tools.vue b/frontend/pages/group/data/tools.vue
index b596e40427c6..ee82a1ed0d88 100644
--- a/frontend/pages/group/data/tools.vue
+++ b/frontend/pages/group/data/tools.vue
@@ -46,7 +46,10 @@
       @confirm="deleteTool"
     >
       <v-card-text>
-        {{ $t("general.confirm-delete-generic") }}
+        <div class="mb-4">
+          {{ $t("general.confirm-delete-generic") }}
+        </div>
+        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>
 

From 3870819e3824accb01d6cdbd2cb336a11b8f2d6b Mon Sep 17 00:00:00 2001
From: Kuchenpirat <jojow@gmx.net>
Date: Tue, 21 Nov 2023 15:22:36 +0000
Subject: [PATCH 5/5] remove unnecessairy div

---
 frontend/pages/group/data/categories.vue | 6 ++----
 frontend/pages/group/data/foods.vue      | 6 ++----
 frontend/pages/group/data/labels.vue     | 6 ++----
 frontend/pages/group/data/tags.vue       | 6 ++----
 frontend/pages/group/data/tools.vue      | 6 ++----
 frontend/pages/group/data/units.vue      | 6 ++----
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/frontend/pages/group/data/categories.vue b/frontend/pages/group/data/categories.vue
index 08a2a1d4205a..290e4f79e083 100644
--- a/frontend/pages/group/data/categories.vue
+++ b/frontend/pages/group/data/categories.vue
@@ -44,10 +44,8 @@
       @confirm="deleteCategory"
     >
       <v-card-text>
-        <div class="mb-4">
-          {{ $t("general.confirm-delete-generic") }}
-        </div>
-        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
+        {{ $t("general.confirm-delete-generic") }}
+        <p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>
 
diff --git a/frontend/pages/group/data/foods.vue b/frontend/pages/group/data/foods.vue
index 3a019ae3682e..32eda4322b7d 100644
--- a/frontend/pages/group/data/foods.vue
+++ b/frontend/pages/group/data/foods.vue
@@ -150,10 +150,8 @@
       @confirm="deleteFood"
     >
       <v-card-text>
-        <div class="mb-4">
-          {{ $t("general.confirm-delete-generic") }}
-        </div>
-        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
+        {{ $t("general.confirm-delete-generic") }}
+        <p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>
 
diff --git a/frontend/pages/group/data/labels.vue b/frontend/pages/group/data/labels.vue
index 7a6b2592d4f6..71838dfd3d93 100644
--- a/frontend/pages/group/data/labels.vue
+++ b/frontend/pages/group/data/labels.vue
@@ -38,10 +38,8 @@
       @confirm="deleteLabel"
     >
       <v-card-text>
-        <div class="mb-4">
-          {{ $t("general.confirm-delete-generic") }}
-        </div>
-        <MultiPurposeLabel v-if="deleteTarget" class="ml-4" :label="deleteTarget" />
+        {{ $t("general.confirm-delete-generic") }}
+        <MultiPurposeLabel v-if="deleteTarget" class="mt-4 ml-4" :label="deleteTarget" />
       </v-card-text>
     </BaseDialog>
 
diff --git a/frontend/pages/group/data/tags.vue b/frontend/pages/group/data/tags.vue
index 8e5b39b6b9f5..076a23f08b4d 100644
--- a/frontend/pages/group/data/tags.vue
+++ b/frontend/pages/group/data/tags.vue
@@ -44,10 +44,8 @@
       @confirm="deleteTag"
     >
       <v-card-text>
-        <div class="mb-4">
-          {{ $t("general.confirm-delete-generic") }}
-        </div>
-        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
+        {{ $t("general.confirm-delete-generic") }}
+        <p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>
 
diff --git a/frontend/pages/group/data/tools.vue b/frontend/pages/group/data/tools.vue
index ee82a1ed0d88..4ff3c547819b 100644
--- a/frontend/pages/group/data/tools.vue
+++ b/frontend/pages/group/data/tools.vue
@@ -46,10 +46,8 @@
       @confirm="deleteTool"
     >
       <v-card-text>
-        <div class="mb-4">
-          {{ $t("general.confirm-delete-generic") }}
-        </div>
-        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
+        {{ $t("general.confirm-delete-generic") }}
+        <p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>
 
diff --git a/frontend/pages/group/data/units.vue b/frontend/pages/group/data/units.vue
index 1e8acd8d3baa..9ce5fa991110 100644
--- a/frontend/pages/group/data/units.vue
+++ b/frontend/pages/group/data/units.vue
@@ -124,10 +124,8 @@
       @confirm="deleteUnit"
     >
       <v-card-text>
-        <div class="mb-4">
-          {{ $t("general.confirm-delete-generic") }}
-        </div>
-        <p v-if="deleteTarget" class="ml-4">{{ deleteTarget.name }}</p>
+        {{ $t("general.confirm-delete-generic") }}
+        <p v-if="deleteTarget" class="mt-4 ml-4">{{ deleteTarget.name }}</p>
       </v-card-text>
     </BaseDialog>