From f6243f4703c94af48dfcbcf833febb8d73ea1bc1 Mon Sep 17 00:00:00 2001 From: "Jade.VAN_BRABANDT" Date: Mon, 8 Jan 2024 18:12:20 +0100 Subject: [PATCH] refactor : code cleanliness --- .../Blazor/Modals/DeleteConfirmation.razor.cs | 2 +- .../Pages/Admins/AddAdministrator.razor.cs | 6 +----- .../Pages/Admins/Administrators.razor.cs | 7 ------- .../Pages/Admins/EditAdministrator.razor.cs | 3 --- .../Blazor/Pages/Chapters/AddChapter.razor.cs | 2 -- .../Blazor/Pages/Chapters/Chapters.razor.cs | 21 +------------------ .../Blazor/Pages/Chapters/Chapters.razor.js | 11 ---------- .../Pages/Chapters/EditChapter.razor.cs | 2 -- .../Blazor/Pages/Players/AddPlayer.razor.cs | 2 -- .../Blazor/Pages/Players/EditPlayer.razor.cs | 4 ---- Blazor/Blazor/Pages/Players/Players.razor.cs | 14 ------------- .../Pages/Questions/AddQuestion.razor.cs | 4 +--- .../Blazor/Pages/Questions/Questions.razor.cs | 14 ------------- 13 files changed, 4 insertions(+), 88 deletions(-) delete mode 100644 Blazor/Blazor/Pages/Chapters/Chapters.razor.js diff --git a/Blazor/Blazor/Modals/DeleteConfirmation.razor.cs b/Blazor/Blazor/Modals/DeleteConfirmation.razor.cs index 0e79b81..b6f8431 100644 --- a/Blazor/Blazor/Modals/DeleteConfirmation.razor.cs +++ b/Blazor/Blazor/Modals/DeleteConfirmation.razor.cs @@ -20,7 +20,7 @@ namespace Blazor.Modals //private Chapter chapter = new Chapter(); //protected override async Task OnInitializedAsync() - //{ + // // Get the chapter // chapter = await DataService.GetById(Id); //} diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs index e4dac7d..23b3d6a 100644 --- a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs @@ -1,6 +1,4 @@ -using Blazored.LocalStorage; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components; using Blazor.Models; using Blazor.Services; @@ -24,8 +22,6 @@ namespace Blazor.Pages.Admins { 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)); diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs index 000e031..d99d06e 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs @@ -2,14 +2,10 @@ using Blazorise.DataGrid; using Blazor.ViewClasses; using Blazor.Modals; -using Blazor.Models; using Blazored.LocalStorage; using Blazored.Modal.Services; -using Blazor.Modals; using Blazor.Services; using Blazored.Modal; -using Blazored.Modal; -using Blazor.Pages.Chapters; namespace Blazor.Pages.Admins; @@ -43,7 +39,6 @@ public partial class Administrators return; } - // When you use a real API, we use this follow code var response = Http.GetFromJsonAsync(API.API_URL+"administrators/"+API.TOKEN).Result; if (!e.CancellationToken.IsCancellationRequested) @@ -87,9 +82,7 @@ public partial class Administrators var errorResponse = await response.Content.ReadAsStringAsync(); } } - //await DataService.Delete(id); - // Reload the page NavigationManager.NavigateTo("administrators", true); } } diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs index e59e679..3d91c64 100644 --- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs @@ -31,7 +31,6 @@ namespace Blazor.Pages.Admins var administrator = await DataService.GetAdminById(Id); OldAdminName = administrator.Username; - // Set the model with the admin administratorModel = new AdministratorModel { Id = administrator.Id, @@ -44,7 +43,6 @@ namespace Blazor.Pages.Admins { administratorModel.HashPassword(administratorModel.HashedPassword); - //await DataService.Update(Id, administratorModel); var formData = new List>(); formData.Add(new KeyValuePair("username", administratorModel.Username)); formData.Add(new KeyValuePair("password", administratorModel.HashedPassword)); @@ -67,7 +65,6 @@ namespace Blazor.Pages.Admins } } - Logger.LogInformation("Admin '{OldAdminModelName}' edited in '{NewAdminModelName}'",OldAdminName,administratorModel.Username); NavigationManager.NavigateTo("administrators"); diff --git a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs index 5389c76..098045b 100644 --- a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs @@ -21,8 +21,6 @@ public partial class AddChapter private async Task HandleValidSubmit() { - //await DataService.Add(chapterModel); - var formData = new List>(); formData.Add(new KeyValuePair("name", chapterModel.Name)); diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs index 2ebc800..7243cc5 100644 --- a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs @@ -2,18 +2,13 @@ using Blazor.Services; using Blazored.Modal.Services; using Blazor.ViewClasses; -using System.Text; using Microsoft.JSInterop; using Microsoft.AspNetCore.Components; using Blazorise.DataGrid; -using ChoETL; -using Microsoft.AspNetCore.Components.Forms; using Blazor.Modals; using Blazored.Modal; -using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Blazor.Models; - namespace Blazor.Pages.Chapters; + public partial class Chapters { public List chapters; @@ -68,23 +63,9 @@ public partial class Chapters var errorResponse = await response.Content.ReadAsStringAsync(); } } - // /api/delete/player/ +chapterid - - //await DataService.Delete(id); - - // Reload the page NavigationManager.NavigateTo("chapters", true); } - - //protected override async Task OnAfterRenderAsync(bool firstRender) - //{ - // if (!firstRender) - // { - // return; - // } - //} - private async Task OnReadData(DataGridReadDataEventArgs e) { if (e.CancellationToken.IsCancellationRequested) diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor.js b/Blazor/Blazor/Pages/Chapters/Chapters.razor.js deleted file mode 100644 index 37f904d..0000000 --- a/Blazor/Blazor/Pages/Chapters/Chapters.razor.js +++ /dev/null @@ -1,11 +0,0 @@ -window.downloadFileFromStream = async (fileName, contentStreamReference) => { - const arrayBuffer = await contentStreamReference.arrayBuffer(); - const blob = new Blob([arrayBuffer]); - const url = URL.createObjectURL(blob); - const anchorElement = document.createElement('a'); - anchorElement.href = url; - anchorElement.download = fileName ?? ''; - anchorElement.click(); - anchorElement.remove(); - URL.revokeObjectURL(url); -} \ No newline at end of file diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs index 29d360e..17b71cd 100644 --- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs @@ -30,7 +30,6 @@ public partial class EditChapter var chapter = await DataService.GetById(Id); OldChapterName = chapter.Name; - // Set the model with the chapter chapterModel = new ChapterModel { Id = chapter.Id, @@ -40,7 +39,6 @@ public partial class EditChapter private async Task HandleValidSubmit() { - //await DataService.Update(Id, chapterModel); var formData = new List>(); formData.Add(new KeyValuePair("name", chapterModel.Name)); diff --git a/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs index ca75be7..e46e775 100644 --- a/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs +++ b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs @@ -19,8 +19,6 @@ namespace Blazor.Pages.Players { playerModel.HashPassword(playerModel.HashedPassword); - //await DataService.Add(playerModel); - var formData = new List>(); formData.Add(new KeyValuePair("nickname", playerModel.Nickname)); formData.Add(new KeyValuePair("password", playerModel.HashedPassword)); diff --git a/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs b/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs index 2943a90..1dd4d4a 100644 --- a/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs +++ b/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs @@ -1,8 +1,6 @@ using Blazor.Models; using Blazor.Services; -using ChoETL; using Microsoft.AspNetCore.Components; -using System.Runtime.InteropServices; namespace Blazor.Pages.Players { @@ -40,8 +38,6 @@ namespace Blazor.Pages.Players { playerModel.HashPassword(playerModel.HashedPassword); - //await DataService.Update(Id, playerModel); - var formData = new List>(); formData.Add(new KeyValuePair("nickname", playerModel.Nickname)); formData.Add(new KeyValuePair("password", playerModel.HashedPassword)); diff --git a/Blazor/Blazor/Pages/Players/Players.razor.cs b/Blazor/Blazor/Pages/Players/Players.razor.cs index 1bef884..5035e2e 100644 --- a/Blazor/Blazor/Pages/Players/Players.razor.cs +++ b/Blazor/Blazor/Pages/Players/Players.razor.cs @@ -63,23 +63,9 @@ public partial class Players var errorResponse = await response.Content.ReadAsStringAsync(); } } - - //await DataService.Delete(id); - - // Reload the page NavigationManager.NavigateTo("Players", true); } - - //protected override async Task OnAfterRenderAsync(bool firstRender) - //{ - // // Do not treat this action if is not the first render - // if (!firstRender) - // { - // return; - // } - //} - private async Task OnReadData(DataGridReadDataEventArgs e) { if (e.CancellationToken.IsCancellationRequested) diff --git a/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs b/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs index 5667193..aed7c3e 100644 --- a/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs +++ b/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs @@ -1,6 +1,4 @@ -using Blazored.LocalStorage; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components; using Blazor.Models; using Blazor.Services; using Blazor.Pages.Admins; diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor.cs b/Blazor/Blazor/Pages/Questions/Questions.razor.cs index fd879b1..37c6f5a 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor.cs +++ b/Blazor/Blazor/Pages/Questions/Questions.razor.cs @@ -10,7 +10,6 @@ using ChoETL; using Microsoft.AspNetCore.Components.Forms; using Blazor.Modals; using Blazored.Modal; -using Blazor.Pages.Admins; using System.Text.RegularExpressions; namespace Blazor.Pages.Questions; @@ -69,22 +68,9 @@ public partial class Questions } } - //await DataService.Delete(id); - - // Reload the page NavigationManager.NavigateTo("questions", true); } - - //protected override async Task OnAfterRenderAsync(bool firstRender) - //{ - // // Do not treat this action if is not the first render - // if (!firstRender) - // { - // return; - // } - //} - private async Task OnReadData(DataGridReadDataEventArgs e) { if (e.CancellationToken.IsCancellationRequested)