From 9c0d49f079dca1048910201a78f5faa0c0c2892f Mon Sep 17 00:00:00 2001
From: Rayhan Hassou <Rayhan.HASSOU@etu.uca.fr>
Date: Wed, 28 Dec 2022 11:23:30 +0100
Subject: [PATCH] modif probleme lors du chagement de langue

---
 src/CraftSharp/Pages/Connexion.razor         |  3 +-
 src/CraftSharp/Pages/Connexion.razor.cs      |  2 +-
 src/CraftSharp/Pages/Index.razor             |  2 +-
 src/CraftSharp/Pages/Inscription.razor.cs    |  2 +-
 src/CraftSharp/Pages/_Host.cshtml            |  1 +
 src/CraftSharp/Shared/HeaderLayout.razor     |  7 +-
 src/CraftSharp/Shared/HeaderLayout.razor.cs  |  4 +-
 src/CraftSharp/Shared/HeaderLayout.razor.css |  4 +-
 src/CraftSharp/Shared/NavMenu.razor          | 76 ++++++++++----------
 src/CraftSharp/_Imports.razor                |  3 +-
 10 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/CraftSharp/Pages/Connexion.razor b/src/CraftSharp/Pages/Connexion.razor
index 3ed8ca3..04e5809 100644
--- a/src/CraftSharp/Pages/Connexion.razor
+++ b/src/CraftSharp/Pages/Connexion.razor
@@ -1,4 +1,5 @@
-@page "/connexion"
+@page "/"
+@page "/connexion"
 @layout InscriptionLayout
 @inject NavigationManager NavManager
 
diff --git a/src/CraftSharp/Pages/Connexion.razor.cs b/src/CraftSharp/Pages/Connexion.razor.cs
index ee559df..f7bd173 100644
--- a/src/CraftSharp/Pages/Connexion.razor.cs
+++ b/src/CraftSharp/Pages/Connexion.razor.cs
@@ -25,7 +25,7 @@ namespace CraftSharp.Pages
             try
             {
                 await AuthStateProvider.Login(loginRequest);
-                NavigationManager.NavigateTo("");
+                NavigationManager.NavigateTo("index");
             }
             catch (Exception ex)
             {
diff --git a/src/CraftSharp/Pages/Index.razor b/src/CraftSharp/Pages/Index.razor
index dd43075..d348c99 100644
--- a/src/CraftSharp/Pages/Index.razor
+++ b/src/CraftSharp/Pages/Index.razor
@@ -1,4 +1,4 @@
-@page "/"
+@page "/index"
 @using System.Globalization
 
 <p>
diff --git a/src/CraftSharp/Pages/Inscription.razor.cs b/src/CraftSharp/Pages/Inscription.razor.cs
index d15dcf6..a22075e 100644
--- a/src/CraftSharp/Pages/Inscription.razor.cs
+++ b/src/CraftSharp/Pages/Inscription.razor.cs
@@ -23,7 +23,7 @@ namespace CraftSharp.Pages
         {
 
                 await AuthStateProvider.Register(registerRequest);
-                NavigationManager.NavigateTo("");
+                NavigationManager.NavigateTo("index");
 
         }
     }
diff --git a/src/CraftSharp/Pages/_Host.cshtml b/src/CraftSharp/Pages/_Host.cshtml
index 17b2f58..99f3fba 100644
--- a/src/CraftSharp/Pages/_Host.cshtml
+++ b/src/CraftSharp/Pages/_Host.cshtml
@@ -6,3 +6,4 @@
 }
 
 <component type="typeof(App)" render-mode="ServerPrerendered" />
+
diff --git a/src/CraftSharp/Shared/HeaderLayout.razor b/src/CraftSharp/Shared/HeaderLayout.razor
index a014692..24fcf4e 100644
--- a/src/CraftSharp/Shared/HeaderLayout.razor
+++ b/src/CraftSharp/Shared/HeaderLayout.razor
@@ -8,7 +8,7 @@
             <div class="collapse navbar-collapse @NavBarCssClass" id="navbarCollapse" @onclick="ToggleNavMenu">
                 <ul class="navbar-nav me-auto mb-0 mb-md-0 topbar_content" >
                     <li class="nav-item">
-                        <NavLink class="nav-link" href="List">
+                        <NavLink class="nav-link" href="tabledecraft">
                             <span class="topbar_item">
                                 <img src="/Images/inventory_icon.png" class="topbar_itemimg"/> @Localizer["Inventory"]
                             </span>
@@ -35,10 +35,7 @@
                             </span>
                         </NavLink>
                     </li>
-                     <span class="btn_wrap">
-                        <div class="button"> @Localizer["Login"]</div>
-                        <div class="button"> @Localizer["Register"]</div>
-                     </span>
+                    <button type="button" class="btn btn-link ml-md-auto" @onclick="@LogoutClick">Logout</button>
                 </ul>
             </div>
         </div>
diff --git a/src/CraftSharp/Shared/HeaderLayout.razor.cs b/src/CraftSharp/Shared/HeaderLayout.razor.cs
index d099430..7ba3cc3 100644
--- a/src/CraftSharp/Shared/HeaderLayout.razor.cs
+++ b/src/CraftSharp/Shared/HeaderLayout.razor.cs
@@ -30,13 +30,13 @@ namespace CraftSharp.Shared
             NavigationManager.NavigateTo("connexion");
         }
 
-        protected override async Task OnParametersSetAsync()
+       /* protected override async Task OnParametersSetAsync()
         {
             if (!(await AuthenticationState).User.Identity.IsAuthenticated)
             {
                 NavigationManager.NavigateTo("/inscription");
             }
-        }
+        }*/
 
         private async Task LogoutClick()
         {
diff --git a/src/CraftSharp/Shared/HeaderLayout.razor.css b/src/CraftSharp/Shared/HeaderLayout.razor.css
index 72764c1..25da42f 100644
--- a/src/CraftSharp/Shared/HeaderLayout.razor.css
+++ b/src/CraftSharp/Shared/HeaderLayout.razor.css
@@ -78,7 +78,7 @@ nav-link {
     align-items: center;
 }
 
-.button {
+button {
     width: 11rem;
     text-decoration: none;
     text-align: center;
@@ -92,7 +92,7 @@ nav-link {
     font-family: Minecraft;
 }
 
-.button:hover {
+button:hover {
     background: url('Images/btn2.png')center center/contain no-repeat;
     background-size: 100% 100%;
 }
diff --git a/src/CraftSharp/Shared/NavMenu.razor b/src/CraftSharp/Shared/NavMenu.razor
index d932678..7089893 100644
--- a/src/CraftSharp/Shared/NavMenu.razor
+++ b/src/CraftSharp/Shared/NavMenu.razor
@@ -4,44 +4,44 @@
             <span class="navbar-toggler-icon"></span>
         </button>
     </div>
-</div>
-
-<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
-    <nav>
-        <div class="nav-item px-2">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="oi oi-key"></span> Ouverture
-            </NavLink>
-        </div>
-        <div>
+</div>
+
+<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
+    <nav>
+        <div class="nav-item px-2">
+            <NavLink class="nav-link" href="opening" Match="NavLinkMatch.All">
+                <span class="oi oi-key"></span> Ouverture
+            </NavLink>
+        </div>
+        <div>
             <img class="nav-image" src="Images/CraftSharp-Logo.png" alt="Logo Application"/>
-        </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="oi oi-plus"></span> Magasin
-            </NavLink>
-        </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="fetchdata">
-                <span class="oi oi-box"></span> Inventaire
-            </NavLink>
-        </div>
-        <div>
+        </div>
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="counter">
+                <span class="oi oi-plus"></span> Magasin
+            </NavLink>
+        </div>
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="fetchdata">
+                <span class="oi oi-box"></span> Inventaire
+            </NavLink>
+        </div>
+        <div>
             <div class="button"> Se connecter
-            </div>
+            </div>
             <div class="button"> Se déconnecter
-            </div>
-        </div>
-    </nav>
-</div>
-
-@code {
-    private bool collapseNavMenu = true;
-
-    private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
-
-    private void ToggleNavMenu()
-    {
-        collapseNavMenu = !collapseNavMenu;
-    }
-}
+            </div>
+        </div>
+    </nav>
+</div>
+
+@code {
+    private bool collapseNavMenu = true;
+
+    private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
+
+    private void ToggleNavMenu()
+    {
+        collapseNavMenu = !collapseNavMenu;
+    }
+}
diff --git a/src/CraftSharp/_Imports.razor b/src/CraftSharp/_Imports.razor
index db445a0..3d33c7f 100644
--- a/src/CraftSharp/_Imports.razor
+++ b/src/CraftSharp/_Imports.razor
@@ -11,4 +11,5 @@
 @using Blazorise.DataGrid
 @using Blazored.Modal
 @using Blazored.Modal.Services
-@using Microsoft.AspNetCore.Components.Authorization
\ No newline at end of file
+@using Microsoft.AspNetCore.Components.Authorization
+@using System.Web
\ No newline at end of file