From d21cd47e8c6fed84bbca1569be97546c9f6ba302 Mon Sep 17 00:00:00 2001 From: "Jade.VAN_BRABANDT" Date: Mon, 8 Jan 2024 18:01:12 +0100 Subject: [PATCH 1/6] refactor : code smells --- Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs | 2 +- Blazor/Blazor/Pages/Admins/Administrators.razor.cs | 4 ++-- Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs | 2 +- Blazor/Blazor/Pages/Chapters/Chapters.razor.cs | 4 ++-- Blazor/Blazor/Pages/Players/AddPlayer.razor.cs | 2 +- Blazor/Blazor/Pages/Players/Players.razor.cs | 4 ++-- Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs | 2 +- Blazor/Blazor/Pages/Questions/Questions.razor.cs | 4 ++-- Blazor/Blazor/Services/DataLocalService.cs | 10 +++++----- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs index 7c69f7b..e4dac7d 100644 --- a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs @@ -32,7 +32,7 @@ namespace Blazor.Pages.Admins var formContent = new FormUrlEncodedContent(formData); - string apiUri = API.API_URL+"add/administrator"+"/"+API.TOKEN; + string apiUri = API.API_URL+"add/administrator/"+API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs index f17bdd1..5fd9ec7 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs @@ -44,7 +44,7 @@ public partial class Administrators } // When you use a real API, we use this follow code - var response = Http.GetFromJsonAsync(API.API_URL+"administrators"+"/"+API.TOKEN).Result; + var response = Http.GetFromJsonAsync(API.API_URL+"administrators/"+API.TOKEN).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -53,7 +53,7 @@ public partial class Administrators var currentData = await LocalStorage.GetItemAsync("data"); if (currentData == null || currentData.Length != administrators.Count) { - var originalData = Http.GetFromJsonAsync(API.API_URL + "administrators" + "/" + API.TOKEN).Result; + var originalData = Http.GetFromJsonAsync(API.API_URL + "administrators/" + API.TOKEN).Result; await LocalStorage.SetItemAsync("data", originalData); } } diff --git a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs index 0e9b032..5389c76 100644 --- a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs @@ -29,7 +29,7 @@ public partial class AddChapter var formContent = new FormUrlEncodedContent(formData); - string apiUri = API.API_URL+"add/chapter"+"/"+API.TOKEN; + string apiUri = API.API_URL+"add/chapter/"+API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs index 4bb105b..473f408 100644 --- a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs @@ -92,7 +92,7 @@ public partial class Chapters return; } - var response = Http.GetFromJsonAsync(API.API_URL+"chapters"+"/"+API.TOKEN).Result; + var response = Http.GetFromJsonAsync(API.API_URL+"chapters/"+API.TOKEN).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -101,7 +101,7 @@ public partial class Chapters var currentData = await LocalStorage.GetItemAsync("data"); if (currentData == null || currentData.Length != chapters.Count) { - var originalData = Http.GetFromJsonAsync(API.API_URL+"chapters"+"/"+API.TOKEN).Result; + var originalData = Http.GetFromJsonAsync(API.API_URL+"chapters/"+API.TOKEN).Result; await LocalStorage.SetItemAsync("data", originalData); } } diff --git a/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs index 432f606..ca75be7 100644 --- a/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs +++ b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs @@ -27,7 +27,7 @@ namespace Blazor.Pages.Players var formContent = new FormUrlEncodedContent(formData); - string apiUri =API.API_URL+"add/player"+"/"+API.TOKEN; + string apiUri =API.API_URL+"add/player/"+API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Players/Players.razor.cs b/Blazor/Blazor/Pages/Players/Players.razor.cs index 2920a25..69ec5e4 100644 --- a/Blazor/Blazor/Pages/Players/Players.razor.cs +++ b/Blazor/Blazor/Pages/Players/Players.razor.cs @@ -87,7 +87,7 @@ public partial class Players return; } - var response = Http.GetFromJsonAsync(API.API_URL+"players"+"/"+API.TOKEN).Result; + var response = Http.GetFromJsonAsync(API.API_URL+"players/"+API.TOKEN).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -96,7 +96,7 @@ public partial class Players var currentData = await LocalStorage.GetItemAsync("data"); if (currentData == null || currentData.Length != players.Count) { - var originalData = Http.GetFromJsonAsync(API.API_URL+"players"+"/"+API.TOKEN).Result; + var originalData = Http.GetFromJsonAsync(API.API_URL+"players/"+API.TOKEN).Result; await LocalStorage.SetItemAsync("data", originalData); } } diff --git a/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs b/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs index 91eaca1..5667193 100644 --- a/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs +++ b/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs @@ -31,7 +31,7 @@ namespace Blazor.Pages.Questions var formContent = new FormUrlEncodedContent(formData); - string apiUri = API.API_URL+"add/administrator"+"/"+API.TOKEN; + string apiUri = API.API_URL+"add/administrator/"+API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor.cs b/Blazor/Blazor/Pages/Questions/Questions.razor.cs index 73e6d4e..03f416e 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor.cs +++ b/Blazor/Blazor/Pages/Questions/Questions.razor.cs @@ -114,7 +114,7 @@ public partial class Questions private async Task Export() { StringBuilder sb = new StringBuilder(); - HttpResponseMessage response = await Http.GetAsync(API.API_URL+"questionsExport"+"/"+API.TOKEN); + HttpResponseMessage response = await Http.GetAsync(API.API_URL+"questionsExport/"+API.TOKEN); var json = await response.Content.ReadAsStringAsync(); using (var jsonFile = ChoJSONReader.LoadText(json)) { @@ -174,7 +174,7 @@ public partial class Questions } var formContent = new FormUrlEncodedContent(formData); - apiUri = API.API_URL+"add/questions"+"/"+API.TOKEN; + apiUri = API.API_URL+"add/questions/"+API.TOKEN; response = await Http.PostAsync(apiUri, formContent); diff --git a/Blazor/Blazor/Services/DataLocalService.cs b/Blazor/Blazor/Services/DataLocalService.cs index c424361..f0d761b 100644 --- a/Blazor/Blazor/Services/DataLocalService.cs +++ b/Blazor/Blazor/Services/DataLocalService.cs @@ -27,7 +27,7 @@ namespace Blazor.Services public async Task GetById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>(API.API_URL+"chapters"+"/"+API.TOKEN).Result; + var currentData = _http.GetFromJsonAsync>(API.API_URL+"chapters/"+API.TOKEN).Result; // Get the chapter int the list var chapter = currentData.FirstOrDefault(w => w.Id == id); @@ -87,7 +87,7 @@ namespace Blazor.Services { // Get the current data //var currentData = await _localStorage.GetItemAsync>("data"); - var currentData = _http.GetFromJsonAsync>(API.API_URL+"chapters"+"/"+API.TOKEN).Result; + var currentData = _http.GetFromJsonAsync>(API.API_URL+"chapters/"+API.TOKEN).Result; // Get the chapter int the list var chapter = currentData.FirstOrDefault(w => w.Id == id); @@ -134,7 +134,7 @@ namespace Blazor.Services public async Task GetAdminById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>(API.API_URL+"administrators"+"/"+API.TOKEN).Result; + var currentData = _http.GetFromJsonAsync>(API.API_URL+"administrators/"+API.TOKEN).Result; // Get the admin int the list var admin = currentData.FirstOrDefault(w => w.Id == id); @@ -227,7 +227,7 @@ namespace Blazor.Services public async Task GetQuestionById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>(API.API_URL+"questions"+"/"+API.TOKEN).Result; + var currentData = _http.GetFromJsonAsync>(API.API_URL+"questions/"+API.TOKEN).Result; // Get the question int the list var question = currentData.FirstOrDefault(w => w.Q_id == id); @@ -319,7 +319,7 @@ namespace Blazor.Services public async Task GetPlayerById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>(API.API_URL+"players"+"/"+API.TOKEN).Result; + var currentData = _http.GetFromJsonAsync>(API.API_URL+"players/"+API.TOKEN).Result; // Get the player in the list var player = currentData.FirstOrDefault(w => w.Id == id); From 90d72219ffd0993c2121b9c889eb6c0c800a43f9 Mon Sep 17 00:00:00 2001 From: "Jade.VAN_BRABANDT" Date: Mon, 8 Jan 2024 18:04:44 +0100 Subject: [PATCH 2/6] refactor : code smells --- Blazor/Blazor/Pages/Admins/Administrators.razor.cs | 2 +- Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs | 2 +- Blazor/Blazor/Pages/Chapters/Chapters.razor.cs | 2 +- Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs | 2 +- Blazor/Blazor/Pages/Players/EditPlayer.razor.cs | 2 +- Blazor/Blazor/Pages/Players/Players.razor.cs | 2 +- Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs | 2 +- Blazor/Blazor/Pages/Questions/Questions.razor.cs | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs index 5fd9ec7..000e031 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs @@ -72,7 +72,7 @@ public partial class Administrators return; } - string apiUri = API.API_URL +"delete/administrator/" + id + "/" + API.TOKEN;; + string apiUri = API.API_URL +"delete/administrator/" + id + "/" + API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs index 0370dbc..e59e679 100644 --- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs @@ -51,7 +51,7 @@ namespace Blazor.Pages.Admins var formContent = new FormUrlEncodedContent(formData); - string apiUri = API.API_URL+"update/administrator/" + administratorModel.Id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"update/administrator/" + administratorModel.Id + "/" + API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs index 473f408..2ebc800 100644 --- a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs @@ -53,7 +53,7 @@ public partial class Chapters return; } - string apiUri = API.API_URL+"delete/chapter/" + id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"delete/chapter/" + id + "/" + API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs index 399849b..29d360e 100644 --- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs @@ -48,7 +48,7 @@ public partial class EditChapter var formContent = new FormUrlEncodedContent(formData); - string apiUri = API.API_URL+"update/chapter/" + chapterModel.Id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"update/chapter/" + chapterModel.Id + "/" + API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs b/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs index a94ae43..2943a90 100644 --- a/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs +++ b/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs @@ -48,7 +48,7 @@ namespace Blazor.Pages.Players var formContent = new FormUrlEncodedContent(formData); - string apiUri = API.API_URL+"update/player/" + playerModel.Id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"update/player/" + playerModel.Id + "/" + API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Players/Players.razor.cs b/Blazor/Blazor/Pages/Players/Players.razor.cs index 69ec5e4..1bef884 100644 --- a/Blazor/Blazor/Pages/Players/Players.razor.cs +++ b/Blazor/Blazor/Pages/Players/Players.razor.cs @@ -48,7 +48,7 @@ public partial class Players return; } - string apiUri = API.API_URL+"delete/player/" + id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"delete/player/" + id + "/" + API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs b/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs index 285e4e6..cf43cfc 100644 --- a/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs +++ b/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs @@ -35,7 +35,7 @@ namespace Blazor.Pages.Questions var formContent = new FormUrlEncodedContent(formData); - string apiUri = API.API_URL+"/update/questions/" + questionModel.Id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"/update/questions/" + questionModel.Id + "/" + API.TOKEN; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor.cs b/Blazor/Blazor/Pages/Questions/Questions.razor.cs index 03f416e..fd879b1 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor.cs +++ b/Blazor/Blazor/Pages/Questions/Questions.razor.cs @@ -53,7 +53,7 @@ public partial class Questions return; } - string apiUri = API.API_URL+"delete/question/" + id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"delete/question/" + id + "/" + API.TOKEN; using (var httpClient = new HttpClient()) { @@ -155,7 +155,7 @@ public partial class Questions formData.Add(new KeyValuePair("answerContent4", field[5])); formData.Add(new KeyValuePair("idanswergood", field[6])); - string apiUri = API.API_URL+"chapters/name/"+field[1] + "/" + API.TOKEN;; + string apiUri = API.API_URL+"chapters/name/"+field[1] + "/" + API.TOKEN; var response = await Http.GetAsync(apiUri); From f6243f4703c94af48dfcbcf833febb8d73ea1bc1 Mon Sep 17 00:00:00 2001 From: "Jade.VAN_BRABANDT" Date: Mon, 8 Jan 2024 18:12:20 +0100 Subject: [PATCH 3/6] 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) From b2e987b67b03aad4b434df6e6448b9ac638fbeb3 Mon Sep 17 00:00:00 2001 From: "Jade.VAN_BRABANDT" Date: Mon, 8 Jan 2024 18:21:03 +0100 Subject: [PATCH 4/6] refactor : removing useless folder/file --- Blazor/Blazor/Data/WeatherForecast.cs | 13 ------------- Blazor/Blazor/Data/WeatherForecastService.cs | 20 -------------------- 2 files changed, 33 deletions(-) delete mode 100644 Blazor/Blazor/Data/WeatherForecast.cs delete mode 100644 Blazor/Blazor/Data/WeatherForecastService.cs diff --git a/Blazor/Blazor/Data/WeatherForecast.cs b/Blazor/Blazor/Data/WeatherForecast.cs deleted file mode 100644 index dbabb10..0000000 --- a/Blazor/Blazor/Data/WeatherForecast.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Blazor.Data -{ - public class WeatherForecast - { - public DateOnly Date { get; set; } - - public int TemperatureC { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - - public string? Summary { get; set; } - } -} diff --git a/Blazor/Blazor/Data/WeatherForecastService.cs b/Blazor/Blazor/Data/WeatherForecastService.cs deleted file mode 100644 index ebaaec8..0000000 --- a/Blazor/Blazor/Data/WeatherForecastService.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace Blazor.Data -{ - public class WeatherForecastService - { - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - public Task GetForecastAsync(DateOnly startDate) - { - return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = startDate.AddDays(index), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = Summaries[Random.Shared.Next(Summaries.Length)] - }).ToArray()); - } - } -} From 6cf514c039219dfd310775d10afc063753d6d51d Mon Sep 17 00:00:00 2001 From: "Jade.VAN_BRABANDT" Date: Mon, 8 Jan 2024 18:24:34 +0100 Subject: [PATCH 5/6] fix : removing every mention of data folder about weather --- Blazor/Blazor/Program.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Blazor/Blazor/Program.cs b/Blazor/Blazor/Program.cs index d5fad49..b6ec9e5 100644 --- a/Blazor/Blazor/Program.cs +++ b/Blazor/Blazor/Program.cs @@ -1,4 +1,3 @@ -using Blazor.Data; using Blazor.Services; using Blazored.LocalStorage; using Blazorise; @@ -12,7 +11,6 @@ var builder = WebApplication.CreateBuilder(args); // Add services to the container. builder.Services.AddRazorPages(); builder.Services.AddServerSideBlazor(); -builder.Services.AddSingleton(); builder.Services.AddHttpClient(); builder.Services From d86cdc773caf092d8297110a85ea3a5d3fd68592 Mon Sep 17 00:00:00 2001 From: "Jade.VAN_BRABANDT" Date: Mon, 8 Jan 2024 18:49:05 +0100 Subject: [PATCH 6/6] fix : export --- Blazor/Blazor/Pages/Questions/Questions.razor | 5 ++++- Blazor/Blazor/Pages/Questions/Questions.razor.cs | 3 +-- Blazor/Blazor/Pages/Questions/Questions.razor.js | 11 +++++++++++ Blazor/Blazor/Pages/_Host.cshtml | 2 +- Blazor/Blazor/Pages/_Layout.cshtml | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 Blazor/Blazor/Pages/Questions/Questions.razor.js diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor b/Blazor/Blazor/Pages/Questions/Questions.razor index 3d04eb3..b5fc630 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor +++ b/Blazor/Blazor/Pages/Questions/Questions.razor @@ -30,4 +30,7 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor.cs b/Blazor/Blazor/Pages/Questions/Questions.razor.cs index 37c6f5a..9922241 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor.cs +++ b/Blazor/Blazor/Pages/Questions/Questions.razor.cs @@ -110,8 +110,7 @@ public partial class Questions } } - var sentFile = new MemoryStream(Encoding.UTF8.GetBytes(sb.ToString())); - + var sentFile = new MemoryStream(Encoding.Unicode.GetBytes(sb.ToString())); using (var streamRef = new DotNetStreamReference(stream: sentFile)) { await IJSRuntime.InvokeVoidAsync("downloadFileFromStream", "data.csv", streamRef); diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor.js b/Blazor/Blazor/Pages/Questions/Questions.razor.js new file mode 100644 index 0000000..37f904d --- /dev/null +++ b/Blazor/Blazor/Pages/Questions/Questions.razor.js @@ -0,0 +1,11 @@ +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/_Host.cshtml b/Blazor/Blazor/Pages/_Host.cshtml index f89e313..fbf07cd 100644 --- a/Blazor/Blazor/Pages/_Host.cshtml +++ b/Blazor/Blazor/Pages/_Host.cshtml @@ -29,7 +29,7 @@ Reload 🗙 - + diff --git a/Blazor/Blazor/Pages/_Layout.cshtml b/Blazor/Blazor/Pages/_Layout.cshtml index c8c28a0..7d6cf4d 100644 --- a/Blazor/Blazor/Pages/_Layout.cshtml +++ b/Blazor/Blazor/Pages/_Layout.cshtml @@ -10,7 +10,7 @@ - +