Merge pull request #222 from Moonlight-Panel/FixServerList

Fixed server list and server navigation

Moonlight/App/ApiClients/Telemetry/Requests/TelemetryData.cs

@@ -0,0 +1,11 @@
+namespace Moonlight.App.ApiClients.Telemetry.Requests;
+
+public class TelemetryData
+{
+    public string AppUrl { get; set; } = "";
+    public int Servers { get; set; }
+    public int Nodes { get; set; }
+    public int Users { get; set; }
+    public int Databases { get; set; }
+    public int Webspaces { get; set; }
+}

Moonlight/App/ApiClients/Telemetry/TelemetryApiHelper.cs

@@ -0,0 +1,52 @@
+using Newtonsoft.Json;
+using RestSharp;
+
+namespace Moonlight.App.ApiClients.Telemetry;
+
+public class TelemetryApiHelper
+{
+    private readonly RestClient Client;
+
+    public TelemetryApiHelper()
+    {
+        Client = new();
+    }
+
+    public async Task Post(string resource, object? body)
+    {
+        var request = CreateRequest(resource);
+
+        request.Method = Method.Post;
+        
+        request.AddParameter("application/json", JsonConvert.SerializeObject(body), ParameterType.RequestBody);
+
+        var response = await Client.ExecuteAsync(request);
+        
+        if (!response.IsSuccessful)
+        {
+            if (response.StatusCode != 0)
+            {
+                throw new TelemetryException(
+                    $"An error occured: ({response.StatusCode}) {response.Content}",
+                    (int)response.StatusCode
+                );
+            }
+            else
+            {
+                throw new Exception($"An internal error occured: {response.ErrorMessage}");
+            }
+        }
+    }
+
+    private RestRequest CreateRequest(string resource)
+    {
+        var url = "https://telemetry.moonlightpanel.xyz/" + resource;
+
+        var request = new RestRequest(url)
+        {
+            Timeout = 3000000
+        };
+
+        return request;
+    }
+}

Moonlight/App/ApiClients/Telemetry/TelemetryException.cs

@@ -0,0 +1,32 @@
+using System.Runtime.Serialization;
+
+namespace Moonlight.App.ApiClients.Telemetry;
+
+[Serializable]
+public class TelemetryException : Exception
+{
+    public int StatusCode { get; set; }
+
+    public TelemetryException()
+    {
+    }
+    
+    public TelemetryException(string message, int statusCode) : base(message)
+    {
+        StatusCode = statusCode;
+    }
+
+    public TelemetryException(string message) : base(message)
+    {
+    }
+
+    public TelemetryException(string message, Exception inner) : base(message, inner)
+    {
+    }
+
+    protected TelemetryException(
+        SerializationInfo info,
+        StreamingContext context) : base(info, context)
+    {
+    }
+}

Moonlight/App/Configuration/ConfigV1.cs

@@ -1,19 +1,27 @@
-namespace Moonlight.App.Configuration;
+using System.ComponentModel;
+using Moonlight.App.Helpers;
+
+namespace Moonlight.App.Configuration;
 
 using System;
 using Newtonsoft.Json;
 
 public class ConfigV1
 {
-    [JsonProperty("Moonlight")] public MoonlightData Moonlight { get; set; } = new();
+    [JsonProperty("Moonlight")]
+    public MoonlightData Moonlight { get; set; } = new();
 
     public class MoonlightData
     {
-        [JsonProperty("AppUrl")] public string AppUrl { get; set; } = "http://your-moonlight-url-without-slash";
+        [JsonProperty("AppUrl")]
+        [Description("The url moonlight is accesible with from the internet")]
+        public string AppUrl { get; set; } = "http://your-moonlight-url-without-slash";
+
+        [JsonProperty("Auth")] public AuthData Auth { get; set; } = new();
 
         [JsonProperty("Database")] public DatabaseData Database { get; set; } = new();
 
-        [JsonProperty("DiscordBotApi")] public DiscordBotData DiscordBotApi { get; set; } = new();
+        [JsonProperty("DiscordBotApi")] public DiscordBotApiData DiscordBotApi { get; set; } = new();
 
         [JsonProperty("DiscordBot")] public DiscordBotData DiscordBot { get; set; } = new();
 
@@ -33,8 +41,7 @@ public class ConfigV1
 
         [JsonProperty("Subscriptions")] public SubscriptionsData Subscriptions { get; set; } = new();
 
-        [JsonProperty("DiscordNotifications")]
+        [JsonProperty("DiscordNotifications")] public DiscordNotificationsData DiscordNotifications { get; set; } = new();
-        public DiscordNotificationsData DiscordNotifications { get; set; } = new();
 
         [JsonProperty("Statistics")] public StatisticsData Statistics { get; set; } = new();
 
@@ -44,20 +51,43 @@ public class ConfigV1
 
         [JsonProperty("Sentry")] public SentryData Sentry { get; set; } = new();
     }
+    
+    public class AuthData
+    {
+        [JsonProperty("DenyLogin")]
+        [Description("Prevent every new login")]
+        public bool DenyLogin { get; set; } = false;
+        
+        [JsonProperty("DenyRegister")]
+        [Description("Prevent every new user to register")]
+        public bool DenyRegister { get; set; } = false;
+    }
 
     public class CleanupData
     {
-        [JsonProperty("Cpu")] public long Cpu { get; set; } = 90;
+        [JsonProperty("Cpu")]
+        [Description("The maximum amount of cpu usage in percent a node is allowed to use before the cleanup starts")]
+        public long Cpu { get; set; } = 90;
 
-        [JsonProperty("Memory")] public long Memory { get; set; } = 8192;
+        [JsonProperty("Memory")]
+        [Description("The minumum amount of memory in megabytes avaliable before the cleanup starts")]
+        public long Memory { get; set; } = 8192;
 
-        [JsonProperty("Wait")] public long Wait { get; set; } = 15;
+        [JsonProperty("Wait")]
+        [Description("The delay between every cleanup check in minutes")]
+        public long Wait { get; set; } = 15;
 
-        [JsonProperty("Uptime")] public long Uptime { get; set; } = 6;
+        [JsonProperty("Uptime")]
+        [Description("The maximum uptime of any server in hours before it the server restarted by the cleanup system")]
+        public long Uptime { get; set; } = 6;
 
-        [JsonProperty("Enable")] public bool Enable { get; set; } = false;
+        [JsonProperty("Enable")]
+        [Description("The cleanup system provides a fair way for stopping unused servers and staying stable even with overallocation. A detailed explanation: docs.endelon-hosting.de/erklaerungen/cleanup")]
+        public bool Enable { get; set; } = false;
 
-        [JsonProperty("MinUptime")] public long MinUptime { get; set; } = 10;
+        [JsonProperty("MinUptime")]
+        [Description("The minumum uptime of a server in minutes to prevent stopping servers which just started")]
+        public long MinUptime { get; set; } = 10;
     }
 
     public class DatabaseData
@@ -65,39 +95,77 @@ public class ConfigV1
         [JsonProperty("Database")] public string Database { get; set; } = "moonlight_db";
 
         [JsonProperty("Host")] public string Host { get; set; } = "your.database.host";
-
+        
-        [JsonProperty("Password")] public string Password { get; set; } = "secret";
+        [JsonProperty("Password")]
+        [Blur]
+        public string Password { get; set; } = "secret";
 
         [JsonProperty("Port")] public long Port { get; set; } = 3306;
 
         [JsonProperty("Username")] public string Username { get; set; } = "moonlight_user";
     }
 
+    public class DiscordBotApiData
+    {
+        [JsonProperty("Enable")]
+        [Description("Enable the discord bot api. Currently only DatBot is using this api")]
+        public bool Enable { get; set; } = false;
+
+        [JsonProperty("Token")]
+        [Description("Specify the token the api client needs to provide")]
+        [Blur]
+        public string Token { get; set; } = Guid.NewGuid().ToString();
+    }
     public class DiscordBotData
     {
-        [JsonProperty("Enable")] public bool Enable { get; set; } = false;
+        [JsonProperty("Enable")]
+        [Description("The discord bot can be used to allow customers to manage their servers via discord")]
+        public bool Enable { get; set; } = false;
 
-        [JsonProperty("Token")] public string Token { get; set; } = "discord token here";
+        [JsonProperty("Token")]
+        [Description("Your discord bot token goes here")]
+        [Blur]
+        public string Token { get; set; } = "discord token here";
 
-        [JsonProperty("PowerActions")] public bool PowerActions { get; set; } = false;
+        [JsonProperty("PowerActions")]
-        [JsonProperty("SendCommands")] public bool SendCommands { get; set; } = false;
+        [Description("Enable actions like starting and stopping servers")]
+        public bool PowerActions { get; set; } = false;
+        
+        [JsonProperty("SendCommands")]
+        [Description("Allow users to send commands to their servers")]
+        public bool SendCommands { get; set; } = false;
     }
 
     public class DiscordNotificationsData
     {
-        [JsonProperty("Enable")] public bool Enable { get; set; } = false;
+        [JsonProperty("Enable")]
+        [Description("The discord notification system sends you a message everytime a event like a new support chat message is triggered with usefull data describing the event")]
+        public bool Enable { get; set; } = false;
 
-        [JsonProperty("WebHook")] public string WebHook { get; set; } = "http://your-discord-webhook-url";
+        [JsonProperty("WebHook")]
+        [Description("The discord webhook the notifications are being sent to")]
+        [Blur]
+        public string WebHook { get; set; } = "http://your-discord-webhook-url";
     }
 
     public class DomainsData
     {
-        [JsonProperty("Enable")] public bool Enable { get; set; } = false;
+        [JsonProperty("Enable")]
-        [JsonProperty("AccountId")] public string AccountId { get; set; } = "cloudflare acc id";
+        [Description("This enables the domain system")]
+        public bool Enable { get; set; } = false;
+        
+        [JsonProperty("AccountId")]
+        [Description("This option specifies the cloudflare account id")]
+        public string AccountId { get; set; } = "cloudflare acc id";
 
-        [JsonProperty("Email")] public string Email { get; set; } = "cloudflare@acc.email";
+        [JsonProperty("Email")]
+        [Description("This specifies the cloudflare email to use for communicating with the cloudflare api")]
+        public string Email { get; set; } = "cloudflare@acc.email";
 
-        [JsonProperty("Key")] public string Key { get; set; } = "secret";
+        [JsonProperty("Key")]
+        [Description("Your cloudflare api key goes here")]
+        [Blur]
+        public string Key { get; set; } = "secret";
     }
 
     public class HtmlData
@@ -107,13 +175,21 @@ public class ConfigV1
 
     public class HeadersData
     {
-        [JsonProperty("Color")] public string Color { get; set; } = "#4b27e8";
+        [JsonProperty("Color")]
+        [Description("This specifies the color of the embed generated by platforms like discord when someone posts a link to your moonlight instance")]
+        public string Color { get; set; } = "#4b27e8";
 
-        [JsonProperty("Description")] public string Description { get; set; } = "the next generation hosting panel";
+        [JsonProperty("Description")]
+        [Description("This specifies the description text of the embed generated by platforms like discord when someone posts a link to your moonlight instance and can also help google to index your moonlight instance correctly")]
+        public string Description { get; set; } = "the next generation hosting panel";
 
-        [JsonProperty("Keywords")] public string Keywords { get; set; } = "moonlight";
+        [JsonProperty("Keywords")]
+        [Description("To help search engines like google to index your moonlight instance correctly you can specify keywords seperated by a comma here")]
+        public string Keywords { get; set; } = "moonlight";
 
-        [JsonProperty("Title")] public string Title { get; set; } = "Moonlight - endelon.link";
+        [JsonProperty("Title")]
+        [Description("This specifies the title of the embed generated by platforms like discord when someone posts a link to your moonlight instance")]
+        public string Title { get; set; } = "Moonlight - endelon.link";
     }
 
     public class MailData
@@ -122,7 +198,9 @@ public class ConfigV1
 
         [JsonProperty("Server")] public string Server { get; set; } = "your.mail.host";
 
-        [JsonProperty("Password")] public string Password { get; set; } = "secret";
+        [JsonProperty("Password")]
+        [Blur]
+        public string Password { get; set; } = "secret";
 
         [JsonProperty("Port")] public int Port { get; set; } = 465;
 
@@ -142,9 +220,13 @@ public class ConfigV1
 
     public class OAuth2Data
     {
-        [JsonProperty("OverrideUrl")] public string OverrideUrl { get; set; } = "https://only-for-development.cases";
+        [JsonProperty("OverrideUrl")]
+        [Description("This overrides the redirect url which would be typicaly the app url")]
+        public string OverrideUrl { get; set; } = "https://only-for-development.cases";
 
-        [JsonProperty("EnableOverrideUrl")] public bool EnableOverrideUrl { get; set; } = false;
+        [JsonProperty("EnableOverrideUrl")]
+        [Description("This enables the url override")]
+        public bool EnableOverrideUrl { get; set; } = false;
 
         [JsonProperty("Providers")]
         public OAuth2ProviderData[] Providers { get; set; } = Array.Empty<OAuth2ProviderData>();
@@ -156,41 +238,65 @@ public class ConfigV1
 
         [JsonProperty("ClientId")] public string ClientId { get; set; }
 
-        [JsonProperty("ClientSecret")] public string ClientSecret { get; set; }
+        [JsonProperty("ClientSecret")]
+        [Blur]
+        public string ClientSecret { get; set; }
     }
 
     public class RatingData
     {
-        [JsonProperty("Enabled")] public bool Enabled { get; set; } = false;
+        [JsonProperty("Enabled")]
+        [Description("The rating systems shows a user who is registered longer than the set amout of days a popup to rate this platform if he hasnt rated it before")]
+        public bool Enabled { get; set; } = false;
 
-        [JsonProperty("Url")] public string Url { get; set; } = "https://link-to-google-or-smth";
+        [JsonProperty("Url")]
+        [Description("This is the url a user who rated above a set limit is shown to rate you again. Its recommended to put your google or trustpilot rate link here")]
+        public string Url { get; set; } = "https://link-to-google-or-smth";
 
-        [JsonProperty("MinRating")] public int MinRating { get; set; } = 4;
+        [JsonProperty("MinRating")]
+        [Description("The minimum star count on the rating ranging from 1 to 5")]
+        public int MinRating { get; set; } = 4;
 
-        [JsonProperty("DaysSince")] public int DaysSince { get; set; } = 5;
+        [JsonProperty("DaysSince")]
+        [Description("The days a user has to be registered to even be able to get this popup")]
+        public int DaysSince { get; set; } = 5;
     }
 
     public class SecurityData
     {
-        [JsonProperty("Token")] public string Token { get; set; } = Guid.NewGuid().ToString();
+        [JsonProperty("Token")]
+        [Description("This is the moonlight app token. It is used to encrypt and decrypt data and validte tokens and sessions")]
+        [Blur]
+        public string Token { get; set; } = Guid.NewGuid().ToString();
 
-        [JsonProperty("ReCaptcha")] public ReCaptchaData ReCaptcha { get; set; }
+        [JsonProperty("ReCaptcha")] public ReCaptchaData ReCaptcha { get; set; } = new();
     }
 
     public class ReCaptchaData
     {
-        [JsonProperty("Enable")] public bool Enable { get; set; } = false;
+        [JsonProperty("Enable")]
+        [Description("Enables repatcha at places like the register page. For information how to get your recaptcha credentails go to google.com/recaptcha/about/")]
+        public bool Enable { get; set; } = false;
 
-        [JsonProperty("SiteKey")] public string SiteKey { get; set; } = "recaptcha site key here";
+        [JsonProperty("SiteKey")]
+        [Blur]
+        public string SiteKey { get; set; } = "recaptcha site key here";
 
-        [JsonProperty("SecretKey")] public string SecretKey { get; set; } = "recaptcha secret here";
+        [JsonProperty("SecretKey")]
+        [Blur]
+        public string SecretKey { get; set; } = "recaptcha secret here";
     }
 
     public class SentryData
     {
-        [JsonProperty("Enable")] public bool Enable { get; set; } = false;
+        [JsonProperty("Enable")]
+        [Description("Sentry is a way to monitor application crashes and performance issues in real time. Enable this option only if you set a sentry dsn")]
+        public bool Enable { get; set; } = false;
 
-        [JsonProperty("Dsn")] public string Dsn { get; set; } = "http://your-sentry-url-here";
+        [JsonProperty("Dsn")]
+        [Description("The dsn is the key moonlight needs to communicate with your sentry instance")]
+        [Blur]
+        public string Dsn { get; set; } = "http://your-sentry-url-here";
     }
 
     public class SmartDeployData

Moonlight/App/Database/Entities/User.cs

@@ -53,4 +53,8 @@ public class User
     public Subscription? CurrentSubscription { get; set; } = null;
     public DateTime SubscriptionSince { get; set; } = DateTime.Now;
     public int SubscriptionDuration { get; set; }
+    
+    // Ip logs
+    public string RegisterIp { get; set; } = "";
+    public string LastIp { get; set; } = "";
 }

Moonlight/App/Database/Migrations/20230703175432_AddedIpLogsForUser.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Moonlight.App.Database.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedIpLogsForUser : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "LastIp",
+                table: "Users",
+                type: "longtext",
+                nullable: false)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<string>(
+                name: "RegisterIp",
+                table: "Users",
+                type: "longtext",
+                nullable: false)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "LastIp",
+                table: "Users");
+
+            migrationBuilder.DropColumn(
+                name: "RegisterIp",
+                table: "Users");
+        }
+    }
+}

Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs

@@ -766,6 +766,10 @@ namespace Moonlight.App.Database.Migrations
                     b.Property<bool>("HasRated")
                         .HasColumnType("tinyint(1)");
 
+                    b.Property<string>("LastIp")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
                     b.Property<string>("LastName")
                         .IsRequired()
                         .HasColumnType("longtext");
@@ -780,6 +784,10 @@ namespace Moonlight.App.Database.Migrations
                     b.Property<int>("Rating")
                         .HasColumnType("int");
 
+                    b.Property<string>("RegisterIp")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
                     b.Property<string>("ServerListLayoutJson")
                         .IsRequired()
                         .HasColumnType("longtext");

Moonlight/App/Helpers/BlurAttribute.cs

@@ -0,0 +1,6 @@
+namespace Moonlight.App.Helpers;
+
+public class BlurAttribute : Attribute
+{
+    
+}

Moonlight/App/Helpers/EggConverter.cs

@@ -0,0 +1,71 @@
+using System.Text;
+using Moonlight.App.Database.Entities;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Moonlight.App.Helpers;
+
+public static class EggConverter
+{
+    public static Image Convert(string json)
+    {
+        var result = new Image();
+
+        var data = new ConfigurationBuilder().AddJsonStream(
+            new MemoryStream(Encoding.ASCII.GetBytes(json))
+        ).Build();
+
+        result.Allocations = 1;
+        result.Description = data.GetValue<string>("description") ?? "";
+        result.Uuid = Guid.NewGuid();
+        result.Startup = data.GetValue<string>("startup") ?? "";
+        result.Name = data.GetValue<string>("name") ?? "Ptero Egg";
+
+        foreach (var variable in data.GetSection("variables").GetChildren())
+        {
+            result.Variables.Add(new()
+            {
+                Key = variable.GetValue<string>("env_variable") ?? "",
+                DefaultValue = variable.GetValue<string>("default_value") ?? ""
+            });
+        }
+        
+        var configData = data.GetSection("config");
+
+        result.ConfigFiles = configData.GetValue<string>("files") ?? "{}";
+
+        var dImagesData = JObject.Parse(json);
+        var dImages = (JObject)dImagesData["docker_images"]!;
+        
+        foreach (var dockerImage in dImages)
+        {
+            var di = new DockerImage()
+            {
+                Default = dockerImage.Key == dImages.Properties().Last().Name,
+                Name = dockerImage.Value!.ToString()
+            };
+
+            result.DockerImages.Add(di);
+        }
+
+        var installSection = data.GetSection("scripts").GetSection("installation");
+
+        result.InstallEntrypoint = installSection.GetValue<string>("entrypoint") ?? "bash";
+        result.InstallScript = installSection.GetValue<string>("script") ?? "";
+        result.InstallDockerImage = installSection.GetValue<string>("container") ?? "";
+
+        var rawJson = configData.GetValue<string>("startup");
+        
+        var startupData = new ConfigurationBuilder().AddJsonStream(
+            new MemoryStream(Encoding.ASCII.GetBytes(rawJson!))
+        ).Build();
+
+        result.StartupDetection = startupData.GetValue<string>("done", "") ?? "";
+        result.StopCommand = configData.GetValue<string>("stop") ?? "";
+
+        result.TagsJson = "[]";
+        result.BackgroundImageUrl = "";
+
+        return result;
+    }
+}

Moonlight/App/Helpers/Formatter.cs

@@ -1,9 +1,36 @@
-using Moonlight.App.Services;
+using System.Text;
+using Moonlight.App.Services;
 
 namespace Moonlight.App.Helpers;
 
 public static class Formatter
 {
+    public static string ReplaceEnd(string input, string substringToReplace, string newSubstring)
+    {
+        int lastIndexOfSubstring = input.LastIndexOf(substringToReplace);
+        if (lastIndexOfSubstring >= 0)
+        {
+            input = input.Remove(lastIndexOfSubstring, substringToReplace.Length).Insert(lastIndexOfSubstring, newSubstring);
+        }
+
+        return input;
+    }
+    public static string ConvertCamelCaseToSpaces(string input)
+    {
+        StringBuilder output = new StringBuilder();
+
+        foreach (char c in input)
+        {
+            if (char.IsUpper(c))
+            {
+                output.Append(' ');
+            }
+
+            output.Append(c);
+        }
+
+        return output.ToString().Trim();
+    }
     public static string FormatUptime(double uptime)
     {
         TimeSpan t = TimeSpan.FromMilliseconds(uptime);

Moonlight/App/Helpers/PropBinder.cs

@@ -0,0 +1,51 @@
+using System.Reflection;
+
+namespace Moonlight.App.Helpers;
+
+public class PropBinder
+{
+    private PropertyInfo PropertyInfo;
+    private object DataObject;
+
+    public PropBinder(PropertyInfo propertyInfo, object dataObject)
+    {
+        PropertyInfo = propertyInfo;
+        DataObject = dataObject;
+    }
+
+    public string StringValue
+    {
+        get => (string)PropertyInfo.GetValue(DataObject)!;
+        set => PropertyInfo.SetValue(DataObject, value);
+    }
+
+    public int IntValue
+    {
+        get => (int)PropertyInfo.GetValue(DataObject)!;
+        set => PropertyInfo.SetValue(DataObject, value);
+    }
+    
+    public long LongValue
+    {
+        get => (long)PropertyInfo.GetValue(DataObject)!;
+        set => PropertyInfo.SetValue(DataObject, value);
+    }
+    
+    public bool BoolValue
+    {
+        get => (bool)PropertyInfo.GetValue(DataObject)!;
+        set => PropertyInfo.SetValue(DataObject, value);
+    }
+
+    public DateTime DateTimeValue
+    {
+        get => (DateTime)PropertyInfo.GetValue(DataObject)!;
+        set => PropertyInfo.SetValue(DataObject, value);
+    }
+    
+    public double DoubleValue
+    {
+        get => (double)PropertyInfo.GetValue(DataObject)!;
+        set => PropertyInfo.SetValue(DataObject, value);
+    }
+}

Moonlight/App/Helpers/Wings/WingsConsole.cs

@@ -243,6 +243,7 @@ public class WingsConsole : IDisposable
                 }
             }
             catch(JsonReaderException){}
+            catch(JsonSerializationException){}
             catch (Exception e)
             {
                 if (!Disconnecting)

Moonlight/App/Models/Misc/Session.cs

@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Components;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Services.Interop;
-
-namespace Moonlight.App.Models.Misc;
-
-public class Session
-{
-    public string Ip { get; set; } = "N/A";
-    public string Url { get; set; } = "N/A";
-    public string Device { get; set; } = "N/A";
-    public User? User { get; set; }
-    public DateTime CreatedAt { get; set; }
-    public NavigationManager Navigation { get; set; }
-    public AlertService AlertService { get; set; }
-}

Moonlight/App/Repositories/SessionRepository.cs

@@ -1,37 +0,0 @@
-using Moonlight.App.Models.Misc;
-
-namespace Moonlight.App.Repositories;
-
-public class SessionRepository
-{
-    private readonly List<Session> Sessions;
-
-    public SessionRepository()
-    {
-        Sessions = new();
-    }
-
-    public Session[] Get()
-    {
-        lock (Sessions)
-        {
-            return Sessions.ToArray();
-        }
-    }
-
-    public void Add(Session session)
-    {
-        lock (Sessions)
-        {
-            Sessions.Add(session);
-        }
-    }
-
-    public void Delete(Session session)
-    {
-        lock (Sessions)
-        {
-            Sessions.Remove(session);
-        }
-    }
-}

Moonlight/App/Services/Background/TelemetryService.cs

@@ -0,0 +1,62 @@
+using Moonlight.App.ApiClients.Telemetry;
+using Moonlight.App.ApiClients.Telemetry.Requests;
+using Moonlight.App.Database.Entities;
+using Moonlight.App.Helpers;
+using Moonlight.App.Repositories;
+
+namespace Moonlight.App.Services.Background;
+
+public class TelemetryService
+{
+    private readonly IServiceScopeFactory ServiceScopeFactory;
+    private readonly ConfigService ConfigService;
+    
+    public TelemetryService(
+        ConfigService configService,
+        IServiceScopeFactory serviceScopeFactory)
+    {
+        ServiceScopeFactory = serviceScopeFactory;
+        ConfigService = configService;
+        
+        if(!ConfigService.DebugMode)
+            Task.Run(Run);
+    }
+    
+    private async Task Run()
+    {
+        var timer = new PeriodicTimer(TimeSpan.FromMinutes(15));
+        
+        while (true)
+        {
+            using var scope = ServiceScopeFactory.CreateScope();
+            
+            var serversRepo = scope.ServiceProvider.GetRequiredService<Repository<Server>>();
+            var nodesRepo = scope.ServiceProvider.GetRequiredService<Repository<Node>>();
+            var usersRepo = scope.ServiceProvider.GetRequiredService<Repository<User>>();
+            var webspacesRepo = scope.ServiceProvider.GetRequiredService<Repository<WebSpace>>();
+            var databaseRepo = scope.ServiceProvider.GetRequiredService<Repository<MySqlDatabase>>();
+
+            var apiHelper = scope.ServiceProvider.GetRequiredService<TelemetryApiHelper>();
+
+            try
+            {
+                await apiHelper.Post("telemetry", new TelemetryData()
+                {
+                    Servers = serversRepo.Get().Count(),
+                    Databases = databaseRepo.Get().Count(),
+                    Nodes = nodesRepo.Get().Count(),
+                    Users = usersRepo.Get().Count(),
+                    Webspaces = webspacesRepo.Get().Count(),
+                    AppUrl = ConfigService.Get().Moonlight.AppUrl
+                });
+            }
+            catch (Exception e)
+            {
+                Logger.Warn("Error sending telemetry");
+                Logger.Warn(e);
+            }
+            
+            await timer.WaitForNextTickAsync();
+        }
+    }
+}

Moonlight/App/Services/ConfigService.cs

@@ -51,7 +51,27 @@ public class ConfigService
             File.ReadAllText(path)
         ) ?? new ConfigV1();
         
-        File.WriteAllText(path, JsonConvert.SerializeObject(Configuration));
+        File.WriteAllText(path, JsonConvert.SerializeObject(Configuration, Formatting.Indented));
+    }
+
+    public void Save(ConfigV1 configV1)
+    {
+        Configuration = configV1;
+        Save();
+    }
+
+    public void Save()
+    {
+        var path = PathBuilder.File("storage", "configs", "config.json");
+        
+        if (!File.Exists(path))
+        {
+            File.WriteAllText(path, "{}");
+        }
+        
+        File.WriteAllText(path, JsonConvert.SerializeObject(Configuration, Formatting.Indented));
+        
+        Reload();
     }
 
     public ConfigV1 Get()

Moonlight/App/Services/DomainService.cs

@@ -20,6 +20,7 @@ namespace Moonlight.App.Services;
 public class DomainService
 {
     private readonly DomainRepository DomainRepository;
+    private readonly ConfigService ConfigService;
     private readonly SharedDomainRepository SharedDomainRepository;
     private readonly CloudFlareClient Client;
     private readonly string AccountId;
@@ -29,6 +30,7 @@ public class DomainService
         DomainRepository domainRepository,
         SharedDomainRepository sharedDomainRepository)
     {
+        ConfigService = configService;
         DomainRepository = domainRepository;
         SharedDomainRepository = sharedDomainRepository;
 
@@ -48,6 +50,9 @@ public class DomainService
 
     public Task<Domain> Create(string domain, SharedDomain sharedDomain, User user)
     {
+        if (!ConfigService.Get().Moonlight.Domains.Enable)
+            throw new DisplayException("This operation is disabled");
+        
         if (DomainRepository.Get().Where(x => x.SharedDomain.Id == sharedDomain.Id).Any(x => x.Name == domain))
             throw new DisplayException("A domain with this name does already exist for this shared domain");
 
@@ -63,6 +68,9 @@ public class DomainService
 
     public Task Delete(Domain domain)
     {
+        if (!ConfigService.Get().Moonlight.Domains.Enable)
+            throw new DisplayException("This operation is disabled");
+        
         DomainRepository.Delete(domain);
 
         return Task.CompletedTask;
@@ -71,6 +79,9 @@ public class DomainService
     public async Task<Zone[]>
         GetAvailableDomains() // This method returns all available domains which are not added as a shared domain
     {
+        if (!ConfigService.Get().Moonlight.Domains.Enable)
+            return Array.Empty<Zone>();
+        
         var domains = GetData(
             await Client.Zones.GetAsync(new()
             {
@@ -93,6 +104,9 @@ public class DomainService
 
     public async Task<DnsRecord[]> GetDnsRecords(Domain d)
     {
+        if (!ConfigService.Get().Moonlight.Domains.Enable)
+            return Array.Empty<DnsRecord>();
+        
         var domain = EnsureData(d);
 
         var records = new List<CloudFlare.Client.Api.Zones.DnsRecord.DnsRecord>();
@@ -146,7 +160,7 @@ public class DomainService
                     Type = record.Type
                 });
             }
-            else if (record.Name.EndsWith(rname))
+            else if (record.Name == rname)
             {
                 result.Add(new()
                 {
@@ -166,6 +180,9 @@ public class DomainService
 
     public async Task AddDnsRecord(Domain d, DnsRecord dnsRecord)
     {
+        if (!ConfigService.Get().Moonlight.Domains.Enable)
+            throw new DisplayException("This operation is disabled");
+        
         var domain = EnsureData(d);
 
         var rname = $"{domain.Name}.{domain.SharedDomain.Name}";
@@ -225,6 +242,9 @@ public class DomainService
 
     public async Task UpdateDnsRecord(Domain d, DnsRecord dnsRecord)
     {
+        if (!ConfigService.Get().Moonlight.Domains.Enable)
+            throw new DisplayException("This operation is disabled");
+        
         var domain = EnsureData(d);
 
         var rname = $"{domain.Name}.{domain.SharedDomain.Name}";
@@ -255,6 +275,9 @@ public class DomainService
 
     public async Task DeleteDnsRecord(Domain d, DnsRecord dnsRecord)
     {
+        if (!ConfigService.Get().Moonlight.Domains.Enable)
+            throw new DisplayException("This operation is disabled");
+        
         var domain = EnsureData(d);
 
         GetData(

Moonlight/App/Services/Interop/AlertService.cs

@@ -1,21 +1,40 @@
 using CurrieTechnologies.Razor.SweetAlert2;
+using Microsoft.JSInterop;
 
 namespace Moonlight.App.Services.Interop;
 
 public class AlertService
 {
-    private readonly SweetAlertService SweetAlertService;
     private readonly SmartTranslateService SmartTranslateService;
+    private readonly IJSRuntime JsRuntime;
+    private SweetAlertService? SweetAlertService;
 
-    public AlertService(SweetAlertService service, SmartTranslateService smartTranslateService)
+    public AlertService(SmartTranslateService smartTranslateService, IJSRuntime jsRuntime)
     {
-        SweetAlertService = service;
         SmartTranslateService = smartTranslateService;
+        JsRuntime = jsRuntime;
+    }
+
+    // We create the swal service here and not using the dependency injection
+    // because it initializes when instantiated which leads to js invoke errors 
+    private Task EnsureService()
+    {
+        if (SweetAlertService == null)
+        {
+            SweetAlertService = new(JsRuntime, new()
+            {
+                Theme = SweetAlertTheme.Dark
+            });
+        }
+        
+        return Task.CompletedTask;
     }
 
     public async Task Info(string title, string desciption)
     {
-        await SweetAlertService.FireAsync(new SweetAlertOptions()
+        await EnsureService();
+        
+        await SweetAlertService!.FireAsync(new SweetAlertOptions()
         {
             Title = title,
             Text = desciption,
@@ -30,7 +49,9 @@ public class AlertService
     
     public async Task Success(string title, string desciption)
     {
-        await SweetAlertService.FireAsync(new SweetAlertOptions()
+        await EnsureService();
+        
+        await SweetAlertService!.FireAsync(new SweetAlertOptions()
         {
             Title = title,
             Text = desciption,
@@ -45,7 +66,9 @@ public class AlertService
     
     public async Task Warning(string title, string desciption)
     {
-        await SweetAlertService.FireAsync(new SweetAlertOptions()
+        await EnsureService();
+        
+        await SweetAlertService!.FireAsync(new SweetAlertOptions()
         {
             Title = title,
             Text = desciption,
@@ -60,7 +83,9 @@ public class AlertService
     
     public async Task Error(string title, string desciption)
     {
-        await SweetAlertService.FireAsync(new SweetAlertOptions()
+        await EnsureService();
+        
+        await SweetAlertService!.FireAsync(new SweetAlertOptions()
         {
             Title = title,
             Text = desciption,
@@ -75,7 +100,9 @@ public class AlertService
     
     public async Task<bool> YesNo(string title, string desciption, string yesText, string noText)
     {
-        var result = await SweetAlertService.FireAsync(new SweetAlertOptions()
+        await EnsureService();
+        
+        var result = await SweetAlertService!.FireAsync(new SweetAlertOptions()
         {
             Title = title,
             Text = desciption,
@@ -91,7 +118,9 @@ public class AlertService
     
     public async Task<string?> Text(string title, string desciption, string setValue)
     {
-        var result = await SweetAlertService.FireAsync(new SweetAlertOptions()
+        await EnsureService();
+        
+        var result = await SweetAlertService!.FireAsync(new SweetAlertOptions()
         {
             Title = title,
             Text = desciption,

Moonlight/App/Services/Sessions/IdentityService.cs

@@ -119,6 +119,10 @@ public class IdentityService
                 return null;
 
             UserCache = user;
+
+            user.LastIp = GetIp();
+            UserRepository.Update(user);
+            
             return UserCache;
         }
         catch (Exception e)

Moonlight/App/Services/Sessions/SessionClientService.cs

@@ -0,0 +1,60 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using Moonlight.App.Database.Entities;
+using Moonlight.App.Repositories;
+using Moonlight.App.Services.Interop;
+
+namespace Moonlight.App.Services.Sessions;
+
+public class SessionClientService
+{
+    public readonly Guid Uuid = Guid.NewGuid();
+    public readonly DateTime CreateTimestamp = DateTime.UtcNow;
+    public User? User { get; private set; }
+    public string Ip { get; private set; } = "N/A";
+    public string Device { get; private set; } = "N/A";
+
+    public readonly IdentityService IdentityService;
+    public readonly AlertService AlertService;
+    public readonly NavigationManager NavigationManager;
+    public readonly IJSRuntime JsRuntime;
+
+    private readonly SessionServerService SessionServerService;
+    private readonly Repository<User> UserRepository;
+
+    public SessionClientService(
+        IdentityService identityService,
+        AlertService alertService,
+        NavigationManager navigationManager,
+        IJSRuntime jsRuntime,
+        SessionServerService sessionServerService,
+        Repository<User> userRepository)
+    {
+        IdentityService = identityService;
+        AlertService = alertService;
+        NavigationManager = navigationManager;
+        JsRuntime = jsRuntime;
+        SessionServerService = sessionServerService;
+        UserRepository = userRepository;
+    }
+
+    public async Task Start()
+    {
+        User = await IdentityService.Get();
+        Ip = IdentityService.GetIp();
+        Device = IdentityService.GetDevice();
+
+        if (User != null) // Track users last visit
+        {
+            User.LastVisitedAt = DateTime.UtcNow;
+            UserRepository.Update(User);
+        }
+
+        await SessionServerService.Register(this);
+    }
+
+    public async Task Stop()
+    {
+        await SessionServerService.UnRegister(this);
+    }
+}

Moonlight/App/Services/Sessions/SessionServerService.cs

@@ -0,0 +1,64 @@
+using Moonlight.App.Database.Entities;
+using Moonlight.App.Events;
+
+namespace Moonlight.App.Services.Sessions;
+
+public class SessionServerService
+{
+    private readonly List<SessionClientService> Sessions = new();
+    private readonly EventSystem Event;
+
+    public SessionServerService(EventSystem eventSystem)
+    {
+        Event = eventSystem;
+    }
+
+    public async Task Register(SessionClientService sessionClientService)
+    {
+        lock (Sessions)
+        {
+            if(!Sessions.Contains(sessionClientService))
+                Sessions.Add(sessionClientService);
+        }
+
+        await Event.Emit("sessions.add", sessionClientService);
+    }
+    public async Task UnRegister(SessionClientService sessionClientService)
+    {
+        lock (Sessions)
+        {
+            if(Sessions.Contains(sessionClientService))
+                Sessions.Remove(sessionClientService);
+        }
+        
+        await Event.Emit("sessions.remove", sessionClientService);
+    }
+
+    public Task<SessionClientService[]> GetSessions()
+    {
+        lock (Sessions)
+        {
+            return Task.FromResult(Sessions.ToArray());
+        }
+    }
+    
+    public async Task ReloadUserSessions(User user)
+    {
+        var sessions = await GetSessions();
+        
+        foreach (var session in sessions)
+        {
+            if (session.User != null && session.User.Id == user.Id)
+            {
+                try
+                {
+                    session.NavigationManager.NavigateTo(session.NavigationManager.Uri, true);
+                }
+                catch (Exception)
+                {
+                    // ignore
+                }
+            }
+        }
+    }
+}

Moonlight/App/Services/Sessions/SessionService.cs

@@ -1,83 +0,0 @@
-using Microsoft.AspNetCore.Components;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Models.Misc;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services.Interop;
-
-namespace Moonlight.App.Services.Sessions;
-
-public class SessionService
-{
-    private readonly SessionRepository SessionRepository;
-    private Repository<User> UserRepository;
-    private readonly IdentityService IdentityService;
-    private readonly NavigationManager NavigationManager;
-    private readonly AlertService AlertService;
-    private readonly DateTimeService DateTimeService;
-
-    private Session? OwnSession;
-
-    public SessionService(
-        SessionRepository sessionRepository, 
-        IdentityService identityService, 
-        NavigationManager navigationManager,
-        AlertService alertService,
-        DateTimeService dateTimeService,
-        Repository<User> userRepository)
-    {
-        SessionRepository = sessionRepository;
-        IdentityService = identityService;
-        NavigationManager = navigationManager;
-        AlertService = alertService;
-        DateTimeService = dateTimeService;
-        UserRepository = userRepository;
-    }
-
-    public async Task Register()
-    {
-        var user = await IdentityService.Get();
-        
-        OwnSession = new Session()
-        {
-            Ip = IdentityService.GetIp(),
-            Url = NavigationManager.Uri,
-            Device = IdentityService.GetDevice(),
-            CreatedAt = DateTimeService.GetCurrent(),
-            User = user,
-            Navigation = NavigationManager,
-            AlertService = AlertService
-        };
-        
-        SessionRepository.Add(OwnSession);
-
-        if (user != null) // Track last session init of user as last visited timestamp
-        {
-            user.LastVisitedAt = DateTimeService.GetCurrent();
-            UserRepository.Update(user);
-        }
-    }
-
-    public void Refresh()
-    {
-        OwnSession.Url = NavigationManager.Uri;
-    }
-
-    public void Close()
-    {
-        SessionRepository.Delete(OwnSession);
-    }
-
-    public Session[] GetAll()
-    {
-        return SessionRepository.Get();
-    }
-
-    public void ReloadUserSessions(User user)
-    {
-        foreach (var session in SessionRepository.Get())
-        {
-            if(session.User != null && session.User.Id == user.Id)
-                session.Navigation.NavigateTo(session.Navigation.Uri, true);
-        }
-    }
-}

Moonlight/App/Services/Statistics/StatisticsCaptureService.cs

@@ -36,8 +36,6 @@ public class StatisticsCaptureService
         {
             while (await Timer.WaitForNextTickAsync())
             {
-                Logger.Warn("Creating statistics");
-                
                 using var scope = ServiceScopeFactory.CreateScope();
 
                 var statisticsRepo = scope.ServiceProvider.GetRequiredService<Repository<StatisticsData>>();
@@ -46,7 +44,7 @@ public class StatisticsCaptureService
                 var domainsRepo = scope.ServiceProvider.GetRequiredService<Repository<Domain>>();
                 var webspacesRepo = scope.ServiceProvider.GetRequiredService<Repository<WebSpace>>();
                 var databasesRepo = scope.ServiceProvider.GetRequiredService<Repository<MySqlDatabase>>();
-                var sessionService = scope.ServiceProvider.GetRequiredService<SessionService>();
+                var sessionService = scope.ServiceProvider.GetRequiredService<SessionServerService>();
             
                 void AddEntry(string chart, int value)
                 {
@@ -63,7 +61,7 @@ public class StatisticsCaptureService
                 AddEntry("domainsCount", domainsRepo.Get().Count());
                 AddEntry("webspacesCount", webspacesRepo.Get().Count());
                 AddEntry("databasesCount", databasesRepo.Get().Count());
-                AddEntry("sessionsCount", sessionService.GetAll().Length);
+                AddEntry("sessionsCount", (await sessionService.GetSessions()).Length);
             }
         }
         catch (Exception e)

Moonlight/App/Services/UserService.cs

@@ -18,6 +18,7 @@ public class UserService
     private readonly IdentityService IdentityService;
     private readonly IpLocateService IpLocateService;
     private readonly DateTimeService DateTimeService;
+    private readonly ConfigService ConfigService;
 
     private readonly string JwtSecret;
 
@@ -32,6 +33,7 @@ public class UserService
     {
         UserRepository = userRepository;
         TotpService = totpService;
+        ConfigService = configService;
         MailService = mailService;
         IdentityService = identityService;
         IpLocateService = ipLocateService;
@@ -44,6 +46,9 @@ public class UserService
 
     public async Task<string> Register(string email, string password, string firstname, string lastname)
     {
+        if (ConfigService.Get().Moonlight.Auth.DenyRegister)
+            throw new DisplayException("This operation was disabled");
+        
         // Check if the email is already taken
         var emailTaken = UserRepository.Get().FirstOrDefault(x => x.Email == email) != null;
 
@@ -72,7 +77,9 @@ public class UserService
             TotpEnabled = false,
             TotpSecret = "",
             UpdatedAt = DateTimeService.GetCurrent(),
-            TokenValidTime = DateTimeService.GetCurrent().AddDays(-5)
+            TokenValidTime = DateTimeService.GetCurrent().AddDays(-5),
+            LastIp = IdentityService.GetIp(),
+            RegisterIp = IdentityService.GetIp()
         });
 
         await MailService.SendMail(user!, "register", values => {});
@@ -106,6 +113,9 @@ public class UserService
 
     public async Task<string> Login(string email, string password, string totpCode = "")
     {
+        if (ConfigService.Get().Moonlight.Auth.DenyLogin)
+            throw new DisplayException("This operation was disabled");
+        
         // First password check and check if totp is enabled
         var needTotp = await CheckTotp(email, password);
         

Moonlight/Moonlight.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="BlazorMonaco" Version="2.1.0" />
     <PackageReference Include="BlazorTable" Version="1.17.0" />
     <PackageReference Include="CloudFlare.Client" Version="6.1.4" />
-    <PackageReference Include="CurrieTechnologies.Razor.SweetAlert2" Version="5.4.0" />
+    <PackageReference Include="CurrieTechnologies.Razor.SweetAlert2" Version="5.5.0" />
     <PackageReference Include="Discord.Net" Version="3.10.0" />
     <PackageReference Include="Discord.Net.Webhook" Version="3.10.0" />
     <PackageReference Include="DnsClient" Version="1.7.0" />

Moonlight/Pages/_Layout.cshtml

@@ -96,7 +96,6 @@
     </div>
 </div>
 
-<script src="/_framework/blazor.server.js"></script>
 <script src="/assets/plugins/global/plugins.bundle.js"></script>
 <script src="/_content/XtermBlazor/XtermBlazor.min.js"></script>
 <script src="/_content/BlazorTable/BlazorTable.min.js"></script>
@@ -124,5 +123,7 @@ moonlight.loading.registerXterm();
 <script src="_content/Blazor-ApexCharts/js/apex-charts.min.js"></script>
 <script src="_content/Blazor-ApexCharts/js/blazor-apex-charts.js"></script>
 
+<script src="/_framework/blazor.server.js"></script>
+
 </body>
 </html>

Moonlight/Program.cs

@@ -6,6 +6,7 @@ using Moonlight.App.ApiClients.CloudPanel;
 using Moonlight.App.ApiClients.Daemon;
 using Moonlight.App.ApiClients.Modrinth;
 using Moonlight.App.ApiClients.Paper;
+using Moonlight.App.ApiClients.Telemetry;
 using Moonlight.App.ApiClients.Wings;
 using Moonlight.App.Database;
 using Moonlight.App.Diagnostics.HealthChecks;
@@ -32,7 +33,6 @@ using Moonlight.App.Services.SupportChat;
 using Sentry;
 using Serilog;
 using Serilog.Events;
-using Serilog.Sinks.SystemConsole.Themes;
 
 namespace Moonlight
 {
@@ -153,7 +153,6 @@ namespace Moonlight
             builder.Services.AddDbContext<DataContext>();
 
             // Repositories
-            builder.Services.AddSingleton<SessionRepository>();
             builder.Services.AddScoped<UserRepository>();
             builder.Services.AddScoped<NodeRepository>();
             builder.Services.AddScoped<ServerRepository>();
@@ -180,7 +179,6 @@ namespace Moonlight
             builder.Services.AddScoped<CookieService>();
             builder.Services.AddScoped<IdentityService>();
             builder.Services.AddScoped<IpLocateService>();
-            builder.Services.AddScoped<SessionService>();
             builder.Services.AddScoped<AlertService>();
             builder.Services.AddScoped<SmartTranslateService>();
             builder.Services.AddScoped<UserService>();
@@ -216,6 +214,9 @@ namespace Moonlight
             builder.Services.AddScoped<SubscriptionService>();
             builder.Services.AddScoped<SubscriptionAdminService>();
 
+            builder.Services.AddScoped<SessionClientService>();
+            builder.Services.AddSingleton<SessionServerService>();
+
             // Loggers
             builder.Services.AddScoped<MailService>();
             builder.Services.AddSingleton<TrashMailDetectorService>();
@@ -236,6 +237,7 @@ namespace Moonlight
             builder.Services.AddScoped<DaemonApiHelper>();
             builder.Services.AddScoped<CloudPanelApiHelper>();
             builder.Services.AddScoped<ModrinthApiHelper>();
+            builder.Services.AddScoped<TelemetryApiHelper>();
 
             // Background services
             builder.Services.AddSingleton<DiscordBotService>();
@@ -243,13 +245,13 @@ namespace Moonlight
             builder.Services.AddSingleton<DiscordNotificationService>();
             builder.Services.AddSingleton<CleanupService>();
             builder.Services.AddSingleton<MalwareScanService>();
+            builder.Services.AddSingleton<TelemetryService>();
             
             // Other
             builder.Services.AddSingleton<MoonlightService>();
 
             // Third party services
             builder.Services.AddBlazorTable();
-            builder.Services.AddSweetAlert2(options => { options.Theme = SweetAlertTheme.Dark; });
             builder.Services.AddBlazorContextMenu();
             builder.Services.AddBlazorDownloadFile();
 
@@ -288,6 +290,7 @@ namespace Moonlight
             _ = app.Services.GetRequiredService<StatisticsCaptureService>();
             _ = app.Services.GetRequiredService<DiscordNotificationService>();
             _ = app.Services.GetRequiredService<MalwareScanService>();
+            _ = app.Services.GetRequiredService<TelemetryService>();
             
             _ = app.Services.GetRequiredService<MoonlightService>();
 

Moonlight/Shared/Components/Forms/SmartFormClass.razor

@@ -0,0 +1,65 @@
+@using System.Reflection
+@using System.Collections
+@using Moonlight.App.Helpers
+
+<div class="accordion my-3" id="configSetting@(Model.GetHashCode())">
+    <div class="accordion-item">
+        <h2 class="accordion-header" id="configSetting-header@(Model.GetHashCode())">
+            <button class="accordion-button fs-4 fw-semibold collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#configSetting-body@(Model.GetHashCode())" aria-expanded="false" aria-controls="configSetting-body@(Model.GetHashCode())">
+                @{
+                    var name = Formatter.ReplaceEnd(Model.GetType().Name, "Data", "");
+                    name = Formatter.ConvertCamelCaseToSpaces(name);
+                }
+
+                @(name)
+            </button>
+        </h2>
+        <div id="configSetting-body@(Model.GetHashCode())" class="accordion-collapse collapse" aria-labelledby="configSetting-header@(Model.GetHashCode())" data-bs-parent="#configSetting">
+            <div class="accordion-body">
+                @foreach (var property in Model.GetType().GetProperties())
+                {
+                    @BindAndRenderProperty(property)
+                }
+            </div>
+        </div>
+    </div>
+</div>
+
+@code
+{
+    [Parameter]
+    public object Model { get; set; }
+
+    private RenderFragment BindAndRenderProperty(PropertyInfo property)
+    {
+        if (property.PropertyType.IsClass && !property.PropertyType.IsPrimitive && !typeof(IEnumerable).IsAssignableFrom(property.PropertyType))
+        {
+            return @<SmartFormClass Model="@property.GetValue(Model)"/>;
+
+            // If the property is a subclass, serialize and generate form for it
+            /*
+            foreach (var subProperty in property.PropertyType.GetProperties())
+            {
+                return BindAndRenderProperty(subProperty);
+            }*/
+        }
+        else if (property.PropertyType == typeof(int) || property.PropertyType == typeof(string) || property.PropertyType == typeof(bool) || property.PropertyType == typeof(decimal) || property.PropertyType == typeof(long))
+        {
+            return @<SmartFormProperty Model="Model" PropertyInfo="property"/>;
+        }
+        else if (typeof(IEnumerable).IsAssignableFrom(property.PropertyType))
+        {
+            // If the property is a collection, generate form for each element
+            var collection = property.GetValue(Model) as IEnumerable;
+            if (collection != null)
+            {
+                foreach (var element in collection)
+                {
+                }
+            }
+        }
+        // Additional property types could be handled here (e.g., DateTime, int, etc.)
+
+        return @<div></div>;
+    }
+}

Moonlight/Shared/Components/Forms/SmartFormProperty.razor

@@ -0,0 +1,79 @@
+@using System.Reflection
+@using Moonlight.App.Helpers
+@using System.ComponentModel
+
+<label class="form-label" for="@PropertyInfo.Name">
+    @(Formatter.ConvertCamelCaseToSpaces(PropertyInfo.Name))
+</label>
+@{
+    //TODO: Tidy up this code
+    
+    var attrs = PropertyInfo.GetCustomAttributes(true);
+    
+    var descAttr = attrs
+        .FirstOrDefault(x => x.GetType() == typeof(DescriptionAttribute));
+
+    var blurBool = attrs.Any(x => x.GetType() == typeof(BlurAttribute));
+    var blur = blurBool ? "blur-unless-hover" : "";
+}
+
+@if (descAttr != null)
+{
+    var a = descAttr as DescriptionAttribute;
+
+    <div class="form-text fs-5 mb-2 mt-0">
+        @(a.Description)
+    </div>
+}
+
+<div class="input-group mb-5">
+    @if (PropertyInfo.PropertyType == typeof(string))
+    {
+        var binder = new PropBinder(PropertyInfo, Model!);
+
+        <div class="@(blur) w-100">
+            <InputText id="@PropertyInfo.Name" @bind-Value="binder.StringValue" class="form-control"/>
+        </div>
+    }
+    else if (PropertyInfo.PropertyType == typeof(int))
+    {
+        var binder = new PropBinder(PropertyInfo, Model!);
+
+        <InputNumber id="@PropertyInfo.Name" @bind-Value="binder.IntValue" class="form-control"/>
+    }
+    else if (PropertyInfo.PropertyType == typeof(long))
+    {
+        var binder = new PropBinder(PropertyInfo, Model!);
+
+        <InputNumber id="@PropertyInfo.Name" @bind-Value="binder.LongValue" class="form-control"/>
+    }
+    else if (PropertyInfo.PropertyType == typeof(bool))
+    {
+        var binder = new PropBinder(PropertyInfo, Model!);
+
+        <div class="form-check">
+            <InputCheckbox id="@PropertyInfo.Name" @bind-Value="binder.BoolValue" class="form-check-input"/>
+        </div>
+    }
+    else if (PropertyInfo.PropertyType == typeof(DateTime))
+    {
+        var binder = new PropBinder(PropertyInfo, Model!);
+
+        <InputDate id="@PropertyInfo.Name" @bind-Value="binder.DateTimeValue" class="form-control"/>
+    }
+    else if (PropertyInfo.PropertyType == typeof(decimal))
+    {
+        var binder = new PropBinder(PropertyInfo, Model!);
+
+        <InputNumber id="@PropertyInfo.Name" step="0.01" @bind-Value="binder.DoubleValue" class="form-control"/>
+    }
+</div>
+
+@code
+{
+    [Parameter]
+    public PropertyInfo PropertyInfo { get; set; }
+
+    [Parameter]
+    public object Model { get; set; }
+}

Moonlight/Shared/Components/Navigations/AdminSystemNavigation.razor

@@ -39,6 +39,11 @@
                     <TL>News</TL>
                 </a>
             </li>
+            <li class="nav-item mt-2">
+                <a class="nav-link text-active-primary ms-0 me-10 py-5 @(Index == 8 ? "active" : "")" href="/admin/system/configuration">
+                    <TL>Configuration</TL>
+                </a>
+            </li>
         </ul>
     </div>
 </div>

Moonlight/Shared/Components/Xterm/Terminal.razor

@@ -39,7 +39,15 @@
 
     public async void Dispose()
     {
-        await Xterm.DisposeAsync();
+        try
+        {
+            await Xterm.DisposeAsync();
+        }
+        catch (Exception)
+        {
+            // ignore dispose errors. They occur when the tab closes unexpectedly
+            // so we can ignore them
+        }
     }
 
     private async void OnFirstRender()

Moonlight/Shared/Layouts/MainLayout.razor

@@ -14,7 +14,7 @@
 
 @inject IJSRuntime JsRuntime
 @inject IdentityService IdentityService
-@inject SessionService SessionService
+@inject SessionClientService SessionClientService
 @inject NavigationManager NavigationManager
 @inject EventSystem Event
 @inject ToastService ToastService
@@ -163,13 +163,11 @@
 
     private bool IsIpBanned = false;
 
-    protected override void OnInitialized()
-    {
-        AddBodyAttribute("data-kt-app-page-loading", "on");
-    }
-
     protected override void OnAfterRender(bool firstRender)
     {
+        if(firstRender)
+            AddBodyAttribute("data-kt-app-page-loading", "on");
+        
     //Initialize classes and attributes for layout with dark sidebar
         AddBodyAttribute("data-kt-app-reset-transition", "true");
 
@@ -217,12 +215,10 @@
                 }
                 catch (Exception){ /* ignore errors to make sure that the session call is executed */ }
 
-                await SessionService.Register();
+                await SessionClientService.Start();
 
                 NavigationManager.LocationChanged += async (_, _) =>
                 {
-                    SessionService.Refresh();
-
                     if (!NavigationManager.Uri.Contains("/server/"))
                         await DynamicBackgroundService.Reset();
                 };
@@ -257,7 +253,7 @@
 
     public async void Dispose()
     {
-        SessionService.Close();
+        await SessionClientService.Stop();
 
         await KeyListenerService.DisposeAsync();
 

Moonlight/Shared/Layouts/NotFoundLayout.razor

@@ -9,7 +9,7 @@
 
 @inject IJSRuntime JsRuntime
 @inject IdentityService IdentityService
-@inject SessionService SessionService
+@inject SessionClientService SessionClientService
 @inject NavigationManager NavigationManager
 
 <GlobalErrorBoundary>
@@ -106,9 +106,7 @@
                 await JsRuntime.InvokeVoidAsync("KTDrawer.createInstances");
                 await JsRuntime.InvokeVoidAsync("createSnow");
 
-                await SessionService.Register();
+                await SessionClientService.Start();
-
-                NavigationManager.LocationChanged += (sender, args) => { SessionService.Refresh(); };
             }
             catch (Exception)
             {
@@ -117,9 +115,9 @@
         }
     }
 
-    public void Dispose()
+    public async void Dispose()
     {
-        SessionService.Close();
+        await SessionClientService.Stop();
     }
 
     private void AddBodyAttribute(string attribute, string value)

Moonlight/Shared/Views/Admin/Nodes/Setup.razor

@@ -40,7 +40,7 @@
                             &nbsp;&nbsp;host: 0.0.0.0<br/>
                             &nbsp;&nbsp;port: @(Node.HttpPort)<br/>
                             &nbsp;&nbsp;ssl:<br/>
-                            &nbsp;&nbsp;&nbsp;&nbsp;enabled: false<br/>
+                            &nbsp;&nbsp;&nbsp;&nbsp;enabled: @(Node.Ssl ? "true" : "false")<br/>
                             &nbsp;&nbsp;&nbsp;&nbsp;cert: /etc/letsencrypt/live/@(Node.Fqdn)/fullchain.pem<br/>
                             &nbsp;&nbsp;&nbsp;&nbsp;key: /etc/letsencrypt/live/@(Node.Fqdn)/privkey.pem<br/>
                             &nbsp;&nbsp;disable_remote_download: false<br/>

Moonlight/Shared/Views/Admin/Servers/Images/Index.razor

@@ -32,7 +32,7 @@
                             <TL>New image</TL>
                         </a>
                         <InputFile OnChange="OnFileChanged" type="file" id="fileUpload" hidden="" multiple=""/>
-                        <label for="fileUpload" class="btn btn-sm btn-light-primary">
+                        <label for="fileUpload" class="btn btn-sm btn-light-primary me-3">
                             <span class="svg-icon svg-icon-2">
                                 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                                     <path opacity="0.3" d="M10 4H21C21.6 4 22 4.4 22 5V7H10V4Z" fill="currentColor"></path>
@@ -42,6 +42,17 @@
                             </span>
                             <TL>Import</TL>
                         </label>
+                        <InputFile OnChange="OnEggFileChanged" type="file" id="eggFileUpload" hidden="" multiple=""/>
+                        <label for="eggFileUpload" class="btn btn-sm btn-light-primary">
+                            <span class="svg-icon svg-icon-2">
+                                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <path opacity="0.3" d="M10 4H21C21.6 4 22 4.4 22 5V7H10V4Z" fill="currentColor"></path>
+                                    <path d="M10.4 3.60001L12 6H21C21.6 6 22 6.4 22 7V19C22 19.6 21.6 20 21 20H3C2.4 20 2 19.6 2 19V4C2 3.4 2.4 3 3 3H9.20001C9.70001 3 10.2 3.20001 10.4 3.60001ZM16 11.6L12.7 8.29999C12.3 7.89999 11.7 7.89999 11.3 8.29999L8 11.6H11V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H16Z" fill="currentColor"></path>
+                                    <path opacity="0.3" d="M11 11.6V17C11 17.6 11.4 18 12 18C12.6 18 13 17.6 13 17V11.6H11Z" fill="currentColor"></path>
+                                </svg>
+                            </span>
+                            <TL>Import pterodactyl egg</TL>
+                        </label>
                     </div>
                 </div>
                 <div class="card-body pt-0">
@@ -105,7 +116,7 @@
     private async Task Load(LazyLoader lazyLoader)
     {
         await lazyLoader.SetText("Loading images");
-        
+
         Images = ImageRepository
             .Get()
             .Include(x => x.DockerImages)
@@ -113,7 +124,7 @@
             .ToArray();
 
         await lazyLoader.SetText("Counting image servers");
-        
+
         ServersCount.Clear();
 
         foreach (var image in Images)
@@ -130,7 +141,7 @@
     private async Task Delete(Image image)
     {
         var variables = image.Variables.ToArray();
-        
+
         image.Variables.Clear();
         ImageRepository.Update(image);
 
@@ -138,11 +149,11 @@
         {
             ImageVariableRepository.Delete(v);
         }
-        
+
         ImageRepository.Delete(image);
         await LazyLoader.Reload();
     }
-    
+
     private async Task OnFileChanged(InputFileChangeEventArgs arg)
     {
         foreach (var browserFile in arg.GetMultipleFiles())
@@ -155,7 +166,7 @@
 
                 var text = Encoding.UTF8.GetString(data);
                 var image = JsonConvert.DeserializeObject<Image>(text)!;
-                    
+
                 image.Uuid = Guid.NewGuid();
 
                 ImageRepository.Add(image);
@@ -170,7 +181,47 @@
                 Logger.Error(e);
             }
         }
+
+        await InvokeAsync(StateHasChanged);
+    }
+    
+    private async Task OnEggFileChanged(InputFileChangeEventArgs arg)
+    {
+        var b = await AlertService.YesNo(
+            SmartTranslateService.Translate("Attention"),
+            SmartTranslateService.Translate("Imported pterodactyl eggs can result in broken images. We do not support pterodactyl eggs"),
+            SmartTranslateService.Translate("I take the risk"),
+            SmartTranslateService.Translate("Cancel")
+            );
         
+        if(!b)
+            return;
+        
+        foreach (var browserFile in arg.GetMultipleFiles())
+        {
+            try
+            {
+                var stream = browserFile.OpenReadStream(1024 * 1024 * 100);
+                var data = new byte[browserFile.Size];
+                _ = await stream.ReadAsync(data, 0, data.Length);
+
+                var json = Encoding.UTF8.GetString(data);
+
+                var image = EggConverter.Convert(json);
+
+                ImageRepository.Add(image);
+
+                await AlertService.Success(SmartTranslateService.Translate("Successfully imported image"));
+                await LazyLoader.Reload();
+            }
+            catch (Exception e)
+            {
+                await AlertService.Error(SmartTranslateService.Translate("An unknown error occured while uploading and importing the image"));
+                Logger.Error("Error importing image");
+                Logger.Error(e);
+            }
+        }
+
         await InvokeAsync(StateHasChanged);
     }
 }

Moonlight/Shared/Views/Admin/Sys/Configuration.razor

@@ -0,0 +1,53 @@
+@page "/admin/system/configuration"
+
+@using Moonlight.App.Services
+@using Moonlight.Shared.Components.Navigations
+@using Moonlight.App.Configuration
+@using Moonlight.App.Services.Interop
+
+@inject ConfigService ConfigService
+@inject ToastService ToastService
+@inject SmartTranslateService SmartTranslateService
+
+<OnlyAdmin>
+    <AdminSystemNavigation Index="8"/>
+
+    <LazyLoader Load="Load">
+        <div class="card">
+            <SmartForm Model="Config" OnValidSubmit="OnSubmit">
+                <div class="card-body">
+                    <SmartFormClass Model="Config"/>
+                </div>
+                <div class="card-footer">
+                    <div class="text-end">
+                        <button type="submit" class="btn btn-success">
+                            <TL>Save</TL>
+                        </button>
+                    </div>
+                </div>
+            </SmartForm>
+        </div>
+    </LazyLoader>
+</OnlyAdmin>
+
+@code
+{
+    private ConfigV1 Config;
+
+    private Task Load(LazyLoader lazyLoader)
+    {
+        Config = ConfigService.Get();
+
+        return Task.CompletedTask;
+    }
+
+    private async Task OnSubmit()
+    {
+        ConfigService.Save(Config);
+        await ToastService.Success(
+            SmartTranslateService.Translate(
+                "Successfully saved and reloaded configuration. Some changes may take affect after a restart of moonlight"
+                )
+            );
+    }
+}

Moonlight/Shared/Views/Admin/Users/Edit.razor

@@ -8,7 +8,7 @@
 
 @inject UserRepository UserRepository
 @inject UserService UserService
-@inject SessionService SessionService
+@inject SessionServerService SessionServerService
 @inject ToastService ToastService
 @inject SmartTranslateService SmartTranslateService
 
@@ -174,7 +174,7 @@
         user.Status = User!.Status;
         UserRepository.Update(user);
 
-        SessionService.ReloadUserSessions(User);
+        await SessionServerService.ReloadUserSessions(User);
 
         await ToastService.Success(SmartTranslateService.Translate("Successfully updated user"));
     }
@@ -191,7 +191,7 @@
         await UserService.ChangePassword(User!, NewPassword, true);
         NewPassword = "";
         
-        SessionService.ReloadUserSessions(User);
+        await SessionServerService.ReloadUserSessions(User!);
         
         await ToastService.Success(SmartTranslateService.Translate("Successfully updated password"));
     }

Moonlight/Shared/Views/Admin/Users/Sessions.razor

@@ -8,9 +8,10 @@
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
 
-@inject SessionService SessionService
+@inject SessionServerService SessionServerService
 @inject SmartTranslateService SmartTranslateService
 @inject AlertService AlertService
+@inject ToastService ToastService
 
 <OnlyAdmin>
     <AdminSessionNavigation Index="1"/>
@@ -44,8 +45,8 @@
                 }
                 else
                 {
-                    <Table TableItem="Session" Items="AllSessions" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                    <Table TableItem="SessionClientService" Items="AllSessions" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                        <Column TableItem="Session" Title="@(SmartTranslateService.Translate("Email"))" Field="@(x => x.User.Email)" Sortable="true" Filterable="true" Width="20%">
+                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Email"))" Field="@(x => x.User.Email)" Sortable="true" Filterable="true" Width="20%">
                             <Template>
                                 @if (context.User == null)
                                 {
@@ -57,25 +58,33 @@
                                 }
                             </Template>
                         </Column>
-                        <Column TableItem="Session" Title="@(SmartTranslateService.Translate("IP"))" Field="@(x => x.Ip)" Sortable="true" Filterable="true" Width="10%"/>
+                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("IP"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
-                        <Column TableItem="Session" Title="@(SmartTranslateService.Translate("URL"))" Field="@(x => x.Url)" Sortable="true" Filterable="true" Width="10%"/>
+                            <Template>
-                        <Column TableItem="Session" Title="@(SmartTranslateService.Translate("Device"))" Field="@(x => x.Device)" Sortable="true" Filterable="true" Width="10%"/>
+                                @(context.Ip)
-                        <Column TableItem="Session" Title="@(SmartTranslateService.Translate("Time"))" Field="@(x => x.CreatedAt)" Sortable="true" Filterable="true" Width="10%">
+                            </Template>
+                        </Column>
+                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("URL"))" Field="@(x => x.NavigationManager.Uri)" Sortable="true" Filterable="true" Width="10%"/>
+                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Device"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
+                            <Template>
+                                @(context.Device)
+                            </Template>
+                        </Column>
+                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Time"))" Field="@(x => x.CreateTimestamp)" Sortable="true" Filterable="true" Width="10%">
                             <Template>
                                 @{
-                                    var time = Formatter.FormatUptime((DateTime.UtcNow - context.CreatedAt).TotalMilliseconds);
+                                    var time = Formatter.FormatUptime((DateTime.UtcNow - context.CreateTimestamp).TotalMilliseconds);
                                 }
                                 <span>@(time)</span>
                             </Template>
                         </Column>
-                        <Column TableItem="Session" Title="@(SmartTranslateService.Translate("Actions"))" Field="@(x => x.Ip)" Sortable="false" Filterable="false" Width="10%">
+                        <Column TableItem="SessionClientService" Title="@(SmartTranslateService.Translate("Actions"))" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
                             <Template>
                                 <button @onclick="() => Navigate(context)" class="btn btn-sm btn-primary">
                                     <TL>Change url</TL>
                                 </button>
                             </Template>
                         </Column>
-                        <Column TableItem="Session" Title="" Field="@(x => x.Ip)" Sortable="false" Filterable="false" Width="10%">
+                        <Column TableItem="SessionClientService" Title="" Field="@(x => x.Uuid)" Sortable="false" Filterable="false" Width="10%">
                             <Template>
                                 <button @onclick="() => Message(context)" class="btn btn-sm btn-warning">
                                     <TL>Message</TL>
@@ -92,11 +101,11 @@
 
 @code
 {
-    private Session[]? AllSessions;
+    private SessionClientService[]? AllSessions;
 
-    private Task Load(LazyLoader arg)
+    private async Task Load(LazyLoader arg)
     {
-        AllSessions = SessionService.GetAll();
+        AllSessions = await SessionServerService.GetSessions();
 
         Task.Run(async () =>
         {
@@ -109,35 +118,30 @@
                 }
                 catch (Exception e)
                 {
-                    Logger.Warn("Error autorefreshing sessions");
+                    Logger.Warn("Error auto refreshing sessions");
                     Logger.Warn(e);
                 }
             }
         });
-
-        return Task.CompletedTask;
     }
 
     private async Task Refresh()
     {
-        AllSessions = SessionService.GetAll();
+        AllSessions = await SessionServerService.GetSessions();
         await InvokeAsync(StateHasChanged);
     }
 
-    private async Task Navigate(Session session)
+    private async Task Navigate(SessionClientService session)
     {
         var url = await AlertService.Text("URL", SmartTranslateService.Translate("Enter url"), "");
 
-        if (url == null)
+        if (string.IsNullOrEmpty(url))
-            return;
-
-        if (url == "")
             return;
 
         if (url == "null")
             return;
 
-        session.Navigation.NavigateTo(url, true);
+        session.NavigationManager.NavigateTo(url, true);
     }
 
     private async Task MessageAll()
@@ -157,22 +161,30 @@
 
         if (b)
         {
-            foreach (var session in SessionService.GetAll())
+            foreach (var session in AllSessions!)
             {
-                try
+                Task.Run(async () =>
                 {
-                    await session.AlertService.Warning("Admin Message", message);
+                    try
-                }
+                    {
-                catch (Exception e)
+                        await session.AlertService.Warning("Admin Message", message);
-                {
+                    }
-                    Logger.Warn("Error sending user a alert");
+                    catch (Exception e)
-                    Logger.Warn(e);
+                    {
-                }
+                        Logger.Warn("Error sending user a alert");
+                        Logger.Warn(e);
+
+                        var translation = SmartTranslateService.Translate("An unknown error occured while sending admin message to user: ");
+                        var identifier = session.User != null ? session.User.Email : session.Uuid.ToString();
+
+                        await ToastService.Warning(translation + identifier);
+                    }
+                });
             }
         }
     }
 
-    private async Task Message(Session session)
+    private async Task Message(SessionClientService session)
     {
         var message = await AlertService.Text(
             SmartTranslateService.Translate("Enter message"),
@@ -191,12 +203,14 @@
         {
             try
             {
-                await session.AlertService.Warning("Admin Message", message);
+                await session.AlertService.Warning("Admin Message", message!);
             }
             catch (Exception e)
             {
                 Logger.Warn("Error sending user a alert");
                 Logger.Warn(e);
+
+                await ToastService.Warning(SmartTranslateService.Translate("An unknown error occured while sending admin message"));
             }
         }
     }

Moonlight/Shared/Views/Admin/Users/View.razor

@@ -21,198 +21,222 @@
 else
 {
     <div class="row">
-        <div class="col-md-4">
+    <div class="col-md-4">
-            <div class="card card-body mb-5">
+        <div class="card card-body mb-5">
-                <div class="d-flex flex-column align-items-center text-center">
+            <div class="d-flex flex-column align-items-center text-center">
-                    <img src="/api/moonlight/avatar/@(User.Id)" class="rounded-circle" alt="Profile picture" width="150">
+                <img src="/api/moonlight/avatar/@(User.Id)" class="rounded-circle" alt="Profile picture" width="150">
-                </div>
-            </div>
-            <div class="card card-body mb-5">
-                <div class="btn-group">
-                    <a class="btn btn-primary" href="/admin/users/edit/@(User.Id)"><TL>Edit</TL></a>
-                    <a class="btn btn-secondary" href="/admin/users"><TL>Back to list</TL></a>
-                    <a class="btn btn-primary" href="/admin/support/view/@(User.Id)"><TL>Open support</TL></a>
-                </div>
-            </div>
-            <div class="card card-xl-stretch mb-5">
-                <div class="card-header border-0">
-                    <h3 class="card-title fw-bold text-dark">
-                        <TL>Servers</TL>
-                    </h3>
-                </div>
-                <div class="card-body pt-2">
-                    @foreach (var server in Servers)
-                    {
-                        <div class="d-flex align-items-center">
-                            <div class="flex-grow-1">
-                                <a href="/server/@(server.Uuid)" class="fs-6">@(server.Name) - @(server.Image.Name)</a>
-                            </div>
-                        </div>
-
-                        if (server != Servers.Last())
-                        {
-                            <div class="separator my-4"></div>
-                        }
-                    }
-                </div>
-            </div>
-            <div class="card card-xl-stretch">
-                <div class="card-header border-0">
-                    <h3 class="card-title fw-bold text-dark">
-                        <TL>Domains</TL>
-                    </h3>
-                </div>
-                <div class="card-body pt-2">
-                    @foreach (var domain in Domains)
-                    {
-                        <div class="d-flex align-items-center">
-                            <div class="flex-grow-1">
-                                <a href="/domain/@(domain.Id)" class="fs-6">@(domain.Name).@(domain.SharedDomain.Name)</a>
-                            </div>
-                        </div>
-
-                        if (domain != Domains.Last())
-                        {
-                            <div class="separator my-4"></div>
-                        }
-                    }
-                </div>
             </div>
         </div>
-        <div class="col-md-8">
+        <div class="card card-body mb-5">
-            <div class="card mb-3">
+            <div class="btn-group">
-                <div class="card-body fs-6">
+                <a class="btn btn-primary" href="/admin/users/edit/@(User.Id)">
-                    <div class="row">
+                    <TL>Edit</TL>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                </a>
-                            <TL>First name</TL>
+                <a class="btn btn-secondary" href="/admin/users">
-                        </label>
+                    <TL>Back to list</TL>
-                        <div class="col-lg-8">
+                </a>
-                            <span class="fw-bold fs-6 text-gray-800">@(User.FirstName)</span>
+                <a class="btn btn-primary" href="/admin/support/view/@(User.Id)">
+                    <TL>Open support</TL>
+                </a>
+            </div>
+        </div>
+        <div class="card card-xl-stretch mb-5">
+            <div class="card-header border-0">
+                <h3 class="card-title fw-bold text-dark">
+                    <TL>Servers</TL>
+                </h3>
+            </div>
+            <div class="card-body pt-2">
+                @foreach (var server in Servers)
+                {
+                    <div class="d-flex align-items-center">
+                        <div class="flex-grow-1">
+                            <a href="/server/@(server.Uuid)" class="fs-6">@(server.Name) - @(server.Image.Name)</a>
                         </div>
                     </div>
-                    <div class="separator my-4"></div>
+
-                    <div class="row">
+                    if (server != Servers.Last())
-                        <label class="col-lg-4 fw-semibold text-muted">
+                    {
-                            <TL>Last name</TL>
+                        <div class="separator my-4"></div>
-                        </label>
+                    }
-                        <div class="col-lg-8">
+                }
-                            <span class="fw-bold fs-6 text-gray-800">@(User.LastName)</span>
+            </div>
+        </div>
+        <div class="card card-xl-stretch">
+            <div class="card-header border-0">
+                <h3 class="card-title fw-bold text-dark">
+                    <TL>Domains</TL>
+                </h3>
+            </div>
+            <div class="card-body pt-2">
+                @foreach (var domain in Domains)
+                {
+                    <div class="d-flex align-items-center">
+                        <div class="flex-grow-1">
+                            <a href="/domain/@(domain.Id)" class="fs-6">@(domain.Name).@(domain.SharedDomain.Name)</a>
                         </div>
                     </div>
-                    <div class="separator my-4"></div>
+
-                    <div class="row">
+                    if (domain != Domains.Last())
-                        <label class="col-lg-4 fw-semibold text-muted">
+                    {
-                            <TL>Email</TL>
+                        <div class="separator my-4"></div>
-                        </label>
+                    }
-                        <div class="col-lg-8">
+                }
-                            <span class="fw-bold fs-6 text-gray-800">@(User.Email)</span>
+            </div>
-                        </div>
+        </div>
+    </div>
+    <div class="col-md-8">
+        <div class="card mb-3">
+            <div class="card-body fs-6">
+                <div class="row">
+                    <label class="col-lg-4 fw-semibold text-muted">
+                        <TL>First name</TL>
+                    </label>
+                    <div class="col-lg-8">
+                        <span class="fw-bold fs-6 text-gray-800">@(User.FirstName)</span>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>Address</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>Last name</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">@(User.Address)</span>
+                    <div class="col-lg-8">
-                        </div>
+                        <span class="fw-bold fs-6 text-gray-800">@(User.LastName)</span>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>City</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>Email</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">@(User.City)</span>
+                    <div class="col-lg-8">
-                        </div>
+                        <span class="fw-bold fs-6 text-gray-800">@(User.Email)</span>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>State</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>Address</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">@(User.State)</span>
+                    <div class="col-lg-8">
-                        </div>
+                        <span class="fw-bold fs-6 text-gray-800">@(User.Address)</span>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>Country</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>City</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">@(User.Country)</span>
+                    <div class="col-lg-8">
-                        </div>
+                        <span class="fw-bold fs-6 text-gray-800">@(User.City)</span>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>Admin</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>State</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">
+                    <div class="col-lg-8">
-                                @if (User.Admin)
+                        <span class="fw-bold fs-6 text-gray-800">@(User.State)</span>
-                                {
-                                    <span>✅</span>
-                                }
-                                else
-                                {
-                                    <span>❌</span>
-                                }
-                            </span>
-                        </div>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>Status</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>Country</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">@(User.Status)</span>
+                    <div class="col-lg-8">
-                        </div>
+                        <span class="fw-bold fs-6 text-gray-800">@(User.Country)</span>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>Totp</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>Admin</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">@(User.TotpEnabled)</span>
+                    <div class="col-lg-8">
-                        </div>
+                        <span class="fw-bold fs-6 text-gray-800">
+                            @if (User.Admin)
+                            {
+                                <span>✅</span>
+                            }
+                            else
+                            {
+                                <span>❌</span>
+                            }
+                        </span>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>Discord</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>Status</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">@(User.DiscordId)</span>
+                    <div class="col-lg-8">
-                        </div>
+                        <span class="fw-bold fs-6 text-gray-800">@(User.Status)</span>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>Subscription</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>Totp</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">
+                    <div class="col-lg-8">
-                                
+                        <span class="fw-bold fs-6 text-gray-800">@(User.TotpEnabled)</span>
-                            </span>
-                        </div>
                     </div>
-                    <div class="separator my-4"></div>
+                </div>
-                    <div class="row">
+                <div class="separator my-4"></div>
-                        <label class="col-lg-4 fw-semibold text-muted">
+                <div class="row">
-                            <TL>Created at</TL>
+                    <label class="col-lg-4 fw-semibold text-muted">
-                        </label>
+                        <TL>Discord</TL>
-                        <div class="col-lg-8">
+                    </label>
-                            <span class="fw-bold fs-6 text-gray-800">@(Formatter.FormatDate(User.CreatedAt))</span>
+                    <div class="col-lg-8">
-                        </div>
+                        <span class="fw-bold fs-6 text-gray-800">@(User.DiscordId)</span>
+                    </div>
+                </div>
+                <div class="separator my-4"></div>
+                <div class="row">
+                    <label class="col-lg-4 fw-semibold text-muted">
+                        <TL>Subscription</TL>
+                    </label>
+                    <div class="col-lg-8">
+                        <span class="fw-bold fs-6 text-gray-800">
+
+                        </span>
+                    </div>
+                </div>
+                <div class="separator my-4"></div>
+                <div class="row">
+                    <label class="col-lg-4 fw-semibold text-muted">
+                        <TL>Created at</TL>
+                    </label>
+                    <div class="col-lg-8">
+                        <span class="fw-bold fs-6 text-gray-800">@(Formatter.FormatDate(User.CreatedAt))</span>
+                    </div>
+                </div>
+                <div class="separator my-4"></div>
+                <div class="row">
+                    <label class="col-lg-4 fw-semibold text-muted">
+                        <TL>Register ip</TL>
+                    </label>
+                    <div class="col-lg-8">
+                        <span class="fw-bold fs-6 text-gray-800">@(User.RegisterIp)</span>
+                    </div>
+                </div>
+                <div class="separator my-4"></div>
+                <div class="row">
+                    <label class="col-lg-4 fw-semibold text-muted">
+                        <TL>Last ip</TL>
+                    </label>
+                    <div class="col-lg-8">
+                        <span class="fw-bold fs-6 text-gray-800">@(User.LastIp)</span>
                     </div>
                 </div>
             </div>
         </div>
     </div>
+    </div>
 }
 </LazyLoader>
 </OnlyAdmin>

Moonlight/Shared/Views/Server/Index.razor

@@ -26,7 +26,7 @@
 <LazyLoader Load="LoadData">
     @if (CurrentServer == null)
     {
-        <NotFoundAlert />
+        <NotFoundAlert/>
     }
     else
     {
@@ -34,33 +34,16 @@
         {
             if (Console.ConsoleState == ConsoleState.Connected)
             {
-                if (Console.ServerState == ServerState.Installing)
+                if (Console.ServerState == ServerState.Installing || CurrentServer.Installing)
                 {
                     <div class="card">
                         <div class="card-body">
-                            <div class="mb-10">
+                            <div class="fs-2hx fw-bold text-gray-800 text-center mb-5">
-                                <div class="fs-2hx fw-bold text-gray-800 text-center mb-13">
+                                <TL>Server installation is currently running</TL>
-                                    <span class="me-2">
-                                        <TL>Server installation is currently running</TL>
-                                    </span>
-                                </div>
                             </div>
-                            <Terminal @ref="InstallConsole"></Terminal>
+                            <div class="rounded bg-black p-3">
-                        </div>
+                                <Terminal @ref="InstallConsole"></Terminal>
-                    </div>
-                }
-                else if (CurrentServer.Installing)
-                {
-                    <div class="card">
-                        <div class="card-body">
-                            <div class="mb-10">
-                                <div class="fs-2hx fw-bold text-gray-800 text-center mb-13">
-                                    <span class="me-2">
-                                        <TL>Server installation is currently running</TL>
-                                    </span>
-                                </div>
                             </div>
-                            <Terminal @ref="InstallConsole"></Terminal>
                         </div>
                     </div>
                 }
@@ -104,7 +87,7 @@
                                     </Route>
                                     <Route Path="/backups">
                                         <ServerNavigation Index="2">
-                                             <ServerBackups/>
+                                            <ServerBackups/>
                                         </ServerNavigation>
                                     </Route>
                                     <Route Path="/network">

Moonlight/Shared/Views/Server/ServerNavigation.razor

@@ -25,11 +25,17 @@
                 </div>
                 <div class="col-4 d-flex flex-column flex-end mb-1">
                     <div class="btn-group btn-group-sm">
-                        <button class="w-100 nav-link btn btn-sm btn-success fw-bold px-4 me-1 @(Console.ServerState == ServerState.Offline ? "" : "disabled")" aria-selected="true" role="tab" @onclick="Start"><TL>Start</TL></button>
+                        <button class="w-100 nav-link btn btn-sm btn-success fw-bold px-4 me-1 @(Console.ServerState == ServerState.Offline ? "" : "disabled")" aria-selected="true" role="tab" @onclick="Start">
-                        <button class="w-100 nav-link btn btn-sm btn-primary fw-bold px-4 me-1 @(Console.ServerState == ServerState.Running ? "" : "disabled")" aria-selected="true" role="tab" @onclick="Restart"><TL>Restart</TL></button>
+                            <TL>Start</TL>
+                        </button>
+                        <button class="w-100 nav-link btn btn-sm btn-primary fw-bold px-4 me-1 @(Console.ServerState == ServerState.Running ? "" : "disabled")" aria-selected="true" role="tab" @onclick="Restart">
+                            <TL>Restart</TL>
+                        </button>
                         @if (Console.ServerState == ServerState.Stopping)
                         {
-                            <button class="w-100 nav-link btn btn-sm btn-danger fw-bold px-4 me-1" aria-selected="true" role="tab" @onclick="Kill"><TL>Kill</TL></button>
+                            <button class="w-100 nav-link btn btn-sm btn-danger fw-bold px-4 me-1" aria-selected="true" role="tab" @onclick="Kill">
+                                <TL>Kill</TL>
+                            </button>
                         }
                         else
                         {
@@ -47,7 +53,7 @@
                 <div class="row align-items-center">
                     <div class="col fs-5">
                         <span class="fw-bold"><TL>Shared IP</TL>:</span>
-                        <span class="ms-1 text-muted @(User.StreamerMode ? "blur" : "")">@($"{CurrentServer.Node.Fqdn}:{CurrentServer.MainAllocation.Port}")</span>
+                        <span class="ms-1 text-muted @(User.StreamerMode ? "blur" : "")">@($"{CurrentServer.Node.Fqdn}:{CurrentServer.MainAllocation?.Port ?? 0}")</span>
                     </div>
                     <div class="col fs-5">
                         <span class="fw-bold"><TL>Server ID</TL>:</span>
@@ -68,21 +74,29 @@
                             @switch (Console.ServerState)
                             {
                                 case ServerState.Offline:
-                                    <span class="text-danger"><TL>Offline</TL></span>
+                                    <span class="text-danger">
+                                        <TL>Offline</TL>
+                                    </span>
                                     break;
 
                                 case ServerState.Starting:
-                                    <span class="text-warning"><TL>Starting</TL></span>
+                                    <span class="text-warning">
+                                        <TL>Starting</TL>
+                                    </span>
                                     <span class="text-gray-700 pt-1 fw-semibold">(@(Formatter.FormatUptime(Console.Resource.Uptime)))</span>
                                     break;
 
                                 case ServerState.Stopping:
-                                    <span class="text-warning"><TL>Stopping</TL></span>
+                                    <span class="text-warning">
+                                        <TL>Stopping</TL>
+                                    </span>
                                     <span class="text-gray-700 pt-1 fw-semibold">(@(Formatter.FormatUptime(Console.Resource.Uptime)))</span>
                                     break;
 
                                 case ServerState.Running:
-                                    <span class="text-success"><TL>Online</TL></span>
+                                    <span class="text-success">
+                                        <TL>Online</TL>
+                                    </span>
                                     <span class="text-gray-700 pt-1 fw-semibold">(@(Formatter.FormatUptime(Console.Resource.Uptime)))</span>
                                     break;
                             }
@@ -110,7 +124,9 @@
                         <a href="/server/@(CurrentServer.Uuid)/" class="nav-link w-100 btn btn-flex @(Index == 0 ? "active" : "") btn-active-light-primary">
                             <i class="bx bx-terminal bx-sm me-2"></i>
                             <span class="d-flex flex-column align-items-start">
-                                <span class="fs-5"><TL>Console</TL></span>
+                                <span class="fs-5">
+                                    <TL>Console</TL>
+                                </span>
                             </span>
                         </a>
                     </li>
@@ -118,7 +134,9 @@
                         <a href="/server/@(CurrentServer.Uuid)/files" class="nav-link w-100 btn btn-flex @(Index == 1 ? "active" : "") btn-active-light-primary">
                             <i class="bx bx-folder bx-sm me-2"></i>
                             <span class="d-flex flex-column align-items-start">
-                                <span class="fs-5"><TL>Files</TL></span>
+                                <span class="fs-5">
+                                    <TL>Files</TL>
+                                </span>
                             </span>
                         </a>
                     </li>
@@ -126,7 +144,9 @@
                         <a href="/server/@(CurrentServer.Uuid)/backups" class="nav-link w-100 btn btn-flex @(Index == 2 ? "active" : "") btn-active-light-primary">
                             <i class="bx bx-box bx-sm me-2"></i>
                             <span class="d-flex flex-column align-items-start">
-                                <span class="fs-5"><TL>Backups</TL></span>
+                                <span class="fs-5">
+                                    <TL>Backups</TL>
+                                </span>
                             </span>
                         </a>
                     </li>
@@ -134,7 +154,9 @@
                         <a href="/server/@(CurrentServer.Uuid)/network" class="nav-link w-100 btn btn-flex @(Index == 3 ? "active" : "") btn-active-light-primary">
                             <i class="bx bx-wifi bx-sm me-2"></i>
                             <span class="d-flex flex-column align-items-start">
-                                <span class="fs-5"><TL>Network</TL></span>
+                                <span class="fs-5">
+                                    <TL>Network</TL>
+                                </span>
                             </span>
                         </a>
                     </li>
@@ -142,7 +164,9 @@
                         <a href="/server/@(CurrentServer.Uuid)/addons" class="nav-link w-100 btn btn-flex @(Index == 4 ? "active" : "") btn-active-light-primary">
                             <i class="bx bx-plug bx-sm me-2"></i>
                             <span class="d-flex flex-column align-items-start">
-                                <span class="fs-5"><TL>Addons</TL></span>
+                                <span class="fs-5">
+                                    <TL>Addons</TL>
+                                </span>
                             </span>
                         </a>
                     </li>
@@ -150,7 +174,9 @@
                         <a href="/server/@(CurrentServer.Uuid)/settings" class="nav-link w-100 btn btn-flex @(Index == 5 ? "active" : "") btn-active-light-primary">
                             <i class="bx bx-cog bx-sm me-2"></i>
                             <span class="d-flex flex-column align-items-start">
-                                <span class="fs-5"><TL>Settings</TL></span>
+                                <span class="fs-5">
+                                    <TL>Settings</TL>
+                                </span>
                             </span>
                         </a>
                     </li>
@@ -169,7 +195,7 @@
 {
     [CascadingParameter]
     public Server CurrentServer { get; set; }
-    
+
     [CascadingParameter]
     public User User { get; set; }
 

Moonlight/Shared/Views/Servers/Create.razor

@@ -48,7 +48,9 @@
                     <div class="card-body pt-0">
                         <div class="d-flex flex-column gap-10">
                             <div class="fv-row">
-                                <label class="form-label"><TL>Node</TL></label>
+                                <label class="form-label">
+                                    <TL>Node</TL>
+                                </label>
                                 <div class="fw-bold fs-3">@(DeployNode.Name)</div>
                             </div>
                             @if (Model.Image != null)
@@ -56,12 +58,16 @@
                                 var limit = Images[Model.Image];
 
                                 <div class="fv-row">
-                                    <label class="form-label"><TL>Image</TL></label>
+                                    <label class="form-label">
+                                        <TL>Image</TL>
+                                    </label>
                                     <div class="fw-bold fs-3">@(Model.Image.Name)</div>
                                 </div>
 
                                 <div class="fv-row">
-                                    <label class="form-label"><TL>CPU</TL></label>
+                                    <label class="form-label">
+                                        <TL>CPU</TL>
+                                    </label>
                                     <div class="fw-bold fs-3">
                                         @{
                                             var cpu = limit.ReadValue("cpu");
@@ -76,12 +82,16 @@
                                 </div>
 
                                 <div class="fv-row">
-                                    <label class="form-label"><TL>Memory</TL></label>
+                                    <label class="form-label">
+                                        <TL>Memory</TL>
+                                    </label>
                                     <div class="fw-bold fs-3">@(limit.ReadValue("memory")) MB</div>
                                 </div>
 
                                 <div class="fv-row">
-                                    <label class="form-label"><TL>Disk</TL></label>
+                                    <label class="form-label">
+                                        <TL>Disk</TL>
+                                    </label>
                                     <div class="fw-bold fs-3">@(limit.ReadValue("disk")) MB</div>
                                 </div>
                             }
@@ -108,15 +118,6 @@
                             </div>
                             @if (Images.Any())
                             {
-                                <label class="form-label">
-                                    <TL>Image</TL>
-                                </label>
-                                <SmartSelect TField="Image"
-                                             @bind-Value="Model.Image"
-                                             Items="Images.Keys.ToArray()"
-                                             DisplayField="@(x => x.Name)">
-                                </SmartSelect>
-
                                 <button type="submit" class="mt-5 float-end btn btn-primary">
                                     <TL>Create</TL>
                                 </button>
@@ -125,13 +126,45 @@
                             {
                                 <div class="alert alert-warning d-flex align-items-center p-5 mb-10">
                                     <span>
-                                        <TL>You reached the maximum amount of servers for every image of your subscription</TL>: @(Subscription == null ? SmartTranslateService.Translate("Default") : Subscription.Name)
+                                        <TL>We could not find any image in your subscription you have access to</TL>: @(Subscription == null ? SmartTranslateService.Translate("Default") : Subscription.Name)
                                     </span>
                                 </div>
                             }
                         </SmartForm>
                     </div>
                 </div>
+
+                <div class="row">
+                    @foreach (var keyValuePair in Images)
+                    {
+                        bool selected = Model.Image != null && Model.Image.Id == keyValuePair.Key.Id;
+
+                        <div class="col-12 col-md-4">
+                            @if (ServerCounts[keyValuePair.Key] > keyValuePair.Value.Amount)
+                            {
+                                <div class="m-2 card blur">
+                                    <div class="card-body">
+                                        <h5 class="card-title text-center">@(keyValuePair.Key.Name)</h5>
+                                        <p class="card-text">
+                                            @(keyValuePair.Key.Description)
+                                        </p>
+                                    </div>
+                                </div>
+                            }
+                            else
+                            {
+                                <a href="#" class="m-2 card @(selected ? "border border-2 border-primary" : "") invisible-a" @onclick:preventDefault @onclick="() => SelectImage(keyValuePair.Key)">
+                                    <div class="card-body">
+                                        <h5 class="card-title text-center">@(keyValuePair.Key.Name)</h5>
+                                        <p class="card-text">
+                                            @(keyValuePair.Key.Description)
+                                        </p>
+                                    </div>
+                                </a>
+                            }
+                        </div>
+                    }
+                </div>
             </div>
         </div>
     }
@@ -141,11 +174,12 @@
 {
     [CascadingParameter]
     public User User { get; set; }
-    
+
     private Node? DeployNode;
     private Subscription? Subscription;
 
     private Dictionary<Image, SubscriptionLimit> Images = new();
+    private Dictionary<Image, int> ServerCounts = new();
 
     private ServerOrderDataModel Model = new();
 
@@ -176,9 +210,9 @@
                     .Include(x => x.Image)
                     .Where(x => x.Owner.Id == User.Id)
                     .Count(x => x.Image.Id == image.Id);
-                
+
-                if(serversCount < limit.Amount)
+                Images.Add(image, limit);
-                    Images.Add(image, limit);
+                ServerCounts.Add(image, serversCount);
             }
         }
     }
@@ -198,7 +232,7 @@
 
             if (serversCount < limit.Amount)
             {
-                if(int.TryParse(limit.ReadValue("cpu"), out int cpu) &&
+                if (int.TryParse(limit.ReadValue("cpu"), out int cpu) &&
                     int.TryParse(limit.ReadValue("memory"), out int memory) &&
                     int.TryParse(limit.ReadValue("disk"), out int disk))
                 {
@@ -211,7 +245,7 @@
                         Model.Image,
                         DeployNode
                         );
-                    
+
                     NavigationManager.NavigateTo($"/server/{server.Uuid}");
                 }
                 else
@@ -221,4 +255,11 @@
             }
         }
     }
+
+    private async Task SelectImage(Image image)
+    {
+        Model.Image = image;
+
+        await InvokeAsync(StateHasChanged);
+    }
 }

Moonlight/Shared/Views/Servers/Index.razor

@@ -221,6 +221,8 @@
         {
             ServerGroups = (JsonConvert.DeserializeObject<ServerGroup[]>(
                 User.ServerListLayoutJson) ?? Array.Empty<ServerGroup>()).ToList();
+
+            await CheckServerGroups();
         }
 
         foreach (var server in AllServers)
@@ -256,8 +258,8 @@
     private async Task RemoveGroup(ServerGroup group)
     {
         ServerGroups.Remove(group);
-        await EnsureAllServersInGroups();
+        
-
+        await CheckServerGroups();
         await InvokeAsync(StateHasChanged);
 
         await JsRuntime.InvokeVoidAsync("moonlight.serverList.init");
@@ -266,11 +268,10 @@
     private async Task SetEditMode(bool toggle)
     {
         EditMode = toggle;
-        await InvokeAsync(StateHasChanged);
 
         if (EditMode)
         {
-            await EnsureAllServersInGroups();
+            await CheckServerGroups();
             await InvokeAsync(StateHasChanged);
 
             await JsRuntime.InvokeVoidAsync("moonlight.serverList.init");
@@ -278,6 +279,9 @@
         else
         {
             var json = JsonConvert.SerializeObject(await GetGroupsFromClient());
+
+            await CheckServerGroups();
+            
             User.ServerListLayoutJson = json;
             UserRepository.Update(User);
 
@@ -289,7 +293,7 @@
     {
         var serverGroups = await JsRuntime.InvokeAsync<ServerGroup[]>("moonlight.serverList.getData");
 
-    // Check user data to prevent users from doing stupid stuff
+        // Check user data to prevent users from doing stupid stuff
         foreach (var serverGroup in serverGroups)
         {
             if (serverGroup.Name.Length > 30)
@@ -297,53 +301,78 @@
                 Logger.Verbose("Server list group lenght too long");
                 return Array.Empty<ServerGroup>();
             }
-
-            if (serverGroup.Servers.Any(x => AllServers.All(y => y.Id.ToString() != x)))
-            {
-                Logger.Verbose("User tried to add a server in his server list which he has no access to");
-                return Array.Empty<ServerGroup>();
-            }
         }
 
         return serverGroups;
     }
 
-    private Task EnsureAllServersInGroups()
+    private Task CheckServerGroups()
     {
-        var presentInGroup = new List<Server>();
+        var result = new List<ServerGroup>();
 
+        // Reconstruct the data with checking for invalid server ids
         foreach (var group in ServerGroups)
+        {
+            var checkedGroup = new ServerGroup()
+            {
+                Name = group.Name
+            };
+
+            foreach (var server in group.Servers)
+            {
+                var s = AllServers.FirstOrDefault(x => x.Id.ToString() == server);
+
+                if (s != null) // This is a check for invalid server ids
+                {
+                    checkedGroup.Servers.Add(s.Id.ToString());
+                }
+            }
+            
+            result.Add(checkedGroup);
+        }
+        
+        var presentInGroup = new List<Server>();
+        
+        // Copy all servers to preset in group if they are in the users servers
+        foreach (var group in result) 
         {
             foreach (var id in group.Servers)
-                presentInGroup.Add(AllServers.First(x => x.Id.ToString() == id));
+            {
+                var s = AllServers.First(x => x.Id.ToString() == id);
+                presentInGroup.Add(s);
+            }
         }
 
         var serversMissing = new List<Server>();
 
+        // Make a list of missing servers
         foreach (var server in AllServers)
         {
             if (presentInGroup.All(x => x.Id != server.Id))
                 serversMissing.Add(server);
         }
 
+        // Add all missing servers into the default group
         if (serversMissing.Any())
         {
-            var defaultGroup = ServerGroups.FirstOrDefault(x => x.Name == "");
+            var defaultGroup = result.FirstOrDefault(x => x.Name == "");
 
-            if (defaultGroup == null)
+            if (defaultGroup == null) // If group does not exist, create it
             {
                 defaultGroup = new ServerGroup()
                 {
                     Name = ""
                 };
 
-                ServerGroups.Add(defaultGroup);
+                result.Add(defaultGroup);
             }
 
             foreach (var server in serversMissing)
                 defaultGroup.Servers.Add(server.Id.ToString());
         }
 
+        ServerGroups = result;
+        
         return Task.CompletedTask;
     }
 
@@ -351,8 +380,11 @@
     {
         lock (StatusCache)
         {
-            StatusCache.Add(server, status);
+            if (!StatusCache.ContainsKey(server))
-            InvokeAsync(StateHasChanged);
+            {
+                StatusCache.Add(server, status);
+                InvokeAsync(StateHasChanged);
+            }
         }
     }
 }

Moonlight/defaultstorage/resources/lang/de_de.lang

@@ -19,7 +19,7 @@ Add admin accounts;Admin Konto hinzufügen
 First name;Vorname
 Last name;Nachname
 Email address;E-Mail-Adresse
-Enter password;Password eingeben
+Enter password;Passwort eingeben
 Next;Weiter
 Back;Zurück
 Configure features;Features konfigurieren
@@ -60,10 +60,10 @@ Servers;Server
 Websites;Websiten
 Databases;Datenbanken
 Domains;Domains
-Changelog;Anderungen
+Changelog;Änderungen
 Firstname;Vorname
 Lastname;Nachname
-Repeat password;Password wiederholen
+Repeat password;Passwort wiederholen
 Sign Up;Anmelden
 Sign up to start with moonlight;Registrieren um mit Moonlight zu starten
 Sign up with Discord;Mit Discord Registrieren
@@ -71,11 +71,11 @@ Sign up with Google;Mit Google Registrieren
 Sign-up;Registrieren
 Already registered?;Schon Registriert?
 Sign in;Registrieren
-Create something new;Etwas neues erstellen
+Create something new;Etwas Neues erstellen
 Create a gameserver;Einen Gameserver erstellen
 A new gameserver in just a few minutes;Ein neuer Gameserver in wenigen Minuten
 Create a database;Eine Datenbank erstellen
-A quick way to store your data and manage it from all around the world;Eine schnelle Möglichkeit, um deine Daten von überall auf der Welt zu verwalten
+A quick way to store your data and manage it from all around the world;Eine schnelle Möglichkeit, deine Daten von überall auf der Welt zu verwalten
 Manage your services;Deine Dienste verwalten
 Manage your gameservers;Gameserver verwalten
 Adjust your gameservers;Deine Gameserver anpassen
@@ -100,7 +100,7 @@ aaPanel;aaPanel
 Users;Benutzer
 Support;Hilfe
 Statistics;Statistiken
-No nodes found. Start with adding a new node;Keine Nodes gefunden. Ein neues Node hinzufügen
+No nodes found. Start with adding a new node;Keine Nodes gefunden. Eine neue Node hinzufügen
 Nodename;Nodename
 FQDN;FQDN
 Create;Erstellen
@@ -115,25 +115,25 @@ Memory;Arbeitsspeicher
 Used / Available memory;Benutzter / Verfügbarer Arbeitsspeicher
 Storage;Speicherplatz
 Available storage;Verfügbarer Speicherplatz
-Add a new node;Ein neues Node hinzufügen
+Add a new node;Eine neue Node hinzufügen
 Delete;Löschen
-Deleting;Wirt gelöscht...
+Deleting;Wird gelöscht...
 Edit;Bearbeiten
-Token Id;Token Id
+Token Id;Token ID
 Token;Token
 Save;Speichern
 Setup;Aufsetzen
-Open a ssh connection to your node and enter;Eine SSH verbindung zum Node hinzufügen und öffnen
+Open a ssh connection to your node and enter;Eine SSH verbindung zu der Node hinzufügen und öffnen
-and paste the config below. Then press STRG+O and STRG+X to save;und die Config darunter einfügern. Dann STRG+O und STRG+X um zu Speichern
+and paste the config below. Then press STRG+O and STRG+X to save;und die Config darunter einfügen. Dann STRG+O und STRG+X drücken um zu Speichern
 Before configuring this node, install the daemon;Installiere den Daemon bevor du dieses Node konfigurierst
-Delete this node?;Dieses Node löschen?
+Delete this node?;Diese Node löschen?
-Do you really want to delete this node;Möchtest du dieses Node wirklich löschen?
+Do you really want to delete this node;Möchtest du diese Node wirklich löschen?
 Yes;Ja
 No;Nein
 Status;Status
 Adding;Hinzufügen
 Port;Port
-Id;Id
+Id;ID
 Manage;Verwalten
 Create new server;Neuen Server erstellen
 No servers found;Keine Server gefunden
@@ -150,20 +150,20 @@ Cores;Kerne
 Owner;Besitzer
 Value;Wert
 An unknown error occured;Ein unbekannter Fehler ist aufgetreten
-No allocation found;Keine Zuweisung gefunden
+No allocation found;Keine Allocation gefunden
 Identifier;Identifier
-UuidIdentifier;UuidIdentifier
+UuidIdentifier;UUIDIdentifier
 Override startup command;Startup Befehl überschreiben
 Loading;Wird geladen...
 Offline;Offline
 Connecting;Verbiden...
 Start;Start
-Restart;Neu Starten
+Restart;Neustarten
 Stop;Stoppen
 Shared IP;Geteilte IP
 Server ID;Server ID
 Cpu;CPU
-Console;Console
+Console;Konsole
 Files;Dateien
 Backups;Backups
 Network;Netzwerk
@@ -184,11 +184,11 @@ Search files and folders;Ordner und Dateien durchsuchen
 Launch WinSCP;WinSCP starten
 New folder;Neuer Ordner
 Upload;Hochladen
-File name;Datei-Name
+File name;Dateiname
-File size;Datei-Größe
+File size;Dateigröße
-Last modified;Zuletz geändert
+Last modified;Zuletzt geändert
 Cancel;Abbrechen
-Canceling;Wird Abbgebrochen
+Canceling;Wird Abgebrochen
 Running;Läuft
 Loading backups;Backups werden geladen
 Started backup creation;Backup wird erstellt
@@ -198,35 +198,35 @@ Move;Bewegen
 Archive;Archivieren
 Unarchive;Archivieren rückgängig machen
 Download;Herunterladen
-Starting download;Herunterladen wird gestartet
+Starting download;Download wird gestartet
 Backup successfully created;Backup wurde erfolgreich erstellt
 Restore;Wiederherstellen
 Copy url;URL Kopieren
-Backup deletion started;Backup löschung wird gestartet
+Backup deletion started;Backup Löschung wird gestartet
 Backup successfully deleted;Backup wurde erfolgreich gelöscht
 Primary;Primärer
-This feature is currently not available;Diese Funktion ist zur Zeit nicht verfügbar
+This feature is currently not available;Diese Funktion ist zurzeit leider nicht verfügbar
 Send;Senden
 Sending;Wird gesendet
-Welcome to the support chat. Ask your question here and we will help you;Willkommen in der Chat Hilfe. Stelle hier deine Frage und wir helfen dir.
+Welcome to the support chat. Ask your question here and we will help you;Willkommen im Support Chat. Stelle hier deine Frage und wir helfen dir.
- minutes ago; Minuten
+ minutes ago; Minuten her
 just now;gerade eben
-less than a minute ago;weniger als eine Minute
+less than a minute ago;vor weniger als einer Minute
 1 hour ago;vor einer Stunde
 1 minute ago;vor einer Minute
 Failed;Fehlgeschlagen
- hours ago; Stunden
+ hours ago; Stunden her
 Open tickets;Tickets öffnen
 Actions;Aktionen
 No support ticket is currently open;Kein Support Ticket ist zurzeit offen.
 User information;Benutzer-Information
 Close ticket;Ticket schließen
 Closing;Wird geschlossen...
-The support team has been notified. Please be patient;Das Support-Team wurde benachrichtigt. Habe etwas gedult
+The support team has been notified. Please be patient;Das Support-Team wurde benachrichtigt. Habe etwas Geduld
 The ticket is now closed. Type a message to open it again;Das Ticket wurde geschlossen. Schreibe etwas, um es wieder zu öffnen
 1 day ago;vor einem Tag
 is typing;schreibt...
-are typing;schreiben
+are typing;schreiben...
 No domains available;Keine Domains verfügbar
 Shared domains;Geteilte Domains
 Shared domain;Geteilte Domain
@@ -238,16 +238,16 @@ Fetching dns records;Es wird nach DNS-Records gesucht
 No dns records found;Keine DNS-Records gefunden
 Content;Inhalt
 Priority;Priorität
-Ttl;Ttl
+Ttl;TTL
 Enable cloudflare proxy;Cloudflare-Proxy benutzen
 CF Proxy;CF Proxy
- days ago; Tage
+ days ago; Tage her
 Cancle;Abbrechen
 An unexpected error occured;Ein unbekannter Fehler ist aufgetreten
 Testy;Testy
 Error from cloudflare api;Fehler von der Cloudflare-API
 Profile;Profil
-No subscription available;Kein Abo verfügbar
+No subscription available;Kein Abonnement verfügbar
 Buy;Kaufen
 Redirecting;Weiterleiten
 Apply;Anwenden
@@ -255,7 +255,7 @@ Applying code;Code Anwenden
 Invalid subscription code;Unbekannter Abo-Code
 Cancel Subscription;Abo beenden
 Active until;Aktiv bis
-We will send you a notification upon subscription expiration;Wenn dein Abo endet, senden wir dir eine E-Mail
+We will send you a notification upon subscription expiration;Wenn dein Abonnement endet, senden wir dir eine E-Mail
 This token has been already used;Dieser Token wurde schon benutzt
 New login for;Neue Anmeldung für
 No records found for this day;Für diesen Tag wurden keine Records gefunden
@@ -265,7 +265,7 @@ Minecraft version;Minecraft Version
 Build version;Build Version
 Server installation is currently running;Der Server wird installiert.
 Selected;Ausgewählt
-Move deleted;Gelöschtest Bewegen
+Move deleted;Gelöschtes Bewegen
 Delete selected;Ausgewähltes löschen
 Log level;Log Level
 Log message;Log Message
@@ -274,11 +274,11 @@ Version;Version
 You are running moonlight version;Du benutzt die Moonlight-Version
 Operating system;Betriebssystem
 Moonlight is running on;Moonlight läuft auf
-Memory usage;Arbeitsspeicher-Auslastung
+Memory usage;Arbeitsspeicher Auslastung
 Moonlight is using;Moonlight benutzt
 of memory;des Arbeitsspeichers
 Cpu usage;CPU Auslastung
-Refresh;Neu Laden
+Refresh;Neuladen
 Send a message to all users;Eine Nachricht an alle Benutzer senden
 IP;IP
 URL;URL
@@ -286,9 +286,9 @@ Device;Gerät
 Change url;URL Ändern
 Message;Nachricht
 Enter message;Nachricht eingeben
-Enter the message to send;Eine Nachricht zum senden eingeben
+Enter the message to send;Eine Nachricht zum Senden eingeben
 Confirm;Bestätigen
-Are you sure?;Bist du dir sicher
+Are you sure?;Bist du dir sicher?
 Enter url;URL eingeben
 An unknown error occured while starting backup deletion;Ein unbekannter Fehler ist während der Backuplöschung aufgetreten
 Success;erfolgreich
@@ -298,9 +298,9 @@ Backup successfully restored;Das Backup wurde erfolgreich wiedergeherstellt
 Register for;Registrieren für
 Core;Kern
 Logs;Logs
-AuditLog;AuditLog
+AuditLog;Audit Log
-SecurityLog;SecurityLog
+SecurityLog;Security Log
-ErrorLog;ErrorLog
+ErrorLog;Error Log
 Resources;Resourcen
 WinSCP cannot be launched here;WinSCP kann nicht gestartet werden
 Create a new folder;Neuen Ordner erstellen
@@ -311,24 +311,24 @@ Sessions;Sitzungen
 New user;Neuer Benutzer
 Created at;Erstellt am
 Mail template not found;E-Mail template wurde nicht gefunden
-Missing admin permissions. This attempt has been logged ;Fehlende Admin-Rechte. Dieser Versuch wurde aufgezeichnet
+Missing admin permissions. This attempt has been logged ;Fehlende Admin-Rechte. Dieser Versuch wurde aufgezeichnet und ist für das ganze Admin Team sichtbar
 Address;Addresse
 City;Stadt
 State;Land
 Country;Staat
-Totp;Totp
+Totp;TOTP
 Discord;Discord
-Subscription;Abonament
+Subscription;Abonnement
 None;None
 No user with this id found;Kein Benutzer mit dieser ID gefunden
-Back to list;Zurück zur liste
+Back to list;Zurück zur Liste
-New domain;Neue domain
+New domain;Neue Domain
 Reset password;Password wiederherstellen
 Password reset;Password wiederherstellung
 Reset the password of your account;Password deines Accounts zurücksetzen
 Wrong here?;Falsch hier?
 A user with this email can not be found;Ein Benutzer mit dieser E-Mail konnte nicht gefunden werden
-Passwort reset successfull. Check your mail;Password wiederherstellung erfolgreich. Überprüfe deine Email
+Passwort reset successfull. Check your mail;Password wiederherstellung erfolgreich. Überprüfe dein Email Postfach
 Discord bot;Discord Bot
 New image;Neues Image
 Description;Beschreibung
@@ -348,15 +348,15 @@ Startup detection;Startuperkennung
 Stop command;Stopp-Befehl
 Successfully saved image;Das Image wurde erfolgreich gespeichert
 No docker images found;Keine Docker Images gefunden
-Key;Schlüssel
+Key;Key
 Default value;Standardwert
 Allocations;Zuweisung
 No variables found;Keine Variablen gefunden
 Successfully added image;Das Image wurde erfolgreich hinzugefügt
 Password change for;Password ändern für
 of;von
-New node;Neues Node
+New node;Neue Node
-Fqdn;Fqdn
+Fqdn;FQDN
 Cores used;Kerne genutzt
 used;benutzt
 5.15.90.1-microsoft-standard-WSL2 - amd64;5.15.90.1-microsoft-standard-WSL2 - amd64
@@ -367,7 +367,7 @@ details;Details
 1;1
 2;2
 DDos;DDos
-No ddos attacks found;Keine DDoS gefunden
+No ddos attacks found;Keine DDos Attacken gefunden
 Node;Node
 Date;Datum
 DDos attack started;DDos Attacke gestartet
@@ -383,25 +383,25 @@ Do you really want to kill all running servers?;Möchtest du wirklich alle laufe
 Change power state for;Power-State ändern für
 to;zu
 Stop all servers;Alle Server stoppen
-Do you really want to stop all running servers?;Möchtest du wirklich alle laufenden Server Killen?
+Do you really want to stop all running servers?;Möchtest du wirklich alle laufenden Server stoppen?
 Manage ;Verwalten 
 Manage user ;Benutzer verwalten 
-Reloading;Neu Laden...
+Reloading;Lade neu...
 Update;Aktualisieren
 Updating;Wird Aktualisiert...
 Successfully updated user;Benutzer erfolgreich aktualisiert
-Discord id;Discord ID
+Discord id;Discord User ID
 Discord username;Discord Benutzername
 Discord discriminator;Discord Tag
 The Name field is required.;Der Name dieses Feldes ist erforderlich
-An error occured while logging you in;Ein Fehler ist aufgetreten, als du dich angemeldet hast
+An error occured while logging you in;Ein Fehler ist aufgetreten, während du dich angemeldet hast
 You need to enter an email address;Du musst eine E-Mail-Adresse angeben
 You need to enter a password;Du musst ein Password eingeben
 You need to enter a password with minimum 8 characters in lenght;Du musst ein Password eingeben, das mindestens 8 Buchstaben lang ist
 Proccessing;Weid verarbeitet...
 The FirstName field is required.;Das Vorname-Feld ist erforderlich
 The LastName field is required.;Das Nachname-Feld ist erforderlich
-The Address field is required.;Das Address-Feld ist erforderlich
+The Address field is required.;Das Addresse-Feld ist erforderlich
 The City field is required.;Das Stadt-Feld ist erforderlich
 The State field is required.;Das Staat-Feld ist erforderlich
 The Country field is required.;Das Land-Feld ist erforderlich
@@ -417,7 +417,7 @@ Disable;Deaktivieren
 Addons;Add-ons
 Javascript version;Javascript Version
 Javascript file;Javascript Datei
-Select javascript file to execute on start;Javascript Datei zum starten auswählen
+Select javascript file to execute on start;Javascript Datei zum Starten auswählen
 Submit;Einreichen
 Processing;Wird verarbeitet...
 Go up;Nach oben gehen
@@ -433,15 +433,15 @@ Are you sure you want to reset this server?;Möchtest du diesen Server wirklich
 Are you sure? This cannot be undone;Bist du dir sicher? Dies kann nicht rückgängig gemacht werden
 Resetting server;Server wird zurückgesetzt...
 Deleted file;Datei gelöscht
-Reinstalling server;Server wird reinstalliert
+Reinstalling server;Server wird neuinstalliert
 Uploading files;Dateien wurden hochgeladen
 complete;vollständig
 Upload complete;Upload komplett
 Security;Sicherheit
-Subscriptions;Abonaments
+Subscriptions;Abonnements
 2fa Code;2FA Code
 Your account is secured with 2fa;Dein Account wird mit 2-FA gesichert
-anyone write a fancy text here?;hier einen schönen Text schreiben?
+anyone write a fancy text here?;hier einen schönen Text schreiben? -Nö.
 Activate 2fa;2-FA Aktivieren
 2fa apps;2-FA Apps
 Use an app like ;Benutze eine App wie 
@@ -453,34 +453,34 @@ Finish activation;Aktivierung fertig
 New password;Neues Password
 Secure your account;Deinen Account sichern
 2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login.;2-FA fügt eine weitere Sicherheits-Schicht hinzu. Du musst einen 6-Ziffern-Code eingeben, um dich anzumelden.
-New subscription;Neues Abonament
+New subscription;Neues Abonnement
 You need to enter a name;Du musst einen Namen eingeben
 You need to enter a description;Du musst eine Beschreibung eigeben
 Add new limit;Ein neues Limit hinzufügen
-Create subscription;Abonament erstellen
+Create subscription;Abonnement erstellen
 Options;Optionen
 Amount;Betrag
 Do you really want to delete it?;Möchtes du es wirklich löschen?
-Loading your subscription;Dein Abonament wird geladen
+Loading your subscription;Dein Abonnement wird geladen
-Searching for deploy node;#Empty#
+Searching for deploy node;Suche nach einer verfügbaren Node
 Searching for available images;Nach verfügbaren Images wird gesucht
 Server details;Server Details
 Configure your server;Deinen Server konfigurieren
 Default;Standart
-You reached the maximum amount of servers for every image of your subscription;Du hast die maximale Anzahl an Images von deinem Abonament erreicht.
+You reached the maximum amount of servers for every image of your subscription;Du hast die maximale Anzahl an Images von deinem Abonnement erreicht.
-Personal information;Prsönliche Informationen
+Personal information;Persönliche Informationen
 Enter code;Code eingeben
 Server rename;Server Umbenennen
 Create code;Code erstellen
-Save subscription;Abonament speichern
+Save subscription;Abonnement speichern
 Enter your information;Informationen eingeben
 You need to enter your full name in order to use moonlight;Du musst deinen ganzen Namen eingeben, um Moonlight zu nutzen
 No node found;Kein Node gefunden
-No node found to deploy to found;#Empty#
+No node found to deploy to found;Keine Node für die Bereitstellung gefunden
 Node offline;Node offline
-The node the server is running on is currently offline;Das Node, auf dem der Server grat läuft, ist offline
+The node the server is running on is currently offline;Das Node, auf dem der Server grade läuft, ist offline
 Server not found;Server konnte nicht gefunden werden
-A server with that id cannot be found or you have no access for this server;Ein Server mit dieser ID konnte nicht gefunden werden
+A server with that id cannot be found or you have no access for this server;Ein Server mit dieser ID konnte nicht gefunden werden oder du hast keinen Zugriff auf ihn
 Compress;Komprimieren
 Decompress;De-Komprimieren
 Moving;Bewegen...
@@ -495,11 +495,11 @@ No SSL certificate found;Keine SSL-Zertifikate gefunden
 Ftp Host;FTP Host
 Ftp Port;FTP Port
 Ftp Username;FTP Username
-Ftp Password;FTP Password
+Ftp Password;FTP Passwort
 Use;Benutzen
 SSL Certificates;SSL Zertifikate
 SSL certificates;SSL Zertifikate
-Issue certificate;SSL-Zertifikat Ausgeben
+Issue certificate;SSL-Zertifikat erstellen lassen
 New plesk server;Neuer Plesk Server
 Api url;API URL
 Host system offline;Host System Offline
@@ -514,14 +514,14 @@ Username;Benutzername
 SRV records cannot be updated thanks to the cloudflare api client. Please delete the record and create a new one;SRV Records können aufgrund von Cloudflare nicht geupdatet werden. Bitte lösche den Record und erstelle einen neuen.
 The User field is required.;Das Benutzer-Feld ist erforderlich
 You need to specify a owner;Du musst einen Server-Besitzer angeben
-You need to specify a image;You need to specify a image
+You need to specify a image;Du musst ein Image angeben
 Api Url;API URL
 Api Key;Api Key
 Duration;Dauer
-Enter duration of subscription;Dauer des Abonaments eingeben
+Enter duration of subscription;Dauer des Abonnements eingeben
 Copied code to clipboard;Code in die Zwischenablage kopiert
 Invalid or expired subscription code;Ungültiger oder Abgelaufener Abo-Code
-Current subscription;Dein Abonament
+Current subscription;Dein Abonnement
 You need to specify a server image;Du musst ein Image angeben
 CPU;CPU
 Hour;Stunde
@@ -532,14 +532,14 @@ All time;Für immer
 This function is not implemented;Diese Funktion wurde noch nicht hinzugefügt
 Domain details;Domain Details
 Configure your domain;Deine Domain konfigurieren
-You reached the maximum amount of domains in your subscription;Du hast das Maximum an Domains in deinem Abonament erreicht
+You reached the maximum amount of domains in your subscription;Du hast das Maximum an Domains in deinem Abonnement erreicht
 You need to specify a shared domain;Du musst eine Shared-Domain angeben
 A domain with this name does already exist for this shared domain;Eine Domain mit diesem Name existiert bereits in dieser Shared-Domain
 The Email field is required.;Das E-Mail-Feld ist erforderlich
 The Password field is required.;Das Password-Feld ist erforderlich
 The ConfirmPassword field is required.;Das Password-Bestätigen-Feld ist erforderlich
 Passwords need to match;Die Passwörter müssen übereinstimmen
-Cleanup exception;Cleanup ausnahme
+Cleanup exception;Cleanup Ausnahme
 No shared domain found;Keine Shared-Domain gefunden
 Searching for deploy plesk server;Suchen um den Plesk Server aufzusetzen
 No plesk server found;Kein Plesk Server gefunden
@@ -561,7 +561,7 @@ We were not able to find any domains associated with your account;Wir haben kein
 You have no websites;Du hast keine Websites
 We were not able to find any websites associated with your account;Wir haben keine Websiten, die mit deinem Account verbunden sind, gefunden
 Guest;Gast
-You need a domain;Du brauchts eine Domain
+You need a domain;Du brauchst eine Domain
 New post;Neuer Post
 New entry;Neuer Eintrag
 You have no servers;Du hast keine Server
@@ -572,27 +572,27 @@ Error from daemon;Fehler vom Daemon
 End;Ende
 Cloud panel;Cloud Panel
 Cloud panels;Cloud Panels
-New cloud panel;Neues cloud Panel
+New cloud panel;Neues Cloud Panel
 You need to enter an api key;Du musst einen API-Key eigeben
 Webspaces;Webspaces
 New webspace;Neuer Webspace
-The uploaded file should not be bigger than 100MB;DIe Datei sollte nicht größer als 100MB sein
+The uploaded file should not be bigger than 100MB;Die Datei sollte nicht größer als 100MB sein
-An unknown error occured while uploading a file;Ein unbekannter Fehler ist während dem Datei-Hochladen aufgetreten
+An unknown error occured while uploading a file;Ein unbekannter Fehler ist während dem Datei Upload aufgetreten
 No databases found for this webspace;Keine Datenbanken für diesen Webspace gefunden
 Sftp;SFTP
-Sftp Host;Sftp Host
+Sftp Host;SFTP Host
-Sftp Port;Sftp Port
+Sftp Port;SFTP Port
-Sftp Username;Sftp Benutzername
+Sftp Username;SFTP Benutzername
-Sftp Password;Sftp Password
+Sftp Password;SFTP Password
 Lets Encrypt certificate successfully issued;Lets Encrypt Zertifikat erfolgreich erstellt
 Add shared domain;Shared Domain Hinzufügen
 Webspace;Webspace
-You reached the maximum amount of websites in your subscription;Du hast das Maximum an Websiten in deinem Abonament erreicht
+You reached the maximum amount of websites in your subscription;Du hast das Maximum an Websiten in deinem Abonnement erreicht
 Searching for deploy web host;Suchen um den Webhost aufzusetzen
 Webspace details;Webspace Details
 Web host;Web host
 Configure your webspaces;Konfiguriere deine Webspaces
-You reached the maximum amount of webspaces in your subscription;Du hast das Maximum an Webspaces in deinem Abonament erreicht
+You reached the maximum amount of webspaces in your subscription;Du hast das Maximum an Webspaces in deinem Abonnement erreicht
 Create a webspace;Einen Webspace erstellen
 Manage your webspaces;Deine Webspaces verwalten
 Modify the content of your webspaces;Den Inhalt deiner Webspaces verwalten
@@ -607,11 +607,11 @@ We paused your connection because of inactivity. The resume just focus the tab a
 Failed to reconnect to the moonlight servers;Die Wiederverbindung zu den Moonlight-Servern ist gescheitert
 We were unable to reconnect to moonlight. Please refresh the page;Verbindung zu Moonlight fehlgeschlagen. Bitte aktualisiere die Seite
 Failed to reconnect to the moonlight servers. The connection has been rejected;Die Wiederverbindung zu den Moonlight-Servern ist fehlgeschlagen. Die Verbindung wurde abgelehnt
-We were unable to reconnect to moonlight. Most of the time this is caused by an update of moonlight. Please refresh the page;Verbindung zu Moonlight fehlgeschlagen. Meistens wird dies durch eine Aktualisierung von Moonlight verursacht. Bitte aktualisieren Sie die Seite
+We were unable to reconnect to moonlight. Most of the time this is caused by an update of moonlight. Please refresh the page;Verbindung zu Moonlight fehlgeschlagen. Meistens wird dies durch eine Aktualisierung von Moonlight verursacht. Bitte aktualisiere die Seite
-Verifying token, loading user data;Token verifizieren, Benutzer-Daten laden
+Verifying token, loading user data;Token verifizieren, lade Benutzerdaten
-Reload config;Konfiguration neu laden
+Reload config;Konfiguration neuladen
-Successfully reloading configuration;Konfiguration wird neu geladen...
+Successfully reloading configuration;Konfiguration wird neugeladen...
-Successfully reloaded configuration;Die Konfiguration wurde erfolgreich neu geladen
+Successfully reloaded configuration;Die Konfiguration wurde erfolgreich neugeladen
 Flows;Flows
 Add node;Node Hinzufügen
 Web system;Web System
@@ -627,10 +627,10 @@ Fabric loader version;Fabric Loader Version
 Rate;Rate
 Hey, can i borrow you for a second?;Hey, kann ich dich mal kurz ausleihen?
 We want to improve our services and get a little bit of feedback how we are currently doing. Please leave us a rating;Da wir unsere Dienste ständig verbessern, möchten wir dich um Feedback bitten. Bitte Bewerte uns:
-Thanks for your rating;Danke für deine Bewertun
+Thanks for your rating;Danke für deine Bewertung
 It would be really kind of you rating us on a external platform as it will help our project very much;Es wäre wirklich nett, wenn du uns auf einer externen Plattform bewerten würdest, denn das würde unserem Projekt sehr helfen
 Close;Schließen
-Rating saved;Bewretung gespeichert
+Rating saved;Bewertung gespeichert
 Group;Gruppe
 Beta;Beta
 Create a new group;Eine neue Gruppe erstellen

Moonlight/wwwroot/assets/css/blazor.css

@@ -41,6 +41,7 @@
 .components-reconnect-rejected > .rejected {
     display: block;
 }
+
 .components-reconnect-hide > div {
     display: none;
 }
@@ -55,4 +56,17 @@
 
 .components-reconnect-rejected {
     display: block;
+}
+
+::-webkit-scrollbar {
+    width: 12px;
+    background: var(--kt-card-bg);
+}
+
+::-webkit-scrollbar-thumb {
+    background: #6964E4;
+}
+
+::-webkit-scrollbar-thumb:hover {
+    background: #6964E4;
 }

README.md

@@ -22,7 +22,7 @@
 
 ![Screen Shot](https://media.discordapp.net/attachments/1059911407170228234/1119793539732217876/image.png?width=1340&height=671)
 
-Moonlight is a new free and open source alternative to pterodactyl allowing users to create their own hosting platform and host all sorts of gameservers in docker containers. With a simple migration from pterodactyl to moonlight (migrator will be open source soon) you can easily switch to moonlight and use its features like a server manager, cleanup system and automatic version switcher, just to name a few.
+Moonlight is a new free and open source alternative to pterodactyl allowing users to create their own hosting platform and host all sorts of gameservers in docker containers. With a simple migration from pterodactyl to moonlight ([see guide](https://docs.moonlightpanel.xyz/migrating-from-pterodactyl)) you can easily switch to moonlight and use its features like a server manager, cleanup system and automatic version switcher, just to name a few.
 
 Moonlight's core features are