From 9e49536a88bb52d3dd42373f039aafd9cf61582f Mon Sep 17 00:00:00 2001 From: "maxence.guitard" Date: Mon, 18 Dec 2023 11:00:00 +0100 Subject: [PATCH 1/5] feat : add admin --- Blazor/Blazor/Models/AdministratorModel.cs | 30 +++++++++++ Blazor/Blazor/Models/AdministratorsModel.cs | 13 ----- ...istrators.razor => AddAdministrator.razor} | 10 ++-- .../Pages/Admins/AddAdministrator.razor.cs | 51 +++++++++++++++++++ .../Pages/Admins/AddAdministrators.razor.cs | 27 ---------- .../Blazor/Pages/Admins/Administrators.razor | 2 +- .../Pages/Admins/Administrators.razor.cs | 11 ++-- .../Pages/Admins/EditAdministrator.razor | 2 +- .../Pages/Admins/EditAdministrator.razor.cs | 4 +- Blazor/Blazor/Pages/Questions/Questions.razor | 2 +- Blazor/Blazor/Services/DataLocalService.cs | 8 +-- Blazor/Blazor/Services/IDataService.cs | 4 +- Blazor/Blazor/ViewClasses/Administrator.cs | 2 +- 13 files changed, 104 insertions(+), 62 deletions(-) create mode 100644 Blazor/Blazor/Models/AdministratorModel.cs delete mode 100644 Blazor/Blazor/Models/AdministratorsModel.cs rename Blazor/Blazor/Pages/Admins/{AddAdministrators.razor => AddAdministrator.razor} (57%) create mode 100644 Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs delete mode 100644 Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs diff --git a/Blazor/Blazor/Models/AdministratorModel.cs b/Blazor/Blazor/Models/AdministratorModel.cs new file mode 100644 index 0000000..89e5042 --- /dev/null +++ b/Blazor/Blazor/Models/AdministratorModel.cs @@ -0,0 +1,30 @@ +using Microsoft.AspNetCore.Cryptography.KeyDerivation; +using Microsoft.AspNetCore.Identity; +using System.Security.Cryptography; +using System.Text; + +namespace Blazor.Models; + +public class AdministratorModel +{ + public int Id { get; set; } + public string Username { get; set; } + public string HashedPassword { get; set; } + + public void HashPassword(string password) + { + using (MD5 md5 = MD5.Create()) + { + byte[] inputBytes = Encoding.UTF8.GetBytes(password); + byte[] hashBytes = md5.ComputeHash(inputBytes); + + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < hashBytes.Length; i++) + { + sb.Append(hashBytes[i].ToString("x2")); + } + + HashedPassword = sb.ToString(); + } + } +} diff --git a/Blazor/Blazor/Models/AdministratorsModel.cs b/Blazor/Blazor/Models/AdministratorsModel.cs deleted file mode 100644 index 5a03654..0000000 --- a/Blazor/Blazor/Models/AdministratorsModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Microsoft.AspNetCore.Cryptography.KeyDerivation; -using Microsoft.AspNetCore.Identity; -using System.Security.Cryptography; - -namespace Blazor.Models; - -public class AdministratorsModel : PasswordHasher -{ - public int Id { get; set; } - public string Username { get; set; } - public string hashedPassword { get; set; } - -} diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor similarity index 57% rename from Blazor/Blazor/Pages/Admins/AddAdministrators.razor rename to Blazor/Blazor/Pages/Admins/AddAdministrator.razor index 1d2d431..5a940e3 100644 --- a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor +++ b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor @@ -1,20 +1,20 @@ -@page "/addAdministrators" +@page "/addAdministrator" @using Blazor.Models -

AddAdministrators

+

AddAdministrator

- +

diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs new file mode 100644 index 0000000..2be24ba --- /dev/null +++ b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs @@ -0,0 +1,51 @@ +using Blazored.LocalStorage; +using Microsoft.AspNetCore.Components.Forms; +using Microsoft.AspNetCore.Components; +using Blazor.Models; +using Blazor.Services; + +namespace Blazor.Pages.Admins +{ + public partial class AddAdministrator + { + private AdministratorModel administratorModel = new(); + + [Inject] + public IDataService DataService { get; set; } + + [Inject] + public NavigationManager NavigationManager { get; set; } + + + private async void HandleValidSubmit() + { + administratorModel.HashPassword(administratorModel.HashedPassword); + + await DataService.Add(administratorModel); + + var formData = new List>(); + formData.Add(new KeyValuePair("username", administratorModel.Username)); + formData.Add(new KeyValuePair("password", administratorModel.HashedPassword)); + + var formContent = new FormUrlEncodedContent(formData); + + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrators"; + + using (var httpClient = new HttpClient()) + { + var response = await httpClient.PostAsync(apiUri, formContent); + + if (response.IsSuccessStatusCode) + { + var responseBody = await response.Content.ReadAsStringAsync(); + } + else + { + var errorResponse = await response.Content.ReadAsStringAsync(); + } + } + + NavigationManager.NavigateTo("administrators"); + } + } +} diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs deleted file mode 100644 index 257062b..0000000 --- a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Blazored.LocalStorage; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components; -using Blazor.Models; -using Blazor.Services; - -namespace Blazor.Pages.Admins -{ - public partial class AddAdministrators - { - private AdministratorsModel administratorsModel = new(); - - [Inject] - public IDataService DataService { get; set; } - - [Inject] - public NavigationManager NavigationManager { get; set; } - - - private async void HandleValidSubmit() - { - await DataService.Add(administratorsModel); - - NavigationManager.NavigateTo("administrators"); - } - } -} diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor b/Blazor/Blazor/Pages/Admins/Administrators.razor index 53b79bf..7aeed40 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor @@ -5,7 +5,7 @@

Administrators

- + Ajouter
diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs index a55bc97..c86a07f 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs @@ -9,6 +9,7 @@ using Blazor.Modals; using Blazor.Services; using Blazored.Modal; using Blazored.Modal; +using Blazor.Pages.Chapters; namespace Blazor.Pages.Admins; @@ -43,13 +44,13 @@ public partial class Administrators } // When you use a real API, we use this follow code - //var response = await Http.GetJsonAsync( $"http://my-api/api/data?page={e.Page}&pageSize={e.PageSize}" ); - var response = (await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-administrator.json")).Skip((e.Page - 1) * e.PageSize).Take(e.PageSize).ToList(); + //var response = await Http.GetFromJsonAsync( $"https://trusting-panini.87-106-126-109.plesk.page/api/administrators?page={e.Page}&pageSize={e.PageSize}" ); + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators").Result; if (!e.CancellationToken.IsCancellationRequested) { - totalItem = (await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-administrator.json")).Count; administrators = new List(response); // an actual data for the current page + totalItem = administrators.Count; } } @@ -61,13 +62,13 @@ public partial class Administrators return; } - var currentData = await LocalStorage.GetItemAsync("data"); + var currentData = await LocalStorage.GetItemAsync("data"); // Check if data exist in the local storage if (currentData == null) { // this code add in the local storage the fake data (we load the data sync for initialize the data before load the OnReadData method) - var originalData = Http.GetFromJsonAsync($"trusting-panini.87-106-126-109.plesk.page/api/chapters").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators").Result; await LocalStorage.SetItemAsync("data", originalData); } } diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor index 660b5d1..49f91d3 100644 --- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor +++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor @@ -13,7 +13,7 @@

diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs index f41a5e9..75528fc 100644 --- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs @@ -10,7 +10,7 @@ namespace Blazor.Pages.Admins [Parameter] public int Id { get; set; } - private AdministratorsModel administratorsModel = new(); + private AdministratorModel administratorsModel = new(); [Inject] public IDataService DataService { get; set; } @@ -26,7 +26,7 @@ namespace Blazor.Pages.Admins var administrator = await DataService.GetAdminById(Id); // Set the model with the admin - administratorsModel = new AdministratorsModel + administratorsModel = new AdministratorModel { Id = administrator.Id, Username = administrator.Username diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor b/Blazor/Blazor/Pages/Questions/Questions.razor index eb87f83..5ae8448 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor +++ b/Blazor/Blazor/Pages/Questions/Questions.razor @@ -5,7 +5,7 @@

Chapters

- + Ajouter
diff --git a/Blazor/Blazor/Services/DataLocalService.cs b/Blazor/Blazor/Services/DataLocalService.cs index 7db40b3..5fc7542 100644 --- a/Blazor/Blazor/Services/DataLocalService.cs +++ b/Blazor/Blazor/Services/DataLocalService.cs @@ -149,7 +149,7 @@ namespace Blazor.Services return admin; } - public async Task Update(int id, AdministratorsModel model) + public async Task Update(int id, AdministratorModel model) { // Get the current data var currentData = await _localStorage.GetItemAsync>("data"); @@ -165,13 +165,13 @@ namespace Blazor.Services // Modify the content of the adminnistrator admin.Username = model.Username; - admin.hashedPassword = model.hashedPassword; + admin.HashedPassword = model.HashedPassword; // Save the data await _localStorage.SetItemAsync("data", currentData); } - public async Task Add(AdministratorsModel model) + public async Task Add(AdministratorModel model) { // Get the current data var currentData = await _localStorage.GetItemAsync>("data"); @@ -184,7 +184,7 @@ namespace Blazor.Services { Id = model.Id, Username = model.Username, - hashedPassword = model.hashedPassword + HashedPassword = model.HashedPassword }); diff --git a/Blazor/Blazor/Services/IDataService.cs b/Blazor/Blazor/Services/IDataService.cs index e965c2b..6a1d422 100644 --- a/Blazor/Blazor/Services/IDataService.cs +++ b/Blazor/Blazor/Services/IDataService.cs @@ -15,9 +15,9 @@ namespace Blazor.Services Task Update(int id, ChapterModel model); - Task Add(AdministratorsModel model); + Task Add(AdministratorModel model); - Task Update(int id, AdministratorsModel model); + Task Update(int id, AdministratorModel model); Task GetAdminById(int id); diff --git a/Blazor/Blazor/ViewClasses/Administrator.cs b/Blazor/Blazor/ViewClasses/Administrator.cs index 8abff03..93a5ceb 100644 --- a/Blazor/Blazor/ViewClasses/Administrator.cs +++ b/Blazor/Blazor/ViewClasses/Administrator.cs @@ -4,6 +4,6 @@ public class Administrator { public int Id { get; set; } public string Username { get; set; } - public string hashedPassword { get; set; } + public string HashedPassword { get; set; } } From e160e2f069adaa60a12e6a5c35019508eb91ec30 Mon Sep 17 00:00:00 2001 From: "yvan.calatayud" Date: Mon, 18 Dec 2023 11:03:22 +0100 Subject: [PATCH 2/5] feat : logs --- Blazor/Blazor/Blazor.csproj | 1 + Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs | 8 ++++++++ Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs | 7 +++++++ Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs | 7 +++++++ Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs | 6 ++++++ Blazor/Blazor/Program.cs | 3 +++ Blazor/Blazor/appsettings.json | 8 ++++---- 7 files changed, 36 insertions(+), 4 deletions(-) diff --git a/Blazor/Blazor/Blazor.csproj b/Blazor/Blazor/Blazor.csproj index 6df041b..34a02a6 100644 --- a/Blazor/Blazor/Blazor.csproj +++ b/Blazor/Blazor/Blazor.csproj @@ -25,6 +25,7 @@ + diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs index 257062b..75df454 100644 --- a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs @@ -3,6 +3,8 @@ using Microsoft.AspNetCore.Components.Forms; using Microsoft.AspNetCore.Components; using Blazor.Models; using Blazor.Services; +using Microsoft.Extensions.Logging; +using Blazor.Pages.Chapters; namespace Blazor.Pages.Admins { @@ -16,11 +18,17 @@ namespace Blazor.Pages.Admins [Inject] public NavigationManager NavigationManager { get; set; } + [Inject] + public ILogger Logger { get; set; } + private async void HandleValidSubmit() { await DataService.Add(administratorsModel); + + Logger.LogInformation("Admin '{administratorsModelName}' added", administratorsModel.Username); + NavigationManager.NavigateTo("administrators"); } } diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs index f41a5e9..7d70f74 100644 --- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs @@ -1,4 +1,5 @@ using Blazor.Models; +using Blazor.Pages.Chapters; using Blazor.Services; using Microsoft.AspNetCore.Components; @@ -21,6 +22,9 @@ namespace Blazor.Pages.Admins [Inject] public IWebHostEnvironment WebHostEnvironment { get; set; } + [Inject] + public ILogger Logger { get; set; } + protected override async Task OnInitializedAsync() { var administrator = await DataService.GetAdminById(Id); @@ -37,6 +41,9 @@ namespace Blazor.Pages.Admins { await DataService.Update(Id, administratorsModel); + + Logger.LogInformation("Chapter '{administratorsModelName}' edited", administratorsModel.Username); + NavigationManager.NavigateTo("administrators"); } } diff --git a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs index 906c141..e8b463a 100644 --- a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs @@ -14,6 +14,10 @@ public partial class AddChapter [Inject] public NavigationManager NavigationManager { get; set; } + [Inject] + public ILogger Logger { get; set; } + + private async void HandleValidSubmit() { @@ -40,6 +44,9 @@ public partial class AddChapter var errorResponse = await response.Content.ReadAsStringAsync(); } } + + Logger.LogInformation("Chapter '{chapterModelName}' added",chapterModel.Name); + NavigationManager.NavigateTo("chapters"); } diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs index 6fb7e9c..221ccf5 100644 --- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs @@ -20,6 +20,9 @@ public partial class EditChapter [Inject] public IWebHostEnvironment WebHostEnvironment { get; set; } + [Inject] + public ILogger Logger { get; set; } + protected override async Task OnInitializedAsync() { var chapter = await DataService.GetById(Id); @@ -36,6 +39,9 @@ public partial class EditChapter { await DataService.Update(Id, chapterModel); + + Logger.LogInformation("Chapter '{chapterModelName}' edited", chapterModel.Name); + NavigationManager.NavigateTo("chapters"); } } diff --git a/Blazor/Blazor/Program.cs b/Blazor/Blazor/Program.cs index 2ccc758..12120ef 100644 --- a/Blazor/Blazor/Program.cs +++ b/Blazor/Blazor/Program.cs @@ -7,6 +7,7 @@ using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; using Blazored.Modal; +using Microsoft.Extensions.Logging; var builder = WebApplication.CreateBuilder(args); @@ -36,6 +37,8 @@ builder.Services.AddBlazoredModal(); builder.Services.AddScoped(); +builder.Logging.AddConfiguration(builder.Configuration.GetSection("Logging")); + var app = builder.Build(); // Configure the HTTP request pipeline. diff --git a/Blazor/Blazor/appsettings.json b/Blazor/Blazor/appsettings.json index 10f68b8..45fe774 100644 --- a/Blazor/Blazor/appsettings.json +++ b/Blazor/Blazor/appsettings.json @@ -2,8 +2,8 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } - }, - "AllowedHosts": "*" -} + } +} \ No newline at end of file From f323a92675ff164961a4c6382a1a277569884c10 Mon Sep 17 00:00:00 2001 From: "yvan.calatayud" Date: Mon, 18 Dec 2023 11:17:03 +0100 Subject: [PATCH 3/5] feat : logs --- .../Pages/Admins/AddAdministrator.razor.cs | 5 +++ .../Pages/Admins/AddAdministrators.razor.cs | 35 ------------------- 2 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs index 2be24ba..b44b4bc 100644 --- a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs @@ -16,6 +16,9 @@ namespace Blazor.Pages.Admins [Inject] public NavigationManager NavigationManager { get; set; } + [Inject] + public ILogger Logger { get; set; } + private async void HandleValidSubmit() { @@ -45,6 +48,8 @@ namespace Blazor.Pages.Admins } } + Logger.LogInformation("Admin '{administratorsModelName}' added", administratorModel.Username); + NavigationManager.NavigateTo("administrators"); } } diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs deleted file mode 100644 index 75df454..0000000 --- a/Blazor/Blazor/Pages/Admins/AddAdministrators.razor.cs +++ /dev/null @@ -1,35 +0,0 @@ -using Blazored.LocalStorage; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components; -using Blazor.Models; -using Blazor.Services; -using Microsoft.Extensions.Logging; -using Blazor.Pages.Chapters; - -namespace Blazor.Pages.Admins -{ - public partial class AddAdministrators - { - private AdministratorsModel administratorsModel = new(); - - [Inject] - public IDataService DataService { get; set; } - - [Inject] - public NavigationManager NavigationManager { get; set; } - - [Inject] - public ILogger Logger { get; set; } - - - private async void HandleValidSubmit() - { - await DataService.Add(administratorsModel); - - - Logger.LogInformation("Admin '{administratorsModelName}' added", administratorsModel.Username); - - NavigationManager.NavigateTo("administrators"); - } - } -} From f7024dac0d7e43034ee2fd675a7afa743a1da7b5 Mon Sep 17 00:00:00 2001 From: "yvan.calatayud" Date: Mon, 18 Dec 2023 11:27:55 +0100 Subject: [PATCH 4/5] feat : logs --- Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs index a98c14f..b66518e 100644 --- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs @@ -23,9 +23,12 @@ public partial class EditChapter [Inject] public ILogger Logger { get; set; } + private string oldChapterName { get; set; } + protected override async Task OnInitializedAsync() { var chapter = await DataService.GetById(Id); + oldChapterName = chapter.Name; // Set the model with the chapter chapterModel = new ChapterModel @@ -38,6 +41,7 @@ public partial class EditChapter private async void HandleValidSubmit() { await DataService.Update(Id, chapterModel); + var formData = new List>(); formData.Add(new KeyValuePair("name", chapterModel.Name)); @@ -51,7 +55,7 @@ public partial class EditChapter var response = await httpClient.PostAsync(apiUri, formContent); - Logger.LogInformation("Chapter '{chapterModelName}' edited", chapterModel.Name); + Logger.LogInformation("Chapter '{OldChapterModelName}' edited in '{NewChapterModelName}'",oldChapterName,chapterModel.Name); if (response.IsSuccessStatusCode) { From a5596357ea0b84492af830cdb2de879191a352d3 Mon Sep 17 00:00:00 2001 From: "yvan.calatayud" Date: Mon, 18 Dec 2023 11:42:30 +0100 Subject: [PATCH 5/5] fix : logs --- Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs | 5 ++++- Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs index f1a10cb..3ba002c 100644 --- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs @@ -25,9 +25,12 @@ namespace Blazor.Pages.Admins [Inject] public ILogger Logger { get; set; } + private string OldAdminName { get; set; } + protected override async Task OnInitializedAsync() { var administrator = await DataService.GetAdminById(Id); + OldAdminName = administrator.Username; // Set the model with the admin administratorsModel = new AdministratorModel @@ -42,7 +45,7 @@ namespace Blazor.Pages.Admins await DataService.Update(Id, administratorsModel); - Logger.LogInformation("Chapter '{administratorsModelName}' edited", administratorsModel.Username); + Logger.LogInformation("Admin '{OldAdminModelName}' edited in '{NewAdminModelName}'",OldAdminName,administratorsModel.Username); NavigationManager.NavigateTo("administrators"); } diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs index b66518e..f6d3aff 100644 --- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs @@ -23,12 +23,12 @@ public partial class EditChapter [Inject] public ILogger Logger { get; set; } - private string oldChapterName { get; set; } + private string OldChapterName { get; set; } protected override async Task OnInitializedAsync() { var chapter = await DataService.GetById(Id); - oldChapterName = chapter.Name; + OldChapterName = chapter.Name; // Set the model with the chapter chapterModel = new ChapterModel @@ -55,8 +55,6 @@ public partial class EditChapter var response = await httpClient.PostAsync(apiUri, formContent); - Logger.LogInformation("Chapter '{OldChapterModelName}' edited in '{NewChapterModelName}'",oldChapterName,chapterModel.Name); - if (response.IsSuccessStatusCode) { var responseBody = await response.Content.ReadAsStringAsync(); @@ -66,6 +64,8 @@ public partial class EditChapter var errorResponse = await response.Content.ReadAsStringAsync(); } } + + Logger.LogInformation("Chapter '{OldChapterModelName}' edited in '{NewChapterModelName}'", OldChapterName, chapterModel.Name); NavigationManager.NavigateTo("chapters"); } }