From 3487cdcb58ca50703fc905a4adc9ebf9ff17c666 Mon Sep 17 00:00:00 2001
From: Andre Beging <github@beging.de>
Date: Tue, 31 May 2022 16:13:38 +0200
Subject: [PATCH] Navbar reorder

---
 FoodsharingSiegen.Server/App.razor            |  3 ++-
 .../Pages/Prospects.razor.cs                  |  9 +++----
 FoodsharingSiegen.Server/Shared/NavMenu.razor | 24 ++++++++++++-------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/FoodsharingSiegen.Server/App.razor b/FoodsharingSiegen.Server/App.razor
index 4ff94fd..8bfd40b 100644
--- a/FoodsharingSiegen.Server/App.razor
+++ b/FoodsharingSiegen.Server/App.razor
@@ -12,9 +12,10 @@
             </LayoutView>
         </NotFound>
     </Router>
+    
+    <MessageAlert/>
 </Blazorise.ThemeProvider>
 
-<MessageAlert/>
 
 @code{
     private Theme theme = new()
diff --git a/FoodsharingSiegen.Server/Pages/Prospects.razor.cs b/FoodsharingSiegen.Server/Pages/Prospects.razor.cs
index 842b58c..ebd4571 100644
--- a/FoodsharingSiegen.Server/Pages/Prospects.razor.cs
+++ b/FoodsharingSiegen.Server/Pages/Prospects.razor.cs
@@ -13,11 +13,6 @@ namespace FoodsharingSiegen.Server.Pages
     {
         #region Dependencies (Injected)
 
-        /// <summary>
-        /// Gets or sets the value of the message service (ab)
-        /// </summary>
-        [Inject] private IMessageService MessageService { get; set; } = null!;
-
         /// <summary>
         /// Gets or sets the value of the prospect service (ab)
         /// </summary>
@@ -151,7 +146,7 @@ namespace FoodsharingSiegen.Server.Pages
         /// <param name="arg">The arg</param>
         private async Task RemoveInteraction(Guid arg)
         {
-            var confirm = await MessageService.Confirm("Interaktion wirklich löschen?", "Bestätigen", o => { 
+            var confirm = await Message.Confirm("Interaktion wirklich löschen?", "Bestätigen", o => { 
                 o.ConfirmButtonText = "Ja, wirklich!";
                 o.CancelButtonText = "Abbrechen";
                 o.ShowMessageIcon = false;
@@ -162,6 +157,8 @@ namespace FoodsharingSiegen.Server.Pages
                 await ProspectService.RemoveInteraction(arg);
                 await LoadProspects();
             }
+
+            await InvokeAsync(StateHasChanged);
         }
 
         #endregion
diff --git a/FoodsharingSiegen.Server/Shared/NavMenu.razor b/FoodsharingSiegen.Server/Shared/NavMenu.razor
index 9cd612e..e26a1f0 100644
--- a/FoodsharingSiegen.Server/Shared/NavMenu.razor
+++ b/FoodsharingSiegen.Server/Shared/NavMenu.razor
@@ -1,9 +1,20 @@
 <nav class="flex-column">
     <div class="nav-logo"></div>
-    <div class="nav-item px-3">
-        <NavLink class="nav-link" href="profile" Match="NavLinkMatch.All">
-            <span class="fas fa-user mr-1" aria-hidden="true" style="font-size: 1.4em;"></span> Profil
-        </NavLink>
+    <div class="row px-3">
+        <div class="col">
+            <div class="nav-item">
+                <NavLink class="nav-link justify-content-center" href="profile" Match="NavLinkMatch.All" title="Profil">
+                    <span class="fas fa-user mr-1" aria-hidden="true" style="font-size: 1.4em;"></span>
+                </NavLink>
+            </div>
+        </div>
+        <div class="col">
+            <div class="nav-item">
+                    <NavLink class="nav-link justify-content-center" href="logout" Match="NavLinkMatch.All" title="Ausloggen">
+                        <span class="fa-solid fa-door-open mr-1" aria-hidden="true" style="font-size: 1.4em;"></span>
+                    </NavLink>
+                </div>
+        </div>
     </div>
     <div class="nav-item px-3">
         <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
@@ -20,9 +31,4 @@
             <span class="fa-solid fa-clock-rotate-left mr-1" aria-hidden="true" style="font-size: 1.4em;"></span> Aktivitäten
         </NavLink>
     </div>
-    <div class="nav-item px-3 pt-5">
-        <NavLink class="nav-link" href="logout" Match="NavLinkMatch.All">
-            <span class="fa-solid fa-door-open mr-1" aria-hidden="true" style="font-size: 1.4em;"></span> Ausloggen
-        </NavLink>
-    </div>
 </nav>
\ No newline at end of file