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($"{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 +

▶ Connexion ◀

@@ -8,12 +8,11 @@ - - +
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 usersConnexion; @@ -22,6 +26,7 @@ namespace WF_WebAdmin.Pages protected override async Task OnInitializedAsync() { usersConnexion = await Http.GetFromJsonAsync>($"{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 @@ Corection des citation -

Corection des citation

+

Correction des citations

Ajouter une recherche

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(); builder.Services.AddHttpClient(); -builder.Services.AddSingleton(); +builder.Services.AddScoped(); 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 -WF-WebAdmin - -
- - -
+WF-WebAdmin + + +
+ @if (uLogin.Name != null) + { + + } + +
@if (!string.IsNullOrEmpty(uLogin.Name)) { - } + } else { - } -
-
- @Body -
-
-
- - + + + + 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 @@ - - -
- -
- -@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" }, {