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

Implemented basic ui for server sharing. Extracted server authorization. Refactoring and small improvements

Browse Source
This commit is contained in:
ChiaraBm
2025-06-11 21:59:49 +02:00
parent cfed1aefde
commit b53140e633
35 changed files with 1098 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
MoonlightServers.Frontend/UI/Views/Client/Index.razor
View File

@@ -8,17 +8,19 @@
@inject ServerService ServerService
<LazyLoader Load="Load">
@if (Servers.Length == 0)
{
<IconAlert Title="No servers found" Color="text-primary" Icon="icon-search">
There are no servers linked to your account
</IconAlert>
}
else
{
<div class="flex flex-col gap-y-5">
@* Folder design idea
<Tabs>
<Tab Name="Your servers">
<LazyLoader Load="LoadOwnServers">
@if (OwnServers.Length == 0)
{
<IconAlert Title="No servers found" Color="text-primary" Icon="icon-search">
There are no servers linked to your account
</IconAlert>
}
else
{
<div class="flex flex-col gap-y-5">
@* Folder design idea
<div class="w-full bg-gray-800 px-5 py-3.5 rounded-xl">
<div class="flex items-center">
<div class="bg-gray-900 bg-opacity-45 py-1 px-2 rounded-lg flex items-center">
@@ -36,22 +38,51 @@
</div>
</div>
*@
@foreach (var server in Servers)
{
<ServerCard Server="server"/>
@foreach (var server in OwnServers)
{
<ServerCard Server="server"/>
}
</div>
}
</div>
}
</LazyLoader>
</LazyLoader>
</Tab>
<Tab Name="Shared servers">
<LazyLoader Load="LoadSharedServers">
@if (SharedServers.Length == 0)
{
<IconAlert Title="No shared servers found" Color="text-primary" Icon="icon-share-2">
There are no shared servers linked to your account
</IconAlert>
}
else
{
<div class="flex flex-col gap-y-5">
@foreach (var server in SharedServers)
{
<ServerCard Server="server"/>
}
</div>
}
</LazyLoader>
</Tab>
</Tabs>
@code
{
private ServerDetailResponse[] Servers;
private ServerDetailResponse[] OwnServers;
private ServerDetailResponse[] SharedServers;
private async Task Load(LazyLoader lazyLoader)
private async Task LoadOwnServers(LazyLoader lazyLoader)
{
Servers = await PagedData<ServerDetailResponse>.All(async (page, pageSize) =>
OwnServers = await PagedData<ServerDetailResponse>.All(async (page, pageSize) =>
await ServerService.GetServers(page, pageSize)
);
}
private async Task LoadSharedServers(LazyLoader lazyLoader)
{
SharedServers = await PagedData<ServerDetailResponse>.All(async (page, pageSize) =>
await ServerService.GetSharedServers(page, pageSize)
);
}
}

169
MoonlightServers.Frontend/UI/Views/Client/Manage.razor
View File

@@ -1,7 +1,6 @@
@page "/servers/{ServerId:int}"
@page "/servers/{ServerId:int}/{TabPath:alpha}"
@using Microsoft.AspNetCore.Http.Connections
@using Microsoft.AspNetCore.SignalR.Client
@using MoonCore.Blazor.Tailwind.Components
@using MoonCore.Exceptions
@@ -66,12 +65,62 @@
</div>
<div class="flex flex-row items-center">
<div class="flex gap-x-1.5">
@if (State == ServerState.Offline)
@if (HasPermissionTo("power", ServerPermissionType.ReadWrite))
{
<WButton CssClasses="btn btn-success" OnClick="_ => Start()">
<i class="icon-play me-1 align-middle"></i>
<span class="align-middle">Start</span>
</WButton>
@if (State == ServerState.Offline)
{
<WButton CssClasses="btn btn-success" OnClick="_ => Start()">
<i class="icon-play me-1 align-middle"></i>
<span class="align-middle">Start</span>
</WButton>
}
else
{
<button type="button" class="btn btn-success" disabled="disabled">
<i class="icon-play me-1 align-middle"></i>
<span class="align-middle">Start</span>
</button>
}
@if (State == ServerState.Online)
{
<button type="button" class="btn btn-primary">
<i class="icon-rotate-ccw me-1 align-middle"></i>
<span class="align-middle">Restart</span>
</button>
}
else
{
<button type="button" class="btn btn-primary" disabled="disabled">
<i class="icon-rotate-ccw me-1 align-middle"></i>
<span class="align-middle">Restart</span>
</button>
}
@if (State == ServerState.Starting || State == ServerState.Online || State == ServerState.Stopping)
{
if (State == ServerState.Stopping)
{
<WButton CssClasses="btn btn-danger" OnClick="_ => Kill()">
<i class="icon-bomb me-1 align-middle"></i>
<span class="align-middle">Kill</span>
</WButton>
}
else
{
<WButton CssClasses="btn btn-danger" OnClick="_ => Stop()">
<i class="icon-squircle me-1 align-middle"></i>
<span class="align-middle">Stop</span>
</WButton>
}
}
else
{
<button type="button" class="btn btn-danger" disabled="disabled">
<i class="icon-squircle me-1 align-middle"></i>
<span class="align-middle">Stop</span>
</button>
}
}
else
{
@@ -79,42 +128,12 @@
<i class="icon-play me-1 align-middle"></i>
<span class="align-middle">Start</span>
</button>
}
@if (State == ServerState.Online)
{
<button type="button" class="btn btn-primary">
<i class="icon-rotate-ccw me-1 align-middle"></i>
<span class="align-middle">Restart</span>
</button>
}
else
{
<button type="button" class="btn btn-primary" disabled="disabled">
<i class="icon-rotate-ccw me-1 align-middle"></i>
<span class="align-middle">Restart</span>
</button>
}
@if (State == ServerState.Starting || State == ServerState.Online || State == ServerState.Stopping)
{
if (State == ServerState.Stopping)
{
<WButton CssClasses="btn btn-danger" OnClick="_ => Kill()">
<i class="icon-bomb me-1 align-middle"></i>
<span class="align-middle">Kill</span>
</WButton>
}
else
{
<WButton CssClasses="btn btn-danger" OnClick="_ => Stop()">
<i class="icon-squircle me-1 align-middle"></i>
<span class="align-middle">Stop</span>
</WButton>
}
}
else
{
<button type="button" class="btn btn-danger" disabled="disabled">
<i class="icon-squircle me-1 align-middle"></i>
<span class="align-middle">Stop</span>
@@ -148,19 +167,26 @@
}
</ul>
@{
var rf = ComponentHelper.FromType(CurrentTab!.ComponentType, parameters =>
{
parameters.Add("Server", Server);
parameters.Add("State", State);
parameters.Add("InitialConsoleMessage", InitialConsoleMessage);
parameters.Add("HubConnection", HubConnection);
parameters.Add("Parent", this);
});
}
<div class="mt-5">
@rf
@if (CurrentTab == null)
{
<IconAlert Title="No tabs found" Color="text-primary" Icon="icon-app-window">
Seems like you are missing access to all tabs or no tabs for this server could be found
</IconAlert>
}
else
{
var rf = ComponentHelper.FromType(CurrentTab!.ComponentType, parameters =>
{
parameters.Add("Server", Server);
parameters.Add("State", State);
parameters.Add("InitialConsoleMessage", InitialConsoleMessage);
parameters.Add("HubConnection", HubConnection!);
parameters.Add("Parent", this);
});
@rf
}
</div>
</div>
}
@@ -177,9 +203,9 @@
private ServerDetailResponse Server;
private bool NotFound = false;
private ServerState State;
private string InitialConsoleMessage;
private string InitialConsoleMessage = "";
private HubConnection HubConnection;
private HubConnection? HubConnection;
private async Task Load(LazyLoader _)
{
@@ -194,24 +220,39 @@
foreach (var serverTabProvider in TabProviders)
tmpTabs.AddRange(await serverTabProvider.GetTabs(Server));
// If we are accessing a shared server, we need to handle permissions
if (Server.Share != null)
{
// This removes all tabs where the permission filter is not set
tmpTabs.RemoveAll(tab =>
{
if (tab.PermissionFilter == null)
return false;
return !Server.Share.Permissions.Any(tab.PermissionFilter);
});
}
Tabs = tmpTabs.OrderBy(x => x.Priority).ToArray();
// Find current tab
if (!string.IsNullOrEmpty(TabPath))
{
CurrentTab = Tabs.FirstOrDefault(
x => TabPath.Equals(x.Path, StringComparison.InvariantCultureIgnoreCase)
CurrentTab = Tabs.FirstOrDefault(x => TabPath.Equals(x.Path, StringComparison.InvariantCultureIgnoreCase)
);
}
if (CurrentTab == null)
CurrentTab = Tabs.First();
CurrentTab = Tabs.FirstOrDefault();
// Load initial status for first render
var status = await ServerService.GetStatus(ServerId);
State = status.State;
if (!HasPermissionTo("console", ServerPermissionType.Read))
return; // Exit early if we don't have permissions to load the console
// Load initial messages
var initialLogs = await ServerService.GetLogs(ServerId);
@@ -265,6 +306,15 @@
}
}
private bool HasPermissionTo(string name, ServerPermissionType type)
{
// All non shares have permissions
if (Server.Share == null)
return true;
return Server.Share.Permissions.Any(x => x.Name == name && x.Type >= type);
}
private async Task SwitchTab(ServerTab tab)
{
CurrentTab = tab;
@@ -284,9 +334,12 @@
public async ValueTask DisposeAsync()
{
if (HubConnection.State == HubConnectionState.Connected)
await HubConnection.StopAsync();
if (HubConnection != null)
{
if (HubConnection.State == HubConnectionState.Connected)
await HubConnection.StopAsync();
await HubConnection.DisposeAsync();
await HubConnection.DisposeAsync();
}
}
}