From e54077fc5549c536075d30f8e838692e6d8be4e4 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:38:49 +0200 Subject: [PATCH] Removed legacy plesk models and imports --- .../CloudPanel/CloudPanelApiHelper.cs | 4 +- .../App/Models/Plesk/Requests/CliCall.cs | 10 ----- .../Models/Plesk/Requests/CreateDatabase.cs | 23 ---------- .../Plesk/Requests/CreateDatabaseUser.cs | 15 ------- .../App/Models/Plesk/Requests/CreateDomain.cs | 45 ------------------- .../App/Models/Plesk/Resources/CliResult.cs | 13 ------ .../App/Models/Plesk/Resources/Client.cs | 45 ------------------- .../Models/Plesk/Resources/CreateResult.cs | 12 ----- .../App/Models/Plesk/Resources/Database.cs | 15 ------- .../Models/Plesk/Resources/DatabaseServer.cs | 30 ------------- .../Models/Plesk/Resources/DatabaseUser.cs | 15 ------- .../Models/Plesk/Resources/ServerStatus.cs | 18 -------- Moonlight/App/Services/WebSpaceService.cs | 5 +-- .../WebsiteControl/WebSpaceDatabases.razor | 1 - 14 files changed, 2 insertions(+), 249 deletions(-) delete mode 100644 Moonlight/App/Models/Plesk/Requests/CliCall.cs delete mode 100644 Moonlight/App/Models/Plesk/Requests/CreateDatabase.cs delete mode 100644 Moonlight/App/Models/Plesk/Requests/CreateDatabaseUser.cs delete mode 100644 Moonlight/App/Models/Plesk/Requests/CreateDomain.cs delete mode 100644 Moonlight/App/Models/Plesk/Resources/CliResult.cs delete mode 100644 Moonlight/App/Models/Plesk/Resources/Client.cs delete mode 100644 Moonlight/App/Models/Plesk/Resources/CreateResult.cs delete mode 100644 Moonlight/App/Models/Plesk/Resources/Database.cs delete mode 100644 Moonlight/App/Models/Plesk/Resources/DatabaseServer.cs delete mode 100644 Moonlight/App/Models/Plesk/Resources/DatabaseUser.cs delete mode 100644 Moonlight/App/Models/Plesk/Resources/ServerStatus.cs diff --git a/Moonlight/App/ApiClients/CloudPanel/CloudPanelApiHelper.cs b/Moonlight/App/ApiClients/CloudPanel/CloudPanelApiHelper.cs index fd6e99fb..cfa2b51d 100644 --- a/Moonlight/App/ApiClients/CloudPanel/CloudPanelApiHelper.cs +++ b/Moonlight/App/ApiClients/CloudPanel/CloudPanelApiHelper.cs @@ -1,6 +1,4 @@ -using Moonlight.App.Database.Entities; -using Moonlight.App.Models.Plesk.Resources; -using Newtonsoft.Json; +using Newtonsoft.Json; using RestSharp; namespace Moonlight.App.ApiClients.CloudPanel; diff --git a/Moonlight/App/Models/Plesk/Requests/CliCall.cs b/Moonlight/App/Models/Plesk/Requests/CliCall.cs deleted file mode 100644 index c6fb06ee..00000000 --- a/Moonlight/App/Models/Plesk/Requests/CliCall.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Requests; - -public class CliCall -{ - [JsonProperty("params")] public List Params { get; set; } = new(); - - [JsonProperty("env")] public Dictionary Env { get; set; } = new(); -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Requests/CreateDatabase.cs b/Moonlight/App/Models/Plesk/Requests/CreateDatabase.cs deleted file mode 100644 index 11c9a0cb..00000000 --- a/Moonlight/App/Models/Plesk/Requests/CreateDatabase.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Requests; - -public class CreateDatabase -{ - [JsonProperty("name")] - public string Name { get; set; } - - [JsonProperty("type")] - public string Type { get; set; } - - [JsonProperty("parent_domain")] public ParentDomainModel ParentDomain { get; set; } = new(); - - [JsonProperty("server_id")] - public int ServerId { get; set; } - - public class ParentDomainModel - { - [JsonProperty("name")] - public string Name { get; set; } - } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Requests/CreateDatabaseUser.cs b/Moonlight/App/Models/Plesk/Requests/CreateDatabaseUser.cs deleted file mode 100644 index eca5dd38..00000000 --- a/Moonlight/App/Models/Plesk/Requests/CreateDatabaseUser.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Requests; - -public class CreateDatabaseUser -{ - [JsonProperty("login")] - public string Login { get; set; } - - [JsonProperty("password")] - public string Password { get; set; } - - [JsonProperty("database_id")] - public int DatabaseId { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Requests/CreateDomain.cs b/Moonlight/App/Models/Plesk/Requests/CreateDomain.cs deleted file mode 100644 index 1ef11caa..00000000 --- a/Moonlight/App/Models/Plesk/Requests/CreateDomain.cs +++ /dev/null @@ -1,45 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Requests; - -public class CreateDomain -{ - [JsonProperty("name")] - public string Name { get; set; } - - [JsonProperty("description")] - public string Description { get; set; } - - [JsonProperty("hosting_type")] - public string HostingType { get; set; } - - [JsonProperty("hosting_settings")] - public HostingSettingsModel HostingSettings { get; set; } - - [JsonProperty("owner_client")] - public OwnerClientModel OwnerClient { get; set; } - - [JsonProperty("plan")] - public PlanModel Plan { get; set; } - - public partial class HostingSettingsModel - { - [JsonProperty("ftp_login")] - public string FtpLogin { get; set; } - - [JsonProperty("ftp_password")] - public string FtpPassword { get; set; } - } - - public partial class OwnerClientModel - { - [JsonProperty("id")] - public long Id { get; set; } - } - - public partial class PlanModel - { - [JsonProperty("name")] - public string Name { get; set; } - } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/CliResult.cs b/Moonlight/App/Models/Plesk/Resources/CliResult.cs deleted file mode 100644 index 255ff8d4..00000000 --- a/Moonlight/App/Models/Plesk/Resources/CliResult.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Resources; - -public class CliResult -{ - [JsonProperty("code")] - public int Code { get; set; } - - [JsonProperty("stdout")] public string Stdout { get; set; } = ""; - - [JsonProperty("stderr")] public string Stderr { get; set; } = ""; -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/Client.cs b/Moonlight/App/Models/Plesk/Resources/Client.cs deleted file mode 100644 index 8bf96ae2..00000000 --- a/Moonlight/App/Models/Plesk/Resources/Client.cs +++ /dev/null @@ -1,45 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Resources; - -public class Client -{ - [JsonProperty("id")] - public int Id { get; set; } - - [JsonProperty("created")] - public DateTimeOffset Created { get; set; } - - [JsonProperty("name")] - public string Name { get; set; } - - [JsonProperty("company")] - public string Company { get; set; } - - [JsonProperty("login")] - public string Login { get; set; } - - [JsonProperty("status")] - public long Status { get; set; } - - [JsonProperty("email")] - public string Email { get; set; } - - [JsonProperty("locale")] - public string Locale { get; set; } - - [JsonProperty("guid")] - public Guid Guid { get; set; } - - [JsonProperty("owner_login")] - public string OwnerLogin { get; set; } - - [JsonProperty("external_id")] - public string ExternalId { get; set; } - - [JsonProperty("description")] - public string Description { get; set; } - - [JsonProperty("type")] - public string Type { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/CreateResult.cs b/Moonlight/App/Models/Plesk/Resources/CreateResult.cs deleted file mode 100644 index 54415aed..00000000 --- a/Moonlight/App/Models/Plesk/Resources/CreateResult.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Resources; - -public class CreateResult -{ - [JsonProperty("id")] - public int Id { get; set; } - - [JsonProperty("guid")] - public Guid Guid { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/Database.cs b/Moonlight/App/Models/Plesk/Resources/Database.cs deleted file mode 100644 index 27a78993..00000000 --- a/Moonlight/App/Models/Plesk/Resources/Database.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Resources; - -public class Database -{ - [JsonProperty("id")] - public int Id { get; set; } - - [JsonProperty("name")] - public string Name { get; set; } - - [JsonProperty("type")] - public string Type { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/DatabaseServer.cs b/Moonlight/App/Models/Plesk/Resources/DatabaseServer.cs deleted file mode 100644 index a16ceabd..00000000 --- a/Moonlight/App/Models/Plesk/Resources/DatabaseServer.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Resources; - -public class DatabaseServer -{ - [JsonProperty("id")] - public int Id { get; set; } - - [JsonProperty("host")] - public string Host { get; set; } - - [JsonProperty("port")] - public int Port { get; set; } - - [JsonProperty("type")] - public string Type { get; set; } - - [JsonProperty("status")] - public string Status { get; set; } - - [JsonProperty("db_count")] - public int DbCount { get; set; } - - [JsonProperty("is_default")] - public bool IsDefault { get; set; } - - [JsonProperty("is_local")] - public bool IsLocal { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/DatabaseUser.cs b/Moonlight/App/Models/Plesk/Resources/DatabaseUser.cs deleted file mode 100644 index 033a763b..00000000 --- a/Moonlight/App/Models/Plesk/Resources/DatabaseUser.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Resources; - -public class DatabaseUser -{ - [JsonProperty("id")] - public int Id { get; set; } - - [JsonProperty("login")] - public string Login { get; set; } - - [JsonProperty("database_id")] - public int DatabaseId { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Models/Plesk/Resources/ServerStatus.cs b/Moonlight/App/Models/Plesk/Resources/ServerStatus.cs deleted file mode 100644 index 32962dbe..00000000 --- a/Moonlight/App/Models/Plesk/Resources/ServerStatus.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Models.Plesk.Resources; - -public class ServerStatus -{ - [JsonProperty("platform")] - public string Platform { get; set; } - - [JsonProperty("hostname")] - public string Hostname { get; set; } - - [JsonProperty("guid")] - public Guid Guid { get; set; } - - [JsonProperty("panel_version")] - public string PanelVersion { get; set; } -} \ No newline at end of file diff --git a/Moonlight/App/Services/WebSpaceService.cs b/Moonlight/App/Services/WebSpaceService.cs index 91a3d718..1f1820b8 100644 --- a/Moonlight/App/Services/WebSpaceService.cs +++ b/Moonlight/App/Services/WebSpaceService.cs @@ -1,13 +1,10 @@ -using Logging.Net; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Moonlight.App.ApiClients.CloudPanel; using Moonlight.App.ApiClients.CloudPanel.Requests; using Moonlight.App.Database.Entities; using Moonlight.App.Exceptions; using Moonlight.App.Helpers; using Moonlight.App.Helpers.Files; -using Moonlight.App.Models.Plesk.Requests; -using Moonlight.App.Models.Plesk.Resources; using Moonlight.App.Repositories; using FileAccess = Moonlight.App.Helpers.Files.FileAccess; diff --git a/Moonlight/Shared/Components/WebsiteControl/WebSpaceDatabases.razor b/Moonlight/Shared/Components/WebsiteControl/WebSpaceDatabases.razor index 9645f2f1..7aa0b5cb 100644 --- a/Moonlight/Shared/Components/WebsiteControl/WebSpaceDatabases.razor +++ b/Moonlight/Shared/Components/WebsiteControl/WebSpaceDatabases.razor @@ -1,6 +1,5 @@ @using Moonlight.App.Database.Entities @using Moonlight.App.Models.Forms -@using Moonlight.App.Models.Plesk.Resources @using Moonlight.App.Services @inject SmartTranslateService SmartTranslateService