Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restructure solution to modules structure #22

Merged
ChiaraBm merged 2 commits from feat/RestructureToModules into v2.1 2026-03-13 07:56:01 +00:00
Conversation 0 Commits 2 Files Changed 221 +265 -254
37 changed files with 265 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6d1e6e1690 - Show all commits

2
Hosts/Moonlight.Api.Host/Moonlight.Api.Host.csproj
View File

@@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

6
Hosts/Moonlight.Frontend.Host/Moonlight.Frontend.Host.csproj
View File

@@ -12,8 +12,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3"/> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.3" PrivateAssets="all"/> <PackageReference Include="Microsoft.DotNet.HotReload.WebAssembly.Browser" Version="10.0.201" />
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="10.0.5" />
<PackageReference Include="Microsoft.NET.Sdk.WebAssembly.Pack" Version="10.0.5" />
<PackageReference Include="SimplePlugin" Version="1.0.2"/> <PackageReference Include="SimplePlugin" Version="1.0.2"/>
<PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/> <PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/>
</ItemGroup> </ItemGroup>

5
Moonlight.Api/Admin/Users/Users/UserAuthService.cs
View File

@@ -12,10 +12,11 @@ namespace Moonlight.Api.Admin.Users.Users;
public class UserAuthService public class UserAuthService
{ {
public const string CacheKeyPattern = $"Moonlight.{nameof(UserAuthService)}.{nameof(ValidateAsync)}-{{0}}";
private const string UserIdClaim = "UserId"; private const string UserIdClaim = "UserId";
private const string IssuedAtClaim = "IssuedAt"; private const string IssuedAtClaim = "IssuedAt";
public const string CacheKeyPattern = $"Moonlight.{nameof(UserAuthService)}.{nameof(ValidateAsync)}-{{0}}";
private readonly IEnumerable<IUserAuthHook> Hooks; private readonly IEnumerable<IUserAuthHook> Hooks;
private readonly HybridCache HybridCache; private readonly HybridCache HybridCache;
private readonly ILogger<UserAuthService> Logger; private readonly ILogger<UserAuthService> Logger;

2
Moonlight.Api/Admin/Users/Users/UserDeletionController.cs
View File

@@ -34,6 +34,7 @@ public class UserDeletionController : Controller
var validationResult = await UserDeletionService.ValidateAsync(id); var validationResult = await UserDeletionService.ValidateAsync(id);
if (!validationResult.IsValid) if (!validationResult.IsValid)
{
return ValidationProblem( return ValidationProblem(
new ValidationProblemDetails( new ValidationProblemDetails(
new Dictionary<string, string[]> new Dictionary<string, string[]>
@@ -45,6 +46,7 @@ public class UserDeletionController : Controller
} }
) )
); );
}
await UserDeletionService.DeleteAsync(id); await UserDeletionService.DeleteAsync(id);
return NoContent(); return NoContent();

4
Moonlight.Api/Admin/Users/Users/UsersController.cs
View File

@@ -43,7 +43,9 @@ public class UsersController : Controller
// Filters // Filters
if (filterOptions != null) if (filterOptions != null)
{
foreach (var filterOption in filterOptions.Filters) foreach (var filterOption in filterOptions.Filters)
{
query = filterOption.Key switch query = filterOption.Key switch
{ {
nameof(Infrastructure.Database.Entities.User.Email) => nameof(Infrastructure.Database.Entities.User.Email) =>
@@ -54,6 +56,8 @@ public class UsersController : Controller
_ => query _ => query
}; };
}
}
// Pagination // Pagination
var data = await query var data = await query

2
Moonlight.Api/Infrastructure/Database/DbMigrationService.cs
View File

@@ -28,7 +28,7 @@ public class DbMigrationService : IHostedLifecycleService
if (migrationNames.Length == 0) if (migrationNames.Length == 0)
{ {
Logger.LogDebug("No pending migrations found"); Logger.LogTrace("No pending migrations found");
return; return;
} }

14
Moonlight.Api/Moonlight.Api.csproj
View File

@@ -24,13 +24,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.3"/> <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.3"/> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3"/> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="10.3.0"/> <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="10.4.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.3"/> <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.5" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0"/> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
<PackageReference Include="Riok.Mapperly" Version="4.3.1"/> <PackageReference Include="Riok.Mapperly" Version="5.0.0-next.2" />
<PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/> <PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/>
<PackageReference Include="VYaml" Version="1.2.0"/> <PackageReference Include="VYaml" Version="1.2.0"/>
</ItemGroup> </ItemGroup>

2
Moonlight.Api/Startup/Startup.Base.cs
View File

@@ -15,7 +15,7 @@ using Moonlight.Api.Infrastructure.Helpers;
using Moonlight.Api.Infrastructure.Hooks; using Moonlight.Api.Infrastructure.Hooks;
using Moonlight.Api.Infrastructure.Implementations; using Moonlight.Api.Infrastructure.Implementations;
using Moonlight.Api.Shared.Frontend; using Moonlight.Api.Shared.Frontend;
using SerializationContext = Moonlight.Shared.SerializationContext; using Moonlight.Shared;
using VersionService = Moonlight.Api.Admin.Sys.Versions.VersionService; using VersionService = Moonlight.Api.Admin.Sys.Versions.VersionService;
namespace Moonlight.Api.Startup; namespace Moonlight.Api.Startup;

181
Moonlight.Frontend/Admin/Setup/Index.razor Normal file
View File

@@ -0,0 +1,181 @@
@using LucideBlazor
@using Moonlight.Shared.Admin.Setup
@using ShadcnBlazor.Buttons
@using ShadcnBlazor.Cards
@using ShadcnBlazor.Inputs
@using ShadcnBlazor.Labels
@using ShadcnBlazor.Spinners
@inject HttpClient HttpClient
@inject NavigationManager Navigation
<div class="h-screen w-full flex items-center justify-center">
<Card ClassName="w-full max-w-[calc(100%-2rem)] lg:max-w-xl grid gap-4 p-6">
@if (IsLoaded)
{
<div class="space-y-6">
@switch (CurrentStep)
{
case 0:
<div
class="flex h-56 items-center justify-center rounded-lg bg-linear-to-br from-gray-100 to-gray-300 dark:from-gray-800 dark:to-gray-900">
<img alt="Moonlight Logo" class="size-34" src="/_content/Moonlight.Frontend/logo.svg"/>
</div>
<div class="space-y-2 text-center">
<h2 class="text-2xl font-bold">Welcome to Moonlight Panel</h2>
<p class="text-muted-foreground">
You successfully installed moonlight. Now you are ready to perform some initial steps to
complete your installation
</p>
</div>
break;
case 1:
<div
class="flex h-56 items-center justify-center rounded-lg bg-linear-to-br from-gray-100 to-gray-300 dark:from-gray-800 dark:to-gray-900">
<UserIcon ClassName="size-34 text-blue-500"/>
</div>
<div class="space-y-2 text-center">
<h2 class="text-2xl font-bold">Admin Account Creation</h2>
<p class="text-muted-foreground">
To continue please fill in the account details of the user you want to use as the initial
administrator account.
If you use an external OIDC provider, these details need to match with your desired OIDC
account
</p>
</div>
<div class="grid grid-cols-1 gap-5">
<div class="grid gap-2">
<Label for="username">Username</Label>
<TextInputField
@bind-Value="SetupDto.AdminUsername"
id="username"
placeholder="someoneelse"/>
</div>
<div class="grid gap-2">
<Label for="email">Email</Label>
<TextInputField
@bind-Value="SetupDto.AdminEmail"
id="email"
Type="email"
placeholder="a@cool.email"/>
</div>
<div class="grid gap-2">
<Label for="password">Password</Label>
<TextInputField
@bind-Value="SetupDto.AdminPassword"
id="password"
Type="password"
placeholder="......."/>
</div>
</div>
break;
case 2:
<div
class="flex h-56 items-center justify-center rounded-lg bg-linear-to-br from-gray-100 to-gray-300 dark:from-gray-800 dark:to-gray-900">
<RocketIcon ClassName="size-34 text-blue-500"/>
</div>
<div class="space-y-2 text-center">
<h2 class="text-2xl font-bold">You are all set!</h2>
<p class="text-muted-foreground">
You are now ready to finish the initial setup.
The configured options will be applied to the instance.
You will be redirected to the login after changes have been applied successfully
</p>
</div>
break;
}
<div class="flex items-center justify-between">
<div class="flex gap-2">
@for (var step = 0; step < StepCount; step++)
{
if (step == CurrentStep)
{
<div class="h-2 w-2 rounded-full transition-colors bg-foreground">
</div>
}
else
{
<div class="h-2 w-2 rounded-full transition-colors bg-muted">
</div>
}
}
</div>
<div class="flex gap-1.5">
@if (CurrentStep > 0)
{
<Button @onclick="() => Navigate(-1)" Variant="ButtonVariant.Outline">
<ChevronLeftIcon/>
Back
</Button>
}
else if (CurrentStep != StepCount - 1)
{
<Button @onclick="() => Navigate(1)">
Continue
<ArrowRightIcon/>
</Button>
}
else
{
<Button @onclick="ApplyAsync">
Finish
<RocketIcon/>
</Button>
}
</div>
</div>
</div>
}
else
{
<div class="w-full flex justify-center items-center">
<Spinner ClassName="size-10"/>
</div>
}
</Card>
</div>
@code
{
private bool IsLoaded;
private int CurrentStep;
private readonly int StepCount = 3;
private readonly ApplySetupDto SetupDto = new();
private void Navigate(int diff)
{
CurrentStep += diff;
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
return;
var response = await HttpClient.GetAsync("api/admin/setup");
if (!response.IsSuccessStatusCode)
{
Navigation.NavigateTo("/", true);
return;
}
IsLoaded = true;
await InvokeAsync(StateHasChanged);
}
private async Task ApplyAsync()
{
await HttpClient.PostAsJsonAsync("api/admin/setup", SetupDto);
Navigation.NavigateTo("/", true);
}
}

177
Moonlight.Frontend/Admin/Setup/Setup.razor
View File

@@ -1,177 +0,0 @@
@using LucideBlazor
@using Moonlight.Shared.Admin.Setup
@using ShadcnBlazor.Buttons
@using ShadcnBlazor.Cards
@using ShadcnBlazor.Inputs
@using ShadcnBlazor.Labels
@using ShadcnBlazor.Spinners
@inject HttpClient HttpClient
@inject NavigationManager Navigation
<div class="h-screen w-full flex items-center justify-center">
<Card ClassName="w-full max-w-[calc(100%-2rem)] lg:max-w-xl grid gap-4 p-6">
@if (IsLoaded)
{
<div class="space-y-6">
@if (CurrentStep == 0)
{
<div
class="flex h-56 items-center justify-center rounded-lg bg-linear-to-br from-gray-100 to-gray-300 dark:from-gray-800 dark:to-gray-900">
<img alt="Moonlight Logo" class="size-34" src="/_content/Moonlight.Frontend/logo.svg"/>
</div>
<div class="space-y-2 text-center">
<h2 class="text-2xl font-bold">Welcome to Moonlight Panel</h2>
<p class="text-muted-foreground">
You successfully installed moonlight. Now you are ready to perform some initial steps to
complete your installation
</p>
</div>
}
else if (CurrentStep == 1)
{
<div
class="flex h-56 items-center justify-center rounded-lg bg-linear-to-br from-gray-100 to-gray-300 dark:from-gray-800 dark:to-gray-900">
<UserIcon ClassName="size-34 text-blue-500"/>
</div>
<div class="space-y-2 text-center">
<h2 class="text-2xl font-bold">Admin Account Creation</h2>
<p class="text-muted-foreground">
To continue please fill in the account details of the user you want to use as the initial
administrator account.
If you use an external OIDC provider, these details need to match with your desired OIDC
account
</p>
</div>
<div class="grid grid-cols-1 gap-5">
<div class="grid gap-2">
<Label for="username">Username</Label>
<TextInputField
@bind-Value="SetupDto.AdminUsername"
id="username"
placeholder="someoneelse"/>
</div>
<div class="grid gap-2">
<Label for="email">Email</Label>
<TextInputField
@bind-Value="SetupDto.AdminEmail"
id="email"
Type="email"
placeholder="a@cool.email"/>
</div>
<div class="grid gap-2">
<Label for="password">Password</Label>
<TextInputField
@bind-Value="SetupDto.AdminPassword"
id="password"
Type="password"
placeholder="......."/>
</div>
</div>
}
else if (CurrentStep == 2)
{
<div
class="flex h-56 items-center justify-center rounded-lg bg-linear-to-br from-gray-100 to-gray-300 dark:from-gray-800 dark:to-gray-900">
<RocketIcon ClassName="size-34 text-blue-500"/>
</div>
<div class="space-y-2 text-center">
<h2 class="text-2xl font-bold">You are all set!</h2>
<p class="text-muted-foreground">
You are now ready to finish the initial setup.
The configured options will be applied to the instance.
You will be redirected to the login after changes have been applied successfully
</p>
</div>
}
<div class="flex items-center justify-between">
<div class="flex gap-2">
@for (var step = 0; step < StepCount; step++)
{
if (step == CurrentStep)
{
<div class="h-2 w-2 rounded-full transition-colors bg-foreground">
</div>
}
else
{
<div class="h-2 w-2 rounded-full transition-colors bg-muted">
</div>
}
}
</div>
<div class="flex gap-1.5">
@if (CurrentStep > 0)
{
<Button @onclick="() => Navigate(-1)" Variant="ButtonVariant.Outline">
<ChevronLeftIcon/>
Back
</Button>
}
@if (CurrentStep != StepCount - 1)
{
<Button @onclick="() => Navigate(1)">
Continue
<ArrowRightIcon/>
</Button>
}
else
{
<Button @onclick="ApplyAsync">
Finish
<RocketIcon/>
</Button>
}
</div>
</div>
</div>
}
else
{
<div class="w-full flex justify-center items-center">
<Spinner ClassName="size-10"/>
</div>
}
</Card>
</div>
@code
{
private bool IsLoaded;
private int CurrentStep;
private readonly int StepCount = 3;
private readonly ApplySetupDto SetupDto = new();
private void Navigate(int diff)
{
CurrentStep += diff;
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
return;
var response = await HttpClient.GetAsync("api/admin/setup");
if (!response.IsSuccessStatusCode)
{
Navigation.NavigateTo("/", true);
return;
}
IsLoaded = true;
await InvokeAsync(StateHasChanged);
}
private async Task ApplyAsync()
{
await HttpClient.PostAsJsonAsync("api/admin/setup", SetupDto);
Navigation.NavigateTo("/", true);
}
}

4
Moonlight.Frontend/Admin/Sys/ApiKeys/CreateApiKeyDialog.razor
View File

@@ -59,7 +59,7 @@
private CreateApiKeyDto Request; private CreateApiKeyDto Request;
private readonly List<string> Permissions = new(); private readonly List<string> Permissions = [];
protected override void OnInitialized() protected override void OnInitialized()
{ {
@@ -88,7 +88,7 @@
} }
await ToastService.SuccessAsync( await ToastService.SuccessAsync(
"API Key creation", "API Key Creation",
$"Successfully created API key {Request.Name}" $"Successfully created API key {Request.Name}"
); );

1
Moonlight.Frontend/Admin/Sys/ApiKeys/Index.razor
View File

@@ -12,7 +12,6 @@
@using ShadcnBlazor.Extras.Dialogs @using ShadcnBlazor.Extras.Dialogs
@using ShadcnBlazor.Extras.Toasts @using ShadcnBlazor.Extras.Toasts
@using ShadcnBlazor.Tabels @using ShadcnBlazor.Tabels
@using SerializationContext = Moonlight.Shared.SerializationContext
@inject ToastService ToastService @inject ToastService ToastService
@inject DialogService DialogService @inject DialogService DialogService

2
Moonlight.Frontend/Admin/Sys/ApiKeys/UpdateApiKeyDialog.razor
View File

@@ -84,7 +84,7 @@
} }
await ToastService.SuccessAsync( await ToastService.SuccessAsync(
"API Key update", "API Key Update",
$"Successfully updated API key {Request.Name}" $"Successfully updated API key {Request.Name}"
); );

4
Moonlight.Frontend/Admin/Sys/HelperContainer/Instance.razor → Moonlight.Frontend/Admin/Sys/ContainerHelper/Index.razor
View File

@@ -122,10 +122,10 @@
@code @code
{ {
private ContainerHelperStatusDto StatusDto;
private string SelectedVersion = "v2.1"; private string SelectedVersion = "v2.1";
private bool NoBuildCache; private bool NoBuildCache;
private ContainerHelperStatusDto StatusDto;
private VersionDto[] Versions; private VersionDto[] Versions;
private async Task LoadAsync(LazyLoader _) private async Task LoadAsync(LazyLoader _)

5
Moonlight.Frontend/Admin/Sys/HelperContainer/UpdateInstanceModal.razor → Moonlight.Frontend/Admin/Sys/ContainerHelper/UpdateInstanceModal.razor
View File

@@ -1,15 +1,16 @@
@inherits ShadcnBlazor.Extras.Dialogs.DialogBase
@using System.Text.Json @using System.Text.Json
@using LucideBlazor @using LucideBlazor
@using Moonlight.Shared
@using Moonlight.Shared.Admin.Sys.ContainerHelper @using Moonlight.Shared.Admin.Sys.ContainerHelper
@using ShadcnBlazor.Buttons @using ShadcnBlazor.Buttons
@using ShadcnBlazor.Dialogs @using ShadcnBlazor.Dialogs
@using ShadcnBlazor.Progresses @using ShadcnBlazor.Progresses
@using ShadcnBlazor.Spinners @using ShadcnBlazor.Spinners
@using SerializationContext = Moonlight.Shared.SerializationContext
@inject HttpClient HttpClient @inject HttpClient HttpClient
@inherits ShadcnBlazor.Extras.Dialogs.DialogBase
<DialogHeader> <DialogHeader>
<DialogTitle> <DialogTitle>
Updating instance to @Version... Updating instance to @Version...

1
Moonlight.Frontend/Admin/Sys/Diagnose.razor
View File

@@ -10,6 +10,7 @@
@using ShadcnBlazor.Emptys @using ShadcnBlazor.Emptys
@using ShadcnBlazor.Extras.Common @using ShadcnBlazor.Extras.Common
@using ShadcnBlazor.Spinners @using ShadcnBlazor.Spinners
@inject HttpClient HttpClient @inject HttpClient HttpClient
@inject IAuthorizationService AuthorizationService @inject IAuthorizationService AuthorizationService

6
Moonlight.Frontend/Admin/Sys/Index.razor
View File

@@ -2,8 +2,6 @@
@using LucideBlazor @using LucideBlazor
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization
@using Microsoft.AspNetCore.Components.Authorization @using Microsoft.AspNetCore.Components.Authorization
@using Moonlight.Frontend.Admin.Sys.HelperContainer
@using Moonlight.Frontend.Admin.Sys.Settings
@using Moonlight.Shared @using Moonlight.Shared
@using ShadcnBlazor.Tab @using ShadcnBlazor.Tab
@@ -36,7 +34,7 @@
@if (SettingsResult.Succeeded) @if (SettingsResult.Succeeded)
{ {
<TabsContent Value="settings"> <TabsContent Value="settings">
<Settings/> <<Moonlight.Frontend.Admin.Sys.Settings.Index/>
</TabsContent> </TabsContent>
} }
@if (DiagnoseResult.Succeeded) @if (DiagnoseResult.Succeeded)
@@ -60,7 +58,7 @@
@if (InstanceResult.Succeeded && VersionsResult.Succeeded) @if (InstanceResult.Succeeded && VersionsResult.Succeeded)
{ {
<TabsContent Value="instance"> <TabsContent Value="instance">
<Instance/> <Moonlight.Frontend.Admin.Sys.ContainerHelper.Index/>
</TabsContent> </TabsContent>
} }
</Tabs> </Tabs>

5
Moonlight.Frontend/Admin/Sys/Overview.razor
View File

@@ -1,15 +1,14 @@
@page "/admin" @page "/admin"
@using LucideBlazor @using LucideBlazor
@using Moonlight.Frontend.Infrastructure.Helpers @using Moonlight.Frontend.Infrastructure.Helpers
@using Moonlight.Shared
@using Moonlight.Shared.Admin.Sys @using Moonlight.Shared.Admin.Sys
@using ShadcnBlazor.Buttons @using ShadcnBlazor.Buttons
@using ShadcnBlazor.Cards @using ShadcnBlazor.Cards
@using ShadcnBlazor.Extras.Dialogs
@using ShadcnBlazor.Spinners @using ShadcnBlazor.Spinners
@using SerializationContext = Moonlight.Shared.SerializationContext
@inject HttpClient HttpClient @inject HttpClient HttpClient
@inject DialogService DialogService
<h1 class="text-xl font-semibold">Overview</h1> <h1 class="text-xl font-semibold">Overview</h1>
<div class="text-muted-foreground"> <div class="text-muted-foreground">

0
Moonlight.Frontend/Admin/Sys/Settings/Settings.razor → Moonlight.Frontend/Admin/Sys/Settings/Index.razor
View File

19
Moonlight.Frontend/Admin/Sys/Settings/SystemSettingsOptions.cs
View File

@@ -5,21 +5,28 @@ namespace Moonlight.Frontend.Admin.Sys.Settings;
public class SystemSettingsOptions public class SystemSettingsOptions
{ {
private readonly List<SystemSettingsPage> InnerComponents = new();
public IReadOnlyList<SystemSettingsPage> Components => InnerComponents; public IReadOnlyList<SystemSettingsPage> Components => InnerComponents;
private readonly List<SystemSettingsPage> InnerComponents = [];
public void Add<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TIcon, public void Add<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TIcon,
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
TComponent>(string name, string description, TComponent>(string name, string description,
int order) int order
where TIcon : ComponentBase where TComponent : ComponentBase ) where TIcon : ComponentBase where TComponent : ComponentBase
{ {
Add(name, description, order, typeof(TIcon), typeof(TComponent)); Add(name, description, order, typeof(TIcon), typeof(TComponent));
} }
public void Add(string name, string description, int order, public void Add(
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type iconComponent, string name,
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type component) string description,
int order,
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
Type iconComponent,
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
Type component
)
{ {
InnerComponents.Add(new SystemSettingsPage(name, description, order, iconComponent, component)); InnerComponents.Add(new SystemSettingsPage(name, description, order, iconComponent, component));
} }

2
Moonlight.Frontend/Admin/Sys/Settings/WhiteLabelingSetting.razor
View File

@@ -1,13 +1,13 @@
@using LucideBlazor @using LucideBlazor
@using Moonlight.Frontend.Infrastructure.Helpers @using Moonlight.Frontend.Infrastructure.Helpers
@using Moonlight.Frontend.Shared.Frontend @using Moonlight.Frontend.Shared.Frontend
@using Moonlight.Shared
@using Moonlight.Shared.Admin.Sys.Settings @using Moonlight.Shared.Admin.Sys.Settings
@using ShadcnBlazor.Extras.Common @using ShadcnBlazor.Extras.Common
@using ShadcnBlazor.Extras.Forms @using ShadcnBlazor.Extras.Forms
@using ShadcnBlazor.Extras.Toasts @using ShadcnBlazor.Extras.Toasts
@using ShadcnBlazor.Fields @using ShadcnBlazor.Fields
@using ShadcnBlazor.Inputs @using ShadcnBlazor.Inputs
@using SerializationContext = Moonlight.Shared.SerializationContext
@inject HttpClient HttpClient @inject HttpClient HttpClient
@inject ToastService ToastService @inject ToastService ToastService

2
Moonlight.Frontend/Admin/Sys/Themes/Create.razor
View File

@@ -1,4 +1,5 @@
@page "/admin/system/themes/create" @page "/admin/system/themes/create"
@using LucideBlazor @using LucideBlazor
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization
@using Moonlight.Frontend.Infrastructure.Helpers @using Moonlight.Frontend.Infrastructure.Helpers
@@ -13,7 +14,6 @@
@using ShadcnBlazor.Fields @using ShadcnBlazor.Fields
@using ShadcnBlazor.Inputs @using ShadcnBlazor.Inputs
@using ShadcnBlazor.Switches @using ShadcnBlazor.Switches
@using SerializationContext = Moonlight.Shared.SerializationContext
@attribute [Authorize(Policy = Permissions.Themes.Create)] @attribute [Authorize(Policy = Permissions.Themes.Create)]

16
Moonlight.Frontend/Admin/Sys/Themes/Index.razor
View File

@@ -10,7 +10,6 @@
@using ShadcnBlazor.Extras.AlertDialogs @using ShadcnBlazor.Extras.AlertDialogs
@using ShadcnBlazor.Extras.Toasts @using ShadcnBlazor.Extras.Toasts
@using ShadcnBlazor.Tabels @using ShadcnBlazor.Tabels
@using SerializationContext = Moonlight.Shared.SerializationContext
@inject ToastService ToastService @inject ToastService ToastService
@inject NavigationManager Navigation @inject NavigationManager Navigation
@@ -142,20 +141,11 @@
return new DataGridResponse<ThemeDto>(response!.Data, response.TotalLength); return new DataGridResponse<ThemeDto>(response!.Data, response.TotalLength);
} }
private void Create() private void Create() => Navigation.NavigateTo("/admin/system/themes/create");
{
Navigation.NavigateTo("/admin/system/themes/create");
}
private void Edit(ThemeDto theme) private void Edit(ThemeDto theme) => Navigation.NavigateTo($"/admin/system/themes/{theme.Id}");
{
Navigation.NavigateTo($"/admin/system/themes/{theme.Id}");
}
private void Download(ThemeDto theme) private void Download(ThemeDto theme) => Navigation.NavigateTo($"api/admin/themes/{theme.Id}/export", true);
{
Navigation.NavigateTo($"api/admin/themes/{theme.Id}/export", true);
}
private async Task DeleteAsync(ThemeDto theme) private async Task DeleteAsync(ThemeDto theme)
{ {

2
Moonlight.Frontend/Admin/Sys/Themes/ThemeMapper.cs
View File

@@ -7,7 +7,7 @@ namespace Moonlight.Frontend.Admin.Sys.Themes;
[Mapper] [Mapper]
[SuppressMessage("Mapper", "RMG020:No members are mapped in an object mapping")] [SuppressMessage("Mapper", "RMG020:No members are mapped in an object mapping")]
[SuppressMessage("Mapper", "RMG012:No members are mapped in an object mapping")] [SuppressMessage("Mapper", "RMG012:No members are mapped in an object mapping")]
public partial class ThemeMapper public static partial class ThemeMapper
{ {
public static partial UpdateThemeDto ToUpdate(ThemeDto theme); public static partial UpdateThemeDto ToUpdate(ThemeDto theme);
} }

2
Moonlight.Frontend/Admin/Sys/Themes/Update.razor
View File

@@ -1,4 +1,5 @@
@page "/admin/system/themes/{Id:int}" @page "/admin/system/themes/{Id:int}"
@using LucideBlazor @using LucideBlazor
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization
@using Moonlight.Frontend.Infrastructure.Helpers @using Moonlight.Frontend.Infrastructure.Helpers
@@ -14,7 +15,6 @@
@using ShadcnBlazor.Fields @using ShadcnBlazor.Fields
@using ShadcnBlazor.Inputs @using ShadcnBlazor.Inputs
@using ShadcnBlazor.Switches @using ShadcnBlazor.Switches
@using SerializationContext = Moonlight.Shared.SerializationContext
@attribute [Authorize(Policy = Permissions.Themes.Edit)] @attribute [Authorize(Policy = Permissions.Themes.Edit)]

6
Moonlight.Frontend/Admin/Users/Index.razor
View File

@@ -22,10 +22,10 @@
</TabsTrigger> </TabsTrigger>
</TabsList> </TabsList>
<TabsContent Value="users"> <TabsContent Value="users">
<Users/> <Moonlight.Frontend.Admin.Users.Users.Index/>
</TabsContent> </TabsContent>
<TabsContent Value="roles"> <TabsContent Value="roles">
<Roles/> <Moonlight.Frontend.Admin.Users.Roles.Index/>
</TabsContent> </TabsContent>
</Tabs> </Tabs>
@@ -39,4 +39,4 @@
{ {
Navigation.NavigateTo($"/admin/users?tab={name}"); Navigation.NavigateTo($"/admin/users?tab={name}");
} }
} }

6
Moonlight.Frontend/Admin/Users/Roles/CreateRoleDialog.razor
View File

@@ -1,12 +1,12 @@
@using Moonlight.Frontend.Admin.Users.Shared @using Moonlight.Frontend.Admin.Users.Shared
@using Moonlight.Frontend.Infrastructure.Helpers @using Moonlight.Frontend.Infrastructure.Helpers
@using Moonlight.Shared
@using Moonlight.Shared.Admin.Users.Roles @using Moonlight.Shared.Admin.Users.Roles
@using ShadcnBlazor.Dialogs @using ShadcnBlazor.Dialogs
@using ShadcnBlazor.Extras.Forms @using ShadcnBlazor.Extras.Forms
@using ShadcnBlazor.Extras.Toasts @using ShadcnBlazor.Extras.Toasts
@using ShadcnBlazor.Fields @using ShadcnBlazor.Fields
@using ShadcnBlazor.Inputs @using ShadcnBlazor.Inputs
@using SerializationContext = Moonlight.Shared.SerializationContext
@inherits ShadcnBlazor.Extras.Dialogs.DialogBase @inherits ShadcnBlazor.Extras.Dialogs.DialogBase
@@ -67,7 +67,7 @@
Permissions = [] Permissions = []
}; };
Permissions = new List<string>(); Permissions = [];
} }
private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore) private async Task<bool> OnSubmitAsync(EditContext editContext, ValidationMessageStore validationMessageStore)
@@ -86,7 +86,7 @@
return false; return false;
} }
await ToastService.SuccessAsync("Role creation", $"Role {Request.Name} has been successfully created"); await ToastService.SuccessAsync("Role Creation", $"Role {Request.Name} has been successfully created");
await OnSubmit.Invoke(); await OnSubmit.Invoke();
await CloseAsync(); await CloseAsync();

1
Moonlight.Frontend/Admin/Users/Roles/Roles.razor → Moonlight.Frontend/Admin/Users/Roles/Index.razor
View File

@@ -11,7 +11,6 @@
@using ShadcnBlazor.Extras.Dialogs @using ShadcnBlazor.Extras.Dialogs
@using ShadcnBlazor.Extras.Toasts @using ShadcnBlazor.Extras.Toasts
@using ShadcnBlazor.Tabels @using ShadcnBlazor.Tabels
@using SerializationContext = Moonlight.Shared.SerializationContext
@inject HttpClient HttpClient @inject HttpClient HttpClient
@inject DialogService DialogService @inject DialogService DialogService

10
Moonlight.Frontend/Admin/Users/Roles/ManageRoleMembersDialog.razor
View File

@@ -1,4 +1,5 @@
@using LucideBlazor @using LucideBlazor
@using Moonlight.Shared
@using Moonlight.Shared.Admin.Users.Roles @using Moonlight.Shared.Admin.Users.Roles
@using Moonlight.Shared.Admin.Users.Users @using Moonlight.Shared.Admin.Users.Users
@using Moonlight.Shared.Shared @using Moonlight.Shared.Shared
@@ -9,10 +10,11 @@
@using ShadcnBlazor.Extras.Common @using ShadcnBlazor.Extras.Common
@using ShadcnBlazor.Labels @using ShadcnBlazor.Labels
@using ShadcnBlazor.Tabels @using ShadcnBlazor.Tabels
@inherits ShadcnBlazor.Extras.Dialogs.DialogBase
@inject HttpClient HttpClient @inject HttpClient HttpClient
@inherits ShadcnBlazor.Extras.Dialogs.DialogBase
<DialogHeader> <DialogHeader>
<DialogTitle> <DialogTitle>
Manage members of @Role.Name Manage members of @Role.Name
@@ -75,7 +77,8 @@
query += $"&searchTerm={request.SearchTerm}"; query += $"&searchTerm={request.SearchTerm}";
var response = await HttpClient.GetFromJsonAsync<PagedData<UserDto>>( var response = await HttpClient.GetFromJsonAsync<PagedData<UserDto>>(
$"api/admin/roles/{Role.Id}/members{query}" $"api/admin/roles/{Role.Id}/members{query}",
SerializationContext.Default.Options
); );
return new DataGridResponse<UserDto>(response!.Data, response.TotalLength); return new DataGridResponse<UserDto>(response!.Data, response.TotalLength);
@@ -89,7 +92,8 @@
query += $"&searchTerm={searchTerm}"; query += $"&searchTerm={searchTerm}";
var response = await HttpClient.GetFromJsonAsync<PagedData<UserDto>>( var response = await HttpClient.GetFromJsonAsync<PagedData<UserDto>>(
$"api/admin/roles/{Role.Id}/members/available{query}" $"api/admin/roles/{Role.Id}/members/available{query}",
SerializationContext.Default.Options
); );
return response!.Data; return response!.Data;

2
Moonlight.Frontend/Admin/Users/Roles/UpdateRoleDialog.razor
View File

@@ -1,12 +1,12 @@
@using Moonlight.Frontend.Admin.Users.Shared @using Moonlight.Frontend.Admin.Users.Shared
@using Moonlight.Frontend.Infrastructure.Helpers @using Moonlight.Frontend.Infrastructure.Helpers
@using Moonlight.Shared
@using Moonlight.Shared.Admin.Users.Roles @using Moonlight.Shared.Admin.Users.Roles
@using ShadcnBlazor.Dialogs @using ShadcnBlazor.Dialogs
@using ShadcnBlazor.Extras.Forms @using ShadcnBlazor.Extras.Forms
@using ShadcnBlazor.Extras.Toasts @using ShadcnBlazor.Extras.Toasts
@using ShadcnBlazor.Fields @using ShadcnBlazor.Fields
@using ShadcnBlazor.Inputs @using ShadcnBlazor.Inputs
@using SerializationContext = Moonlight.Shared.SerializationContext
@inherits ShadcnBlazor.Extras.Dialogs.DialogBase @inherits ShadcnBlazor.Extras.Dialogs.DialogBase

1
Moonlight.Frontend/Admin/Users/Shared/PermissionSelector.razor
View File

@@ -3,6 +3,7 @@
@using ShadcnBlazor.Checkboxes @using ShadcnBlazor.Checkboxes
@using ShadcnBlazor.Extras.Common @using ShadcnBlazor.Extras.Common
@using ShadcnBlazor.Labels @using ShadcnBlazor.Labels
@inject IEnumerable<IPermissionProvider> Providers @inject IEnumerable<IPermissionProvider> Providers
<LazyLoader Load="LoadAsync"> <LazyLoader Load="LoadAsync">

8
Moonlight.Frontend/Admin/Users/Users/CreateUserDialog.razor
View File

@@ -1,17 +1,17 @@
@using Moonlight.Frontend.Infrastructure.Helpers @using Moonlight.Frontend.Infrastructure.Helpers
@using Moonlight.Shared
@using Moonlight.Shared.Admin.Users.Users @using Moonlight.Shared.Admin.Users.Users
@using ShadcnBlazor.Dialogs @using ShadcnBlazor.Dialogs
@using ShadcnBlazor.Extras.Forms @using ShadcnBlazor.Extras.Forms
@using ShadcnBlazor.Extras.Toasts @using ShadcnBlazor.Extras.Toasts
@using ShadcnBlazor.Fields @using ShadcnBlazor.Fields
@using ShadcnBlazor.Inputs @using ShadcnBlazor.Inputs
@using SerializationContext = Moonlight.Shared.SerializationContext
@inject ToastService ToastService
@inject HttpClient HttpClient
@inherits ShadcnBlazor.Extras.Dialogs.DialogBase @inherits ShadcnBlazor.Extras.Dialogs.DialogBase
@inject HttpClient HttpClient
@inject ToastService ToastService
<DialogHeader> <DialogHeader>
<DialogTitle> <DialogTitle>
Create new user Create new user

1
Moonlight.Frontend/Admin/Users/Users/Users.razor → Moonlight.Frontend/Admin/Users/Users/Index.razor
View File

@@ -11,7 +11,6 @@
@using ShadcnBlazor.Extras.Dialogs @using ShadcnBlazor.Extras.Dialogs
@using ShadcnBlazor.Extras.Toasts @using ShadcnBlazor.Extras.Toasts
@using ShadcnBlazor.Tabels @using ShadcnBlazor.Tabels
@using SerializationContext = Moonlight.Shared.SerializationContext
@inject HttpClient HttpClient @inject HttpClient HttpClient
@inject AlertDialogService AlertDialogService @inject AlertDialogService AlertDialogService

4
Moonlight.Frontend/Admin/Users/Users/UpdateUserDialog.razor
View File

@@ -1,4 +1,5 @@
@using Moonlight.Frontend.Infrastructure.Helpers @using Moonlight.Frontend.Infrastructure.Helpers
@using Moonlight.Shared
@using Moonlight.Shared.Admin.Users.Users @using Moonlight.Shared.Admin.Users.Users
@using ShadcnBlazor.Dialogs @using ShadcnBlazor.Dialogs
@using ShadcnBlazor.Extras.Forms @using ShadcnBlazor.Extras.Forms
@@ -62,7 +63,8 @@
{ {
var response = await HttpClient.PatchAsJsonAsync( var response = await HttpClient.PatchAsJsonAsync(
$"/api/admin/users/{User.Id}", $"/api/admin/users/{User.Id}",
Request Request,
SerializationContext.Default.Options
); );
if (!response.IsSuccessStatusCode) if (!response.IsSuccessStatusCode)

2
Moonlight.Frontend/Infrastructure/Services/RemoteAuthProvider.cs
View File

@@ -3,8 +3,8 @@ using System.Net.Http.Json;
using System.Security.Claims; using System.Security.Claims;
using Microsoft.AspNetCore.Components.Authorization; using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Moonlight.Shared;
using Moonlight.Shared.Shared.Auth; using Moonlight.Shared.Shared.Auth;
using SerializationContext = Moonlight.Shared.SerializationContext;
namespace Moonlight.Frontend.Infrastructure.Services; namespace Moonlight.Frontend.Infrastructure.Services;

8
Moonlight.Frontend/Moonlight.Frontend.csproj
View File

@@ -21,9 +21,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.3"/> <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3"/> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
<PackageReference Include="Riok.Mapperly" Version="4.3.1"/> <PackageReference Include="Riok.Mapperly" Version="5.0.0-next.2" />
<PackageReference Include="ShadcnBlazor" Version="1.0.14"/> <PackageReference Include="ShadcnBlazor" Version="1.0.14"/>
<PackageReference Include="ShadcnBlazor.Extras" Version="1.0.14"/> <PackageReference Include="ShadcnBlazor.Extras" Version="1.0.14"/>
<PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/> <PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/>
@@ -54,8 +54,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AdditionalFiles Include="Admin\Sys\HelperContainer\Instance.razor"/>
<AdditionalFiles Include="Admin\Sys\Settings\Settings.razor"/>
<AdditionalFiles Include="Admin\Sys\Themes\Create.razor"/> <AdditionalFiles Include="Admin\Sys\Themes\Create.razor"/>
<AdditionalFiles Include="Admin\Sys\Themes\Index.razor"/> <AdditionalFiles Include="Admin\Sys\Themes\Index.razor"/>
<AdditionalFiles Include="Admin\Sys\Themes\Update.razor"/> <AdditionalFiles Include="Admin\Sys\Themes\Update.razor"/>

4
Moonlight.Frontend/Shared/Auth/Authentication.razor
View File

@@ -1,8 +1,8 @@
@using Moonlight.Shared.Shared.Auth @using Moonlight.Shared
@using Moonlight.Shared.Shared.Auth
@using ShadcnBlazor.Buttons @using ShadcnBlazor.Buttons
@using ShadcnBlazor.Cards @using ShadcnBlazor.Cards
@using ShadcnBlazor.Spinners @using ShadcnBlazor.Spinners
@using SerializationContext = Moonlight.Shared.SerializationContext
@inject HttpClient HttpClient @inject HttpClient HttpClient
@inject NavigationManager Navigation @inject NavigationManager Navigation