beenull/Moonlight
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #407 from Moonlight-Panel/v2_ImprovedAdminPage

Browse source 
Improved admin page with extendable columns and components via plugin system
This commit is contained in:
Masu Baumgartner 2024-05-18 22:15:06 +02:00 committed by GitHub
parent c27b1689f3 158115bb3b
commit 2950034a30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 140 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Moonlight/Core/CoreFeature.cs
View file

@ -7,6 +7,7 @@ using MoonCoreUI.Services;
using Moonlight.Core.Configuration;
using Moonlight.Core.Database;
using Moonlight.Core.Database.Entities;
using Moonlight.Core.Implementations.AdminColumns;
using Moonlight.Core.Implementations.Diagnose;
using Moonlight.Core.Interfaces;
using Moonlight.Core.Models;
@ -15,6 +16,7 @@ using Moonlight.Core.Models.Abstractions.Feature;
using Moonlight.Core.Models.Enums;
using Moonlight.Core.Repositories;
using Moonlight.Core.Services;
using Moonlight.Core.UI.Components.Cards;
namespace Moonlight.Core;
@ -155,6 +157,9 @@ public class CoreFeature : MoonlightFeature
await pluginService.RegisterImplementation<IDiagnoseAction>(new FeatureDiagnoseAction());
await pluginService.RegisterImplementation<IDiagnoseAction>(new LogDiagnoseAction());
//Admin Page
await pluginService.RegisterImplementation<IAdminDashboardColumn>(new UserCount());
// Startup job services
var startupJobService = app.Services.GetRequiredService<StartupJobService>();

16
Moonlight/Core/Implementations/AdminColumns/UserCount.cs Normal file
View file

@ -0,0 +1,16 @@
using Microsoft.AspNetCore.Components;
using MoonCoreUI.Helpers;
using Moonlight.Core.Interfaces;
using Moonlight.Core.UI.Components.Cards;
namespace Moonlight.Core.Implementations.AdminColumns;
public class UserCount : IAdminDashboardColumn
{
public Task<RenderFragment> Get()
{
var res = ComponentHelper.FromType<AdminUserCard>();
return Task.FromResult(res);
}
}

8
Moonlight/Core/Interfaces/IAdminDashboardColumn.cs Normal file
View file

@ -0,0 +1,8 @@
using Microsoft.AspNetCore.Components;
namespace Moonlight.Core.Interfaces;
public interface IAdminDashboardColumn
{
public Task<RenderFragment> Get();
}

8
Moonlight/Core/Interfaces/IAdminDashboardComponent.cs Normal file
View file

@ -0,0 +1,8 @@
using Microsoft.AspNetCore.Components;
namespace Moonlight.Core.Interfaces;
public interface IAdminDashboardComponent
{
public Task<RenderFragment> Get();
}

11
Moonlight/Core/Models/Abstractions/Feature/UiInitContext.cs
View file

@ -1,4 +1,9 @@
using System.Reflection;
using System.ComponentModel;
using System.Reflection;
using Microsoft.AspNetCore.Components;
using Microsoft.Extensions.Options;
using Moonlight.Core.UI.Components.Partials;
using IComponent = Microsoft.AspNetCore.Components.IComponent;
namespace Moonlight.Core.Models.Abstractions.Feature;
@ -6,7 +11,9 @@ public class UiInitContext
{
public List<SidebarItem> SidebarItems { get; set; } = new();
public List<Assembly> RouteAssemblies { get; set; } = new();
public List<AdminComponent> AdminPageComponents { get; set; } = new();
public List<AdminComponent> AdminPageCards { get; set; } = new();
public void EnablePages<T>()
{
var assembly = typeof(T).Assembly;

19
Moonlight/Core/UI/Components/Cards/AdminUserCard.razor Normal file
View file

@ -0,0 +1,19 @@
@using MoonCore.Abstractions
@using Moonlight.Core.Database.Entities
@inject Repository<User> UserRepository
<a href="/admin/servers">
<StatCard Value="@UserCount.ToString()" Description="Users" Icon="bxs-group"></StatCard>
</a>
@code {
private int UserCount;
protected override async Task OnInitializedAsync()
{
UserCount = UserRepository.Get().Count();
}
}

59
Moonlight/Core/UI/Views/Admin/Index.razor
View file

@ -1,43 +1,54 @@
@page "/admin"
@using MoonCore.Abstractions
@using Moonlight.Core.Database.Entities
@using Moonlight.Core.Interfaces
@using Moonlight.Core.Services
@using Moonlight.Features.Servers.Entities
@inject Repository<Server> ServerRepository
@inject Repository<User> UserRepository
@inject PluginService PluginService
@attribute [RequirePermission(999)]
<LazyLoader Load="Load">
<div class="row g-4">
<div class="col-12 col-lg-6 col-xl">
<a href="/admin/servers">
<StatCard Value="@UserCount.ToString()" Description="Users" Icon="bxs-group">
</StatCard>
</a>
</div>
<div class="col-12 col-lg-6 col-xl">
<a href="/admin/servers">
<StatCard Value="@ServerCount.ToString()" Description="Servers" Icon="bxs-server">
</StatCard>
</a>
</div>
<div class="row mb-8">
@foreach(var column in Columns)
{
<div class="col-12 col-lg-6 col-xl">
@column
</div>
}
</div>
@foreach (var component in Components)
{
<div class="mb-4">
@component
</div>
}
</LazyLoader>
@* This is just the start of this admin page, there will still be added more during the developement process *@
@code {
private int ServerCount;
private int UserCount;
private List<RenderFragment> Columns = new();
private List<RenderFragment> Components = new();
private async Task Load(LazyLoader arg)
{
await Task.Run(() =>
{
arg.SetText("Loading Information...");
ServerCount = ServerRepository.Get().Count();
UserCount = UserRepository.Get().Count();
});
await arg.SetText("Loading statistics...");
var componentImplementations = await PluginService.GetImplementations<IAdminDashboardComponent>();
foreach (var implementation in componentImplementations)
{
Components.Add(await implementation.Get());
}
var columnImplementations = await PluginService.GetImplementations<IAdminDashboardColumn>();
foreach (var implementation in columnImplementations)
{
Columns.Add(await implementation.Get());
}
}
}

16
Moonlight/Features/Servers/Implementations/AdminColumns/ServerCount.cs Normal file
View file

@ -0,0 +1,16 @@
using Microsoft.AspNetCore.Components;
using MoonCoreUI.Helpers;
using Moonlight.Core.Interfaces;
using Moonlight.Features.Servers.UI.Components.Cards;
namespace Moonlight.Features.Servers.Implementations.AdminColumns;
public class ServerCount : IAdminDashboardColumn
{
public Task<RenderFragment> Get()
{
var res = ComponentHelper.FromType<AdminServersCard>();
return Task.FromResult(res);
}
}

4
Moonlight/Features/Servers/ServersFeature.cs
View file

@ -7,9 +7,11 @@ using Moonlight.Core.Services;
using Moonlight.Features.Servers.Actions;
using Moonlight.Features.Servers.Configuration;
using Moonlight.Features.Servers.Http.Middleware;
using Moonlight.Features.Servers.Implementations.AdminColumns;
using Moonlight.Features.Servers.Implementations.Diagnose;
using Moonlight.Features.Servers.Models.Enums;
using Moonlight.Features.Servers.Services;
using Moonlight.Features.Servers.UI.Components.Cards;
namespace Moonlight.Features.Servers;
@ -95,6 +97,8 @@ public class ServersFeature : MoonlightFeature
var pluginService = app.Services.GetRequiredService<PluginService>();
await pluginService.RegisterImplementation<IDiagnoseAction>(new NodesDiagnoseAction());
await pluginService.RegisterImplementation<IAdminDashboardColumn>(new ServerCount());
}
public override Task OnUiInitialized(UiInitContext context)

19
Moonlight/Features/Servers/UI/Components/Cards/AdminServersCard.razor Normal file
View file

@ -0,0 +1,19 @@
@using MoonCore.Abstractions
@using Moonlight.Features.Servers.Entities
@inject Repository<Server> ServerRepository
<a href="/admin/servers">
<StatCard Value="@ServerCount.ToString()" Description="Servers" Icon="bxs-server"></StatCard>
</a>
@code {
private int ServerCount;
protected override async Task OnInitializedAsync()
{
ServerCount = ServerRepository.Get().Count();
}
}

1
Moonlight/Moonlight.csproj
View file

@ -53,6 +53,7 @@
<Folder Include="Core\Database\Migrations\" />
<Folder Include="Core\Http\Requests\" />
<Folder Include="Core\Http\Resources\" />
<Folder Include="Core\Implementations\AdminComponents\" />
<Folder Include="Core\UI\Components\Forms\" />
<Folder Include="Features\Dummy\Configuration\" />
<Folder Include="Features\Dummy\Entities\" />