From 0015001d7c630dc2501461704b7fc6eff87e16c9 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 17 Jul 2023 16:22:22 +0200 Subject: [PATCH] Fixed some permissions. Cleaned some UIs --- Moonlight/App/Perms/Permissions.cs | 4 +- .../Navigations/AdminNodesNavigation.razor | 22 - .../Navigations/AdminServersNavigation.razor | 37 ++ .../Components/Partials/SidebarMenu.razor | 53 +- Moonlight/Shared/Views/Admin/Nodes/Ddos.razor | 2 + .../Shared/Views/Admin/Nodes/Index.razor | 2 +- .../Shared/Views/Admin/Servers/Cleanup.razor | 3 + .../Views/Admin/Servers/Images/Edit.razor | 474 +++++++++--------- .../Views/Admin/Servers/Images/Index.razor | 175 +++---- .../Shared/Views/Admin/Servers/Index.razor | 9 +- .../Shared/Views/Admin/Servers/Manager.razor | 154 +++--- 11 files changed, 457 insertions(+), 478 deletions(-) delete mode 100644 Moonlight/Shared/Components/Navigations/AdminNodesNavigation.razor create mode 100644 Moonlight/Shared/Components/Navigations/AdminServersNavigation.razor diff --git a/Moonlight/App/Perms/Permissions.cs b/Moonlight/App/Perms/Permissions.cs index 1ffb9b45..ad88c641 100644 --- a/Moonlight/App/Perms/Permissions.cs +++ b/Moonlight/App/Perms/Permissions.cs @@ -135,10 +135,10 @@ public static class Permissions Description = "Edit server image settings in the admin area" }; - public static Permission AdminServerImageIndex = new() + public static Permission AdminServerImages = new() { Index = 21, - Name = "Admin Server Image", + Name = "Admin Server Images", Description = "Access the server image management page in the admin area" }; diff --git a/Moonlight/Shared/Components/Navigations/AdminNodesNavigation.razor b/Moonlight/Shared/Components/Navigations/AdminNodesNavigation.razor deleted file mode 100644 index 16db4eb5..00000000 --- a/Moonlight/Shared/Components/Navigations/AdminNodesNavigation.razor +++ /dev/null @@ -1,22 +0,0 @@ -
-
- -
-
- -@code -{ - [Parameter] - public int Index { get; set; } = 0; -} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Navigations/AdminServersNavigation.razor b/Moonlight/Shared/Components/Navigations/AdminServersNavigation.razor new file mode 100644 index 00000000..d307f551 --- /dev/null +++ b/Moonlight/Shared/Components/Navigations/AdminServersNavigation.razor @@ -0,0 +1,37 @@ +
+
+ +
+
+ +@code +{ + [Parameter] + public int Index { get; set; } = 0; +} \ No newline at end of file diff --git a/Moonlight/Shared/Components/Partials/SidebarMenu.razor b/Moonlight/Shared/Components/Partials/SidebarMenu.razor index e4e7090d..9661c502 100644 --- a/Moonlight/Shared/Components/Partials/SidebarMenu.razor +++ b/Moonlight/Shared/Components/Partials/SidebarMenu.razor @@ -92,60 +92,13 @@ else System -
- +
+ Servers - - -
-
- - - - - Overview - -
- -
- - - - - Manager - -
- -
- - - - - Cleanup - -
- -
- - - - - Nodes - -
- -
- - - - - Images - -
-
+
diff --git a/Moonlight/Shared/Views/Admin/Nodes/Ddos.razor b/Moonlight/Shared/Views/Admin/Nodes/Ddos.razor index 9b626a0f..fe90fb55 100644 --- a/Moonlight/Shared/Views/Admin/Nodes/Ddos.razor +++ b/Moonlight/Shared/Views/Admin/Nodes/Ddos.razor @@ -99,4 +99,6 @@ { await Event.Off("node.ddos", this); } + + //TODO: Move to security } \ No newline at end of file diff --git a/Moonlight/Shared/Views/Admin/Nodes/Index.razor b/Moonlight/Shared/Views/Admin/Nodes/Index.razor index b9f0dfc2..73d66885 100644 --- a/Moonlight/Shared/Views/Admin/Nodes/Index.razor +++ b/Moonlight/Shared/Views/Admin/Nodes/Index.razor @@ -15,7 +15,7 @@ @attribute [PermissionRequired(nameof(Permissions.AdminNodes))] - +
diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor index 888060a0..a06a0f23 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor @@ -1,6 +1,7 @@ @page "/admin/servers/cleanup" @using Moonlight.App.Events @using Moonlight.App.Services.Background +@using Moonlight.Shared.Components.Navigations @inject CleanupService CleanupService @inject EventSystem Event @@ -9,6 +10,8 @@ @attribute [PermissionRequired(nameof(Permissions.AdminServerCleanup))] + +
diff --git a/Moonlight/Shared/Views/Admin/Servers/Images/Edit.razor b/Moonlight/Shared/Views/Admin/Servers/Images/Edit.razor index 18f8eeb4..d61f1944 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Images/Edit.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Images/Edit.razor @@ -12,252 +12,252 @@ @inject ToastService ToastService @inject FileDownloadService FileDownloadService - +@attribute [PermissionRequired(nameof(Permissions.AdminServerImageEdit))] +
- -@if (Image == null) -{ -
- No image with this id found -
-} -else -{ -
-
-
-
- - + + @if (Image == null) + { +
+ No image with this id found
-
- - -
-
- - -
-
-
-
-
- -
- - -
-
- @if (Tags.Any()) - { -
- @foreach (var tag in Tags) - { - - } + } + else + { +
+
+
+
+ + +
+
+ + +
+
+ + +
- } - else - { -
- No tags found -
- } -
-
-
-
-
-
-
- -
- - -
-
- @if (Image.DockerImages.Any()) - { -
- @foreach (var imageDocker in Image.DockerImages) - { - - } -
- } - else - { -
- No docker images found -
- } -
-
-
-
-
-
- - -
-
- - -
-
-
-
-
-
-
- - -
- -
-
-
- -
-
-
-
- - -
-
- -
- -
- -
-
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
- - -
-
-
-
-
-
-
- - - -
- -
- @if (Image!.Variables.Any()) - { -
- @foreach (var variable in Image!.Variables) - { -
- - -
- } +
+ @if (Tags.Any()) + { +
+ @foreach (var tag in Tags) + { + + } +
+ } + else + { +
+ No tags found +
+ } +
+
- } - else - { -
- No variables found +
+
+
+
+ +
+ + +
+
+ @if (Image.DockerImages.Any()) + { +
+ @foreach (var imageDocker in Image.DockerImages) + { + + } +
+ } + else + { +
+ No docker images found +
+ } +
+
- } +
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ + +
+ +
+
+
+ + +
+
+
+
+ + +
+
+ +
+ +
+ +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ + + +
+ +
+ @if (Image!.Variables.Any()) + { +
+ @foreach (var variable in Image!.Variables) + { +
+ + + +
+ } +
+ } + else + { +
+ No variables found +
+ } +
+
+
+
+
+
+ + Cancel + + + + + +
+
+
+ } +
-
-
-
-
-
- - Cancel - - - - - -
-
-
-} - -
- @code { diff --git a/Moonlight/Shared/Views/Admin/Servers/Images/Index.razor b/Moonlight/Shared/Views/Admin/Servers/Images/Index.razor index 5fc6356c..3a9130e0 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Images/Index.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Images/Index.razor @@ -9,6 +9,7 @@ @using System.Text @using Moonlight.App.Helpers @using Newtonsoft.Json +@using Moonlight.Shared.Components.Navigations @inject Repository ImageRepository @inject Repository ImageVariableRepository @@ -16,95 +17,95 @@ @inject SmartTranslateService SmartTranslateService @inject AlertService AlertService - -
- -
-
-

- - Images - -

-
- - - New image - -
-
-
- @if (Images.Any()) - { -
- - - - - - - - - - - - - - - -
+ Import + +
+
+
+ @if (Images.Any()) + { +
+ + + + + + + + + + + + + + + +
+
+ } + else + { +
+ No images found +
+ } +
- } - else - { -
- No images found -
- } -
-
- -
- + @code { diff --git a/Moonlight/Shared/Views/Admin/Servers/Index.razor b/Moonlight/Shared/Views/Admin/Servers/Index.razor index 8a967184..6eae3292 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Index.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Index.razor @@ -4,14 +4,16 @@ @using Moonlight.App.Repositories.Servers @using BlazorTable @using Microsoft.EntityFrameworkCore +@using Moonlight.Shared.Components.Navigations @inject ServerRepository ServerRepository @inject SmartTranslateService SmartTranslateService @attribute [PermissionRequired(nameof(Permissions.AdminServers))] -
- + + +

@@ -65,7 +67,6 @@

-
@code { @@ -76,6 +77,8 @@ Servers = ServerRepository .Get() .Include(x => x.Owner) + .ToArray() // Execute query and use the moonlight instance to sort + .OrderBy(x => x.Id) .ToArray(); return Task.CompletedTask; diff --git a/Moonlight/Shared/Views/Admin/Servers/Manager.razor b/Moonlight/Shared/Views/Admin/Servers/Manager.razor index f91ba4fa..bd0f387a 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Manager.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Manager.razor @@ -6,7 +6,7 @@ @using Moonlight.App.Database.Entities @using BlazorTable @using Microsoft.EntityFrameworkCore -@using Moonlight.App.ApiClients.Daemon.Resources +@using Moonlight.Shared.Components.Navigations @using Moonlight.App.ApiClients.Wings @using Moonlight.App.Helpers @using Moonlight.App.Models.Misc @@ -20,82 +20,84 @@ @attribute [PermissionRequired(nameof(Permissions.AdminServerManager))] -
+ + +
+
+ + @if (IsRunning) + { + Status: Currently scanning @(Node?.Name) + } + else + { + Status: Scan complete + } + +
+ + + + + + +
+
- - - - - - -
-
-
-
- @if (IsRunning) - { -

Currently scanning: @(Node?.Name)

- } - else - { - Scan complete - } -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+