From 8181404f0c8fcf04d5c8c8d811a4047e9eebb4b9 Mon Sep 17 00:00:00 2001 From: ChiaraBm Date: Thu, 29 Jan 2026 12:45:09 +0100 Subject: [PATCH] Moved request and responses dtos to correct namespace --- .../Http/Controllers/Admin/ApiKeyController.cs | 4 ++-- .../Controllers/Admin/RoleMembersController.cs | 2 +- .../Http/Controllers/Admin/RolesController.cs | 2 +- .../Http/Controllers/Admin/ThemesController.cs | 4 ++-- .../Http/Controllers/Admin/UsersController.cs | 4 ++-- Moonlight.Api/Http/Controllers/AuthController.cs | 2 +- .../Http/Controllers/FrontendController.cs | 2 +- Moonlight.Api/Mappers/ApiKeyMapper.cs | 4 ++-- Moonlight.Api/Mappers/FrontendConfigMapper.cs | 2 +- Moonlight.Api/Mappers/RoleMapper.cs | 2 +- Moonlight.Api/Mappers/ThemeMapper.cs | 4 ++-- Moonlight.Api/Mappers/UserMapper.cs | 4 ++-- Moonlight.Frontend/Mappers/ApiKeyMapper.cs | 4 ++-- Moonlight.Frontend/Mappers/RoleMapper.cs | 2 +- Moonlight.Frontend/Mappers/ThemeMapper.cs | 4 ++-- Moonlight.Frontend/Mappers/UserMapper.cs | 4 ++-- .../Services/RemoteAuthProvider.cs | 2 +- .../UI/Admin/Modals/CreateApiKeyDialog.razor | 2 +- .../UI/Admin/Modals/CreateRoleDialog.razor | 2 +- .../UI/Admin/Modals/CreateUserDialog.razor | 2 +- .../Admin/Modals/ManageRoleMembersDialog.razor | 2 +- .../UI/Admin/Modals/UpdateApiKeyDialog.razor | 4 ++-- .../UI/Admin/Modals/UpdateRoleDialog.razor | 2 +- .../UI/Admin/Modals/UpdateUserDialog.razor | 4 ++-- .../UI/Admin/Views/Sys/ApiKeys.razor | 5 ++--- .../UI/Admin/Views/Sys/Themes/Create.razor | 2 +- .../UI/Admin/Views/Sys/Themes/Index.razor | 2 +- .../UI/Admin/Views/Sys/Themes/Update.razor | 4 ++-- .../UI/Admin/Views/Users/Roles.razor | 1 - .../UI/Admin/Views/Users/Users.razor | 3 +-- .../Shared/Components/Auth/Authentication.razor | 4 ++-- .../{ => Admin}/ApiKeys/CreateApiKeyDto.cs | 2 +- .../{ => Admin}/ApiKeys/UpdateApiKeyDto.cs | 2 +- .../Requests/{ => Admin}/Roles/CreateRoleDto.cs | 2 +- .../Requests/{ => Admin}/Roles/UpdateRoleDto.cs | 2 +- .../{ => Admin}/Themes/CreateThemeDto.cs | 2 +- .../{ => Admin}/Themes/UpdateThemeDto.cs | 2 +- .../Requests/{ => Admin}/Users/CreateUserDto.cs | 2 +- .../Requests/{ => Admin}/Users/UpdateUserDto.cs | 2 +- .../Responses/{ => Admin}/ApiKeys/ApiKeyDto.cs | 2 +- .../Http/Responses/Admin/Auth/ClaimDto.cs | 3 +++ .../Http/Responses/{ => Admin}/Auth/SchemeDto.cs | 2 +- .../{ => Admin}/Frontend/FrontendConfigDto.cs | 2 +- .../Responses/{ => Admin}/Themes/ThemeDto.cs | 2 +- .../Http/Responses/{ => Admin}/Users/UserDto.cs | 2 +- Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs | 3 --- .../Http/SharedSerializationContext.cs | 16 ++++++++-------- 47 files changed, 68 insertions(+), 71 deletions(-) rename Moonlight.Shared/Http/Requests/{ => Admin}/ApiKeys/CreateApiKeyDto.cs (84%) rename Moonlight.Shared/Http/Requests/{ => Admin}/ApiKeys/UpdateApiKeyDto.cs (83%) rename Moonlight.Shared/Http/Requests/{ => Admin}/Roles/CreateRoleDto.cs (83%) rename Moonlight.Shared/Http/Requests/{ => Admin}/Roles/UpdateRoleDto.cs (83%) rename Moonlight.Shared/Http/Requests/{ => Admin}/Themes/CreateThemeDto.cs (88%) rename Moonlight.Shared/Http/Requests/{ => Admin}/Themes/UpdateThemeDto.cs (88%) rename Moonlight.Shared/Http/Requests/{ => Admin}/Users/CreateUserDto.cs (81%) rename Moonlight.Shared/Http/Requests/{ => Admin}/Users/UpdateUserDto.cs (81%) rename Moonlight.Shared/Http/Responses/{ => Admin}/ApiKeys/ApiKeyDto.cs (71%) create mode 100644 Moonlight.Shared/Http/Responses/Admin/Auth/ClaimDto.cs rename Moonlight.Shared/Http/Responses/{ => Admin}/Auth/SchemeDto.cs (50%) rename Moonlight.Shared/Http/Responses/{ => Admin}/Frontend/FrontendConfigDto.cs (52%) rename Moonlight.Shared/Http/Responses/{ => Admin}/Themes/ThemeDto.cs (66%) rename Moonlight.Shared/Http/Responses/{ => Admin}/Users/UserDto.cs (66%) delete mode 100644 Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs diff --git a/Moonlight.Api/Http/Controllers/Admin/ApiKeyController.cs b/Moonlight.Api/Http/Controllers/Admin/ApiKeyController.cs index e1c27afd..23c47e95 100644 --- a/Moonlight.Api/Http/Controllers/Admin/ApiKeyController.cs +++ b/Moonlight.Api/Http/Controllers/Admin/ApiKeyController.cs @@ -6,9 +6,9 @@ using Moonlight.Api.Database.Entities; using Moonlight.Api.Mappers; using Moonlight.Shared; using Moonlight.Shared.Http.Requests; -using Moonlight.Shared.Http.Requests.ApiKeys; +using Moonlight.Shared.Http.Requests.Admin.ApiKeys; using Moonlight.Shared.Http.Responses; -using Moonlight.Shared.Http.Responses.ApiKeys; +using Moonlight.Shared.Http.Responses.Admin.ApiKeys; namespace Moonlight.Api.Http.Controllers.Admin; diff --git a/Moonlight.Api/Http/Controllers/Admin/RoleMembersController.cs b/Moonlight.Api/Http/Controllers/Admin/RoleMembersController.cs index 662516a4..ea2619c0 100644 --- a/Moonlight.Api/Http/Controllers/Admin/RoleMembersController.cs +++ b/Moonlight.Api/Http/Controllers/Admin/RoleMembersController.cs @@ -6,7 +6,7 @@ using Moonlight.Api.Database.Entities; using Moonlight.Api.Mappers; using Moonlight.Shared; using Moonlight.Shared.Http.Responses; -using Moonlight.Shared.Http.Responses.Users; +using Moonlight.Shared.Http.Responses.Admin.Users; namespace Moonlight.Api.Http.Controllers.Admin; diff --git a/Moonlight.Api/Http/Controllers/Admin/RolesController.cs b/Moonlight.Api/Http/Controllers/Admin/RolesController.cs index 9e828f9b..af1bdbff 100644 --- a/Moonlight.Api/Http/Controllers/Admin/RolesController.cs +++ b/Moonlight.Api/Http/Controllers/Admin/RolesController.cs @@ -6,7 +6,7 @@ using Moonlight.Api.Database.Entities; using Moonlight.Api.Mappers; using Moonlight.Shared; using Moonlight.Shared.Http.Requests; -using Moonlight.Shared.Http.Requests.Roles; +using Moonlight.Shared.Http.Requests.Admin.Roles; using Moonlight.Shared.Http.Responses; using Moonlight.Shared.Http.Responses.Admin; diff --git a/Moonlight.Api/Http/Controllers/Admin/ThemesController.cs b/Moonlight.Api/Http/Controllers/Admin/ThemesController.cs index 0c46ae39..8c9b08e9 100644 --- a/Moonlight.Api/Http/Controllers/Admin/ThemesController.cs +++ b/Moonlight.Api/Http/Controllers/Admin/ThemesController.cs @@ -7,9 +7,9 @@ using Moonlight.Api.Mappers; using Moonlight.Api.Services; using Moonlight.Shared; using Moonlight.Shared.Http.Requests; -using Moonlight.Shared.Http.Requests.Themes; +using Moonlight.Shared.Http.Requests.Admin.Themes; using Moonlight.Shared.Http.Responses; -using Moonlight.Shared.Http.Responses.Themes; +using Moonlight.Shared.Http.Responses.Admin.Themes; namespace Moonlight.Api.Http.Controllers.Admin; diff --git a/Moonlight.Api/Http/Controllers/Admin/UsersController.cs b/Moonlight.Api/Http/Controllers/Admin/UsersController.cs index 79110804..f4500f3d 100644 --- a/Moonlight.Api/Http/Controllers/Admin/UsersController.cs +++ b/Moonlight.Api/Http/Controllers/Admin/UsersController.cs @@ -6,9 +6,9 @@ using Moonlight.Api.Database.Entities; using Moonlight.Api.Mappers; using Moonlight.Shared; using Moonlight.Shared.Http.Requests; -using Moonlight.Shared.Http.Requests.Users; +using Moonlight.Shared.Http.Requests.Admin.Users; using Moonlight.Shared.Http.Responses; -using Moonlight.Shared.Http.Responses.Users; +using Moonlight.Shared.Http.Responses.Admin.Users; namespace Moonlight.Api.Http.Controllers.Admin; diff --git a/Moonlight.Api/Http/Controllers/AuthController.cs b/Moonlight.Api/Http/Controllers/AuthController.cs index a5ff547a..34dc18e7 100644 --- a/Moonlight.Api/Http/Controllers/AuthController.cs +++ b/Moonlight.Api/Http/Controllers/AuthController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Moonlight.Shared.Http.Responses.Auth; +using Moonlight.Shared.Http.Responses.Admin.Auth; namespace Moonlight.Api.Http.Controllers; diff --git a/Moonlight.Api/Http/Controllers/FrontendController.cs b/Moonlight.Api/Http/Controllers/FrontendController.cs index cdf201ee..6fffb0aa 100644 --- a/Moonlight.Api/Http/Controllers/FrontendController.cs +++ b/Moonlight.Api/Http/Controllers/FrontendController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Moonlight.Api.Mappers; using Moonlight.Api.Services; -using Moonlight.Shared.Http.Responses.Frontend; +using Moonlight.Shared.Http.Responses.Admin.Frontend; namespace Moonlight.Api.Http.Controllers; diff --git a/Moonlight.Api/Mappers/ApiKeyMapper.cs b/Moonlight.Api/Mappers/ApiKeyMapper.cs index f4f694ad..55dd62e1 100644 --- a/Moonlight.Api/Mappers/ApiKeyMapper.cs +++ b/Moonlight.Api/Mappers/ApiKeyMapper.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using Moonlight.Api.Database.Entities; -using Moonlight.Shared.Http.Requests.ApiKeys; -using Moonlight.Shared.Http.Responses.ApiKeys; +using Moonlight.Shared.Http.Requests.Admin.ApiKeys; +using Moonlight.Shared.Http.Responses.Admin.ApiKeys; using Riok.Mapperly.Abstractions; namespace Moonlight.Api.Mappers; diff --git a/Moonlight.Api/Mappers/FrontendConfigMapper.cs b/Moonlight.Api/Mappers/FrontendConfigMapper.cs index 85118685..e731d714 100644 --- a/Moonlight.Api/Mappers/FrontendConfigMapper.cs +++ b/Moonlight.Api/Mappers/FrontendConfigMapper.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; using Moonlight.Api.Models; -using Moonlight.Shared.Http.Responses.Frontend; +using Moonlight.Shared.Http.Responses.Admin.Frontend; using Riok.Mapperly.Abstractions; namespace Moonlight.Api.Mappers; diff --git a/Moonlight.Api/Mappers/RoleMapper.cs b/Moonlight.Api/Mappers/RoleMapper.cs index 7ac52dad..b4a4e0ad 100644 --- a/Moonlight.Api/Mappers/RoleMapper.cs +++ b/Moonlight.Api/Mappers/RoleMapper.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; using Moonlight.Api.Database.Entities; -using Moonlight.Shared.Http.Requests.Roles; +using Moonlight.Shared.Http.Requests.Admin.Roles; using Moonlight.Shared.Http.Responses.Admin; using Riok.Mapperly.Abstractions; diff --git a/Moonlight.Api/Mappers/ThemeMapper.cs b/Moonlight.Api/Mappers/ThemeMapper.cs index ad266092..4496a329 100644 --- a/Moonlight.Api/Mappers/ThemeMapper.cs +++ b/Moonlight.Api/Mappers/ThemeMapper.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using Moonlight.Api.Database.Entities; -using Moonlight.Shared.Http.Requests.Themes; -using Moonlight.Shared.Http.Responses.Themes; +using Moonlight.Shared.Http.Requests.Admin.Themes; +using Moonlight.Shared.Http.Responses.Admin.Themes; using Riok.Mapperly.Abstractions; namespace Moonlight.Api.Mappers; diff --git a/Moonlight.Api/Mappers/UserMapper.cs b/Moonlight.Api/Mappers/UserMapper.cs index 2d150bc5..ef9673d3 100644 --- a/Moonlight.Api/Mappers/UserMapper.cs +++ b/Moonlight.Api/Mappers/UserMapper.cs @@ -1,8 +1,8 @@ using System.Diagnostics.CodeAnalysis; using Riok.Mapperly.Abstractions; -using Moonlight.Shared.Http.Requests.Users; -using Moonlight.Shared.Http.Responses.Users; using Moonlight.Api.Database.Entities; +using Moonlight.Shared.Http.Requests.Admin.Users; +using Moonlight.Shared.Http.Responses.Admin.Users; namespace Moonlight.Api.Mappers; diff --git a/Moonlight.Frontend/Mappers/ApiKeyMapper.cs b/Moonlight.Frontend/Mappers/ApiKeyMapper.cs index 77dde21e..b1bb2ad6 100644 --- a/Moonlight.Frontend/Mappers/ApiKeyMapper.cs +++ b/Moonlight.Frontend/Mappers/ApiKeyMapper.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -using Moonlight.Shared.Http.Requests.ApiKeys; -using Moonlight.Shared.Http.Responses.ApiKeys; +using Moonlight.Shared.Http.Requests.Admin.ApiKeys; +using Moonlight.Shared.Http.Responses.Admin.ApiKeys; using Riok.Mapperly.Abstractions; namespace Moonlight.Frontend.Mappers; diff --git a/Moonlight.Frontend/Mappers/RoleMapper.cs b/Moonlight.Frontend/Mappers/RoleMapper.cs index 3495f872..4c4861f1 100644 --- a/Moonlight.Frontend/Mappers/RoleMapper.cs +++ b/Moonlight.Frontend/Mappers/RoleMapper.cs @@ -1,5 +1,5 @@ using System.Diagnostics.CodeAnalysis; -using Moonlight.Shared.Http.Requests.Roles; +using Moonlight.Shared.Http.Requests.Admin.Roles; using Moonlight.Shared.Http.Responses.Admin; using Riok.Mapperly.Abstractions; diff --git a/Moonlight.Frontend/Mappers/ThemeMapper.cs b/Moonlight.Frontend/Mappers/ThemeMapper.cs index 8ddff698..2e1747e7 100644 --- a/Moonlight.Frontend/Mappers/ThemeMapper.cs +++ b/Moonlight.Frontend/Mappers/ThemeMapper.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -using Moonlight.Shared.Http.Requests.Themes; -using Moonlight.Shared.Http.Responses.Themes; +using Moonlight.Shared.Http.Requests.Admin.Themes; +using Moonlight.Shared.Http.Responses.Admin.Themes; using Riok.Mapperly.Abstractions; namespace Moonlight.Frontend.Mappers; diff --git a/Moonlight.Frontend/Mappers/UserMapper.cs b/Moonlight.Frontend/Mappers/UserMapper.cs index 0762ba58..c20a8c8f 100644 --- a/Moonlight.Frontend/Mappers/UserMapper.cs +++ b/Moonlight.Frontend/Mappers/UserMapper.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; +using Moonlight.Shared.Http.Requests.Admin.Users; +using Moonlight.Shared.Http.Responses.Admin.Users; using Riok.Mapperly.Abstractions; -using Moonlight.Shared.Http.Requests.Users; -using Moonlight.Shared.Http.Responses.Users; namespace Moonlight.Frontend.Mappers; diff --git a/Moonlight.Frontend/Services/RemoteAuthProvider.cs b/Moonlight.Frontend/Services/RemoteAuthProvider.cs index 22cdee35..8e17d6e4 100644 --- a/Moonlight.Frontend/Services/RemoteAuthProvider.cs +++ b/Moonlight.Frontend/Services/RemoteAuthProvider.cs @@ -3,7 +3,7 @@ using System.Net.Http.Json; using System.Security.Claims; using Microsoft.AspNetCore.Components.Authorization; using Microsoft.Extensions.Logging; -using Moonlight.Shared.Http.Responses.Auth; +using Moonlight.Shared.Http.Responses.Admin.Auth; namespace Moonlight.Frontend.Services; diff --git a/Moonlight.Frontend/UI/Admin/Modals/CreateApiKeyDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/CreateApiKeyDialog.razor index a0e0e899..459164c5 100644 --- a/Moonlight.Frontend/UI/Admin/Modals/CreateApiKeyDialog.razor +++ b/Moonlight.Frontend/UI/Admin/Modals/CreateApiKeyDialog.razor @@ -1,6 +1,6 @@ @using Moonlight.Frontend.Helpers @using Moonlight.Frontend.UI.Admin.Components -@using Moonlight.Shared.Http.Requests.ApiKeys +@using Moonlight.Shared.Http.Requests.Admin.ApiKeys @using Moonlight.Shared.Http.Responses @using ShadcnBlazor.Dialogs @using ShadcnBlazor.Extras.Forms diff --git a/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor index 671e8317..942e79b8 100644 --- a/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor +++ b/Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor @@ -1,6 +1,6 @@ @using Moonlight.Frontend.Helpers @using Moonlight.Frontend.UI.Admin.Components -@using Moonlight.Shared.Http.Requests.Roles +@using Moonlight.Shared.Http.Requests.Admin.Roles @using ShadcnBlazor.Dialogs @using ShadcnBlazor.Extras.Forms @using ShadcnBlazor.Extras.Toasts diff --git a/Moonlight.Frontend/UI/Admin/Modals/CreateUserDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/CreateUserDialog.razor index 55c1f566..ff9113de 100644 --- a/Moonlight.Frontend/UI/Admin/Modals/CreateUserDialog.razor +++ b/Moonlight.Frontend/UI/Admin/Modals/CreateUserDialog.razor @@ -1,5 +1,5 @@ @using Moonlight.Frontend.Helpers -@using Moonlight.Shared.Http.Requests.Users +@using Moonlight.Shared.Http.Requests.Admin.Users @using Moonlight.Shared.Http.Responses @using ShadcnBlazor.Dialogs @using ShadcnBlazor.Extras.Forms diff --git a/Moonlight.Frontend/UI/Admin/Modals/ManageRoleMembersDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/ManageRoleMembersDialog.razor index 4dc004fa..403d9c3f 100644 --- a/Moonlight.Frontend/UI/Admin/Modals/ManageRoleMembersDialog.razor +++ b/Moonlight.Frontend/UI/Admin/Modals/ManageRoleMembersDialog.razor @@ -1,7 +1,7 @@ @using LucideBlazor @using Moonlight.Shared.Http.Responses @using Moonlight.Shared.Http.Responses.Admin -@using Moonlight.Shared.Http.Responses.Users +@using Moonlight.Shared.Http.Responses.Admin.Users @using ShadcnBlazor.Buttons @using ShadcnBlazor.DataGrids @using ShadcnBlazor.Dialogs diff --git a/Moonlight.Frontend/UI/Admin/Modals/UpdateApiKeyDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/UpdateApiKeyDialog.razor index b6a34e44..f9e4aef9 100644 --- a/Moonlight.Frontend/UI/Admin/Modals/UpdateApiKeyDialog.razor +++ b/Moonlight.Frontend/UI/Admin/Modals/UpdateApiKeyDialog.razor @@ -1,8 +1,8 @@ @using Moonlight.Frontend.Helpers @using Moonlight.Frontend.Mappers @using Moonlight.Frontend.UI.Admin.Components -@using Moonlight.Shared.Http.Requests.ApiKeys -@using Moonlight.Shared.Http.Responses.ApiKeys +@using Moonlight.Shared.Http.Requests.Admin.ApiKeys +@using Moonlight.Shared.Http.Responses.Admin.ApiKeys @using ShadcnBlazor.Dialogs @using ShadcnBlazor.Extras.Forms @using ShadcnBlazor.Extras.Toasts diff --git a/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor index 22130a11..288d8a71 100644 --- a/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor +++ b/Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor @@ -1,7 +1,7 @@ @using Moonlight.Frontend.Helpers @using Moonlight.Frontend.Mappers @using Moonlight.Frontend.UI.Admin.Components -@using Moonlight.Shared.Http.Requests.Roles +@using Moonlight.Shared.Http.Requests.Admin.Roles @using Moonlight.Shared.Http.Responses.Admin @using ShadcnBlazor.Dialogs @using ShadcnBlazor.Extras.Forms diff --git a/Moonlight.Frontend/UI/Admin/Modals/UpdateUserDialog.razor b/Moonlight.Frontend/UI/Admin/Modals/UpdateUserDialog.razor index 145fa3cc..f23a2ec7 100644 --- a/Moonlight.Frontend/UI/Admin/Modals/UpdateUserDialog.razor +++ b/Moonlight.Frontend/UI/Admin/Modals/UpdateUserDialog.razor @@ -1,8 +1,8 @@ @using Moonlight.Frontend.Helpers @using Moonlight.Frontend.Mappers -@using Moonlight.Shared.Http.Requests.Users +@using Moonlight.Shared.Http.Requests.Admin.Users @using Moonlight.Shared.Http.Responses -@using Moonlight.Shared.Http.Responses.Users +@using Moonlight.Shared.Http.Responses.Admin.Users @using ShadcnBlazor.Dialogs @using ShadcnBlazor.Extras.Forms @using ShadcnBlazor.Extras.Toasts diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/ApiKeys.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/ApiKeys.razor index ff344fd1..9b76f917 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Sys/ApiKeys.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Sys/ApiKeys.razor @@ -1,12 +1,11 @@ -@using Moonlight.Shared.Http.Requests.ApiKeys -@using Moonlight.Shared.Http.Responses.ApiKeys -@using LucideBlazor +@using LucideBlazor @using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Components.Authorization @using Moonlight.Frontend.UI.Admin.Modals @using Moonlight.Shared @using Moonlight.Shared.Http.Requests @using Moonlight.Shared.Http.Responses +@using Moonlight.Shared.Http.Responses.Admin.ApiKeys @using ShadcnBlazor.DataGrids @using ShadcnBlazor.Dropdowns @using ShadcnBlazor.Extras.AlertDialogs diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor index 759eaa5d..be2711df 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor @@ -5,7 +5,7 @@ @using LucideBlazor @using Moonlight.Frontend.Helpers @using Moonlight.Frontend.Services -@using Moonlight.Shared.Http.Requests.Themes +@using Moonlight.Shared.Http.Requests.Admin.Themes @using ShadcnBlazor.Buttons @using ShadcnBlazor.Cards @using ShadcnBlazor.Extras.Editors diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Index.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Index.razor index 17208173..c90c0dfd 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Index.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Index.razor @@ -4,7 +4,7 @@ @using Moonlight.Shared @using Moonlight.Shared.Http.Requests @using Moonlight.Shared.Http.Responses -@using Moonlight.Shared.Http.Responses.Themes +@using Moonlight.Shared.Http.Responses.Admin.Themes @using ShadcnBlazor.DataGrids @using ShadcnBlazor.Dropdowns @using ShadcnBlazor.Extras.AlertDialogs diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor index bab7f725..4c19541f 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor @@ -6,8 +6,8 @@ @using Moonlight.Frontend.Helpers @using Moonlight.Frontend.Mappers @using Moonlight.Frontend.Services -@using Moonlight.Shared.Http.Requests.Themes -@using Moonlight.Shared.Http.Responses.Themes +@using Moonlight.Shared.Http.Requests.Admin.Themes +@using Moonlight.Shared.Http.Responses.Admin.Themes @using ShadcnBlazor.Buttons @using ShadcnBlazor.Cards @using ShadcnBlazor.Extras.Common diff --git a/Moonlight.Frontend/UI/Admin/Views/Users/Roles.razor b/Moonlight.Frontend/UI/Admin/Views/Users/Roles.razor index 195ebae1..a84bf8ba 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Users/Roles.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Users/Roles.razor @@ -4,7 +4,6 @@ @using Moonlight.Frontend.UI.Admin.Modals @using Moonlight.Shared @using Moonlight.Shared.Http.Requests -@using Moonlight.Shared.Http.Requests.Roles @using Moonlight.Shared.Http.Responses @using Moonlight.Shared.Http.Responses.Admin @using ShadcnBlazor.DataGrids diff --git a/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor b/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor index d7778005..c6a4e752 100644 --- a/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor +++ b/Moonlight.Frontend/UI/Admin/Views/Users/Users.razor @@ -10,9 +10,8 @@ @using ShadcnBlazor.Extras.Toasts @using ShadcnBlazor.Tabels @using Moonlight.Shared.Http.Requests -@using Moonlight.Shared.Http.Requests.Users @using Moonlight.Shared.Http.Responses -@using Moonlight.Shared.Http.Responses.Users +@using Moonlight.Shared.Http.Responses.Admin.Users @using ShadcnBlazor.Extras.Dialogs @inject HttpClient HttpClient diff --git a/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor b/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor index 1278c182..22a2f7eb 100644 --- a/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor +++ b/Moonlight.Frontend/UI/Shared/Components/Auth/Authentication.razor @@ -1,7 +1,7 @@ -@using ShadcnBlazor.Cards +@using Moonlight.Shared.Http.Responses.Admin.Auth +@using ShadcnBlazor.Cards @using ShadcnBlazor.Spinners @using ShadcnBlazor.Buttons -@using Moonlight.Shared.Http.Responses.Auth @inject HttpClient HttpClient @inject NavigationManager Navigation diff --git a/Moonlight.Shared/Http/Requests/ApiKeys/CreateApiKeyDto.cs b/Moonlight.Shared/Http/Requests/Admin/ApiKeys/CreateApiKeyDto.cs similarity index 84% rename from Moonlight.Shared/Http/Requests/ApiKeys/CreateApiKeyDto.cs rename to Moonlight.Shared/Http/Requests/Admin/ApiKeys/CreateApiKeyDto.cs index 0f5e2e65..2b60a525 100644 --- a/Moonlight.Shared/Http/Requests/ApiKeys/CreateApiKeyDto.cs +++ b/Moonlight.Shared/Http/Requests/Admin/ApiKeys/CreateApiKeyDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Shared.Http.Requests.ApiKeys; +namespace Moonlight.Shared.Http.Requests.Admin.ApiKeys; public class CreateApiKeyDto { diff --git a/Moonlight.Shared/Http/Requests/ApiKeys/UpdateApiKeyDto.cs b/Moonlight.Shared/Http/Requests/Admin/ApiKeys/UpdateApiKeyDto.cs similarity index 83% rename from Moonlight.Shared/Http/Requests/ApiKeys/UpdateApiKeyDto.cs rename to Moonlight.Shared/Http/Requests/Admin/ApiKeys/UpdateApiKeyDto.cs index d9fcbfc2..3c154ec7 100644 --- a/Moonlight.Shared/Http/Requests/ApiKeys/UpdateApiKeyDto.cs +++ b/Moonlight.Shared/Http/Requests/Admin/ApiKeys/UpdateApiKeyDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Shared.Http.Requests.ApiKeys; +namespace Moonlight.Shared.Http.Requests.Admin.ApiKeys; public class UpdateApiKeyDto { diff --git a/Moonlight.Shared/Http/Requests/Roles/CreateRoleDto.cs b/Moonlight.Shared/Http/Requests/Admin/Roles/CreateRoleDto.cs similarity index 83% rename from Moonlight.Shared/Http/Requests/Roles/CreateRoleDto.cs rename to Moonlight.Shared/Http/Requests/Admin/Roles/CreateRoleDto.cs index 638673fd..6573aedd 100644 --- a/Moonlight.Shared/Http/Requests/Roles/CreateRoleDto.cs +++ b/Moonlight.Shared/Http/Requests/Admin/Roles/CreateRoleDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Shared.Http.Requests.Roles; +namespace Moonlight.Shared.Http.Requests.Admin.Roles; public class CreateRoleDto { diff --git a/Moonlight.Shared/Http/Requests/Roles/UpdateRoleDto.cs b/Moonlight.Shared/Http/Requests/Admin/Roles/UpdateRoleDto.cs similarity index 83% rename from Moonlight.Shared/Http/Requests/Roles/UpdateRoleDto.cs rename to Moonlight.Shared/Http/Requests/Admin/Roles/UpdateRoleDto.cs index d7a03ee6..57538cc2 100644 --- a/Moonlight.Shared/Http/Requests/Roles/UpdateRoleDto.cs +++ b/Moonlight.Shared/Http/Requests/Admin/Roles/UpdateRoleDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Shared.Http.Requests.Roles; +namespace Moonlight.Shared.Http.Requests.Admin.Roles; public class UpdateRoleDto { diff --git a/Moonlight.Shared/Http/Requests/Themes/CreateThemeDto.cs b/Moonlight.Shared/Http/Requests/Admin/Themes/CreateThemeDto.cs similarity index 88% rename from Moonlight.Shared/Http/Requests/Themes/CreateThemeDto.cs rename to Moonlight.Shared/Http/Requests/Admin/Themes/CreateThemeDto.cs index 01ebf5b0..36374de0 100644 --- a/Moonlight.Shared/Http/Requests/Themes/CreateThemeDto.cs +++ b/Moonlight.Shared/Http/Requests/Admin/Themes/CreateThemeDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Shared.Http.Requests.Themes; +namespace Moonlight.Shared.Http.Requests.Admin.Themes; public class CreateThemeDto { diff --git a/Moonlight.Shared/Http/Requests/Themes/UpdateThemeDto.cs b/Moonlight.Shared/Http/Requests/Admin/Themes/UpdateThemeDto.cs similarity index 88% rename from Moonlight.Shared/Http/Requests/Themes/UpdateThemeDto.cs rename to Moonlight.Shared/Http/Requests/Admin/Themes/UpdateThemeDto.cs index 0d22d223..ead52a32 100644 --- a/Moonlight.Shared/Http/Requests/Themes/UpdateThemeDto.cs +++ b/Moonlight.Shared/Http/Requests/Admin/Themes/UpdateThemeDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Shared.Http.Requests.Themes; +namespace Moonlight.Shared.Http.Requests.Admin.Themes; public class UpdateThemeDto { diff --git a/Moonlight.Shared/Http/Requests/Users/CreateUserDto.cs b/Moonlight.Shared/Http/Requests/Admin/Users/CreateUserDto.cs similarity index 81% rename from Moonlight.Shared/Http/Requests/Users/CreateUserDto.cs rename to Moonlight.Shared/Http/Requests/Admin/Users/CreateUserDto.cs index 826b7129..0c3b9d1b 100644 --- a/Moonlight.Shared/Http/Requests/Users/CreateUserDto.cs +++ b/Moonlight.Shared/Http/Requests/Admin/Users/CreateUserDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Shared.Http.Requests.Users; +namespace Moonlight.Shared.Http.Requests.Admin.Users; public class CreateUserDto { diff --git a/Moonlight.Shared/Http/Requests/Users/UpdateUserDto.cs b/Moonlight.Shared/Http/Requests/Admin/Users/UpdateUserDto.cs similarity index 81% rename from Moonlight.Shared/Http/Requests/Users/UpdateUserDto.cs rename to Moonlight.Shared/Http/Requests/Admin/Users/UpdateUserDto.cs index c2182bc1..96b33e87 100644 --- a/Moonlight.Shared/Http/Requests/Users/UpdateUserDto.cs +++ b/Moonlight.Shared/Http/Requests/Admin/Users/UpdateUserDto.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Moonlight.Shared.Http.Requests.Users; +namespace Moonlight.Shared.Http.Requests.Admin.Users; public class UpdateUserDto { diff --git a/Moonlight.Shared/Http/Responses/ApiKeys/ApiKeyDto.cs b/Moonlight.Shared/Http/Responses/Admin/ApiKeys/ApiKeyDto.cs similarity index 71% rename from Moonlight.Shared/Http/Responses/ApiKeys/ApiKeyDto.cs rename to Moonlight.Shared/Http/Responses/Admin/ApiKeys/ApiKeyDto.cs index 8561d083..85158f42 100644 --- a/Moonlight.Shared/Http/Responses/ApiKeys/ApiKeyDto.cs +++ b/Moonlight.Shared/Http/Responses/Admin/ApiKeys/ApiKeyDto.cs @@ -1,3 +1,3 @@ -namespace Moonlight.Shared.Http.Responses.ApiKeys; +namespace Moonlight.Shared.Http.Responses.Admin.ApiKeys; public record ApiKeyDto(int Id, string Name, string Description, string[] Permissions, string Key, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Admin/Auth/ClaimDto.cs b/Moonlight.Shared/Http/Responses/Admin/Auth/ClaimDto.cs new file mode 100644 index 00000000..7d9ee7c1 --- /dev/null +++ b/Moonlight.Shared/Http/Responses/Admin/Auth/ClaimDto.cs @@ -0,0 +1,3 @@ +namespace Moonlight.Shared.Http.Responses.Admin.Auth; + +public record ClaimDto(string Type, string Value); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Auth/SchemeDto.cs b/Moonlight.Shared/Http/Responses/Admin/Auth/SchemeDto.cs similarity index 50% rename from Moonlight.Shared/Http/Responses/Auth/SchemeDto.cs rename to Moonlight.Shared/Http/Responses/Admin/Auth/SchemeDto.cs index bd9fa7ce..4c2218bf 100644 --- a/Moonlight.Shared/Http/Responses/Auth/SchemeDto.cs +++ b/Moonlight.Shared/Http/Responses/Admin/Auth/SchemeDto.cs @@ -1,3 +1,3 @@ -namespace Moonlight.Shared.Http.Responses.Auth; +namespace Moonlight.Shared.Http.Responses.Admin.Auth; public record SchemeDto(string Name, string DisplayName); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Frontend/FrontendConfigDto.cs b/Moonlight.Shared/Http/Responses/Admin/Frontend/FrontendConfigDto.cs similarity index 52% rename from Moonlight.Shared/Http/Responses/Frontend/FrontendConfigDto.cs rename to Moonlight.Shared/Http/Responses/Admin/Frontend/FrontendConfigDto.cs index 747e5d39..f1c7dd5a 100644 --- a/Moonlight.Shared/Http/Responses/Frontend/FrontendConfigDto.cs +++ b/Moonlight.Shared/Http/Responses/Admin/Frontend/FrontendConfigDto.cs @@ -1,3 +1,3 @@ -namespace Moonlight.Shared.Http.Responses.Frontend; +namespace Moonlight.Shared.Http.Responses.Admin.Frontend; public record FrontendConfigDto(string Name, string? ThemeCss); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Themes/ThemeDto.cs b/Moonlight.Shared/Http/Responses/Admin/Themes/ThemeDto.cs similarity index 66% rename from Moonlight.Shared/Http/Responses/Themes/ThemeDto.cs rename to Moonlight.Shared/Http/Responses/Admin/Themes/ThemeDto.cs index adc167dd..854bfd6e 100644 --- a/Moonlight.Shared/Http/Responses/Themes/ThemeDto.cs +++ b/Moonlight.Shared/Http/Responses/Admin/Themes/ThemeDto.cs @@ -1,3 +1,3 @@ -namespace Moonlight.Shared.Http.Responses.Themes; +namespace Moonlight.Shared.Http.Responses.Admin.Themes; public record ThemeDto(int Id, string Name, string Author, string Version, string CssContent, bool IsEnabled); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Users/UserDto.cs b/Moonlight.Shared/Http/Responses/Admin/Users/UserDto.cs similarity index 66% rename from Moonlight.Shared/Http/Responses/Users/UserDto.cs rename to Moonlight.Shared/Http/Responses/Admin/Users/UserDto.cs index 80a824ab..1060b50c 100644 --- a/Moonlight.Shared/Http/Responses/Users/UserDto.cs +++ b/Moonlight.Shared/Http/Responses/Admin/Users/UserDto.cs @@ -1,3 +1,3 @@ -namespace Moonlight.Shared.Http.Responses.Users; +namespace Moonlight.Shared.Http.Responses.Admin.Users; public record UserDto(int Id, string Username, string Email, DateTimeOffset CreatedAt, DateTimeOffset UpdatedAt); \ No newline at end of file diff --git a/Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs b/Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs deleted file mode 100644 index 0b3c73a1..00000000 --- a/Moonlight.Shared/Http/Responses/Auth/ClaimDto.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Moonlight.Shared.Http.Responses.Auth; - -public record ClaimDto(string Type, string Value); \ No newline at end of file diff --git a/Moonlight.Shared/Http/SharedSerializationContext.cs b/Moonlight.Shared/Http/SharedSerializationContext.cs index 3fa23a66..8bb4e776 100644 --- a/Moonlight.Shared/Http/SharedSerializationContext.cs +++ b/Moonlight.Shared/Http/SharedSerializationContext.cs @@ -1,16 +1,16 @@ using System.Text.Json; using System.Text.Json.Serialization; using Moonlight.Shared.Http.Events; -using Moonlight.Shared.Http.Requests.ApiKeys; -using Moonlight.Shared.Http.Requests.Roles; -using Moonlight.Shared.Http.Requests.Themes; -using Moonlight.Shared.Http.Requests.Users; +using Moonlight.Shared.Http.Requests.Admin.ApiKeys; +using Moonlight.Shared.Http.Requests.Admin.Roles; +using Moonlight.Shared.Http.Requests.Admin.Themes; +using Moonlight.Shared.Http.Requests.Admin.Users; using Moonlight.Shared.Http.Responses; using Moonlight.Shared.Http.Responses.Admin; -using Moonlight.Shared.Http.Responses.ApiKeys; -using Moonlight.Shared.Http.Responses.Auth; -using Moonlight.Shared.Http.Responses.Themes; -using Moonlight.Shared.Http.Responses.Users; +using Moonlight.Shared.Http.Responses.Admin.ApiKeys; +using Moonlight.Shared.Http.Responses.Admin.Auth; +using Moonlight.Shared.Http.Responses.Admin.Themes; +using Moonlight.Shared.Http.Responses.Admin.Users; namespace Moonlight.Shared.Http;