From 8ccbe8cf659a65c517024db56c4dc184937132b9 Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Wed, 26 Jun 2024 20:37:49 +0200
Subject: [PATCH] ModalComponent Show und Close-Funktionsnamen normiert

---
 CocktailWeb/.config/dotnet-tools.json        | 2 +-
 CocktailWeb/Pages/ModalComponent.razor       | 4 ++--
 CocktailWeb/Pages/Settings/Cocktails.razor   | 5 ++---
 CocktailWeb/Pages/Settings/Ingredients.razor | 6 +++---
 CocktailWeb/Pages/Settings/Machine.razor.cs  | 4 ++--
 CocktailWeb/Shared/TopRow.razor              | 4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/CocktailWeb/.config/dotnet-tools.json b/CocktailWeb/.config/dotnet-tools.json
index e3cadb9..9d58272 100644
--- a/CocktailWeb/.config/dotnet-tools.json
+++ b/CocktailWeb/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "8.0.0",
+      "version": "8.0.2",
       "commands": [
         "dotnet-ef"
       ]
diff --git a/CocktailWeb/Pages/ModalComponent.razor b/CocktailWeb/Pages/ModalComponent.razor
index 57a1d43..258a377 100644
--- a/CocktailWeb/Pages/ModalComponent.razor
+++ b/CocktailWeb/Pages/ModalComponent.razor
@@ -33,7 +33,7 @@
     private string modalClass = "";
     private bool showBackdrop = false;
 
-    public async Task OpenModal()
+    public async Task ShowAsync()
     {
         modalDisplay = "block;";
         await Task.Delay(100);//Delay allows bootstrap to perform nice fade animation
@@ -41,7 +41,7 @@
         showBackdrop = true;
     }
 
-    public async Task Close()
+    public async Task CloseAsync()
     {
         modalDisplay = "none";
         await Task.Delay(250);//Delay allows bootstrap to perform nice fade animation
diff --git a/CocktailWeb/Pages/Settings/Cocktails.razor b/CocktailWeb/Pages/Settings/Cocktails.razor
index 7cc5873..058c0f3 100644
--- a/CocktailWeb/Pages/Settings/Cocktails.razor
+++ b/CocktailWeb/Pages/Settings/Cocktails.razor
@@ -29,7 +29,6 @@
             }
         </tbody>
     </table>
-
 </div>
 
 <ModalComponent @ref="modal">
@@ -67,13 +66,13 @@
     private async Task ConfirmDelete(Cocktail c)
     {
         SelectedCocktail = c;
-        await modal.OpenModal();
+        await modal.ShowAsync();
     }
 
     private async Task CloseDialog()
     {
         SelectedCocktail = null;
-        await modal.Close();
+        await modal.CloseAsync();
     }
     private async Task DeleteCocktail(MouseEventArgs e)
     {
diff --git a/CocktailWeb/Pages/Settings/Ingredients.razor b/CocktailWeb/Pages/Settings/Ingredients.razor
index 72dd4c4..4307a4f 100644
--- a/CocktailWeb/Pages/Settings/Ingredients.razor
+++ b/CocktailWeb/Pages/Settings/Ingredients.razor
@@ -105,12 +105,12 @@
         if (CocktailsWithIngredient.Count > 0)
         {
             InfoText = String.Join(", ", CocktailsWithIngredient.Select(c => c.Name).ToArray());
-            await dlgInfo.OpenModal();
+            await dlgInfo.ShowAsync();
         }
         else
         {
             SelectedIngredient = fl;
-            await dlgDelete.OpenModal();
+            await dlgDelete.ShowAsync();
         }
     }
 
@@ -133,6 +133,6 @@
     private async Task CloseDialog(ModalComponent dlg)
     {
         SelectedIngredient = null;
-        await dlg.Close();
+        await dlg.CloseAsync();
     }
 }
diff --git a/CocktailWeb/Pages/Settings/Machine.razor.cs b/CocktailWeb/Pages/Settings/Machine.razor.cs
index 6c5b2c2..b701cf4 100644
--- a/CocktailWeb/Pages/Settings/Machine.razor.cs
+++ b/CocktailWeb/Pages/Settings/Machine.razor.cs
@@ -35,7 +35,7 @@ namespace CocktailWeb.Pages.Settings
         {
             SelectedFiller = f;
             SelectedFlasche = f.Flasche;
-            await modal.OpenModal();
+            await modal.ShowAsync();
         }
 
 
@@ -63,7 +63,7 @@ namespace CocktailWeb.Pages.Settings
         {
             SelectedFiller = null;
             SelectedFlasche = null;
-            await modal.Close();
+            await modal.CloseAsync();
         }
     }
 }
diff --git a/CocktailWeb/Shared/TopRow.razor b/CocktailWeb/Shared/TopRow.razor
index 0b66921..7104ff7 100644
--- a/CocktailWeb/Shared/TopRow.razor
+++ b/CocktailWeb/Shared/TopRow.razor
@@ -104,14 +104,14 @@
 
     private async Task OpenDialog()
     {
-        await Pwd_Dialog.OpenModal();
+        await Pwd_Dialog.ShowAsync();
     }
 
     private async Task CloseDialog()
     {
         Pwd_ErrorText = null;
         Pwd_inputPassword = null;
-        await Pwd_Dialog.Close();
+        await Pwd_Dialog.CloseAsync();
     }