Merge branch 'master' of https://codefirst.iut.uca.fr/git/jade.van_brabandt/3.01-QCM_MuscuMaths

Blazor/Blazor/Data/WeatherForecast.cs

@@ -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; }
-    }
-}

Blazor/Blazor/Data/WeatherForecastService.cs

@@ -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<WeatherForecast[]> 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());
-        }
-    }
-}

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);
         //}

Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs

@@ -1,6 +1,4 @@
-using Blazored.LocalStorage;
+using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components;
 using Blazor.Models;
 using Blazor.Services;
 
@@ -24,15 +22,13 @@ namespace Blazor.Pages.Admins
         {
             administratorModel.HashPassword(administratorModel.HashedPassword);
 
-            //await DataService.Add(administratorModel);
-
             var formData = new List<KeyValuePair<string, string>>();
             formData.Add(new KeyValuePair<string, string>("username", administratorModel.Username));
             formData.Add(new KeyValuePair<string, string>("password", administratorModel.HashedPassword));
 
             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())
             {

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,8 +39,7 @@ public partial class Administrators
             return;
         }
 
-        // When you use a real API, we use this follow code
+        var response = Http.GetFromJsonAsync<Administrator[]>(API.API_URL+"administrators/"+API.TOKEN).Result;
-        var response = Http.GetFromJsonAsync<Administrator[]>(API.API_URL+"administrators"+"/"+API.TOKEN).Result;
 
         if (!e.CancellationToken.IsCancellationRequested)
         {
@@ -53,7 +48,7 @@ public partial class Administrators
             var currentData = await LocalStorage.GetItemAsync<Administrator[]>("data");
             if (currentData == null || currentData.Length != administrators.Count)
             {
-                var originalData = Http.GetFromJsonAsync<Administrator[]>(API.API_URL + "administrators" + "/" + API.TOKEN).Result;
+                var originalData = Http.GetFromJsonAsync<Administrator[]>(API.API_URL + "administrators/" + API.TOKEN).Result;
                 await LocalStorage.SetItemAsync("data", originalData);
             }
         }
@@ -72,7 +67,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())
         {
@@ -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);
     }
 }

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,14 +43,13 @@ namespace Blazor.Pages.Admins
         {
             administratorModel.HashPassword(administratorModel.HashedPassword);
 
-            //await DataService.Update(Id, administratorModel);
             var formData = new List<KeyValuePair<string, string>>();
             formData.Add(new KeyValuePair<string, string>("username", administratorModel.Username));
             formData.Add(new KeyValuePair<string, string>("password", administratorModel.HashedPassword));
 
             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())
             {
@@ -67,7 +65,6 @@ namespace Blazor.Pages.Admins
                 }
             }
 
-
             Logger.LogInformation("Admin '{OldAdminModelName}' edited in '{NewAdminModelName}'",OldAdminName,administratorModel.Username);
 
             NavigationManager.NavigateTo("administrators");

Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs

@@ -21,15 +21,13 @@ public partial class AddChapter
 
     private async Task HandleValidSubmit()
     {
-        //await DataService.Add(chapterModel);
-
         var formData = new List<KeyValuePair<string, string>>();
         formData.Add(new KeyValuePair<string, string>("name", chapterModel.Name));
 
 
         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())
         {

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<Chapter> chapters;
@@ -53,7 +48,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())
         {
@@ -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<Chapter> e)
     {
         if (e.CancellationToken.IsCancellationRequested)
@@ -92,7 +73,7 @@ public partial class Chapters
             return;
         }
 
-        var response = Http.GetFromJsonAsync<Chapter[]>(API.API_URL+"chapters"+"/"+API.TOKEN).Result;
+        var response = Http.GetFromJsonAsync<Chapter[]>(API.API_URL+"chapters/"+API.TOKEN).Result;
 
         if (!e.CancellationToken.IsCancellationRequested)
         {
@@ -101,7 +82,7 @@ public partial class Chapters
             var currentData = await LocalStorage.GetItemAsync<Chapter[]>("data");
             if (currentData == null || currentData.Length != chapters.Count)
             {
-                var originalData = Http.GetFromJsonAsync<Chapter[]>(API.API_URL+"chapters"+"/"+API.TOKEN).Result;
+                var originalData = Http.GetFromJsonAsync<Chapter[]>(API.API_URL+"chapters/"+API.TOKEN).Result;
                 await LocalStorage.SetItemAsync("data", originalData);
             }
         }

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<KeyValuePair<string, string>>();
         formData.Add(new KeyValuePair<string, string>("name", chapterModel.Name));
@@ -48,7 +46,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())
         {

Blazor/Blazor/Pages/Players/AddPlayer.razor.cs

@@ -19,15 +19,13 @@ namespace Blazor.Pages.Players
         {
             playerModel.HashPassword(playerModel.HashedPassword);
 
-            //await DataService.Add(playerModel);
-
             var formData = new List<KeyValuePair<string, string>>();
             formData.Add(new KeyValuePair<string, string>("nickname", playerModel.Nickname));
             formData.Add(new KeyValuePair<string, string>("password", playerModel.HashedPassword));
 
             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())
             {

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,15 +38,13 @@ namespace Blazor.Pages.Players
         {
             playerModel.HashPassword(playerModel.HashedPassword);
 
-            //await DataService.Update(Id, playerModel);
-
             var formData = new List<KeyValuePair<string, string>>();
             formData.Add(new KeyValuePair<string, string>("nickname", playerModel.Nickname));
             formData.Add(new KeyValuePair<string, string>("password", playerModel.HashedPassword));
 
             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())
             {

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())
         {
@@ -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<Player> e)
     {
         if (e.CancellationToken.IsCancellationRequested)
@@ -87,7 +73,7 @@ public partial class Players
             return;
         }
 
-        var response = Http.GetFromJsonAsync<Player[]>(API.API_URL+"players"+"/"+API.TOKEN).Result;
+        var response = Http.GetFromJsonAsync<Player[]>(API.API_URL+"players/"+API.TOKEN).Result;
 
         if (!e.CancellationToken.IsCancellationRequested)
         {
@@ -96,7 +82,7 @@ public partial class Players
             var currentData = await LocalStorage.GetItemAsync<Player[]>("data");
             if (currentData == null || currentData.Length != players.Count)
             {
-                var originalData = Http.GetFromJsonAsync<Player[]>(API.API_URL+"players"+"/"+API.TOKEN).Result;
+                var originalData = Http.GetFromJsonAsync<Player[]>(API.API_URL+"players/"+API.TOKEN).Result;
                 await LocalStorage.SetItemAsync("data", originalData);
             }
         }

Blazor/Blazor/Pages/Questions/AddQuestion.razor.cs

@@ -1,6 +1,4 @@
-using Blazored.LocalStorage;
+using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components;
 using Blazor.Models;
 using Blazor.Services;
 using Blazor.Pages.Admins;
@@ -31,7 +29,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())
             {

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())
             {

Blazor/Blazor/Pages/Questions/Questions.razor

@@ -32,3 +32,6 @@
         </DisplayTemplate>
     </DataGridColumn>
 </DataGrid>
+
+
+<script src="Questions/Questions.razor.js"></script>

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;
 using Blazor.Components;
 
@@ -54,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())
         {
@@ -70,22 +69,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<Question> e)
     {
         if (e.CancellationToken.IsCancellationRequested)
@@ -123,7 +109,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))
         {
@@ -133,8 +119,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);
@@ -164,7 +149,7 @@ public partial class Questions
                 formData.Add(new KeyValuePair<string, string>("answerContent4", field[5]));
                 formData.Add(new KeyValuePair<string, string>("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);
@@ -183,7 +168,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);
 

Blazor/Blazor/Pages/_Host.cshtml

@@ -29,7 +29,7 @@
         <a href="" class="reload">Reload</a>
         <a class="dismiss">🗙</a>
     </div>
-    <script src="Pages/Chapters/Chapters.razor.js"></script>
+    <script src="Pages/Questions/Questions.razor.js"></script>
     <script src="_framework/blazor.server.js"></script>
 </body>
 </html>

Blazor/Blazor/Pages/_Layout.cshtml

@@ -10,7 +10,7 @@
         <script src="_content/Blazored.Modal/blazored.modal.js"></script>
 
         <script src="_framework/blazor.server.js"></script>
-        <script src="Pages/Chapters/Chapters.razor.js"></script>
+        <script src="Pages/Questions/Questions.razor.js"></script>
 
 
         <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.15.4/css/all.css">

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<WeatherForecastService>();
 builder.Services.AddHttpClient();
 
 builder.Services

Blazor/Blazor/Services/DataLocalService.cs

@@ -27,7 +27,7 @@ namespace Blazor.Services
         public async Task<Chapter> GetById(int id)
         {
             // Get the current data
-            var currentData = _http.GetFromJsonAsync<List<Chapter>>(API.API_URL+"chapters"+"/"+API.TOKEN).Result;
+            var currentData = _http.GetFromJsonAsync<List<Chapter>>(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<List<Chapter>>("data");
-            var currentData = _http.GetFromJsonAsync<List<Chapter>>(API.API_URL+"chapters"+"/"+API.TOKEN).Result;
+            var currentData = _http.GetFromJsonAsync<List<Chapter>>(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<Administrator> GetAdminById(int id)
         {
             // Get the current data
-            var currentData = _http.GetFromJsonAsync<List<Administrator>>(API.API_URL+"administrators"+"/"+API.TOKEN).Result;
+            var currentData = _http.GetFromJsonAsync<List<Administrator>>(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<Question> GetQuestionById(int id)
         {
             // Get the current data
-            var currentData = _http.GetFromJsonAsync<List<Question>>(API.API_URL+"questions"+"/"+API.TOKEN).Result;
+            var currentData = _http.GetFromJsonAsync<List<Question>>(API.API_URL+"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<Player> GetPlayerById(int id)
         {
             // Get the current data
-            var currentData = _http.GetFromJsonAsync<List<Player>>(API.API_URL+"players"+"/"+API.TOKEN).Result;
+            var currentData = _http.GetFromJsonAsync<List<Player>>(API.API_URL+"players/"+API.TOKEN).Result;
 
             // Get the player in the list
             var player = currentData.FirstOrDefault(w => w.Id == id);