From 6d61e026c11fc188d5f89f39c112756e0ea8c772 Mon Sep 17 00:00:00 2001 From: ChiaraBm Date: Fri, 28 Feb 2025 22:55:25 +0100 Subject: [PATCH] Moved client api routes to client name space --- .../{Users => Client}/ServerPowerController.cs | 5 ++--- .../{Users => Client}/ServersController.cs | 7 ++----- .../MoonlightServers.Daemon.csproj | 11 +++++++++++ .../UI/Components/Servers/ServerCard.razor | 2 +- .../Servers/ServerTabs/BaseServerTab.razor | 2 +- .../Servers/ServerTabs/SettingsTab.razor | 2 +- .../UI/Views/{User => Client}/Index.razor | 2 +- .../UI/Views/{User => Client}/Manage.razor | 14 +++++++------- 8 files changed, 26 insertions(+), 19 deletions(-) rename MoonlightServers.ApiServer/Http/Controllers/{Users => Client}/ServerPowerController.cs (97%) rename MoonlightServers.ApiServer/Http/Controllers/{Users => Client}/ServersController.cs (97%) rename MoonlightServers.Frontend/UI/Views/{User => Client}/Index.razor (95%) rename MoonlightServers.Frontend/UI/Views/{User => Client}/Manage.razor (95%) diff --git a/MoonlightServers.ApiServer/Http/Controllers/Users/ServerPowerController.cs b/MoonlightServers.ApiServer/Http/Controllers/Client/ServerPowerController.cs similarity index 97% rename from MoonlightServers.ApiServer/Http/Controllers/Users/ServerPowerController.cs rename to MoonlightServers.ApiServer/Http/Controllers/Client/ServerPowerController.cs index 921f5e3..b73992b 100644 --- a/MoonlightServers.ApiServer/Http/Controllers/Users/ServerPowerController.cs +++ b/MoonlightServers.ApiServer/Http/Controllers/Client/ServerPowerController.cs @@ -3,16 +3,15 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using MoonCore.Exceptions; using MoonCore.Extended.Abstractions; -using MoonCore.Extensions; using MoonCore.Helpers; using MoonlightServers.ApiServer.Database.Entities; using MoonlightServers.ApiServer.Services; -namespace MoonlightServers.ApiServer.Http.Controllers.Users; +namespace MoonlightServers.ApiServer.Http.Controllers.Client; [ApiController] [Authorize] -[Route("api/servers")] +[Route("api/client/servers")] public class ServerPowerController : Controller { private readonly DatabaseRepository ServerRepository; diff --git a/MoonlightServers.ApiServer/Http/Controllers/Users/ServersController.cs b/MoonlightServers.ApiServer/Http/Controllers/Client/ServersController.cs similarity index 97% rename from MoonlightServers.ApiServer/Http/Controllers/Users/ServersController.cs rename to MoonlightServers.ApiServer/Http/Controllers/Client/ServersController.cs index 98008d4..a21b284 100644 --- a/MoonlightServers.ApiServer/Http/Controllers/Users/ServersController.cs +++ b/MoonlightServers.ApiServer/Http/Controllers/Client/ServersController.cs @@ -1,23 +1,20 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using MoonCore.Extended.PermFilter; using MoonCore.Exceptions; using MoonCore.Extended.Abstractions; -using MoonCore.Extensions; using MoonCore.Helpers; using MoonCore.Models; -using Moonlight.ApiServer.Database.Entities; using MoonlightServers.ApiServer.Database.Entities; using MoonlightServers.ApiServer.Extensions; using MoonlightServers.ApiServer.Services; using MoonlightServers.Shared.Http.Responses.User.Allocations; using MoonlightServers.Shared.Http.Responses.Users.Servers; -namespace MoonlightServers.ApiServer.Http.Controllers.Users; +namespace MoonlightServers.ApiServer.Http.Controllers.Client; [ApiController] -[Route("api/servers")] +[Route("api/client/servers")] public class ServersController : Controller { private readonly DatabaseRepository ServerRepository; diff --git a/MoonlightServers.Daemon/MoonlightServers.Daemon.csproj b/MoonlightServers.Daemon/MoonlightServers.Daemon.csproj index 165daaf..ca4055e 100644 --- a/MoonlightServers.Daemon/MoonlightServers.Daemon.csproj +++ b/MoonlightServers.Daemon/MoonlightServers.Daemon.csproj @@ -18,6 +18,7 @@ + @@ -40,4 +41,14 @@ + + <_ContentIncludedByDefault Remove="storage\volumes\2\banned-ips.json" /> + <_ContentIncludedByDefault Remove="storage\volumes\2\banned-players.json" /> + <_ContentIncludedByDefault Remove="storage\volumes\2\ops.json" /> + <_ContentIncludedByDefault Remove="storage\volumes\2\plugins\spark\config.json" /> + <_ContentIncludedByDefault Remove="storage\volumes\2\usercache.json" /> + <_ContentIncludedByDefault Remove="storage\volumes\2\version_history.json" /> + <_ContentIncludedByDefault Remove="storage\volumes\2\whitelist.json" /> + + diff --git a/MoonlightServers.Frontend/UI/Components/Servers/ServerCard.razor b/MoonlightServers.Frontend/UI/Components/Servers/ServerCard.razor index 9cd8af0..958cffe 100644 --- a/MoonlightServers.Frontend/UI/Components/Servers/ServerCard.razor +++ b/MoonlightServers.Frontend/UI/Components/Servers/ServerCard.razor @@ -159,7 +159,7 @@ try { Status = await ApiClient.GetJson( - $"api/servers/{Server.Id}/status" + $"api/client/servers/{Server.Id}/status" ); } catch (Exception e) diff --git a/MoonlightServers.Frontend/UI/Components/Servers/ServerTabs/BaseServerTab.razor b/MoonlightServers.Frontend/UI/Components/Servers/ServerTabs/BaseServerTab.razor index b9f86c6..eb14e40 100644 --- a/MoonlightServers.Frontend/UI/Components/Servers/ServerTabs/BaseServerTab.razor +++ b/MoonlightServers.Frontend/UI/Components/Servers/ServerTabs/BaseServerTab.razor @@ -1,5 +1,5 @@ @using Microsoft.AspNetCore.SignalR.Client -@using MoonlightServers.Frontend.UI.Views.User +@using MoonlightServers.Frontend.UI.Views.Client @using MoonlightServers.Shared.Enums @using MoonlightServers.Shared.Http.Responses.Users.Servers diff --git a/MoonlightServers.Frontend/UI/Components/Servers/ServerTabs/SettingsTab.razor b/MoonlightServers.Frontend/UI/Components/Servers/ServerTabs/SettingsTab.razor index 5eb405a..46ccb7d 100644 --- a/MoonlightServers.Frontend/UI/Components/Servers/ServerTabs/SettingsTab.razor +++ b/MoonlightServers.Frontend/UI/Components/Servers/ServerTabs/SettingsTab.razor @@ -34,7 +34,7 @@ await AlertService.ConfirmDanger( "Server installation", "Do you really want to reinstall the server? This can potentially lead to loss of data", - () => HttpApiClient.Post($"api/servers/{Server.Id}/install") + () => HttpApiClient.Post($"api/client/servers/{Server.Id}/install") ); } } \ No newline at end of file diff --git a/MoonlightServers.Frontend/UI/Views/User/Index.razor b/MoonlightServers.Frontend/UI/Views/Client/Index.razor similarity index 95% rename from MoonlightServers.Frontend/UI/Views/User/Index.razor rename to MoonlightServers.Frontend/UI/Views/Client/Index.razor index e19672d..f45f326 100644 --- a/MoonlightServers.Frontend/UI/Views/User/Index.razor +++ b/MoonlightServers.Frontend/UI/Views/Client/Index.razor @@ -43,7 +43,7 @@ { Servers = await PagedData.All(async (page, pageSize) => await ApiClient.GetJson>( - $"api/servers?page={page}&pageSize={pageSize}" + $"api/client/servers?page={page}&pageSize={pageSize}" ) ); } diff --git a/MoonlightServers.Frontend/UI/Views/User/Manage.razor b/MoonlightServers.Frontend/UI/Views/Client/Manage.razor similarity index 95% rename from MoonlightServers.Frontend/UI/Views/User/Manage.razor rename to MoonlightServers.Frontend/UI/Views/Client/Manage.razor index a098d4e..092b131 100644 --- a/MoonlightServers.Frontend/UI/Views/User/Manage.razor +++ b/MoonlightServers.Frontend/UI/Views/Client/Manage.razor @@ -165,7 +165,7 @@ { // Load meta data Server = await ApiClient.GetJson( - $"api/servers/{ServerId}" + $"api/client/servers/{ServerId}" ); // Load server tabs @@ -174,14 +174,14 @@ // Load initial status for first render var status = await ApiClient.GetJson( - $"api/servers/{ServerId}/status" + $"api/client/servers/{ServerId}/status" ); State = status.State; // Load initial messages var initialLogs = await ApiClient.GetJson( - $"api/servers/{ServerId}/logs" + $"api/client/servers/{ServerId}/logs" ); InitialConsoleMessage = ""; @@ -191,7 +191,7 @@ // Load websocket meta var websocketDetails = await ApiClient.GetJson( - $"api/servers/{ServerId}/ws" + $"api/client/servers/{ServerId}/ws" ); // Build signal r @@ -232,13 +232,13 @@ } private async Task Start() - => await ApiClient.Post($"api/servers/{Server.Id}/start"); + => await ApiClient.Post($"api/client/servers/{Server.Id}/start"); private async Task Stop() - => await ApiClient.Post($"api/servers/{Server.Id}/stop"); + => await ApiClient.Post($"api/client/servers/{Server.Id}/stop"); private async Task Kill() - => await ApiClient.Post($"api/servers/{Server.Id}/kill"); + => await ApiClient.Post($"api/client/servers/{Server.Id}/kill"); public async ValueTask DisposeAsync() {