diff --git a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs
index a55bc97..c86a07f 100644
--- a/Blazor/Blazor/Pages/Admins/Administrators.razor.cs
+++ b/Blazor/Blazor/Pages/Admins/Administrators.razor.cs
@@ -9,6 +9,7 @@ using Blazor.Modals;
using Blazor.Services;
using Blazored.Modal;
using Blazored.Modal;
+using Blazor.Pages.Chapters;
namespace Blazor.Pages.Admins;
@@ -43,13 +44,13 @@ public partial class Administrators
}
// When you use a real API, we use this follow code
- //var response = await Http.GetJsonAsync( $"http://my-api/api/data?page={e.Page}&pageSize={e.PageSize}" );
- var response = (await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-administrator.json")).Skip((e.Page - 1) * e.PageSize).Take(e.PageSize).ToList();
+ //var response = await Http.GetFromJsonAsync( $"https://trusting-panini.87-106-126-109.plesk.page/api/administrators?page={e.Page}&pageSize={e.PageSize}" );
+ var response = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators").Result;
if (!e.CancellationToken.IsCancellationRequested)
{
- totalItem = (await Http.GetFromJsonAsync>($"{NavigationManager.BaseUri}fake-administrator.json")).Count;
administrators = new List(response); // an actual data for the current page
+ totalItem = administrators.Count;
}
}
@@ -61,13 +62,13 @@ public partial class Administrators
return;
}
- var currentData = await LocalStorage.GetItemAsync("data");
+ var currentData = await LocalStorage.GetItemAsync("data");
// Check if data exist in the local storage
if (currentData == null)
{
// this code add in the local storage the fake data (we load the data sync for initialize the data before load the OnReadData method)
- var originalData = Http.GetFromJsonAsync($"trusting-panini.87-106-126-109.plesk.page/api/chapters").Result;
+ var originalData = Http.GetFromJsonAsync($"https://trusting-panini.87-106-126-109.plesk.page/api/administrators").Result;
await LocalStorage.SetItemAsync("data", originalData);
}
}
diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor
index 660b5d1..49f91d3 100644
--- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor
+++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor
@@ -13,7 +13,7 @@
diff --git a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs
index 7d70f74..f1a10cb 100644
--- a/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs
+++ b/Blazor/Blazor/Pages/Admins/EditAdministrator.razor.cs
@@ -11,7 +11,7 @@ namespace Blazor.Pages.Admins
[Parameter]
public int Id { get; set; }
- private AdministratorsModel administratorsModel = new();
+ private AdministratorModel administratorsModel = new();
[Inject]
public IDataService DataService { get; set; }
@@ -30,7 +30,7 @@ namespace Blazor.Pages.Admins
var administrator = await DataService.GetAdminById(Id);
// Set the model with the admin
- administratorsModel = new AdministratorsModel
+ administratorsModel = new AdministratorModel
{
Id = administrator.Id,
Username = administrator.Username
diff --git a/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/AddChapter.razor.cs
index e8b463a..da8834c 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/chapters";
+ string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/chapter";
using (var httpClient = new HttpClient())
{
diff --git a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs
index 6b1f01c..5aa7d2f 100644
--- a/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs
+++ b/Blazor/Blazor/Pages/Chapters/Chapters.razor.cs
@@ -58,24 +58,13 @@ public partial class Chapters
}
- 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/chapters").Result;
- await LocalStorage.SetItemAsync("data", originalData);
- }
- }
+ //protected override async Task OnAfterRenderAsync(bool firstRender)
+ //{
+ // if (!firstRender)
+ // {
+ // return;
+ // }
+ //}
private async Task OnReadData(DataGridReadDataEventArgs e)
{
@@ -92,7 +81,12 @@ public partial class Chapters
{
chapters = new List(response); // an actual data for the current page
totalChapter = chapters.Count;
-
+ 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").Result;
+ await LocalStorage.SetItemAsync("data", originalData);
+ }
}
}
@@ -116,14 +110,7 @@ public partial class Chapters
await IJSRuntime.InvokeVoidAsync("downloadFileFromStream", "data.csv", streamRef);
}
}
- private async void Import()
- {
- // for
- // {
- // var formData = new MultipartFormDataContent();
- // }
- }
private async Task SingleUpload(InputFileChangeEventArgs e)
{
using (MemoryStream ms = new MemoryStream())
@@ -165,7 +152,7 @@ public partial class Chapters
var formContent = new FormUrlEncodedContent(formData);
- string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/chapters";
+ string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/add/chapter";
using (var httpClient = new HttpClient())
{
diff --git a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs
index 221ccf5..a98c14f 100644
--- a/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs
+++ b/Blazor/Blazor/Pages/Chapters/EditChapter.razor.cs
@@ -38,10 +38,30 @@ public partial class EditChapter
private async void HandleValidSubmit()
{
await DataService.Update(Id, chapterModel);
+ var formData = new List>();
+ formData.Add(new KeyValuePair("name", chapterModel.Name));
+
+
+ var formContent = new FormUrlEncodedContent(formData);
+
+ string apiUri = "https://trusting-panini.87-106-126-109.plesk.page/api/update/chapter/"+chapterModel.Id;
+
+ using (var httpClient = new HttpClient())
+ {
+ var response = await httpClient.PostAsync(apiUri, formContent);
Logger.LogInformation("Chapter '{chapterModelName}' edited", chapterModel.Name);
+ if (response.IsSuccessStatusCode)
+ {
+ var responseBody = await response.Content.ReadAsStringAsync();
+ }
+ else
+ {
+ var errorResponse = await response.Content.ReadAsStringAsync();
+ }
+ }
NavigationManager.NavigateTo("chapters");
}
}
diff --git a/Blazor/Blazor/Pages/Questions/Questions.razor b/Blazor/Blazor/Pages/Questions/Questions.razor
index eb87f83..5ae8448 100644
--- a/Blazor/Blazor/Pages/Questions/Questions.razor
+++ b/Blazor/Blazor/Pages/Questions/Questions.razor
@@ -5,7 +5,7 @@
Chapters
-
+
Ajouter
diff --git a/Blazor/Blazor/Services/DataLocalService.cs b/Blazor/Blazor/Services/DataLocalService.cs
index 7db40b3..51cc20f 100644
--- a/Blazor/Blazor/Services/DataLocalService.cs
+++ b/Blazor/Blazor/Services/DataLocalService.cs
@@ -2,7 +2,6 @@
using Blazor.ViewClasses;
using Blazored.LocalStorage;
using Microsoft.AspNetCore.Components;
-using static System.Net.WebRequestMethods;
namespace Blazor.Services
{
@@ -149,7 +148,7 @@ namespace Blazor.Services
return admin;
}
- public async Task Update(int id, AdministratorsModel model)
+ public async Task Update(int id, AdministratorModel model)
{
// Get the current data
var currentData = await _localStorage.GetItemAsync>("data");
@@ -165,13 +164,13 @@ namespace Blazor.Services
// Modify the content of the adminnistrator
admin.Username = model.Username;
- admin.hashedPassword = model.hashedPassword;
+ admin.HashedPassword = model.HashedPassword;
// Save the data
await _localStorage.SetItemAsync("data", currentData);
}
- public async Task Add(AdministratorsModel model)
+ public async Task Add(AdministratorModel model)
{
// Get the current data
var currentData = await _localStorage.GetItemAsync>("data");
@@ -184,7 +183,7 @@ namespace Blazor.Services
{
Id = model.Id,
Username = model.Username,
- hashedPassword = model.hashedPassword
+ HashedPassword = model.HashedPassword
});
diff --git a/Blazor/Blazor/Services/IDataService.cs b/Blazor/Blazor/Services/IDataService.cs
index e965c2b..6a1d422 100644
--- a/Blazor/Blazor/Services/IDataService.cs
+++ b/Blazor/Blazor/Services/IDataService.cs
@@ -15,9 +15,9 @@ namespace Blazor.Services
Task Update(int id, ChapterModel model);
- Task Add(AdministratorsModel model);
+ Task Add(AdministratorModel model);
- Task Update(int id, AdministratorsModel model);
+ Task Update(int id, AdministratorModel model);
Task GetAdminById(int id);
diff --git a/Blazor/Blazor/ViewClasses/Administrator.cs b/Blazor/Blazor/ViewClasses/Administrator.cs
index 8abff03..93a5ceb 100644
--- a/Blazor/Blazor/ViewClasses/Administrator.cs
+++ b/Blazor/Blazor/ViewClasses/Administrator.cs
@@ -4,6 +4,6 @@ public class Administrator
{
public int Id { get; set; }
public string Username { get; set; }
- public string hashedPassword { get; set; }
+ public string HashedPassword { get; set; }
}