From 21b5ac84e91c27b4a6ebe259f4ff74cb167497be Mon Sep 17 00:00:00 2001 From: Lapis Date: Fri, 19 Jun 2026 16:59:00 -0400 Subject: [PATCH] chore: clean up admin panel --- CannedNet.Admin/CannedNet.Admin.csproj | 4 + CannedNet.Admin/Components/App.razor | 5 + .../Components/Layout/MainLayout.razor.css | 46 +++--- .../Components/Layout/NavMenu.razor | 31 +--- .../Components/Layout/NavMenu.razor.css | 87 ++++-------- .../Layout/ReconnectModal.razor.css | 73 +++++----- .../Components/Layout/ReconnectModal.razor.js | 95 +++++++------ .../Components/Pages/Config/GameConfig.razor | 133 ------------------ CannedNet.Admin/Components/Pages/Home.razor | 4 +- .../Components/Pages/Settings.razor | 91 ++++++++++++ .../Components/Pages/SetupWizard.razor | 96 +++++++++++++ CannedNet.Admin/Program.cs | 36 +++-- .../Services/AdminConfigService.cs | 46 ++++++ CannedNet.Admin/admin_config.json | 3 + .../Services/Controllers/AdminController.cs | 21 ++- 15 files changed, 442 insertions(+), 329 deletions(-) delete mode 100644 CannedNet.Admin/Components/Pages/Config/GameConfig.razor create mode 100644 CannedNet.Admin/Components/Pages/Settings.razor create mode 100644 CannedNet.Admin/Components/Pages/SetupWizard.razor create mode 100644 CannedNet.Admin/Services/AdminConfigService.cs create mode 100644 CannedNet.Admin/admin_config.json diff --git a/CannedNet.Admin/CannedNet.Admin.csproj b/CannedNet.Admin/CannedNet.Admin.csproj index b816860..4b14a7a 100644 --- a/CannedNet.Admin/CannedNet.Admin.csproj +++ b/CannedNet.Admin/CannedNet.Admin.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/CannedNet.Admin/Components/App.razor b/CannedNet.Admin/Components/App.razor index 8b43bfb..0605dc3 100644 --- a/CannedNet.Admin/Components/App.razor +++ b/CannedNet.Admin/Components/App.razor @@ -21,6 +21,11 @@ + diff --git a/CannedNet.Admin/Components/Layout/MainLayout.razor.css b/CannedNet.Admin/Components/Layout/MainLayout.razor.css index 38d1f25..fdd3145 100644 --- a/CannedNet.Admin/Components/Layout/MainLayout.razor.css +++ b/CannedNet.Admin/Components/Layout/MainLayout.razor.css @@ -9,7 +9,7 @@ main { } .sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); + background: white; } .top-row { @@ -21,27 +21,30 @@ main { align-items: center; } - .top-row ::deep a, .top-row ::deep .btn-link { - white-space: nowrap; - margin-left: 1.5rem; - text-decoration: none; - } +.top-row ::deep a, +.top-row ::deep .btn-link { + white-space: nowrap; + margin-left: 1.5rem; + text-decoration: none; +} - .top-row ::deep a:hover, .top-row ::deep .btn-link:hover { - text-decoration: underline; - } +.top-row ::deep a:hover, +.top-row ::deep .btn-link:hover { + text-decoration: underline; +} - .top-row ::deep a:first-child { - overflow: hidden; - text-overflow: ellipsis; - } +.top-row ::deep a:first-child { + overflow: hidden; + text-overflow: ellipsis; +} @media (max-width: 640.98px) { .top-row { justify-content: space-between; } - .top-row ::deep a, .top-row ::deep .btn-link { + .top-row ::deep a, + .top-row ::deep .btn-link { margin-left: 0; } } @@ -70,7 +73,8 @@ main { width: 0; } - .top-row, article { + .top-row, + article { padding-left: 2rem !important; padding-right: 1.5rem !important; } @@ -90,9 +94,9 @@ main { z-index: 1000; } - #blazor-error-ui .dismiss { - cursor: pointer; - position: absolute; - right: 0.75rem; - top: 0.5rem; - } +#blazor-error-ui .dismiss { + cursor: pointer; + position: absolute; + right: 0.75rem; + top: 0.5rem; +} diff --git a/CannedNet.Admin/Components/Layout/NavMenu.razor b/CannedNet.Admin/Components/Layout/NavMenu.razor index 47eb626..f774a61 100644 --- a/CannedNet.Admin/Components/Layout/NavMenu.razor +++ b/CannedNet.Admin/Components/Layout/NavMenu.razor @@ -1,53 +1,36 @@ -
-
- CannedNet.Admin -
-
- - - -
+
diff --git a/CannedNet.Admin/Components/Layout/NavMenu.razor.css b/CannedNet.Admin/Components/Layout/NavMenu.razor.css index c0d9481..9ca5a37 100644 --- a/CannedNet.Admin/Components/Layout/NavMenu.razor.css +++ b/CannedNet.Admin/Components/Layout/NavMenu.razor.css @@ -1,29 +1,3 @@ -.navbar-toggler { - appearance: none; - cursor: pointer; - width: 3.5rem; - height: 2.5rem; - color: white; - position: absolute; - top: 0.5rem; - right: 1rem; - border: 1px solid rgba(255, 255, 255, 0.1); - background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); -} - -.navbar-toggler:checked { - background-color: rgba(255, 255, 255, 0.5); -} - -.top-row { - height: 3.5rem; - background-color: rgba(0,0,0,0.4); -} - -.navbar-brand { - font-size: 1.1rem; -} - .bi { display: inline-block; position: relative; @@ -39,55 +13,42 @@ padding-bottom: 0.5rem; } - .nav-item:first-of-type { - padding-top: 1rem; - } +.nav-item:first-of-type { + padding-top: 0.75rem; +} - .nav-item:last-of-type { - padding-bottom: 1rem; - } +.nav-item:last-of-type { + padding-bottom: 0; +} - .nav-item ::deep a { - color: #d7d7d7; - border-radius: 4px; - height: 2.5rem; - display: flex; - align-items: center; - line-height: 2.5rem; - } +.nav-item ::deep a { + color: #000; + border-radius: 0.5px; + height: 2.5rem; + display: flex; + align-items: center; + line-height: 2.5rem; + justify-content: flex-start; +} - .nav-item ::deep a.active { - background-color: rgba(255,255,255,0.37); - color: white; - } +.nav-item ::deep a.active { + background-color: rgba(0, 0, 0, 0.08); + color: #000; +} - .nav-item ::deep a:hover { - background-color: rgba(255,255,255,0.1); - color: white; - } +.nav-item ::deep a:hover { + background-color: rgba(0, 0, 0, 0.05); + color: #000; +} .nav-scrollable { display: none; } -.navbar-toggler:checked ~ .nav-scrollable { - display: block; -} - -.nav-section-label { - font-size: 0.7rem; - letter-spacing: 0.05em; - opacity: 0.7; -} - @media (min-width: 641px) { - .navbar-toggler { - display: none; - } - .nav-scrollable { display: block; - height: calc(100vh - 3.5rem); + height: 100vh; overflow-y: auto; } } diff --git a/CannedNet.Admin/Components/Layout/ReconnectModal.razor.css b/CannedNet.Admin/Components/Layout/ReconnectModal.razor.css index 3ad3773..9685429 100644 --- a/CannedNet.Admin/Components/Layout/ReconnectModal.razor.css +++ b/CannedNet.Admin/Components/Layout/ReconnectModal.razor.css @@ -7,19 +7,25 @@ display: none; } -#components-reconnect-modal.components-reconnect-show .components-reconnect-first-attempt-visible, -#components-reconnect-modal.components-reconnect-show .components-rejoining-animation, -#components-reconnect-modal.components-reconnect-paused .components-pause-visible, -#components-reconnect-modal.components-reconnect-resume-failed .components-resume-failed-visible, +#components-reconnect-modal.components-reconnect-show + .components-reconnect-first-attempt-visible, +#components-reconnect-modal.components-reconnect-show + .components-rejoining-animation, +#components-reconnect-modal.components-reconnect-paused + .components-pause-visible, +#components-reconnect-modal.components-reconnect-resume-failed + .components-resume-failed-visible, #components-reconnect-modal.components-reconnect-retrying, -#components-reconnect-modal.components-reconnect-retrying .components-reconnect-repeated-attempt-visible, -#components-reconnect-modal.components-reconnect-retrying .components-rejoining-animation, +#components-reconnect-modal.components-reconnect-retrying + .components-reconnect-repeated-attempt-visible, +#components-reconnect-modal.components-reconnect-retrying + .components-rejoining-animation, #components-reconnect-modal.components-reconnect-failed, -#components-reconnect-modal.components-reconnect-failed .components-reconnect-failed-visible { +#components-reconnect-modal.components-reconnect-failed + .components-reconnect-failed-visible { display: block; } - #components-reconnect-modal { background-color: white; width: 20rem; @@ -29,15 +35,17 @@ border-radius: 0.5rem; box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.3); opacity: 0; - transition: display 0.5s allow-discrete, overlay 0.5s allow-discrete; + transition: + display 0.5s allow-discrete, + overlay 0.5s allow-discrete; animation: components-reconnect-modal-fadeOutOpacity 0.5s both; - &[open] - -{ - animation: components-reconnect-modal-slideUp 1.5s cubic-bezier(.05, .89, .25, 1.02) 0.3s, components-reconnect-modal-fadeInOpacity 0.5s ease-in-out 0.3s; - animation-fill-mode: both; -} - + &[open] { + animation: + components-reconnect-modal-slideUp 1.5s + cubic-bezier(0.05, 0.89, 0.25, 1.02) 0.3s, + components-reconnect-modal-fadeInOpacity 0.5s ease-in-out 0.3s; + animation-fill-mode: both; + } } #components-reconnect-modal::backdrop { @@ -96,13 +104,13 @@ border-radius: 4px; } - #components-reconnect-modal button:hover { - background-color: #3b6ea2; - } +#components-reconnect-modal button:hover { + background-color: #3b6ea2; +} - #components-reconnect-modal button:active { - background-color: #6b9ed2; - } +#components-reconnect-modal button:active { + background-color: #6b9ed2; +} .components-rejoining-animation { position: relative; @@ -110,17 +118,18 @@ height: 80px; } - .components-rejoining-animation div { - position: absolute; - border: 3px solid #0087ff; - opacity: 1; - border-radius: 50%; - animation: components-rejoining-animation 1.5s cubic-bezier(0, 0.2, 0.8, 1) infinite; - } +.components-rejoining-animation div { + position: absolute; + border: 3px solid #0087ff; + opacity: 1; + border-radius: 50%; + animation: components-rejoining-animation 1.5s cubic-bezier(0, 0.2, 0.8, 1) + infinite; +} - .components-rejoining-animation div:nth-child(2) { - animation-delay: -0.5s; - } +.components-rejoining-animation div:nth-child(2) { + animation-delay: -0.5s; +} @keyframes components-rejoining-animation { 0% { diff --git a/CannedNet.Admin/Components/Layout/ReconnectModal.razor.js b/CannedNet.Admin/Components/Layout/ReconnectModal.razor.js index a44de78..a808dc2 100644 --- a/CannedNet.Admin/Components/Layout/ReconnectModal.razor.js +++ b/CannedNet.Admin/Components/Layout/ReconnectModal.razor.js @@ -1,6 +1,9 @@ // Set up event handlers const reconnectModal = document.getElementById("components-reconnect-modal"); -reconnectModal.addEventListener("components-reconnect-state-changed", handleReconnectStateChanged); +reconnectModal.addEventListener( + "components-reconnect-state-changed", + handleReconnectStateChanged, +); const retryButton = document.getElementById("components-reconnect-button"); retryButton.addEventListener("click", retry); @@ -9,55 +12,67 @@ const resumeButton = document.getElementById("components-resume-button"); resumeButton.addEventListener("click", resume); function handleReconnectStateChanged(event) { - if (event.detail.state === "show") { - reconnectModal.showModal(); - } else if (event.detail.state === "hide") { - reconnectModal.close(); - } else if (event.detail.state === "failed") { - document.addEventListener("visibilitychange", retryWhenDocumentBecomesVisible); - } else if (event.detail.state === "rejected") { - location.reload(); - } + if (event.detail.state === "show") { + reconnectModal.showModal(); + } else if (event.detail.state === "hide") { + reconnectModal.close(); + } else if (event.detail.state === "failed") { + document.addEventListener( + "visibilitychange", + retryWhenDocumentBecomesVisible, + ); + } else if (event.detail.state === "rejected") { + location.reload(); + } } async function retry() { - document.removeEventListener("visibilitychange", retryWhenDocumentBecomesVisible); + document.removeEventListener( + "visibilitychange", + retryWhenDocumentBecomesVisible, + ); - try { - // Reconnect will asynchronously return: - // - true to mean success - // - false to mean we reached the server, but it rejected the connection (e.g., unknown circuit ID) - // - exception to mean we didn't reach the server (this can be sync or async) - const successful = await Blazor.reconnect(); - if (!successful) { - // We have been able to reach the server, but the circuit is no longer available. - // We'll reload the page so the user can continue using the app as quickly as possible. - const resumeSuccessful = await Blazor.resumeCircuit(); - if (!resumeSuccessful) { - location.reload(); - } else { - reconnectModal.close(); - } - } - } catch (err) { - // We got an exception, server is currently unavailable - document.addEventListener("visibilitychange", retryWhenDocumentBecomesVisible); + try { + // Reconnect will asynchronously return: + // - true to mean success + // - false to mean we reached the server, but it rejected the connection (e.g., unknown circuit ID) + // - exception to mean we didn't reach the server (this can be sync or async) + const successful = await Blazor.reconnect(); + if (!successful) { + // We have been able to reach the server, but the circuit is no longer available. + // We'll reload the page so the user can continue using the app as quickly as possible. + const resumeSuccessful = await Blazor.resumeCircuit(); + if (!resumeSuccessful) { + location.reload(); + } else { + reconnectModal.close(); + } } + } catch (err) { + // We got an exception, server is currently unavailable + document.addEventListener( + "visibilitychange", + retryWhenDocumentBecomesVisible, + ); + } } async function resume() { - try { - const successful = await Blazor.resumeCircuit(); - if (!successful) { - location.reload(); - } - } catch { - reconnectModal.classList.replace("components-reconnect-paused", "components-reconnect-resume-failed"); + try { + const successful = await Blazor.resumeCircuit(); + if (!successful) { + location.reload(); } + } catch { + reconnectModal.classList.replace( + "components-reconnect-paused", + "components-reconnect-resume-failed", + ); + } } async function retryWhenDocumentBecomesVisible() { - if (document.visibilityState === "visible") { - await retry(); - } + if (document.visibilityState === "visible") { + await retry(); + } } diff --git a/CannedNet.Admin/Components/Pages/Config/GameConfig.razor b/CannedNet.Admin/Components/Pages/Config/GameConfig.razor deleted file mode 100644 index a7e2f28..0000000 --- a/CannedNet.Admin/Components/Pages/Config/GameConfig.razor +++ /dev/null @@ -1,133 +0,0 @@ -@page "/config/gameconfig" -@rendermode InteractiveServer - -Game Config - -

Game Config

-

Edit the gameconfigs.json file that controls various game settings.

- -@if (loading) -{ - -} -else if (!string.IsNullOrEmpty(error)) -{ -
@error
-} -else -{ - - - @if (activeTab == "edit") - { -
-
- - @if (!string.IsNullOrEmpty(saveMessage)) - { - @saveMessage - } -
- -
- } - else if (activeTab == "browse") - { -
- -
-
- - - - - - @foreach (var entry in configEntries.Where(e => string.IsNullOrEmpty(filterText) || e.Key.Contains(filterText, StringComparison.OrdinalIgnoreCase))) - { - - - - - } - -
KeyValue
@entry.Key@entry.Value
-
-
@configEntries.Count(e => string.IsNullOrEmpty(filterText) || e.Key.Contains(filterText, StringComparison.OrdinalIgnoreCase)) entries
- } -} - -@code { - [Inject] private HttpClient Http { get; set; } = default!; - - private bool loading = true; - private bool saving; - private string? error; - private string? saveMessage; - private string jsonContent = ""; - private string activeTab = "browse"; - private string filterText = ""; - private List configEntries = new(); - - protected override async Task OnInitializedAsync() - { - try - { - jsonContent = await Http.GetStringAsync("/admin/api/config/gameconfigs"); - configEntries = JsonSerializer.Deserialize>(jsonContent) ?? new(); - } - catch (Exception ex) - { - error = $"Failed to load: {ex.Message}"; - } - finally - { - loading = false; - } - } - - private string GetActiveClass(string tab) => activeTab == tab ? "active" : ""; - - private void SetTab(string tab) - { - activeTab = tab; - } - - private async Task Save() - { - saving = true; - saveMessage = null; - try - { - var content = new StringContent(jsonContent, System.Text.Encoding.UTF8, "application/json"); - var response = await Http.PutAsync("/admin/api/config/gameconfigs", content); - response.EnsureSuccessStatusCode(); - saveMessage = "Saved successfully!"; - configEntries = JsonSerializer.Deserialize>(jsonContent) ?? new(); - } - catch (Exception ex) - { - saveMessage = $"Error: {ex.Message}"; - } - finally - { - saving = false; - } - } - - private class ConfigEntry - { - public string Key { get; set; } = ""; - public string Value { get; set; } = ""; - public string? EndTime { get; set; } - public string? StartTime { get; set; } - } -} diff --git a/CannedNet.Admin/Components/Pages/Home.razor b/CannedNet.Admin/Components/Pages/Home.razor index b88063b..cf74a2b 100644 --- a/CannedNet.Admin/Components/Pages/Home.razor +++ b/CannedNet.Admin/Components/Pages/Home.razor @@ -30,8 +30,8 @@
Config
-

Modify server configuration files: NS config, game configs, community board.

- Manage Config +

Modify server configuration files

+ Manage Config
diff --git a/CannedNet.Admin/Components/Pages/Settings.razor b/CannedNet.Admin/Components/Pages/Settings.razor new file mode 100644 index 0000000..8f8245b --- /dev/null +++ b/CannedNet.Admin/Components/Pages/Settings.razor @@ -0,0 +1,91 @@ +@page "/settings" +@attribute [Authorize] +@rendermode InteractiveServer +@inject AdminConfigService AdminConfig +@inject NavigationManager Navigation + +Admin Settings + +

Admin Settings

+ +@if (saved) +{ + +} + +@if (error) +{ + +} + +
+
+

+ These settings control where the admin panel connects to the CannedNet server API. + If you accidentally change this to the wrong server, please manually change the URL in admin_config.json. +

+ +
+ + +
+ + +
+
+ +@code { + private AdminConfigService.AdminConfigData edit = new(); + private bool saving; + private bool saved; + private bool error; + private string errorMessage = ""; + + protected override void OnInitialized() + { + edit = new AdminConfigService.AdminConfigData + { + ServerBaseUrl = AdminConfig.ServerBaseUrl + }; + } + + private async Task Save() + { + saving = true; + saved = false; + error = false; + errorMessage = ""; + + try + { + if (string.IsNullOrWhiteSpace(edit.ServerBaseUrl)) + { + error = true; + errorMessage = "Server Base URL cannot be empty."; + return; + } + + if (!Uri.TryCreate(edit.ServerBaseUrl, UriKind.Absolute, out _)) + { + error = true; + errorMessage = "Server Base URL is not a valid absolute URL."; + return; + } + + AdminConfig.Save(edit); + saved = true; + } + finally + { + saving = false; + } + } +} diff --git a/CannedNet.Admin/Components/Pages/SetupWizard.razor b/CannedNet.Admin/Components/Pages/SetupWizard.razor new file mode 100644 index 0000000..41ea9f9 --- /dev/null +++ b/CannedNet.Admin/Components/Pages/SetupWizard.razor @@ -0,0 +1,96 @@ +@page "/setup" +@rendermode InteractiveServer +@inject AdminConfigService AdminConfig +@inject NavigationManager Navigation + +First-Time Setup + +@if (!AdminConfig.IsConfigured) +{ +
+
+
+

First-Time Setup

+
+

+ Welcome to the CannedNet Admin Panel. Before you can log in, please configure the + connection to your CannedNet server. +

+ + @if (saved) + { +
Settings saved! Redirecting to login...
+ } + + @if (error) + { +
@errorMessage
+ } + +
+ + +
+ + +
+
+
+
+} +else +{ +
+
+
+
+

Already configured. Go to login.

+
+
+
+
+} + +@code { + private AdminConfigService.AdminConfigData edit = new(); + private bool saving; + private bool saved; + private bool error; + private string errorMessage = ""; + + private async Task Save() + { + saving = true; + saved = false; + error = false; + errorMessage = ""; + + try + { + if (string.IsNullOrWhiteSpace(edit.ServerBaseUrl)) + { + error = true; + errorMessage = "Server Base URL is required."; + return; + } + + if (!Uri.TryCreate(edit.ServerBaseUrl, UriKind.Absolute, out _)) + { + error = true; + errorMessage = "Server Base URL is not a valid absolute URL."; + return; + } + + AdminConfig.Save(edit); + saved = true; + await Task.Delay(1000); + Navigation.NavigateTo("/login", forceLoad: true); + } + finally + { + saving = false; + } + } +} diff --git a/CannedNet.Admin/Program.cs b/CannedNet.Admin/Program.cs index f5cfcfb..f140777 100644 --- a/CannedNet.Admin/Program.cs +++ b/CannedNet.Admin/Program.cs @@ -26,23 +26,27 @@ builder.Services.AddAuthentication("AdminCookie") builder.Services.AddAuthorization(); -var imagesBaseUrl = builder.Configuration.GetValue("ImagesBaseUrl") ?? "http://localhost:5000/img"; -builder.Services.AddSingleton(new ImageUrlService(imagesBaseUrl)); +builder.Services.AddSingleton(); builder.Services.AddHttpContextAccessor(); -var serverUrl = builder.Configuration.GetValue("ServerBaseUrl") ?? "http://localhost:5000"; +builder.Services.AddScoped(sp => +{ + var config = sp.GetRequiredService(); + return new ImageUrlService(config.ImagesBaseUrl); +}); + + builder.Services.AddTransient(); builder.Services.AddScoped(sp => { + var config = sp.GetRequiredService(); var handler = sp.GetRequiredService(); handler.InnerHandler = new SocketsHttpHandler(); - return new HttpClient(handler) { BaseAddress = new Uri(serverUrl) }; + return new HttpClient(handler) { BaseAddress = new Uri(config.ServerBaseUrl) }; }); var app = builder.Build(); -// --- Admin Auth Endpoints --- - app.MapPost("/admin/login", async (HttpContext context) => { var form = await context.Request.ReadFormAsync(); @@ -55,8 +59,8 @@ app.MapPost("/admin/login", async (HttpContext context) => return; } - var serverUrl = app.Services.GetRequiredService().GetValue("ServerBaseUrl") ?? "http://localhost:5000"; - using var httpClient = new HttpClient { BaseAddress = new Uri(serverUrl) }; + var adminConfig = app.Services.GetRequiredService(); + using var httpClient = new HttpClient { BaseAddress = new Uri(adminConfig.ServerBaseUrl) }; var tokenResponse = await httpClient.PostAsync("/auth/connect/token", new FormUrlEncodedContent(new Dictionary { ["grant_type"] = "password", @@ -100,7 +104,6 @@ app.MapPost("/admin/login", async (HttpContext context) => new("access_token", accessToken) }; - // Map JWT roles for admin app authorization if (role.Split(',', StringSplitOptions.RemoveEmptyEntries).Any(rr => rr == "developer" || rr == "admin")) claims.Add(new Claim(ClaimTypes.Role, "Admin")); @@ -122,7 +125,20 @@ app.MapGet("/admin/logout", async (HttpContext context) => context.Response.Redirect("/login"); }); -// --- Standard middleware --- +app.Use(async (context, next) => +{ + var config = context.RequestServices.GetRequiredService(); + if (!config.IsConfigured && !context.Request.Path.StartsWithSegments("/setup")) + { + var accept = context.Request.Headers.Accept.FirstOrDefault() ?? ""; + if (accept.Contains("text/html")) + { + context.Response.Redirect("/setup"); + return; + } + } + await next(); +}); if (!app.Environment.IsDevelopment()) { diff --git a/CannedNet.Admin/Services/AdminConfigService.cs b/CannedNet.Admin/Services/AdminConfigService.cs new file mode 100644 index 0000000..cd1701b --- /dev/null +++ b/CannedNet.Admin/Services/AdminConfigService.cs @@ -0,0 +1,46 @@ +using System.Text.Json; + +namespace CannedNet.Admin.Services; + +public class AdminConfigService +{ + private const string ConfigFile = "admin_config.json"; + private static readonly JsonSerializerOptions Indented = new() { WriteIndented = true }; + + public AdminConfigData Config { get; private set; } + + public string ServerBaseUrl => Config.ServerBaseUrl; + public string ImagesBaseUrl => Config.ServerBaseUrl.TrimEnd('/') + "/img"; + + public AdminConfigService() + { + Config = Load(); + } + + public bool IsConfigured => + !string.IsNullOrWhiteSpace(Config.ServerBaseUrl); + + private static AdminConfigData Load() + { + if (!File.Exists(ConfigFile)) + { + var empty = new AdminConfigData(); + File.WriteAllText(ConfigFile, JsonSerializer.Serialize(empty, Indented)); + return empty; + } + + var json = File.ReadAllText(ConfigFile); + return JsonSerializer.Deserialize(json) ?? new AdminConfigData(); + } + + public void Save(AdminConfigData updated) + { + Config = updated; + File.WriteAllText(ConfigFile, JsonSerializer.Serialize(Config, Indented)); + } + + public class AdminConfigData + { + public string ServerBaseUrl { get; set; } = ""; + } +} diff --git a/CannedNet.Admin/admin_config.json b/CannedNet.Admin/admin_config.json new file mode 100644 index 0000000..a10bbd4 --- /dev/null +++ b/CannedNet.Admin/admin_config.json @@ -0,0 +1,3 @@ +{ + "ServerBaseUrl": "https://cannednet.lapis.codes" +} \ No newline at end of file diff --git a/CannedNet/Services/Controllers/AdminController.cs b/CannedNet/Services/Controllers/AdminController.cs index 37de518..6dc167d 100644 --- a/CannedNet/Services/Controllers/AdminController.cs +++ b/CannedNet/Services/Controllers/AdminController.cs @@ -209,10 +209,23 @@ public class AdminController : ControllerBase [HttpPut("config/gameconfigs")] public async Task SaveGameConfigs() { - using var reader = new StreamReader(Request.Body); - var body = await reader.ReadToEndAsync(); - await System.IO.File.WriteAllTextAsync(Path.Combine(JsonDir, "gameconfigs.json"), body); - return Results.Ok(new { success = true }); + try + { + using var reader = new StreamReader(Request.Body); + var body = await reader.ReadToEndAsync(); + + Console.WriteLine(body); + + var path = Path.Combine(JsonDir, "gameconfigs.json"); + + await System.IO.File.WriteAllTextAsync(path, body); + + return Results.Ok(new { success = true }); + } + catch (Exception ex) + { + return Results.Problem(ex.ToString()); + } } [HttpGet("config/communityboard")]