Fix gitea issues (#54)
All checks were successful
Game Ideas deploy / build-test-deploy (push) Successful in 1m16s

Co-authored-by: Maxime Adler <madler@sqli.com>
Reviewed-on: #54
This commit was merged in pull request #54.
This commit is contained in:
2025-05-18 16:27:56 +02:00
parent edd3ac78de
commit 1baa2a73fe
38 changed files with 301 additions and 197 deletions

View File

@@ -54,16 +54,3 @@
fill: var(--yellow);
}
@keyframes loading {
0% {
background: rgb(255, 255, 255, 0.05);
}
50% {
background: rgb(255, 255, 255, 0.2);
}
100% {
background: rgb(255, 255, 255, 0.05);
}
}

View File

@@ -16,7 +16,7 @@
<div class="header-content">
<SearchInput Placeholder="@ResourcesKey.EnterUsername" @bind-Text="FilterParams.Name" @bind-Text:after=HandleFilterChanged />
<SelectSearch TItem="RoleDto" Placeholder="@ResourcesKey.Roles" @bind-Values="FilterParams.Roles" @bind-Values:after=HandleFilterChanged
Items="Roles.ToList()" GetLabel="@(role => role.Name)" Theme="SelectTheme.Filter" />
Items="Roles.ToList()" GetLabel="@(role => role.Name)" Theme="SelectTheme.Filter" />
</div>
</HeaderGameIdeas>
@@ -28,9 +28,18 @@
<div class="content">
@if (!IsLoading)
{
@foreach (var user in UserList.Users ?? [])
@if (UserList.UsersCount != 0)
{
<UserRow User="user" Roles="Roles.ToList()" OnRemove="HandleOpenConfirmationPopup" OnSubmit="HandleUpdateUser" Validator="@(new UserUpdateValidator())" CanDelete=@(user.Id != currentUserId) />
<div class="user-number">@string.Format(ResourcesKey.UsersNumberFormat, UserList.UsersCount)</div>
@foreach (var user in UserList.Users ?? [])
{
<UserRow User="user" Roles="Roles.ToList()" OnRemove="HandleOpenConfirmationPopup" OnSubmit="HandleUpdateUser" Validator="@(new UserUpdateValidator())" CanDelete=@(user.Id != currentUserId) />
}
}
else
{
<div class="no-users">@ResourcesKey.NoUsers</div>
}
}
else

View File

@@ -36,18 +36,17 @@ public partial class Users
}
await FetchData();
await FetchUsers();
await FetchRoles();
await base.OnInitializedAsync();
}
private async Task FetchData(bool fetchRoles = true)
private async Task FetchUsers(bool displayLoading = true)
{
try
{
IsLoading = true;
if (fetchRoles)
Roles = await UserGateway.GetRoles();
IsLoading = displayLoading;
StateHasChanged();
UserList = await UserGateway.GetUsers(FilterParams, CurrentPage);
}
@@ -58,6 +57,27 @@ public partial class Users
finally
{
IsLoading = false;
StateHasChanged();
}
}
private async Task FetchRoles()
{
try
{
IsLoading = true;
StateHasChanged();
Roles = await UserGateway.GetRoles();
}
catch (Exception)
{
throw;
}
finally
{
IsLoading = false;
StateHasChanged();
}
}
@@ -66,9 +86,10 @@ public partial class Users
try
{
IsLoading = true;
StateHasChanged();
await UserGateway.CreateUser(user);
await FetchData(false);
await FetchUsers();
}
catch (Exception)
{
@@ -77,9 +98,9 @@ public partial class Users
finally
{
IsLoading = false;
StateHasChanged();
UserAdd = new();
}
UserAdd = new();
}
private async Task HandleUpdateUser(UserDto user)
@@ -87,9 +108,10 @@ public partial class Users
try
{
IsLoading = true;
StateHasChanged();
await UserGateway.UpdateUser(user);
await FetchData(false);
await FetchUsers();
}
catch (Exception)
{
@@ -98,6 +120,7 @@ public partial class Users
finally
{
IsLoading = false;
StateHasChanged();
}
}
@@ -113,9 +136,10 @@ public partial class Users
try
{
IsLoading = true;
StateHasChanged();
await UserGateway.DeleteUser(UserDelete.Id);
await FetchData(false);
await FetchUsers();
}
catch (Exception)
{
@@ -124,6 +148,7 @@ public partial class Users
finally
{
IsLoading = false;
StateHasChanged();
}
UserDelete = null;
@@ -134,7 +159,7 @@ public partial class Users
}
private async Task HandleFilterChanged()
{
await FetchData(false);
await FetchUsers(false);
}
private void HandleCancelPopupClicked()
{