diff --git a/Project/adminBlazor/adminBlazor/Models/User.cs b/Project/adminBlazor/adminBlazor/Models/User.cs
index f12b77f..2e51cc3 100644
--- a/Project/adminBlazor/adminBlazor/Models/User.cs
+++ b/Project/adminBlazor/adminBlazor/Models/User.cs
@@ -2,16 +2,16 @@
{
public class User
{
- private int id { get; set; }
- private string password { get; set; }
- private string email { get; set; }
- private string name { get; set; }
- private string surname { get; set; }
- private string nickname { get; set; }
- private string image { get; set; }
- private bool extraTime { get; set; }
- private int group { get; set; }
- private string[] roles { get; set; }
+ public int id { get; set; }
+ public string password { get; set; }
+ public string email { get; set; }
+ public string name { get; set; }
+ public string surname { get; set; }
+ public string nickname { get; set; }
+ public string image { get; set; }
+ public bool extraTime { get; set; }
+ public int group { get; set; }
+ public string[] roles { get; set; }
}
}
diff --git a/Project/adminBlazor/adminBlazor/Pages/DataGrid.razor b/Project/adminBlazor/adminBlazor/Pages/DataGrid.razor
deleted file mode 100644
index e69de29..0000000
diff --git a/Project/adminBlazor/adminBlazor/Pages/DataGridColumn.razor b/Project/adminBlazor/adminBlazor/Pages/DataGridColumn.razor
deleted file mode 100644
index e69de29..0000000
diff --git a/Project/adminBlazor/adminBlazor/Pages/List.razor b/Project/adminBlazor/adminBlazor/Pages/List.razor
index 6c1d33a..0a304c1 100644
--- a/Project/adminBlazor/adminBlazor/Pages/List.razor
+++ b/Project/adminBlazor/adminBlazor/Pages/List.razor
@@ -1,5 +1,5 @@
@page "/list"
-@using Minecraft.Models
+@using adminBlazor.Models
@@ -7,7 +7,6 @@
-
List
@@ -17,23 +16,21 @@
-
-
-
-
-
-
-
-
-
-
- @(string.Join(", ", ((User)context).Roles))
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Project/adminBlazor/adminBlazor/Pages/List.razor.cs b/Project/adminBlazor/adminBlazor/Pages/List.razor.cs
index cad0765..58c27a1 100644
--- a/Project/adminBlazor/adminBlazor/Pages/List.razor.cs
+++ b/Project/adminBlazor/adminBlazor/Pages/List.razor.cs
@@ -1,17 +1,17 @@
-using adminBlazor.Models;
-using Blazored.LocalStorage;
+using Blazored.LocalStorage;
using Blazorise.DataGrid;
using Microsoft.AspNetCore.Components;
-using System.Linq;
+using Microsoft.AspNetCore.Http.Features;
+using adminBlazor.Models;
using System.Net.Http;
using System.Net.Http.Json;
-using System.Threading.Tasks;
namespace adminBlazor.Pages
{
public partial class List
{
- private User[] users;
+ private List _users;
+
private int totalUser;
[Inject]
@@ -25,7 +25,7 @@ namespace adminBlazor.Pages
protected override async Task OnAfterRenderAsync(bool firstRender)
{
- // Do not treat this action if it is not the first render
+ // Do not treat this action if is not the first render
if (!firstRender)
{
return;
@@ -36,8 +36,8 @@ namespace adminBlazor.Pages
// Check if data exist in the local storage
if (currentData == null)
{
- // This code adds fake data to local storage (loading data synchronously to initialize before the OnReadData method)
- var originalData = await Http.GetFromJsonAsync($"{NavigationManager.BaseUri}fake-data.json");
+ // 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($"{NavigationManager.BaseUri}fake-data.json").Result;
await LocalStorage.SetItemAsync("data", originalData);
}
}
@@ -49,15 +49,16 @@ namespace adminBlazor.Pages
return;
}
- // When you use a real API, you use the following code
- // var response = await Http.GetJsonAsync( $"http://my-api/api/data?page={e.Page}&pageSize={e.PageSize}" );
+ // 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 LocalStorage.GetItemAsync("data")).Skip((e.Page - 1) * e.PageSize).Take(e.PageSize).ToList();
if (!e.CancellationToken.IsCancellationRequested)
{
- totalUser = (await LocalStorage.GetItemAsync("data")).Length;
- users = response.ToArray(); // actual data for the current page
+ totalUser = (await LocalStorage.GetItemAsync>("data")).Count;
+ _users = new List(response); // an actual data for the current page
}
}
}
-}
+
+}
\ No newline at end of file
diff --git a/Project/adminBlazor/adminBlazor/Program.cs b/Project/adminBlazor/adminBlazor/Program.cs
index d954df1..246f01b 100644
--- a/Project/adminBlazor/adminBlazor/Program.cs
+++ b/Project/adminBlazor/adminBlazor/Program.cs
@@ -14,7 +14,7 @@ builder.Services.AddServerSideBlazor();
builder.Services.AddSingleton();
builder.Services.AddHttpClient();
-
+builder.Services.AddBlazoredLocalStorage();
builder.Services
@@ -22,7 +22,6 @@ builder.Services
.AddBootstrapProviders()
.AddFontAwesomeIcons();
-builder.Services.AddBlazoredLocalStorage();
var app = builder.Build();
diff --git a/Project/adminBlazor/adminBlazor/Shared/NavMenu.razor b/Project/adminBlazor/adminBlazor/Shared/NavMenu.razor
index 646123c..bb2bdef 100644
--- a/Project/adminBlazor/adminBlazor/Shared/NavMenu.razor
+++ b/Project/adminBlazor/adminBlazor/Shared/NavMenu.razor
@@ -9,6 +9,11 @@
diff --git a/Project/adminBlazor/adminBlazor/_Imports.razor b/Project/adminBlazor/adminBlazor/_Imports.razor
index 241a428..e2c4e28 100644
--- a/Project/adminBlazor/adminBlazor/_Imports.razor
+++ b/Project/adminBlazor/adminBlazor/_Imports.razor
@@ -8,4 +8,4 @@
@using Microsoft.JSInterop
@using adminBlazor
@using adminBlazor.Shared
-
+@using Blazorise.DataGrid;
diff --git a/Project/adminBlazor/adminBlazor/wwwroot/css/user.json b/Project/adminBlazor/adminBlazor/wwwroot/user.json
similarity index 100%
rename from Project/adminBlazor/adminBlazor/wwwroot/css/user.json
rename to Project/adminBlazor/adminBlazor/wwwroot/user.json