From e1c4a6f830e052bc548e54a0674a876b4a38d88d Mon Sep 17 00:00:00 2001 From: "Jade.VAN.BRABANDT" Date: Mon, 8 Jan 2024 10:59:13 +0100 Subject: [PATCH 01/16] refactor : Token ID hidded from public GIT --- .gitignore | 3 ++- 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 | 7 +------ Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs | 2 +- Blazor/Blazor/Pages/Questions/Questions.razor.cs | 4 ++-- Blazor/Blazor/Program.cs | 5 ++--- 10 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 33ba52f..d57f523 100755 --- a/.gitignore +++ b/.gitignore @@ -819,8 +819,9 @@ replay_pid* # .nfs files are created when an open file is removed but is still being accessed .nfs* -# config ignore to not stock password on the git (: +# config ignore to not stock password on the git (: neither the Token of the API /Website/usages/Config_DB.php +/Blazor/Blazor/Pages/Token.cs ### DotnetCore ### # .NET Core build folders diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs index b9660cc..b744dce 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs @@ -92,7 +92,7 @@ public partial class Administrators return; } - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/administrator/" + id + "/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/administrator/" + id + "/" + Token.TOKEN_ID;; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs index 47872cd..88abd95 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/update/administrator/" + administratorModel.Id + "/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/update/administrator/" + administratorModel.Id + "/" + Token.TOKEN_ID;; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs index a31641b..d541152 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/chapter/" + id + "/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/chapter/" + id + "/" + Token.TOKEN_ID;; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs index 25788db..0051141 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/update/chapter/" + chapterModel.Id + "/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/update/chapter/" + chapterModel.Id + "/" + Token.TOKEN_ID;; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs b/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs index 45d7b72..8a2b62c 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/update/player/" + playerModel.Id + "/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/update/player/" + playerModel.Id + "/" + Token.TOKEN_ID;; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Players/Players.razor.cs b/Blazor/Blazor/Pages/Players/Players.razor.cs index 2622395..fbdb5dc 100644 --- a/Blazor/Blazor/Pages/Players/Players.razor.cs +++ b/Blazor/Blazor/Pages/Players/Players.razor.cs @@ -2,16 +2,11 @@ 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 Blazor.Pages.Admins; -using Blazor.Pages.Chapters; namespace Blazor.Pages.Players; @@ -53,7 +48,7 @@ public partial class Players return; } - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/player/" + id + "/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/player/" + id + "/" + Token.TOKEN_ID;; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs b/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs index 1bc3934..c5b5530 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/update/questions/" + questionModel.Id + "/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/update/questions/" + questionModel.Id + "/" + Token.TOKEN_ID;; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor.cs b/Blazor/Blazor/Pages/Questions/Questions.razor.cs index e7e75b7..9b8649e 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/question/" + id + "/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/question/" + id + "/" + Token.TOKEN_ID;; using (var httpClient = new HttpClient()) { @@ -156,7 +156,7 @@ public partial class Questions formData.Add(new KeyValuePair("answerContent4", field[5])); formData.Add(new KeyValuePair("idanswergood", field[6])); - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/chapters/name/"+field[1] + "/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/chapters/name/"+field[1] + "/" + Token.TOKEN_ID;; var response = await Http.GetAsync(apiUri); diff --git a/Blazor/Blazor/Program.cs b/Blazor/Blazor/Program.cs index 12120ef..d5fad49 100644 --- a/Blazor/Blazor/Program.cs +++ b/Blazor/Blazor/Program.cs @@ -4,10 +4,8 @@ using Blazored.LocalStorage; using Blazorise; using Blazorise.Bootstrap; 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); @@ -56,3 +54,4 @@ app.MapBlazorHub(); app.MapFallbackToPage("/_Host"); app.Run(); + From ac218856cf872bf52c9df8d870159cb37f28ebcd Mon Sep 17 00:00:00 2001 From: Jade VAN BRABANDT Date: Mon, 8 Jan 2024 11:18:18 +0100 Subject: [PATCH 02/16] CI : fix build --- Blazor/Blazor/Pages/Token.cs | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Blazor/Blazor/Pages/Token.cs diff --git a/Blazor/Blazor/Pages/Token.cs b/Blazor/Blazor/Pages/Token.cs new file mode 100644 index 0000000..4aac486 --- /dev/null +++ b/Blazor/Blazor/Pages/Token.cs @@ -0,0 +1,7 @@ +namespace Blazor.Pages; + +public static class Token +{ + public static string TOKEN_ID = "[INSERT THE TOKEN ID HERE]"; //ASK IF YOU WANT THOSE ACCESS + +} From 1d4d5b6c8fc5dde65a475a1356b4ca559d730d7c Mon Sep 17 00:00:00 2001 From: "Jade.VAN.BRABANDT" Date: Mon, 8 Jan 2024 11:27:19 +0100 Subject: [PATCH 03/16] Fix : Codesmells fight --- Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs | 2 +- Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs | 2 +- Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs | 2 +- Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs | 2 +- Blazor/Blazor/Pages/Players/AddPlayer.razor.cs | 2 +- Blazor/Blazor/Pages/Players/EditPlayer.razor.cs | 2 +- Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs | 2 +- Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs | 2 +- Blazor/Blazor/Pages/_Host.cshtml | 1 + Blazor/Blazor/Pages/_Layout.cshtml | 8 ++++++-- 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs index 3d483a2..258e8f7 100644 --- a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs @@ -20,7 +20,7 @@ namespace Blazor.Pages.Admins public ILogger Logger { get; set; } - private async void HandleValidSubmit() + private async Task HandleValidSubmit() { administratorModel.HashPassword(administratorModel.HashedPassword); diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs index 88abd95..55bebc1 100644 --- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs @@ -40,7 +40,7 @@ namespace Blazor.Pages.Admins }; } - private async void HandleValidSubmit() + private async Task HandleValidSubmit() { administratorModel.HashPassword(administratorModel.HashedPassword); diff --git a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs index 9180e3e..70a91f9 100644 --- a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs @@ -19,7 +19,7 @@ public partial class AddChapter - private async void HandleValidSubmit() + private async Task HandleValidSubmit() { //await DataService.Add(chapterModel); diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs index 0051141..62ced1d 100644 --- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs +++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs @@ -38,7 +38,7 @@ public partial class EditChapter }; } - private async void HandleValidSubmit() + private async Task HandleValidSubmit() { //await DataService.Update(Id, chapterModel); diff --git a/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs index 4081c15..45d4ca0 100644 --- a/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs +++ b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs @@ -15,7 +15,7 @@ namespace Blazor.Pages.Players public NavigationManager NavigationManager { get; set; } - private async void HandleValidSubmit() + private async Task HandleValidSubmit() { playerModel.HashPassword(playerModel.HashedPassword); diff --git a/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs b/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs index 8a2b62c..6414a03 100644 --- a/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs +++ b/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs @@ -36,7 +36,7 @@ namespace Blazor.Pages.Players }; } - private async void HandleValidSubmit() + private async Task HandleValidSubmit() { playerModel.HashPassword(playerModel.HashedPassword); diff --git a/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs b/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs index c815073..9ffd8a3 100644 --- a/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs +++ b/Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs @@ -21,7 +21,7 @@ namespace Blazor.Pages.Questions public ILogger Logger { get; set; } - private async void HandleValidSubmit() + private async Task HandleValidSubmit() { await DataService.Add(questionModel); diff --git a/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs b/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs index c5b5530..29372e6 100644 --- a/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs +++ b/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs @@ -26,7 +26,7 @@ namespace Blazor.Pages.Questions public ILogger Logger { get; set; } - private async void HandleValidSubmit() + private async Task HandleValidSubmit() { await DataService.Update(Id, questionModel); diff --git a/Blazor/Blazor/Pages/_Host.cshtml b/Blazor/Blazor/Pages/_Host.cshtml index 158359b..f89e313 100644 --- a/Blazor/Blazor/Pages/_Host.cshtml +++ b/Blazor/Blazor/Pages/_Host.cshtml @@ -6,6 +6,7 @@ + Host diff --git a/Blazor/Blazor/Pages/_Layout.cshtml b/Blazor/Blazor/Pages/_Layout.cshtml index 5e9991a..c8c28a0 100644 --- a/Blazor/Blazor/Pages/_Layout.cshtml +++ b/Blazor/Blazor/Pages/_Layout.cshtml @@ -1,5 +1,9 @@ - - + + + + Layout + + From 7a15491bf692a01d0d26fdfe597de4194e4cdc73 Mon Sep 17 00:00:00 2001 From: "Jade.VAN.BRABANDT" Date: Mon, 8 Jan 2024 11:39:11 +0100 Subject: [PATCH 04/16] fix: codesmell fix --- Blazor/Blazor/Pages/Error.cshtml.cs | 27 +++++++------------ .../Blazor/Pages/Questions/Questions.razor.cs | 2 +- Blazor/Blazor/Services/DataLocalService.cs | 3 --- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/Blazor/Blazor/Pages/Error.cshtml.cs b/Blazor/Blazor/Pages/Error.cshtml.cs index 1039b7d..5372821 100644 --- a/Blazor/Blazor/Pages/Error.cshtml.cs +++ b/Blazor/Blazor/Pages/Error.cshtml.cs @@ -2,26 +2,19 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using System.Diagnostics; -namespace Blazor.Pages -{ - [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] - [IgnoreAntiforgeryToken] - public class ErrorModel : PageModel - { - public string? RequestId { get; set; } +namespace Blazor.Pages; - public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); +[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] +[IgnoreAntiforgeryToken] +public class ErrorModel : PageModel +{ + public string? RequestId { get; set; } - private readonly ILogger _logger; + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - public ErrorModel(ILogger logger) - { - _logger = logger; - } - public void OnGet() - { - RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; - } + public void OnGet() + { + RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; } } diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor.cs b/Blazor/Blazor/Pages/Questions/Questions.razor.cs index 9b8649e..a6411a4 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor.cs +++ b/Blazor/Blazor/Pages/Questions/Questions.razor.cs @@ -112,7 +112,7 @@ public partial class Questions } } - private async void Export() + private async Task Export() { StringBuilder sb = new StringBuilder(); HttpResponseMessage response = await Http.GetAsync("https://trusting-panini.87-106-126-109.plesk.page/api/questionsExport/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"); diff --git a/Blazor/Blazor/Services/DataLocalService.cs b/Blazor/Blazor/Services/DataLocalService.cs index 732059a..d2a9062 100644 --- a/Blazor/Blazor/Services/DataLocalService.cs +++ b/Blazor/Blazor/Services/DataLocalService.cs @@ -12,17 +12,14 @@ namespace Blazor.Services private readonly HttpClient _http; private readonly ILocalStorageService _localStorage; private readonly NavigationManager _navigationManager; - private readonly IWebHostEnvironment _webHostEnvironment; public DataLocalService( ILocalStorageService localStorage, HttpClient http, - IWebHostEnvironment webHostEnvironment, NavigationManager navigationManager) { _localStorage = localStorage; _http = http; - _webHostEnvironment = webHostEnvironment; _navigationManager = navigationManager; } From f78c6eb530c504959345f4818cafa9e36bb7ea1b Mon Sep 17 00:00:00 2001 From: "Jade.VAN.BRABANDT" Date: Mon, 8 Jan 2024 11:44:07 +0100 Subject: [PATCH 05/16] Refactor : more token hidding --- 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 | 6 +++--- Blazor/Blazor/Services/DataLocalService.cs | 11 ++++++----- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs index 258e8f7..c27833d 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator"+"/"+Token.TOKEN_ID; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs index b744dce..6a92534 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs @@ -45,7 +45,7 @@ public partial class Administrators // When you use a real API, we use this follow code //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/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+Token.TOKEN_ID).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -54,7 +54,7 @@ public partial class Administrators var currentData = await LocalStorage.GetItemAsync("data"); if (currentData == null || currentData.Length != administrators.Count) { - var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+Token.TOKEN_ID).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 70a91f9..d8e6420 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/add/chapter/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/chapter"+"/"+Token.TOKEN_ID; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs index d541152..c9f7e66 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($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).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($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).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 45d4ca0..0b519c9 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/add/player/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/player"+"/"+Token.TOKEN_ID; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Players/Players.razor.cs b/Blazor/Blazor/Pages/Players/Players.razor.cs index fbdb5dc..c0777a0 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($"https://trusting-panini.87-106-126-109.plesk.page/api/players/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+Token.TOKEN_ID).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($"https://trusting-panini.87-106-126-109.plesk.page/api/players/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+Token.TOKEN_ID).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 9ffd8a3..57ed18f 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator"+"/"+Token.TOKEN_ID; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor.cs b/Blazor/Blazor/Pages/Questions/Questions.razor.cs index a6411a4..37b5d6e 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor.cs +++ b/Blazor/Blazor/Pages/Questions/Questions.razor.cs @@ -106,7 +106,7 @@ public partial class Questions 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($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; await LocalStorage.SetItemAsync("data", originalData); } } @@ -115,7 +115,7 @@ public partial class Questions private async Task Export() { StringBuilder sb = new StringBuilder(); - HttpResponseMessage response = await Http.GetAsync("https://trusting-panini.87-106-126-109.plesk.page/api/questionsExport/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"); + HttpResponseMessage response = await Http.GetAsync("https://trusting-panini.87-106-126-109.plesk.page/api/questionsExport"+"/"+Token.TOKEN_ID); var json = await response.Content.ReadAsStringAsync(); using (var jsonFile = ChoJSONReader.LoadText(json)) { @@ -175,7 +175,7 @@ public partial class Questions } var formContent = new FormUrlEncodedContent(formData); - apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/questions/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; + apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/questions"+"/"+Token.TOKEN_ID; response = await Http.PostAsync(apiUri, formContent); diff --git a/Blazor/Blazor/Services/DataLocalService.cs b/Blazor/Blazor/Services/DataLocalService.cs index d2a9062..5102323 100644 --- a/Blazor/Blazor/Services/DataLocalService.cs +++ b/Blazor/Blazor/Services/DataLocalService.cs @@ -1,4 +1,5 @@ using Blazor.Models; +using Blazor.Pages; using Blazor.ViewClasses; using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; @@ -26,7 +27,7 @@ namespace Blazor.Services public async Task GetById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; // Get the chapter int the list var chapter = currentData.FirstOrDefault(w => w.Id == id); @@ -86,7 +87,7 @@ namespace Blazor.Services { // Get the current data //var currentData = await _localStorage.GetItemAsync>("data"); - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; // Get the chapter int the list var chapter = currentData.FirstOrDefault(w => w.Id == id); @@ -133,7 +134,7 @@ namespace Blazor.Services public async Task GetAdminById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+Token.TOKEN_ID).Result; // Get the admin int the list var admin = currentData.FirstOrDefault(w => w.Id == id); @@ -226,7 +227,7 @@ namespace Blazor.Services public async Task GetQuestionById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/questions/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/questions"+"/"+Token.TOKEN_ID).Result; // Get the question int the list var question = currentData.FirstOrDefault(w => w.Id == id); @@ -318,7 +319,7 @@ namespace Blazor.Services public async Task GetPlayerById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/players/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+Token.TOKEN_ID).Result; // Get the player in the list var player = currentData.FirstOrDefault(w => w.Id == id); From de4f51edc8d3392bcdc357b79dc48da69f1f74c5 Mon Sep 17 00:00:00 2001 From: Jade VAN BRABANDT Date: Mon, 8 Jan 2024 11:48:20 +0100 Subject: [PATCH 06/16] refactor : proper naming & refactor of URL (in progress) --- Blazor/Blazor/Pages/API.cs | 7 +++++++ Blazor/Blazor/Pages/Token.cs | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 Blazor/Blazor/Pages/API.cs delete mode 100644 Blazor/Blazor/Pages/Token.cs diff --git a/Blazor/Blazor/Pages/API.cs b/Blazor/Blazor/Pages/API.cs new file mode 100644 index 0000000..8aaea90 --- /dev/null +++ b/Blazor/Blazor/Pages/API.cs @@ -0,0 +1,7 @@ +namespace Blazor.Pages; + +public static class API +{ + public static string TOKEN = "[INSERT THE TOKEN ID HERE]"; //ASK IF YOU WANT THOSE ACCESS + public static string API_URL = "[INSERT THE API URL HERE]"; //ASK IF YOU WANT THOSE ACCESS +} diff --git a/Blazor/Blazor/Pages/Token.cs b/Blazor/Blazor/Pages/Token.cs deleted file mode 100644 index 4aac486..0000000 --- a/Blazor/Blazor/Pages/Token.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Blazor.Pages; - -public static class Token -{ - public static string TOKEN_ID = "[INSERT THE TOKEN ID HERE]"; //ASK IF YOU WANT THOSE ACCESS - -} From c05cb8cdefbc6a6eddfa23ab3e6143c4554aece7 Mon Sep 17 00:00:00 2001 From: "Jade.VAN.BRABANDT" Date: Mon, 8 Jan 2024 11:51:13 +0100 Subject: [PATCH 07/16] WIP --- Blazor/Blazor/Pages/API.cs | 7 +++++++ Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs | 2 +- Blazor/Blazor/Pages/Admins/Administrators.razor.cs | 6 +++--- Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs | 2 +- Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs | 2 +- Blazor/Blazor/Pages/Chapters/Chapters.razor.cs | 6 +++--- Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs | 2 +- Blazor/Blazor/Pages/Players/AddPlayer.razor.cs | 2 +- Blazor/Blazor/Pages/Players/EditPlayer.razor.cs | 2 +- Blazor/Blazor/Pages/Players/Players.razor.cs | 6 +++--- Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs | 2 +- Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs | 2 +- Blazor/Blazor/Pages/Questions/Questions.razor.cs | 10 +++++----- Blazor/Blazor/Pages/Token.cs | 7 ------- Blazor/Blazor/Services/DataLocalService.cs | 10 +++++----- 15 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 Blazor/Blazor/Pages/API.cs delete mode 100644 Blazor/Blazor/Pages/Token.cs diff --git a/Blazor/Blazor/Pages/API.cs b/Blazor/Blazor/Pages/API.cs new file mode 100644 index 0000000..5275496 --- /dev/null +++ b/Blazor/Blazor/Pages/API.cs @@ -0,0 +1,7 @@ +namespace Blazor.Pages; + +public static class API +{ + public static string TOKEN = "[INSERT THE TOKEN ID HERE]"; //ASK IF YOU WANT THOSE ACCESS + public static string API_URL = "[INSERT THE API URL HERE]"; //ASK IF YOU WANT THOSE ACCESS +} diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs index c27833d..ed0c8e5 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator"+"/"+Token.TOKEN_ID; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/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 6a92534..33b8e14 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs @@ -45,7 +45,7 @@ public partial class Administrators // When you use a real API, we use this follow code //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"+"/"+Token.TOKEN_ID).Result; + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+API.TOKEN).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -54,7 +54,7 @@ public partial class Administrators var currentData = await LocalStorage.GetItemAsync("data"); if (currentData == null || currentData.Length != administrators.Count) { - var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+Token.TOKEN_ID).Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+API.TOKEN).Result; await LocalStorage.SetItemAsync("data", originalData); } } @@ -92,7 +92,7 @@ public partial class Administrators return; } - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/administrator/" + id + "/" + Token.TOKEN_ID;; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/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 55bebc1..5443b00 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/update/administrator/" + administratorModel.Id + "/" + Token.TOKEN_ID;; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/update/administrator/" + administratorModel.Id + "/" + API.TOKEN;; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs index d8e6420..68cc97d 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/add/chapter"+"/"+Token.TOKEN_ID; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/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 c9f7e66..b264233 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/chapter/" + id + "/" + Token.TOKEN_ID;; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/chapter/" + id + "/" + API.TOKEN;; using (var httpClient = new HttpClient()) { @@ -92,7 +92,7 @@ public partial class Chapters return; } - var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/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($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+API.TOKEN).Result; await LocalStorage.SetItemAsync("data", originalData); } } diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs index 62ced1d..d26dd49 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/update/chapter/" + chapterModel.Id + "/" + Token.TOKEN_ID;; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/update/chapter/" + chapterModel.Id + "/" + API.TOKEN;; using (var httpClient = new HttpClient()) { diff --git a/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs index 0b519c9..fd69c1e 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/add/player"+"/"+Token.TOKEN_ID; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/player"+"/"+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 6414a03..946e34c 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/update/player/" + playerModel.Id + "/" + Token.TOKEN_ID;; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/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 c0777a0..b286ab3 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/player/" + id + "/" + Token.TOKEN_ID;; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/player/" + id + "/" + API.TOKEN;; using (var httpClient = new HttpClient()) { @@ -87,7 +87,7 @@ public partial class Players return; } - var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+Token.TOKEN_ID).Result; + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/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($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+Token.TOKEN_ID).Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/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 57ed18f..2267fc4 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator"+"/"+Token.TOKEN_ID; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/administrator"+"/"+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 29372e6..4b99e5f 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/update/questions/" + questionModel.Id + "/" + Token.TOKEN_ID;; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/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 37b5d6e..c1e4fe7 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/question/" + id + "/" + Token.TOKEN_ID;; + string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/question/" + id + "/" + API.TOKEN;; using (var httpClient = new HttpClient()) { @@ -106,7 +106,7 @@ public partial class Questions 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($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+API.TOKEN).Result; await LocalStorage.SetItemAsync("data", originalData); } } @@ -115,7 +115,7 @@ public partial class Questions private async Task Export() { StringBuilder sb = new StringBuilder(); - HttpResponseMessage response = await Http.GetAsync("https://trusting-panini.87-106-126-109.plesk.page/api/questionsExport"+"/"+Token.TOKEN_ID); + HttpResponseMessage response = await Http.GetAsync("https://trusting-panini.87-106-126-109.plesk.page/api/questionsExport"+"/"+API.TOKEN); var json = await response.Content.ReadAsStringAsync(); using (var jsonFile = ChoJSONReader.LoadText(json)) { @@ -156,7 +156,7 @@ public partial class Questions formData.Add(new KeyValuePair("answerContent4", field[5])); formData.Add(new KeyValuePair("idanswergood", field[6])); - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/chapters/name/"+field[1] + "/" + Token.TOKEN_ID;; + string apiUri = API.API_URL+"chapters/name/"+field[1] + "/" + API.TOKEN;; var response = await Http.GetAsync(apiUri); @@ -175,7 +175,7 @@ public partial class Questions } var formContent = new FormUrlEncodedContent(formData); - apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/questions"+"/"+Token.TOKEN_ID; + apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/questions"+"/"+API.TOKEN; response = await Http.PostAsync(apiUri, formContent); diff --git a/Blazor/Blazor/Pages/Token.cs b/Blazor/Blazor/Pages/Token.cs deleted file mode 100644 index 4aac486..0000000 --- a/Blazor/Blazor/Pages/Token.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Blazor.Pages; - -public static class Token -{ - public static string TOKEN_ID = "[INSERT THE TOKEN ID HERE]"; //ASK IF YOU WANT THOSE ACCESS - -} diff --git a/Blazor/Blazor/Services/DataLocalService.cs b/Blazor/Blazor/Services/DataLocalService.cs index 5102323..e23bec6 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>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/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>($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters"+"/"+Token.TOKEN_ID).Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/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>($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+Token.TOKEN_ID).Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/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>($"https://trusting-panini.87-106-126-109.plesk.page/api/questions"+"/"+Token.TOKEN_ID).Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/questions"+"/"+API.TOKEN).Result; // Get the question int the list var question = currentData.FirstOrDefault(w => w.Id == id); @@ -319,7 +319,7 @@ namespace Blazor.Services public async Task GetPlayerById(int id) { // Get the current data - var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+Token.TOKEN_ID).Result; + var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/players"+"/"+API.TOKEN).Result; // Get the player in the list var player = currentData.FirstOrDefault(w => w.Id == id); From 54001d34dbc1baace8b3916aeb61123f2925630b Mon Sep 17 00:00:00 2001 From: "yvan.calatayud" Date: Mon, 8 Jan 2024 15:41:31 +0100 Subject: [PATCH 08/16] refactor : variable name --- Blazor/Blazor/Pages/Questions/Questions.razor | 12 ++++++------ Blazor/Blazor/Pages/Questions/Questions.razor.cs | 13 ++++++------- Blazor/Blazor/Services/DataLocalService.cs | 12 ++++++------ Blazor/Blazor/ViewClasses/Question.cs | 4 ++-- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor b/Blazor/Blazor/Pages/Questions/Questions.razor index cedb724..3d04eb3 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor +++ b/Blazor/Blazor/Pages/Questions/Questions.razor @@ -2,7 +2,7 @@ @using Blazor.ViewClasses; @using Blazorise.DataGrid @using Blazored.Modal; -

Chapters

+

Questions

@@ -21,13 +21,13 @@ PageSize="10" ShowPager Responsive> - - + + - + - Editer - + Editer + \ 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 e7e75b7..fb18ffa 100644 --- a/Blazor/Blazor/Pages/Questions/Questions.razor.cs +++ b/Blazor/Blazor/Pages/Questions/Questions.razor.cs @@ -43,7 +43,7 @@ public partial class Questions private async void OnDelete(int id) { var parameters = new ModalParameters(); - parameters.Add(nameof(Question.Id), id); + parameters.Add(nameof(Question.Q_id), id); var modal = Modal.Show("Delete Confirmation", parameters); var result = await modal.Result; @@ -92,21 +92,20 @@ public partial class Questions return; } - // 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-question.json")).Skip((e.Page - 1) * e.PageSize).Take(e.PageSize).ToList(); + + var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/questions/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; if (!e.CancellationToken.IsCancellationRequested) { - totalQuestion = (await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-question.json")).Count; questions = new List(response); // an actual data for the current page + totalQuestion = questions.Count; var currentData = await LocalStorage.GetItemAsync("data"); // Check if data exist in the local storage - if (currentData == null) + if (currentData == null || currentData.Length != questions.Count) { // 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($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/questions/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; await LocalStorage.SetItemAsync("data", originalData); } } diff --git a/Blazor/Blazor/Services/DataLocalService.cs b/Blazor/Blazor/Services/DataLocalService.cs index 732059a..8956c0e 100644 --- a/Blazor/Blazor/Services/DataLocalService.cs +++ b/Blazor/Blazor/Services/DataLocalService.cs @@ -232,7 +232,7 @@ namespace Blazor.Services var currentData = _http.GetFromJsonAsync>($"https://trusting-panini.87-106-126-109.plesk.page/api/questions/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; // Get the question int the list - var question = currentData.FirstOrDefault(w => w.Id == id); + var question = currentData.FirstOrDefault(w => w.Q_id == id); // Check if question exist if (question == null) @@ -249,7 +249,7 @@ namespace Blazor.Services var currentData = await _localStorage.GetItemAsync>("data"); // Get the admin int the list - var question = currentData.FirstOrDefault(w => w.Id == id); + var question = currentData.FirstOrDefault(w => w.Q_id == id); // Check if admin exist if (question == null) @@ -258,7 +258,7 @@ namespace Blazor.Services } // Modify the content of the adminnistrator - question.Content = model.Content; + question.Q_content = model.Content; // Save the data await _localStorage.SetItemAsync("data", currentData); @@ -270,13 +270,13 @@ namespace Blazor.Services var currentData = await _localStorage.GetItemAsync>("data"); // Simulate the Id - model.Id = currentData.Max(s => s.Id) + 1; + model.Id = currentData.Max(s => s.Q_id) + 1; // Add the admin to the current data currentData.Add(new Question { - Id = model.Id, - Content = model.Content + Q_id = model.Id, + Q_content = model.Content }); diff --git a/Blazor/Blazor/ViewClasses/Question.cs b/Blazor/Blazor/ViewClasses/Question.cs index 4586917..125455d 100644 --- a/Blazor/Blazor/ViewClasses/Question.cs +++ b/Blazor/Blazor/ViewClasses/Question.cs @@ -2,8 +2,8 @@ public class Question { - public int Id { get; set; } - public string Content { get; set; } + public int Q_id { get; set; } + public string Q_content { get; set; } public int IdChapter { get; set; } public int IdAnswerGood { get; set; } public int Difficulty { get; set; } From 116e46dd80e9c01dd8e40632b369bb6567da8625 Mon Sep 17 00:00:00 2001 From: Yvan CALATAYUD Date: Mon, 8 Jan 2024 15:42:51 +0100 Subject: [PATCH 09/16] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'.gitignore'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d57f523..481eaee 100755 --- a/.gitignore +++ b/.gitignore @@ -821,7 +821,7 @@ replay_pid* .nfs* # config ignore to not stock password on the git (: neither the Token of the API /Website/usages/Config_DB.php -/Blazor/Blazor/Pages/Token.cs +/Blazor/Blazor/Pages/API.cs ### DotnetCore ### # .NET Core build folders From 13f68738c596d39e103cd843882eaf966b620770 Mon Sep 17 00:00:00 2001 From: "yvan.calatayud" Date: Mon, 8 Jan 2024 15:54:41 +0100 Subject: [PATCH 10/16] Fix : finishing the WIP --- Blazor/Blazor/Pages/API.cs | 4 +-- .../Pages/Admins/AddAdministrator.razor.cs | 2 +- .../Pages/Admins/Administrators.razor.cs | 26 +++---------------- .../Pages/Admins/EditAdministrator.razor.cs | 2 +- .../Blazor/Pages/Chapters/AddChapter.razor.cs | 2 +- .../Blazor/Pages/Chapters/Chapters.razor.cs | 6 ++--- .../Pages/Chapters/EditChapter.razor.cs | 2 +- .../Blazor/Pages/Players/AddPlayer.razor.cs | 2 +- .../Blazor/Pages/Players/EditPlayer.razor.cs | 2 +- Blazor/Blazor/Pages/Players/Players.razor.cs | 6 ++--- .../Pages/Questions/AddQuestion.razor.cs | 2 +- .../Pages/Questions/EditQuestion.razor.cs | 2 +- .../Blazor/Pages/Questions/Questions.razor.cs | 10 +++---- Blazor/Blazor/Services/DataLocalService.cs | 10 +++---- 14 files changed, 29 insertions(+), 49 deletions(-) diff --git a/Blazor/Blazor/Pages/API.cs b/Blazor/Blazor/Pages/API.cs index 8aaea90..12aab86 100644 --- a/Blazor/Blazor/Pages/API.cs +++ b/Blazor/Blazor/Pages/API.cs @@ -2,6 +2,6 @@ namespace Blazor.Pages; public static class API { - public static string TOKEN = "[INSERT THE TOKEN ID HERE]"; //ASK IF YOU WANT THOSE ACCESS - public static string API_URL = "[INSERT THE API URL HERE]"; //ASK IF YOU WANT THOSE ACCESS + public static string TOKEN = "qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO"; //ASK IF YOU WANT THOSE ACCESS + public static string API_URL = "https://trusting-panini.87-106-126-109.plesk.page/api/"; //ASK IF YOU WANT THOSE ACCESS } diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs index ed0c8e5..7c69f7b 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/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 33b8e14..f17bdd1 100644 --- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs +++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs @@ -44,8 +44,7 @@ public partial class Administrators } // When you use a real API, we use this follow code - //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"+"/"+API.TOKEN).Result; + var response = Http.GetFromJsonAsync(API.API_URL+"administrators"+"/"+API.TOKEN).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -54,31 +53,12 @@ public partial class Administrators var currentData = await LocalStorage.GetItemAsync("data"); if (currentData == null || currentData.Length != administrators.Count) { - var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators"+"/"+API.TOKEN).Result; + var originalData = Http.GetFromJsonAsync(API.API_URL + "administrators" + "/" + API.TOKEN).Result; await LocalStorage.SetItemAsync("data", originalData); } } } - //protected override async Task OnAfterRenderAsync(bool firstRender) - //{ - // // Do not treat this action if is not the first render - // if (!firstRender) - // { - // return; - // } - - // 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($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators").Result; - // await LocalStorage.SetItemAsync("data", originalData); - // } - //} - private async void OnDelete(int id) { var parameters = new ModalParameters(); @@ -92,7 +72,7 @@ public partial class Administrators return; } - string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/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 5443b00..0370dbc 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/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/AddChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs index 68cc97d..0e9b032 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/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 b264233..4bb105b 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/chapter/" + id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"delete/chapter/" + id + "/" + API.TOKEN;; using (var httpClient = new HttpClient()) { @@ -92,7 +92,7 @@ public partial class Chapters return; } - var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/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($"https://trusting-panini.87-106-126-109.plesk.page/api/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/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs index d26dd49..399849b 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/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/AddPlayer.razor.cs b/Blazor/Blazor/Pages/Players/AddPlayer.razor.cs index fd69c1e..432f606 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/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/EditPlayer.razor.cs b/Blazor/Blazor/Pages/Players/EditPlayer.razor.cs index 946e34c..a94ae43 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/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 b286ab3..2920a25 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/player/" + id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"delete/player/" + id + "/" + API.TOKEN;; using (var httpClient = new HttpClient()) { @@ -87,7 +87,7 @@ public partial class Players return; } - var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/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($"https://trusting-panini.87-106-126-109.plesk.page/api/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 2267fc4..91eaca1 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/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/EditQuestion.razor.cs b/Blazor/Blazor/Pages/Questions/EditQuestion.razor.cs index 4b99e5f..285e4e6 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/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 262e725..73e6d4e 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 = "https://trusting-panini.87-106-126-109.plesk.page/api/delete/question/" + id + "/" + API.TOKEN;; + string apiUri = API.API_URL+"delete/question/" + id + "/" + API.TOKEN;; using (var httpClient = new HttpClient()) { @@ -93,7 +93,7 @@ public partial class Questions } - var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/questions/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var response = Http.GetFromJsonAsync(API.API_URL+"questions/"+API.TOKEN).Result; if (!e.CancellationToken.IsCancellationRequested) { @@ -105,7 +105,7 @@ public partial class Questions if (currentData == null || currentData.Length != questions.Count) { // 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($"https://trusting-panini.87-106-126-109.plesk.page/api/chapters/qUOGkWdoPCgbmuqxIC8xiaX0rV1Pw1LoPafkaoHOgszEyD9P2vcOu493xCDZpAqO").Result; + var originalData = Http.GetFromJsonAsync(API.API_URL+"chapters/"+API.TOKEN).Result; await LocalStorage.SetItemAsync("data", originalData); } } @@ -114,7 +114,7 @@ public partial class Questions private async Task Export() { StringBuilder sb = new StringBuilder(); - HttpResponseMessage response = await Http.GetAsync("https://trusting-panini.87-106-126-109.plesk.page/api/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 = "https://trusting-panini.87-106-126-109.plesk.page/api/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 92ca389..c424361 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>($"https://trusting-panini.87-106-126-109.plesk.page/api/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>($"https://trusting-panini.87-106-126-109.plesk.page/api/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>($"https://trusting-panini.87-106-126-109.plesk.page/api/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>($"https://trusting-panini.87-106-126-109.plesk.page/api/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>($"https://trusting-panini.87-106-126-109.plesk.page/api/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 d21cd47e8c6fed84bbca1569be97546c9f6ba302 Mon Sep 17 00:00:00 2001 From: "Jade.VAN_BRABANDT" Date: Mon, 8 Jan 2024 18:01:12 +0100 Subject: [PATCH 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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 @@ - +