From 7983bf3ee43bccb3b0e632fbf0d866bf7e0cf2d5 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 30 Jun 2023 21:55:32 +0200 Subject: [PATCH] Fixed server list --- Moonlight/Shared/Views/Servers/Index.razor | 313 +++++++++++---------- 1 file changed, 158 insertions(+), 155 deletions(-) diff --git a/Moonlight/Shared/Views/Servers/Index.razor b/Moonlight/Shared/Views/Servers/Index.razor index 2a1ab700..e6340547 100644 --- a/Moonlight/Shared/Views/Servers/Index.razor +++ b/Moonlight/Shared/Views/Servers/Index.razor @@ -14,171 +14,174 @@ @inject IJSRuntime JsRuntime -
-
-
- Beta - @if (EditMode) - { -
- - - - -
- } - else - { - - - } -
-
-@foreach (var group in ServerGroups) -{ -
-
-

- -

-
-
-
- @foreach (var id in group.Servers) - { - var server = AllServers.First(x => x.Id.ToString() == id); - -
- @if (EditMode) + } + else + { + + + } +
+
+ @foreach (var group in ServerGroups) + { +
+
+

+ +

+
+
+
+ @foreach (var id in group.Servers) { -
-
-
- @(server.Name) -
-
- - + var server = AllServers.FirstOrDefault(x => x.Id.ToString() == id); + + if (server != null) + { +
+ @if (EditMode) + { +
+
+
+ @(server.Name) +
+
+ + + +
+
+
+ Hidden in edit mode +
+
+ } + else + { + +
+
+
+ @(server.Name) +
+
+
+ + @(Math.Round(server.Memory / 1024D, 2)) GB / @(Math.Round(server.Disk / 1024D, 2)) GB / @(server.Node.Name) - @(server.Image.Name) + +
+ @(server.Node.Fqdn):@(server.MainAllocation.Port) +
+
+ @if (StatusCache.ContainsKey(server)) + { + var status = StatusCache[server]; + + switch (status) + { + case "offline": + + Offline + + break; + case "stopping": + + Stopping + + break; + case "starting": + + Starting + + break; + case "running": + + Running + + break; + case "failed": + + Failed + + break; + default: + + Offline + + break; + } + } + else + { + + Loading + + } +
+
+
-
+ }
-
- Hidden in edit mode -
-
- } - else - { - -
-
-
- @(server.Name) -
-
-
- - @(Math.Round(server.Memory / 1024D, 2)) GB / @(Math.Round(server.Disk / 1024D, 2)) GB / @(server.Node.Name) - @(server.Image.Name) - -
- @(server.Node.Fqdn):@(server.MainAllocation.Port) -
-
- @if (StatusCache.ContainsKey(server)) - { - var status = StatusCache[server]; - - switch (status) - { - case "offline": - - Offline - - break; - case "stopping": - - Stopping - - break; - case "starting": - - Starting - - break; - case "running": - - Running - - break; - case "failed": - - Failed - - break; - default: - - Offline - - break; - } - } - else - { - - Loading - - } -
-
-
- + } }
- } +
-
+ }
-} -
@code