diff --git a/WF-WebAdmin/WF-WebAdmin/Model/LoggerSaveStub.cs b/WF-WebAdmin/WF-WebAdmin/Model/LoggerSaveStub.cs index 0d71a7f..0920ee3 100644 --- a/WF-WebAdmin/WF-WebAdmin/Model/LoggerSaveStub.cs +++ b/WF-WebAdmin/WF-WebAdmin/Model/LoggerSaveStub.cs @@ -2,7 +2,9 @@ using Microsoft.Extensions.Configuration.UserSecrets; using Microsoft.Extensions.Logging; using Microsoft.VisualBasic; +using System; using System.Diagnostics; +using System.Security.Claims; using WF_WebAdmin.Pages; using WF_WebAdmin.Service; @@ -22,18 +24,18 @@ namespace WF_WebAdmin.Model } /* - * [Inject] - * public ILogger< Class > Logger { get; set; } - * - * LoggerSaveStub.Log(Logger,LogLevel. level , message ); - * - * - * LogLevel: - * Trace = 0, - * Debug = 1, - * Information = 2, - * Warning = 3, - * Error = 4, - * Critical = 5, - * None = 6, +[Inject] +public ILogger< Class > Logger { get; set; } + +LoggerSaveStub.Log(Logger,LogLevel. level , message ); + + +LogLevel: +Trace = 0, +Debug = 1, +Information = 2, +Warning = 3, +Error = 4, +Critical = 5, +None = 6, */ \ No newline at end of file diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor index 099d4dd..d9af67e 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor @@ -1,4 +1,4 @@ -@page "/Accueil" +@page "/" @using WF_WebAdmin.Model Accueil @@ -28,5 +28,5 @@ else }

@Localizer["AccueilManualChange"]

- + diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor.cs index 797b255..3117665 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Accueil.razor.cs @@ -1,6 +1,7 @@ using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; +using System.Security.Claims; using WF_WebAdmin.Model; @@ -9,6 +10,8 @@ namespace WF_WebAdmin.Pages public partial class Accueil { private Quote[] Dailyquote; + [Inject] + public ILogger Logger { get; set; } [Inject] public HttpClient Http { get; set; } @@ -23,5 +26,11 @@ namespace WF_WebAdmin.Pages Dailyquote = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-dataDailyQuote.json"); } + private void RandomDailyquote() + { + //fonction a compléter + LoggerSaveStub.Log(Logger, LogLevel.Information, "Changement aléatoire de la quote du jour"); + } } } + diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/AddQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/AddQuiz.razor.cs index ff10734..7d11c03 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/AddQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/AddQuiz.razor.cs @@ -4,12 +4,16 @@ using WF_WebAdmin.Model; using Microsoft.AspNetCore.Mvc; using System.Text.RegularExpressions; using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Logging; +using System.Security.Claims; namespace WF_WebAdmin.Pages { public partial class AddQuiz { + [Inject] + public ILogger Logger { get; set; } [Inject] public IStringLocalizer Localizer { get; set; } @@ -24,10 +28,10 @@ namespace WF_WebAdmin.Pages private async void HandleValidSubmit() { - int id; id = await quizService.getNbQuiz(); id++; + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Création de la question {QuizModel.Question}"); await quizService.addQuiz(new Quiz( id, validateInformation(QuizModel.Question), diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs index e363cee..5bebc2f 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/DeleteUser.razor.cs @@ -18,7 +18,6 @@ namespace WF_WebAdmin.Pages private bool showDeletePopup = false; private bool showModifyPopup = false; - private List users; private User userToDelete = null; private User selectedUser; private bool showPopupDelete = false; @@ -68,9 +67,7 @@ namespace WF_WebAdmin.Pages // ------- Popup remove user ------- private void ShowConfirmation(User user) - { - LoggerSaveStub.Log(Logger,LogLevel.Information, $"Demande de supretion de l utilisateur : { user.Name }"); - + { userToDelete = user; showPopupDelete = true; } @@ -85,7 +82,8 @@ namespace WF_WebAdmin.Pages private async Task RemoveUser() { if (userToDelete != null) - { + { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Supretion de l utilisateur : {userToDelete.Name}"); await userService.removeUser(userToDelete); ClosePopup(); var response = await userService.getSomeUser(MaxValue, page); @@ -94,7 +92,8 @@ namespace WF_WebAdmin.Pages } private async Task ModifyUser() - { + { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Modification de l utilisateur : {selectedUser.Name}"); await userService.updateUser(selectedUser); ClosePopup(); } @@ -121,12 +120,14 @@ namespace WF_WebAdmin.Pages { if (!userToAdmin.IsAdmin) { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"L utilisateur {userToAdmin.Name} a ete mis en administrateur"); userToAdmin.IsAdmin = true; await userService.updateUser(userToAdmin); ClosePopup(); } else { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"L utilisateur {userToAdmin.Name} n'est plus administrateur"); userToAdmin.IsAdmin = false; await userService.updateUser(userToAdmin); ClosePopup(); diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Edit.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/Edit.razor.cs index 71bb9f0..f04058f 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Edit.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Edit.razor.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Components; +using System.Security.Claims; using WF_WebAdmin.Model; using WF_WebAdmin.Service; @@ -9,6 +10,9 @@ namespace WF_WebAdmin.Pages [Parameter] public int Id { get; set; } + [Inject] + public ILogger Logger { get; set; } + [Inject] private IQuoteService quoteService { get; set; } @@ -42,6 +46,7 @@ namespace WF_WebAdmin.Pages protected async void HandleValidSubmit() { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Modification de la quote {q.Content}"); q.Content = quoteModel.Content; q.Langue = quoteModel.Langue; q.TitleSrc = quoteModel.TitleSrc; diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor index f6089d6..c437551 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Login.razor @@ -1,4 +1,4 @@ -@page "/" +@page "/Login" @using WF_WebAdmin.Model @using System.Globalization diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuiz.razor.cs index 6ba0d53..366b158 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuiz.razor.cs @@ -1,6 +1,7 @@ using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; +using System.Security.Claims; using WF_WebAdmin.Model; using WF_WebAdmin.Service; @@ -22,6 +23,9 @@ namespace WF_WebAdmin.Pages private int page = 1; + [Inject] + public ILogger Logger { get; set; } + [Inject] public IStringLocalizer Localizer { get; set; } @@ -61,6 +65,7 @@ namespace WF_WebAdmin.Pages private async Task EditQuiz() { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Modification de la question {selectedQuiz.Question}"); await QuizService.updateQuiz(selectedQuiz); selectedQuiz = null; ClosePopup(); @@ -76,6 +81,7 @@ namespace WF_WebAdmin.Pages { if (selectedQuiz != null) { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Supretion de la question {selectedQuiz.Question}"); await QuizService.removeQuiz(selectedQuiz.Id); selectedQuiz = null; var response = await QuizService.getSommeQuiz(MaxValue, page); diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs index 8bf4ed1..09bd6ec 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ModifQuote.razor.cs @@ -1,6 +1,8 @@ using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Logging; +using System.Security.Claims; using WF_WebAdmin.Model; using WF_WebAdmin.Service; @@ -22,6 +24,9 @@ namespace WF_WebAdmin.Pages private int page = 1; + [Inject] + public ILogger Logger { get; set; } + [Inject] public IStringLocalizer Localizer { get; set; } @@ -76,6 +81,7 @@ namespace WF_WebAdmin.Pages { if (selectedQuote != null) { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"La quote {selectedQuote.Content} a ete suprimer"); await QuoteService.removeQuote(selectedQuote); selectedQuote= null; var response = await QuoteService.getSomeQuote(MaxValue, page); diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs index 6239fdd..a63707a 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs +++ b/WF-WebAdmin/WF-WebAdmin/Pages/ValidQuiz.razor.cs @@ -1,6 +1,8 @@ using Blazorise.DataGrid; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Logging; +using System.Security.Claims; using WF_WebAdmin.Model; using WF_WebAdmin.Service; @@ -9,6 +11,8 @@ namespace WF_WebAdmin.Pages public partial class ValidQuiz { private List quizzes; + [Inject] + public ILogger Logger { get; set; } [Inject] public IStringLocalizer Localizer { get; set; } @@ -34,6 +38,8 @@ namespace WF_WebAdmin.Pages private void ValidateQuiz(Quiz quiz) { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Quiz {quiz.Id} validated!"); + Console.WriteLine($"Quiz {quiz.Id} validated!"); Quiz newQuiz = quiz; @@ -50,6 +56,8 @@ namespace WF_WebAdmin.Pages private void RejectQuiz(Quiz quiz) { + LoggerSaveStub.Log(Logger, LogLevel.Information, $"Quiz {quiz.Id} rejected!"); + Console.WriteLine($"Quiz {quiz.Id} rejected!"); QuizService.removeQuiz(quiz.Id); diff --git a/WF-WebAdmin/WF-WebAdmin/Program.cs b/WF-WebAdmin/WF-WebAdmin/Program.cs index 81a3506..18b8666 100644 --- a/WF-WebAdmin/WF-WebAdmin/Program.cs +++ b/WF-WebAdmin/WF-WebAdmin/Program.cs @@ -26,7 +26,7 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddHttpClient(); builder.Services.AddScoped(); -builder.WebHost.UseUrls("http://0.0.0.0:5000"); +//builder.WebHost.UseUrls("http://0.0.0.0:5000"); builder.Logging.AddConfiguration(builder.Configuration.GetSection("Logging")); diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor index eab28e1..e129354 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor @@ -5,29 +5,29 @@ WF-WebAdmin -
+
@* @if (uLogin.Name != null) - { + {*@
- } + @*}*@
- @if (!string.IsNullOrEmpty(uLogin.Name)) + @* @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 cfd963a..358d38d 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor @@ -15,7 +15,7 @@