From 60eeea39209d8e1bdc730c6fad617ad260d26bd8 Mon Sep 17 00:00:00 2001
From: lebeaulato <lebeaulato@IUTCLINFA1907>
Date: Tue, 14 Jan 2025 17:13:21 +0100
Subject: [PATCH] Login fonctionne

---
 WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs    |   8 +-
 WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs      |   1 +
 WF-WebAdmin/WF-WebAdmin/Pages/Login.razor     |   5 +-
 WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs  |  14 ++-
 .../WF-WebAdmin/Pages/ModifQuote.razor        |   2 +-
 WF-WebAdmin/WF-WebAdmin/Program.cs            |   2 +-
 .../WF-WebAdmin/Shared/MainLayout.razor       |  46 ++++----
 WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor  | 104 +++++++++---------
 .../wwwroot/fake-dataUserLogin.json           |   2 +-
 .../WF-WebAdmin/wwwroot/fake-dataUsers.json   |   2 +-
 10 files changed, 100 insertions(+), 86 deletions(-)

diff --git a/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs b/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs
index a2e9bb7..b8f12b1 100644
--- a/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs
+++ b/WF-WebAdmin/WF-WebAdmin/Model/UserLogin.cs
@@ -1,15 +1,13 @@
-namespace WF_WebAdmin.Model
+using System;
+namespace WF_WebAdmin.Model
 {
     public class UserLogin
     {
         public int Id { get; set; }
         public string Image { get; set; }
-        public string Name { get; set; }
-
+        public string Name { get; set;}
         public Boolean IsAdmin { get; set; }
-
         public string Mdp { get; set; }
-
         public UserLogin(int id,string image, string name, bool isAdmin, string mdp)
         {
             Id = id;
diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs
index b9e90bc..0e69dcf 100644
--- a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs
+++ b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.cs
@@ -18,6 +18,7 @@ namespace WF_WebAdmin.Pages
         protected override async Task OnInitializedAsync()
         {
             quotes = await Http.GetFromJsonAsync<Quote[]>($"{NavigationManager.BaseUri}fake-dataQuote.json");
+        
         }
     }
 }
diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor
index 908ce74..bc7c735 100644
--- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor
+++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor
@@ -1,6 +1,6 @@
 @page "/"
 @using WF_WebAdmin.Model
-@inject UserLogin uLogin
+
 <h1>▶ Connexion ◀</h1>
 
     <div class="login">
@@ -8,12 +8,11 @@
         <DataAnnotationsValidator />
         <ValidationSummary />
 
-
             <label for="name"><strong>Identifiant *</strong></label>
             <InputText @bind-Value="userLogin.Name" id="name" placeholder="Entrez votre pseudo" class="connexion" required />
 
             <label for="mdp"><strong>Mot de passe*</strong></label>
-            <InputText @bind-Value="@userLogin.Mdp" type="password" placeholder="Password" class="connexion" required />
+            <InputText @bind-Value="@userLogin.Mdp" type="password" placeholder="Entrez votre mot de passe" class="connexion" required />
             
 
             <div class="buttonSubmitDiv">
diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs
index 6f6c59f..94d4492 100644
--- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs
+++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor.cs
@@ -8,8 +8,12 @@ namespace WF_WebAdmin.Pages
 {
     public partial class Login
     {
+
         private UserLogin userLogin = new UserLogin();
 
+        [Inject]
+        public UserLogin uLogin {  get; set; }
+
         private string ErrorConnexion;
 
         private List<UserLogin> usersConnexion;
@@ -22,6 +26,7 @@ namespace WF_WebAdmin.Pages
         protected override async Task OnInitializedAsync()
         {
             usersConnexion = await Http.GetFromJsonAsync<List<UserLogin>>($"{NavigationManager.BaseUri}fake-dataUsers.json");
+
         }
 
 
@@ -36,8 +41,13 @@ namespace WF_WebAdmin.Pages
                         if(user.IsAdmin)
                         {
                             ErrorConnexion = $"Connecté en tant que {user.Name} (Ca doit disparaitre dans le futur)";
-                            uLogin.Id = user.Id;
-                            break;
+                            uLogin.Id = userLogin.Id;
+                            uLogin.Name = user.Name;
+                            uLogin.Image = user.Image;
+                            
+                            NavigationManager.NavigateTo(NavigationManager.BaseUri + "/accueil");
+                            return;
+                            
                         }
                         else
                         {
diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor
index d562f7a..c3eaede 100644
--- a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor
+++ b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor
@@ -3,7 +3,7 @@
 
 <PageTitle>Corection des citation</PageTitle>
 
-<h3>Corection des citation</h3>
+<h3>Correction des citations</h3>
 
 <p>Ajouter une recherche</p>
 
diff --git a/WF-WebAdmin/WF-WebAdmin/Program.cs b/WF-WebAdmin/WF-WebAdmin/Program.cs
index ed541e6..fb07a82 100644
--- a/WF-WebAdmin/WF-WebAdmin/Program.cs
+++ b/WF-WebAdmin/WF-WebAdmin/Program.cs
@@ -14,7 +14,7 @@ builder.Services.AddServerSideBlazor();
 builder.Services.AddSingleton<WeatherForecastService>();
 
 builder.Services.AddHttpClient();
-builder.Services.AddSingleton<UserLogin>();
+builder.Services.AddScoped<UserLogin>();
 
 builder.Services
    .AddBlazorise()
diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor
index 942b447..13bedc2 100644
--- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor
+++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor
@@ -2,35 +2,41 @@
 @inherits LayoutComponentBase
 @inject UserLogin uLogin
 
-<PageTitle>WF-WebAdmin</PageTitle>
-
-<div class="page">
-    <div class="sidebar">
-        <NavMenu />
-    </div>
-
-    <main>
+<PageTitle>WF-WebAdmin</PageTitle>
+
+
+<div class="page">
+    @if (uLogin.Name != null)
+    {
+        <div class="sidebar">
+            <NavMenu />
+        </div>
+    }
+
+    <main>
         <div class="top-row px-4">
             @if (!string.IsNullOrEmpty(uLogin.Name))
             {
                 <img class="imageProfil" src="@uLogin.Image" />
-            }
+            }
             else
             {
                 <img class="imageProfil" src="https://cdn-icons-png.flaticon.com/512/61/61205.png"/>
-            }
-        </div>
-        <article class="content px-4">
-            @Body
-        </article>
-    </main>
-</div>
-
-<style>
+            }
+        </div>
+        <article class="content px-4">
+            @Body
+        </article>
+    </main>
+</div>
+
+<style>
     .imageProfil{
         height:auto;
         width : 30px;
         border-radius:45%;
     }
-
-</style>
+
+</style>
+
+
diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor
index a650684..28062bd 100644
--- a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor
+++ b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor
@@ -1,61 +1,61 @@
-<div class="top-row ps-3 navbar navbar-dark">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="">What the Fantasy</a>
-        <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-    </div>
-</div>
-
-<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
-    <nav class="flex-column">
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="oi oi-home" aria-hidden="true"></span> Login
-            </NavLink>
-        </div>
-
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="Accueil">
-                <span class="oi oi-plus" aria-hidden="true"></span> Accueil
-            </NavLink>
-        </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="ValidQuote">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Validation de citations
-            </NavLink>
-        </div>
-
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="ValidQuiz">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Validation de quiz
-            </NavLink>
-        </div>
+@using WF_WebAdmin.Model
+@inject UserLogin uLogin
 
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="deleteuser">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Gestion des utilisateurs
-            </NavLink>
-        </div>
 
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="modifquote">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Correction des citations
-            </NavLink>
+    <div class="top-row ps-3 navbar navbar-dark">
+        <div class="container-fluid">
+            <a class="navbar-brand" href="">What the Fantasy</a>
+            <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
+                <span class="navbar-toggler-icon"></span>
+            </button>
         </div>
+    </div>
 
+    <div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
+        <nav class="flex-column">
+            
+            <div class="nav-item px-3">
+                <NavLink class="nav-link" href="Accueil">
+                    <span class="oi oi-plus" aria-hidden="true"></span> Accueil
+                </NavLink>
+            </div>
+            <div class="nav-item px-3">
+                <NavLink class="nav-link" href="ValidQuote">
+                    <span class="oi oi-list-rich" aria-hidden="true"></span> Validation de citations
+                </NavLink>
+            </div>
+
+            <div class="nav-item px-3">
+                <NavLink class="nav-link" href="ValidQuiz">
+                    <span class="oi oi-list-rich" aria-hidden="true"></span> Validation de quiz
+                </NavLink>
+            </div>
+
+            <div class="nav-item px-3">
+                <NavLink class="nav-link" href="deleteuser">
+                    <span class="oi oi-list-rich" aria-hidden="true"></span> Gestion des utilisateurs
+                </NavLink>
+            </div>
+
+            <div class="nav-item px-3">
+                <NavLink class="nav-link" href="modifquote">
+                    <span class="oi oi-list-rich" aria-hidden="true"></span> Correction des citations
+                </NavLink>
+            </div>
+
+
+        </nav>
+    </div>
 
-    </nav>
-</div>
-
-@code {
-    private bool collapseNavMenu = true;
+    @code {
+        private bool collapseNavMenu = true;
 
-    private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
+        private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
 
-    private void ToggleNavMenu()
-    {
-        collapseNavMenu = !collapseNavMenu;
+        private void ToggleNavMenu()
+        {
+            collapseNavMenu = !collapseNavMenu;
+        }
     }
-}
+
 
diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json
index 241a266..5808bf5 100644
--- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json
+++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUserLogin.json
@@ -10,7 +10,7 @@
     "Id": 2,
     "Image": "https://tse2.mm.bing.net/th/id/OIP.MMpXBB5RDRYQm05FJmevGAHaKl?w=137&h=195&c=7&r=0&o=5&pid=1.7",
     "Name": "exploit",
-    "IsAdmin": false,
+    "IsAdmin": true,
     "Mdp": "passwd"
   }
 ]
\ No newline at end of file
diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json
index d995d42..23e361d 100644
--- a/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json
+++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/fake-dataUsers.json
@@ -24,7 +24,7 @@
     "Name": "exploit",
     "Email": "exploit@gmail.com",
     "DateCreation": "2024-11-12",
-    "IsAdmin": false,
+    "IsAdmin": true,
     "Mdp": "passwd"
   },
   {