From 5a7eeb1490f8a88ab6907823bd3035fbdd9b4265 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:33:45 +0200 Subject: [PATCH 01/11] Removed legacy resources folder --- Moonlight/Moonlight.csproj | 1 - Moonlight/resources/lang/de_de.lang | 568 ------------------ Moonlight/resources/lang/en_us.lang | 86 --- Moonlight/resources/mail/login.html | 53 -- Moonlight/resources/mail/passwordChange.html | 53 -- Moonlight/resources/mail/passwordReset.html | 54 -- Moonlight/resources/mail/register.html | 50 -- Moonlight/resources/public/images/logo.svg | 14 - .../resources/public/images/logolong.png | Bin 12410 -> 0 bytes 9 files changed, 879 deletions(-) delete mode 100644 Moonlight/resources/lang/de_de.lang delete mode 100644 Moonlight/resources/lang/en_us.lang delete mode 100644 Moonlight/resources/mail/login.html delete mode 100644 Moonlight/resources/mail/passwordChange.html delete mode 100644 Moonlight/resources/mail/passwordReset.html delete mode 100644 Moonlight/resources/mail/register.html delete mode 100644 Moonlight/resources/public/images/logo.svg delete mode 100644 Moonlight/resources/public/images/logolong.png diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index a0d9713d..feae4b72 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -74,7 +74,6 @@ - diff --git a/Moonlight/resources/lang/de_de.lang b/Moonlight/resources/lang/de_de.lang deleted file mode 100644 index dc4f01e0..00000000 --- a/Moonlight/resources/lang/de_de.lang +++ /dev/null @@ -1,568 +0,0 @@ -Open support;Open support -About us;About us -Imprint;Imprint -Privacy;Privacy -Login;Login -Register;Register -Insert brand name...;Insert brand name... -Save and continue;Save and continue -Saving;Saving -Configure basics;Configure basics -Brand name;Brand name -test;test -Insert first name...;Insert first name... -Insert last name...;Insert last name... -Insert email address...;Insert email address... -Add;Add -Adding...;Adding... -Add admin accounts;Add admin accounts -First name;First name -Last name;Last name -Email address;Email address -Enter password;Enter password -Next;Next -Back;Back -Configure features;Configure features -Support chat;Support chat -Finish;Finish -Finalize installation;Finalize installation -Moonlight basic settings successfully configured;Moonlight basic settings successfully configured -Ooops. This page is crashed;Ooops. This page is crashed -This page is crashed. The error has been reported to the moonlight team. Meanwhile you can try reloading the page;This page is crashed. The error has been reported to the moonlight team. Meanwhile you can try reloading the page -Setup complete;Setup complete -It looks like this moonlight instance is ready to go;It looks like this moonlight instance is ready to go -User successfully created;User successfully created -Ooops. Your moonlight client is crashed;Ooops. Your moonlight client is crashed -This error has been reported to the moonlight team;This error has been reported to the moonlight team -Sign In;Sign In -Sign in to start with moonlight;Sign in to start with moonlight -Sign in with Discord;Sign in with Discord -Or with email;Or with email -Forgot password?;Forgot password? -Sign-in;Sign-in -Not registered yet?;Not registered yet? -Sign up;Sign up -Authenticating;Authenticating -Sign in with Google;Sign in with Google -Working;Working -Error;Error -Email and password combination not found;Email and password combination not found -Email;Email -Password;Password -Account settings;Account settings -Logout;Logout -Dashboard;Dashboard -Order;Order -Website;Website -Database;Database -Domain;Domain -Servers;Servers -Websites;Websites -Databases;Databases -Domains;Domains -Changelog;Changelog -Firstname;Firstname -Lastname;Lastname -Repeat password;Repeat password -Sign Up;Sign Up -Sign up to start with moonlight;Sign up to start with moonlight -Sign up with Discord;Sign up with Discord -Sign up with Google;Sign up with Google -Sign-up;Sign-up -Already registered?;Already registered? -Sign in;Sign in -Create something new;Create something new -Create a gameserver;Create a gameserver -A new gameserver in just a few minutes;A new gameserver in just a few minutes -Create a database;Create a database -A quick way to store your data and manage it from all around the world;A quick way to store your data and manage it from all around the world -Manage your services;Manage your services -Manage your gameservers;Manage your gameservers -Adjust your gameservers;Adjust your gameservers -Manage your databases;Manage your databases -Insert, delete and update the data in your databases;Insert, delete and update the data in your databases -Create a website;Create a website -Make your own websites with a webspace;Make your own websites with a webspace -Create a domain;Create a domain -Make your servvices accessible throught your own domain;Make your servvices accessible throught your own domain -Manage your websites;Manage your websites -Modify the content of your websites;Modify the content of your websites -Manage your domains;Manage your domains -Add, edit and delete dns records;Add, edit and delete dns records -Admin;Admin -System;System -Overview;Overview -Manager;Manager -Cleanup;Cleanup -Nodes;Nodes -Images;Images -aaPanel;aaPanel -Users;Users -Support;Support -Statistics;Statistics -No nodes found. Start with adding a new node;No nodes found. Start with adding a new node -Nodename;Nodename -FQDN;FQDN -Create;Create -Creating;Creating -Http port;Http port -Sftp port;Sftp port -Moonlight daemon port;Moonlight daemon port -SSL;SSL -CPU Usage;CPU Usage -In %;In % -Memory;Memory -Used / Available memory;Used / Available memory -Storage;Storage -Available storage;Available storage -Add a new node;Add a new node -Delete;Delete -Deleting;Deleting -Edit;Edit -Token Id;Token Id -Token;Token -Save;Save -Setup;Setup -Open a ssh connection to your node and enter;Open a ssh connection to your node and enter -and paste the config below. Then press STRG+O and STRG+X to save;and paste the config below. Then press STRG+O and STRG+X to save -Before configuring this node, install the daemon;Before configuring this node, install the daemon -Delete this node?;Delete this node? -Do you really want to delete this node;Do you really want to delete this node -Yes;Yes -No;No -Status;Status -Adding;Adding -Port;Port -Id;Id -Manage;Manage -Create new server;Create new server -No servers found;No servers found -Server name;Server name -Cpu cores;Cpu cores -Disk;Disk -Image;Image -Override startup;Override startup -Docker image;Docker image -CPU Cores (100% = 1 Core);CPU Cores (100% = 1 Core) -Server successfully created;Server successfully created -Name;Name -Cores;Cores -Owner;Owner -Value;Value -An unknown error occured;An unknown error occured -No allocation found;No allocation found -Identifier;Identifier -UuidIdentifier;UuidIdentifier -Override startup command;Override startup command -Loading;Loading -Offline;Offline -Connecting;Connecting -Start;Start -Restart;Restart -Stop;Stop -Shared IP;Shared IP -Server ID;Server ID -Cpu;Cpu -Console;Console -Files;Files -Backups;Backups -Network;Network -Plugins;Plugins -Settings;Settings -Enter command;Enter command -Execute;Execute -Checking disk space;Checking disk space -Updating config files;Updating config files -Checking file permissions;Checking file permissions -Downloading server image;Downloading server image -Downloaded server image;Downloaded server image -Starting;Starting -Online;Online -Kill;Kill -Stopping;Stopping -Search files and folders;Search files and folders -Launch WinSCP;Launch WinSCP -New folder;New folder -Upload;Upload -File name;File name -File size;File size -Last modified;Last modified -Cancel;Cancel -Canceling;Canceling -Running;Running -Loading backups;Loading backups -Started backup creation;Started backup creation -Backup is going to be created;Backup is going to be created -Rename;Rename -Move;Move -Archive;Archive -Unarchive;Unarchive -Download;Download -Starting download;Starting download -Backup successfully created;Backup successfully created -Restore;Restore -Copy url;Copy url -Backup deletion started;Backup deletion started -Backup successfully deleted;Backup successfully deleted -Primary;Primary -This feature is currently not available;This feature is currently not available -Send;Send -Sending;Sending -Welcome to the support chat. Ask your question here and we will help you;Welcome to the support chat. Ask your question here and we will help you - minutes ago; minutes ago -just now;just now -less than a minute ago;less than a minute ago -1 hour ago;1 hour ago -1 minute ago;1 minute ago -Failed;Failed - hours ago; hours ago -Open tickets;Open tickets -Actions;Actions -No support ticket is currently open;No support ticket is currently open -User information;User information -Close ticket;Close ticket -Closing;Closing -The support team has been notified. Please be patient;The support team has been notified. Please be patient -The ticket is now closed. Type a message to open it again;The ticket is now closed. Type a message to open it again -1 day ago;1 day ago -is typing;is typing -are typing;are typing -No domains available;No domains available -Shared domains;Shared domains -Shared domain;Shared domain -Shared domain successfully deleted;Shared domain successfully deleted -Shared domain successfully added;Shared domain successfully added -Domain name;Domain name -DNS records for;DNS records for -Fetching dns records;Fetching dns records -No dns records found;No dns records found -Content;Content -Priority;Priority -Ttl;Ttl -Enable cloudflare proxy;Enable cloudflare proxy -CF Proxy;CF Proxy - days ago; days ago -Cancle;Cancle -An unexpected error occured;An unexpected error occured -Testy;Testy -Error from cloudflare api;Error from cloudflare api -Profile;Profile -No subscription available;No subscription available -Buy;Buy -Redirecting;Redirecting -Apply;Apply -Applying code;Applying code -Invalid subscription code;Invalid subscription code -Cancel Subscription;Cancel Subscription -Active until;Active until -We will send you a notification upon subscription expiration;We will send you a notification upon subscription expiration -This token has been already used;This token has been already used -New login for;New login for -No records found for this day;No records found for this day -Change;Change -Changing;Changing -Minecraft version;Minecraft version -Build version;Build version -Server installation is currently running;Server installation is currently running -Selected;Selected -Move deleted;Move deleted -Delete selected;Delete selected -Log level;Log level -Log message;Log message -Time;Time -Version;Version -You are running moonlight version;You are running moonlight version -Operating system;Operating system -Moonlight is running on;Moonlight is running on -Memory usage;Memory usage -Moonlight is using;Moonlight is using -of memory;of memory -Cpu usage;Cpu usage -Refresh;Refresh -Send a message to all users;Send a message to all users -IP;IP -URL;URL -Device;Device -Change url;Change url -Message;Message -Enter message;Enter message -Enter the message to send;Enter the message to send -Confirm;Confirm -Are you sure?;Are you sure? -Enter url;Enter url -An unknown error occured while starting backup deletion;An unknown error occured while starting backup deletion -Success;Success -Backup URL successfully copied to your clipboard;Backup URL successfully copied to your clipboard -Backup restore started;Backup restore started -Backup successfully restored;Backup successfully restored -Register for;Register for -Core;Core -Logs;Logs -AuditLog;AuditLog -SecurityLog;SecurityLog -ErrorLog;ErrorLog -Resources;Resources -WinSCP cannot be launched here;WinSCP cannot be launched here -Create a new folder;Create a new folder -Enter a name;Enter a name -File upload complete;File upload complete -New server;New server -Sessions;Sessions -New user;New user -Created at;Created at -Mail template not found;Mail template not found -Missing admin permissions. This attempt has been logged ;) -Address;Address -City;City -State;State -Country;Country -Totp;Totp -Discord;Discord -Subscription;Subscription -None;None -No user with this id found;No user with this id found -Back to list;Back to list -New domain;New domain -Reset password;Reset password -Password reset;Password reset -Reset the password of your account;Reset the password of your account -Wrong here?;Wrong here? -A user with this email can not be found;A user with this email can not be found -Passwort reset successfull. Check your mail;Passwort reset successfull. Check your mail -Discord bot;Discord bot -New image;New image -Description;Description -Uuid;Uuid -Enter tag name;Enter tag name -Remove;Remove -No tags found;No tags found -Enter docker image name;Enter docker image name -Tags;Tags -Docker images;Docker images -Default image;Default image -Startup command;Startup command -Install container;Install container -Install entry;Install entry -Configuration files;Configuration files -Startup detection;Startup detection -Stop command;Stop command -Successfully saved image;Successfully saved image -No docker images found;No docker images found -Key;Key -Default value;Default value -Allocations;Allocations -No variables found;No variables found -Successfully added image;Successfully added image -Password change for;Password change for -of;of -New node;New node -Fqdn;Fqdn -Cores used;Cores used -used;used -5.15.90.1-microsoft-standard-WSL2 - amd64;5.15.90.1-microsoft-standard-WSL2 - amd64 -Host system information;Host system information -0;0 -Docker containers running;Docker containers running -details;details -1;1 -2;2 -DDos;DDos -No ddos attacks found;No ddos attacks found -Node;Node -Date;Date -DDos attack started;DDos attack started -packets;packets -DDos attack stopped;DDos attack stopped - packets; packets -Stop all;Stop all -Kill all;Kill all -Network in;Network in -Network out;Network out -Kill all servers;Kill all servers -Do you really want to kill all running servers?;Do you really want to kill all running servers? -Change power state for;Change power state for -to;to -Stop all servers;Stop all servers -Do you really want to stop all running servers?;Do you really want to stop all running servers? -Manage ;Manage -Manage user ;Manage user -Reloading;Reloading -Update;Update -Updating;Updating -Successfully updated user;Successfully updated user -Discord id;Discord id -Discord username;Discord username -Discord discriminator;Discord discriminator -The Name field is required.;The Name field is required. -An error occured while logging you in;An error occured while logging you in -You need to enter an email address;You need to enter an email address -You need to enter a password;You need to enter a password -You need to enter a password with minimum 8 characters in lenght;You need to enter a password with minimum 8 characters in lenght -Proccessing;Proccessing -The FirstName field is required.;The FirstName field is required. -The LastName field is required.;The LastName field is required. -The Address field is required.;The Address field is required. -The City field is required.;The City field is required. -The State field is required.;The State field is required. -The Country field is required.;The Country field is required. -Street and house number requered;Street and house number requered -Max lenght reached;Max lenght reached -Server;Server -stopped;stopped -Cleanups;Cleanups -executed;executed -Used clanup;Used clanup -Enable;Enable -Disabble;Disabble -Disable;Disable -Addons;Addons -Javascript version;Javascript version -Javascript file;Javascript file -Select javascript file to execute on start;Select javascript file to execute on start -Submit;Submit -Processing;Processing -Go up;Go up -Running cleanup;Running cleanup -servers;servers -Select folder to move the file(s) to;Select folder to move the file(s) to -Paper version;Paper version -Join2Start;Join2Start -Server reset;Server reset -Reset;Reset -Resetting;Resetting -Are you sure you want to reset this server?;Are you sure you want to reset this server? -Are you sure? This cannot be undone;Are you sure? This cannot be undone -Resetting server;Resetting server -Deleted file;Deleted file -Reinstalling server;Reinstalling server -Uploading files;Uploading files -complete;complete -Upload complete;Upload complete -Security;Security -Subscriptions;Subscriptions -2fa Code;2fa Code -Your account is secured with 2fa;Your account is secured with 2fa -anyone write a fancy text here?;anyone write a fancy text here? -Activate 2fa;Activate 2fa -2fa apps;2fa apps -Use an app like ;Use an app like -or;or -and scan the following QR Code;and scan the following QR Code -If you have trouble using the QR Code, select manual input in the app and enter your email and the following code:;If you have trouble using the QR Code, select manual input in the app and enter your email and the following code: -Finish activation;Finish activation -2fa Code requiered;2fa Code requiered -New password;New password -Secure your account;Secure your account -2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login.;2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login. -New subscription;New subscription -You need to enter a name;You need to enter a name -You need to enter a description;You need to enter a description -Add new limit;Add new limit -Create subscription;Create subscription -Options;Options -Amount;Amount -Do you really want to delete it?;Do you really want to delete it? -Loading your subscription;Loading your subscription -Searching for deploy node;Searching for deploy node -Searching for available images;Searching for available images -Server details;Server details -Configure your server;Configure your server -Default;Default -You reached the maximum amount of servers for every image of your subscription;You reached the maximum amount of servers for every image of your subscription -Personal information;Personal information -Enter code;Enter code -Server rename;Server rename -Create code;Create code -Save subscription;Save subscription -Enter your information;Enter your information -You need to enter your full name in order to use moonlight;You need to enter your full name in order to use moonlight -No node found;No node found -No node found to deploy to found;No node found to deploy to found -Node offline;Node offline -The node the server is running on is currently offline;The node the server is running on is currently offline -Server not found;Server not found -A server with that id cannot be found or you have no access for this server;A server with that id cannot be found or you have no access for this server -Compress;Compress -Decompress;Decompress -Moving;Moving -Compressing;Compressing -selected;selected -New website;New website -Plesk servers;Plesk servers -Base domain;Base domain -Plesk server;Plesk server -Ftp;Ftp -No SSL certificate found;No SSL certificate found -Ftp Host;Ftp Host -Ftp Port;Ftp Port -Ftp Username;Ftp Username -Ftp Password;Ftp Password -Use;Use -SSL Certificates;SSL Certificates -SSL certificates;SSL certificates -Issue certificate;Issue certificate -New plesk server;New plesk server -Api url;Api url -Host system offline;Host system offline -The host system the website is running on is currently offline;The host system the website is running on is currently offline -No SSL certificates found;No SSL certificates found -No databases found for this website;No databases found for this website -The name should be at least 8 characters long;The name should be at least 8 characters long -The name should only contain of lower case characters and numbers;The name should only contain of lower case characters and numbers -Error from plesk;Error from plesk -Host;Host -Username;Username -SRV records cannot be updated thanks to the cloudflare api client. Please delete the record and create a new one;SRV records cannot be updated thanks to the cloudflare api client. Please delete the record and create a new one -The User field is required.;The User field is required. -You need to specify a owner;You need to specify a owner -You need to specify a image;You need to specify a image -Api Url;Api Url -Api Key;Api Key -Duration;Duration -Enter duration of subscription;Enter duration of subscription -Copied code to clipboard;Copied code to clipboard -Invalid or expired subscription code;Invalid or expired subscription code -Current subscription;Current subscription -You need to specify a server image;You need to specify a server image -CPU;CPU -Hour;Hour -Day;Day -Month;Month -Year;Year -All time;All time -This function is not implemented;This function is not implemented -Domain details;Domain details -Configure your domain;Configure your domain -You reached the maximum amount of domains in your subscription;You reached the maximum amount of domains in your subscription -You need to specify a shared domain;You need to specify a shared domain -A domain with this name does already exist for this shared domain;A domain with this name does already exist for this shared domain -The Email field is required.;The Email field is required. -The Password field is required.;The Password field is required. -The ConfirmPassword field is required.;The ConfirmPassword field is required. -Passwords need to match;Passwords need to match -Cleanup exception;Cleanup exception -No shared domain found;No shared domain found -Searching for deploy plesk server;Searching for deploy plesk server -No plesk server found;No plesk server found -No plesk server found to deploy to;No plesk server found to deploy to -No node found to deploy to;No node found to deploy to -Website details;Website details -Configure your website;Configure your website -The name cannot be longer that 32 characters;The name cannot be longer that 32 characters -The name should only consist of lower case characters;The name should only consist of lower case characters -News;News -Title...;Title... -Enter text...;Enter text... -Saving...;Saving... -Deleting...;Deleting... -Delete post;Delete post -Do you really want to delete the post ";Do you really want to delete the post " -You have no domains;You have no domains -We were not able to find any domains associated with your account;We were not able to find any domains associated with your account -You have no websites;You have no websites -We were not able to find any websites associated with your account;We were not able to find any websites associated with your account -Guest;Guest -You need a domain;You need a domain -New post;New post -New entry;New entry -You reached the maximum amount of websites in your subscription;You reached the maximum amount of websites in your subscription diff --git a/Moonlight/resources/lang/en_us.lang b/Moonlight/resources/lang/en_us.lang deleted file mode 100644 index 2e2e1fcb..00000000 --- a/Moonlight/resources/lang/en_us.lang +++ /dev/null @@ -1,86 +0,0 @@ -Open support;Open support -About us;About us -Imprint;Imprint -Privacy;Privacy -Create;Create -Server;Server -Domain;Domain -Website;Website -Login;Login -Register;Register -Email;Email -Password;Password -Sign In;Sign In -Sign in to start with moonlight;Sign in to start with moonlight -Sign in with Discord;Sign in with Discord -Sign in with Google;Sign in with Google -Or with email;Or with email -Forgot password?;Forgot password? -Sign-in;Sign-in -Not registered yet?;Not registered yet? -Sign up;Sign up -Profile;Profile -Logout;Logout -Dashboard;Dashboard -Servers;Servers -Websites;Websites -Domains;Domains -Changelog;Changelog -Admin;Admin -System;System -Overview;Overview -Manager;Manager -Cleanup;Cleanup -Nodes;Nodes -Images;Images -Users;Users -Shared domains;Shared domains -Support;Support -Subscriptions;Subscriptions -Statistics;Statistics -Create something new;Create something new -Create a gameserver;Create a gameserver -A new gameserver in just a few minutes;A new gameserver in just a few minutes -Create a website;Create a website -Make your own websites with a webspace;Make your own websites with a webspace -Create a domain;Create a domain -Make your servvices accessible throught your own domain;Make your servvices accessible throught your own domain -Manage your services;Manage your services -Manage your gameservers;Manage your gameservers -Adjust your gameservers;Adjust your gameservers -Manage your websites;Manage your websites -Modify the content of your websites;Modify the content of your websites -Manage your domains;Manage your domains -Add, edit and delete dns records;Add, edit and delete dns records -New server;New server -Id;Id -Name;Name -Cores;Cores -Memory;Memory -Disk;Disk -Owner;Owner -Manage;Manage -Node offline;Node offline -The node the server is running on is currently offline;The node the server is running on is currently offline -Sessions;Sessions -New user;New user -First name;First name -Last name;Last name -Created at;Created at -Refresh;Refresh -Send a message to all users;Send a message to all users -IP;IP -URL;URL -Device;Device -Time;Time -Actions;Actions -Change url;Change url -Message;Message -Enter url;Enter url -Send;Send -Sending;Sending -Welcome to the support chat. Ask your question here and we will help you;Welcome to the support chat. Ask your question here and we will help you -less than a minute ago;less than a minute ago -The support team has been notified. Please be patient;The support team has been notified. Please be patient -is typing;is typing -Proccessing;Proccessing diff --git a/Moonlight/resources/mail/login.html b/Moonlight/resources/mail/login.html deleted file mode 100644 index 06748d96..00000000 --- a/Moonlight/resources/mail/login.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - New moonlight login - - -
- - - - - - - - - - - - -
-
-
- - Logo - -
-
-

Hey {{FirstName}}, there is a new login in your moonlight account

-

Here is all the data we collected

-

IP: {{Ip}}

-

Device: {{Device}}

-

Location: {{Location}}

-
- Open Moonlight - -
-
-

You need help?

-

We are happy to help!

-

More information at - endelon.link/support. -

-
-

Copyright 2022 Endelon Hosting

-
-
- - \ No newline at end of file diff --git a/Moonlight/resources/mail/passwordChange.html b/Moonlight/resources/mail/passwordChange.html deleted file mode 100644 index ae3e5a12..00000000 --- a/Moonlight/resources/mail/passwordChange.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Moonlight password change - - -
- - - - - - - - - - - - -
-
-
- - Logo - -
-
-

Hey {{FirstName}}, your password has been changed

-

If this was not you please contact us. Also here is the data we collected.

-

IP: {{Ip}}

-

Device: {{Device}}

-

Location: {{Location}}

-
- Open Moonlight - -
-
-

You need help?

-

We are happy to help!

-

More information at - endelon.link/support. -

-
-

Copyright 2023 Endelon Hosting

-
-
- - \ No newline at end of file diff --git a/Moonlight/resources/mail/passwordReset.html b/Moonlight/resources/mail/passwordReset.html deleted file mode 100644 index 9dd066c6..00000000 --- a/Moonlight/resources/mail/passwordReset.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - Moonlight password reset - - -
- - - - - - - - - - - - -
-
-
- - Logo - -
-
-

Hey {{FirstName}}, your password has been resetted

-

Your new password is: {{Password}}

-

If this was not you please contact us. Also here is the data we collected.

-

IP: {{Ip}}

-

Device: {{Device}}

-

Location: {{Location}}

-
- Open Moonlight - -
-
-

You need help?

-

We are happy to help!

-

More information at - endelon.link/support. -

-
-

Copyright 2022 Endelon Hosting

-
-
- - \ No newline at end of file diff --git a/Moonlight/resources/mail/register.html b/Moonlight/resources/mail/register.html deleted file mode 100644 index 3ffbc507..00000000 --- a/Moonlight/resources/mail/register.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - Welcome - - -
- - - - - - - - - - - - -
-
-
- - Logo - -
-
-

Hey {{FirstName}}, welcome to moonlight

-

We are happy to welcome you in ;)

-
- Open Moonlight - -
-
-

You need help?

-

We are happy to help!

-

More information at - endelon.link/support. -

-
-

Copyright 2022 Endelon Hosting

-
-
- - \ No newline at end of file diff --git a/Moonlight/resources/public/images/logo.svg b/Moonlight/resources/public/images/logo.svg deleted file mode 100644 index 193ebfae..00000000 --- a/Moonlight/resources/public/images/logo.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Moonlight/resources/public/images/logolong.png b/Moonlight/resources/public/images/logolong.png deleted file mode 100644 index 1494f265b2016cf05d3c58cfe0f77c72be0ef78b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12410 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 U*aKCyJ{bUVQeP$O#f^ji2N?sR&;S4c From bb272b7fc5aa627e8fddf85c152ade08f82f6610 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:36:53 +0200 Subject: [PATCH 02/11] Moved wings api client to new location --- Moonlight/App/{Models => ApiClients}/Wings/PowerSignal.cs | 2 +- .../{Models => ApiClients}/Wings/Requests/CompressFiles.cs | 2 +- .../{Models => ApiClients}/Wings/Requests/CreateBackup.cs | 2 +- .../Wings/Requests/CreateDirectory.cs | 2 +- .../{Models => ApiClients}/Wings/Requests/CreateServer.cs | 2 +- .../{Models => ApiClients}/Wings/Requests/DecompressFile.cs | 2 +- .../{Models => ApiClients}/Wings/Requests/DeleteFiles.cs | 2 +- .../{Models => ApiClients}/Wings/Requests/RenameFiles.cs | 2 +- .../{Models => ApiClients}/Wings/Requests/RestoreBackup.cs | 2 +- .../{Models => ApiClients}/Wings/Requests/ServerPower.cs | 2 +- .../{Models => ApiClients}/Wings/Resources/ListDirectory.cs | 2 +- .../{Models => ApiClients}/Wings/Resources/ServerDetails.cs | 2 +- .../{Models => ApiClients}/Wings/Resources/SystemStatus.cs | 2 +- .../App/{Helpers => ApiClients/Wings}/WingsApiHelper.cs | 2 +- Moonlight/App/Helpers/Files/WingsFileAccess.cs | 5 +++-- Moonlight/App/Services/CleanupService.cs | 2 +- .../DiscordBot/Modules/ServerListComponentHandlerModule.cs | 2 +- Moonlight/App/Services/NodeService.cs | 5 +++-- Moonlight/App/Services/ServerService.cs | 6 +++--- Moonlight/Program.cs | 1 + Moonlight/Shared/Components/ServerControl/ServerFiles.razor | 1 + Moonlight/Shared/Views/Admin/Nodes/Index.razor | 2 +- Moonlight/Shared/Views/Admin/Nodes/View.razor | 2 +- Moonlight/Shared/Views/Admin/Servers/Manager.razor | 2 +- 24 files changed, 30 insertions(+), 26 deletions(-) rename Moonlight/App/{Models => ApiClients}/Wings/PowerSignal.cs (61%) rename Moonlight/App/{Models => ApiClients}/Wings/Requests/CompressFiles.cs (78%) rename Moonlight/App/{Models => ApiClients}/Wings/Requests/CreateBackup.cs (83%) rename Moonlight/App/{Models => ApiClients}/Wings/Requests/CreateDirectory.cs (79%) rename Moonlight/App/{Models => ApiClients}/Wings/Requests/CreateServer.cs (80%) rename Moonlight/App/{Models => ApiClients}/Wings/Requests/DecompressFile.cs (78%) rename Moonlight/App/{Models => ApiClients}/Wings/Requests/DeleteFiles.cs (79%) rename Moonlight/App/{Models => ApiClients}/Wings/Requests/RenameFiles.cs (87%) rename Moonlight/App/{Models => ApiClients}/Wings/Requests/RestoreBackup.cs (85%) rename Moonlight/App/{Models => ApiClients}/Wings/Requests/ServerPower.cs (70%) rename Moonlight/App/{Models => ApiClients}/Wings/Resources/ListDirectory.cs (92%) rename Moonlight/App/{Models => ApiClients}/Wings/Resources/ServerDetails.cs (95%) rename Moonlight/App/{Models => ApiClients}/Wings/Resources/SystemStatus.cs (89%) rename Moonlight/App/{Helpers => ApiClients/Wings}/WingsApiHelper.cs (99%) diff --git a/Moonlight/App/Models/Wings/PowerSignal.cs b/Moonlight/App/ApiClients/Wings/PowerSignal.cs similarity index 61% rename from Moonlight/App/Models/Wings/PowerSignal.cs rename to Moonlight/App/ApiClients/Wings/PowerSignal.cs index 921adc8e..b036b9d5 100644 --- a/Moonlight/App/Models/Wings/PowerSignal.cs +++ b/Moonlight/App/ApiClients/Wings/PowerSignal.cs @@ -1,4 +1,4 @@ -namespace Moonlight.App.Models.Wings; +namespace Moonlight.App.ApiClients.Wings; public enum PowerSignal { diff --git a/Moonlight/App/Models/Wings/Requests/CompressFiles.cs b/Moonlight/App/ApiClients/Wings/Requests/CompressFiles.cs similarity index 78% rename from Moonlight/App/Models/Wings/Requests/CompressFiles.cs rename to Moonlight/App/ApiClients/Wings/Requests/CompressFiles.cs index 2c866671..4a90c9dd 100644 --- a/Moonlight/App/Models/Wings/Requests/CompressFiles.cs +++ b/Moonlight/App/ApiClients/Wings/Requests/CompressFiles.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Requests; +namespace Moonlight.App.ApiClients.Wings.Requests; public class CompressFiles { diff --git a/Moonlight/App/Models/Wings/Requests/CreateBackup.cs b/Moonlight/App/ApiClients/Wings/Requests/CreateBackup.cs similarity index 83% rename from Moonlight/App/Models/Wings/Requests/CreateBackup.cs rename to Moonlight/App/ApiClients/Wings/Requests/CreateBackup.cs index 779abf1f..0d9aaae9 100644 --- a/Moonlight/App/Models/Wings/Requests/CreateBackup.cs +++ b/Moonlight/App/ApiClients/Wings/Requests/CreateBackup.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Requests; +namespace Moonlight.App.ApiClients.Wings.Requests; public class CreateBackup { diff --git a/Moonlight/App/Models/Wings/Requests/CreateDirectory.cs b/Moonlight/App/ApiClients/Wings/Requests/CreateDirectory.cs similarity index 79% rename from Moonlight/App/Models/Wings/Requests/CreateDirectory.cs rename to Moonlight/App/ApiClients/Wings/Requests/CreateDirectory.cs index 1dc6617c..424fc962 100644 --- a/Moonlight/App/Models/Wings/Requests/CreateDirectory.cs +++ b/Moonlight/App/ApiClients/Wings/Requests/CreateDirectory.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Requests; +namespace Moonlight.App.ApiClients.Wings.Requests; public class CreateDirectory { diff --git a/Moonlight/App/Models/Wings/Requests/CreateServer.cs b/Moonlight/App/ApiClients/Wings/Requests/CreateServer.cs similarity index 80% rename from Moonlight/App/Models/Wings/Requests/CreateServer.cs rename to Moonlight/App/ApiClients/Wings/Requests/CreateServer.cs index 7e939a4a..2cf980aa 100644 --- a/Moonlight/App/Models/Wings/Requests/CreateServer.cs +++ b/Moonlight/App/ApiClients/Wings/Requests/CreateServer.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Requests; +namespace Moonlight.App.ApiClients.Wings.Requests; public class CreateServer { diff --git a/Moonlight/App/Models/Wings/Requests/DecompressFile.cs b/Moonlight/App/ApiClients/Wings/Requests/DecompressFile.cs similarity index 78% rename from Moonlight/App/Models/Wings/Requests/DecompressFile.cs rename to Moonlight/App/ApiClients/Wings/Requests/DecompressFile.cs index 5fb7073d..298ec83a 100644 --- a/Moonlight/App/Models/Wings/Requests/DecompressFile.cs +++ b/Moonlight/App/ApiClients/Wings/Requests/DecompressFile.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Requests; +namespace Moonlight.App.ApiClients.Wings.Requests; public class DecompressFile { diff --git a/Moonlight/App/Models/Wings/Requests/DeleteFiles.cs b/Moonlight/App/ApiClients/Wings/Requests/DeleteFiles.cs similarity index 79% rename from Moonlight/App/Models/Wings/Requests/DeleteFiles.cs rename to Moonlight/App/ApiClients/Wings/Requests/DeleteFiles.cs index 9988ff0f..82d0d389 100644 --- a/Moonlight/App/Models/Wings/Requests/DeleteFiles.cs +++ b/Moonlight/App/ApiClients/Wings/Requests/DeleteFiles.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Requests; +namespace Moonlight.App.ApiClients.Wings.Requests; public class DeleteFiles { diff --git a/Moonlight/App/Models/Wings/Requests/RenameFiles.cs b/Moonlight/App/ApiClients/Wings/Requests/RenameFiles.cs similarity index 87% rename from Moonlight/App/Models/Wings/Requests/RenameFiles.cs rename to Moonlight/App/ApiClients/Wings/Requests/RenameFiles.cs index f565a32d..57c37bb7 100644 --- a/Moonlight/App/Models/Wings/Requests/RenameFiles.cs +++ b/Moonlight/App/ApiClients/Wings/Requests/RenameFiles.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Requests; +namespace Moonlight.App.ApiClients.Wings.Requests; public class RenameFiles { diff --git a/Moonlight/App/Models/Wings/Requests/RestoreBackup.cs b/Moonlight/App/ApiClients/Wings/Requests/RestoreBackup.cs similarity index 85% rename from Moonlight/App/Models/Wings/Requests/RestoreBackup.cs rename to Moonlight/App/ApiClients/Wings/Requests/RestoreBackup.cs index fcd7b8a1..18f0f51c 100644 --- a/Moonlight/App/Models/Wings/Requests/RestoreBackup.cs +++ b/Moonlight/App/ApiClients/Wings/Requests/RestoreBackup.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Requests; +namespace Moonlight.App.ApiClients.Wings.Requests; public class RestoreBackup { diff --git a/Moonlight/App/Models/Wings/Requests/ServerPower.cs b/Moonlight/App/ApiClients/Wings/Requests/ServerPower.cs similarity index 70% rename from Moonlight/App/Models/Wings/Requests/ServerPower.cs rename to Moonlight/App/ApiClients/Wings/Requests/ServerPower.cs index e877fb71..75ee64ce 100644 --- a/Moonlight/App/Models/Wings/Requests/ServerPower.cs +++ b/Moonlight/App/ApiClients/Wings/Requests/ServerPower.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Requests; +namespace Moonlight.App.ApiClients.Wings.Requests; public class ServerPower { diff --git a/Moonlight/App/Models/Wings/Resources/ListDirectory.cs b/Moonlight/App/ApiClients/Wings/Resources/ListDirectory.cs similarity index 92% rename from Moonlight/App/Models/Wings/Resources/ListDirectory.cs rename to Moonlight/App/ApiClients/Wings/Resources/ListDirectory.cs index d99e15d7..304c7656 100644 --- a/Moonlight/App/Models/Wings/Resources/ListDirectory.cs +++ b/Moonlight/App/ApiClients/Wings/Resources/ListDirectory.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Resources; +namespace Moonlight.App.ApiClients.Wings.Resources; public class ListDirectory { diff --git a/Moonlight/App/Models/Wings/Resources/ServerDetails.cs b/Moonlight/App/ApiClients/Wings/Resources/ServerDetails.cs similarity index 95% rename from Moonlight/App/Models/Wings/Resources/ServerDetails.cs rename to Moonlight/App/ApiClients/Wings/Resources/ServerDetails.cs index b14ac561..6756128a 100644 --- a/Moonlight/App/Models/Wings/Resources/ServerDetails.cs +++ b/Moonlight/App/ApiClients/Wings/Resources/ServerDetails.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Resources; +namespace Moonlight.App.ApiClients.Wings.Resources; public class ServerDetails { diff --git a/Moonlight/App/Models/Wings/Resources/SystemStatus.cs b/Moonlight/App/ApiClients/Wings/Resources/SystemStatus.cs similarity index 89% rename from Moonlight/App/Models/Wings/Resources/SystemStatus.cs rename to Moonlight/App/ApiClients/Wings/Resources/SystemStatus.cs index 26a30dea..66b4d4cc 100644 --- a/Moonlight/App/Models/Wings/Resources/SystemStatus.cs +++ b/Moonlight/App/ApiClients/Wings/Resources/SystemStatus.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Wings.Resources; +namespace Moonlight.App.ApiClients.Wings.Resources; public class SystemStatus { diff --git a/Moonlight/App/Helpers/WingsApiHelper.cs b/Moonlight/App/ApiClients/Wings/WingsApiHelper.cs similarity index 99% rename from Moonlight/App/Helpers/WingsApiHelper.cs rename to Moonlight/App/ApiClients/Wings/WingsApiHelper.cs index 9611d645..bf727d53 100644 --- a/Moonlight/App/Helpers/WingsApiHelper.cs +++ b/Moonlight/App/ApiClients/Wings/WingsApiHelper.cs @@ -3,7 +3,7 @@ using Moonlight.App.Exceptions; using Newtonsoft.Json; using RestSharp; -namespace Moonlight.App.Helpers; +namespace Moonlight.App.ApiClients.Wings; public class WingsApiHelper { diff --git a/Moonlight/App/Helpers/Files/WingsFileAccess.cs b/Moonlight/App/Helpers/Files/WingsFileAccess.cs index b1c2296c..47acdc9d 100644 --- a/Moonlight/App/Helpers/Files/WingsFileAccess.cs +++ b/Moonlight/App/Helpers/Files/WingsFileAccess.cs @@ -1,7 +1,8 @@ using System.Web; +using Moonlight.App.ApiClients.Wings; +using Moonlight.App.ApiClients.Wings.Requests; +using Moonlight.App.ApiClients.Wings.Resources; using Moonlight.App.Database.Entities; -using Moonlight.App.Models.Wings.Requests; -using Moonlight.App.Models.Wings.Resources; using Moonlight.App.Services; using RestSharp; diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/CleanupService.cs index 1ccb78c9..cbc854d0 100644 --- a/Moonlight/App/Services/CleanupService.cs +++ b/Moonlight/App/Services/CleanupService.cs @@ -3,10 +3,10 @@ using Microsoft.EntityFrameworkCore; using MineStatLib; using Moonlight.App.Database.Entities; using Moonlight.App.Models.Daemon.Resources; -using Moonlight.App.Models.Wings; using Moonlight.App.Repositories; using Moonlight.App.Repositories.Servers; using Logging.Net; +using Moonlight.App.ApiClients.Wings; using Moonlight.App.Events; using Newtonsoft.Json; diff --git a/Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs b/Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs index 1a529bc0..24bcb79d 100644 --- a/Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs +++ b/Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs @@ -2,7 +2,7 @@ using Discord.WebSocket; using Logging.Net; using Microsoft.EntityFrameworkCore; -using Moonlight.App.Models.Wings; +using Moonlight.App.ApiClients.Wings; using Moonlight.App.Repositories; using Moonlight.App.Repositories.Servers; diff --git a/Moonlight/App/Services/NodeService.cs b/Moonlight/App/Services/NodeService.cs index 87f0c307..89910d8a 100644 --- a/Moonlight/App/Services/NodeService.cs +++ b/Moonlight/App/Services/NodeService.cs @@ -1,7 +1,8 @@ -using Moonlight.App.Database.Entities; +using Moonlight.App.ApiClients.Wings; +using Moonlight.App.ApiClients.Wings.Resources; +using Moonlight.App.Database.Entities; using Moonlight.App.Helpers; using Moonlight.App.Models.Daemon.Resources; -using Moonlight.App.Models.Wings.Resources; using Moonlight.App.Repositories; namespace Moonlight.App.Services; diff --git a/Moonlight/App/Services/ServerService.cs b/Moonlight/App/Services/ServerService.cs index d61ae7d4..fb9c4db0 100644 --- a/Moonlight/App/Services/ServerService.cs +++ b/Moonlight/App/Services/ServerService.cs @@ -1,4 +1,7 @@ using Microsoft.EntityFrameworkCore; +using Moonlight.App.ApiClients.Wings; +using Moonlight.App.ApiClients.Wings.Requests; +using Moonlight.App.ApiClients.Wings.Resources; using Moonlight.App.Database; using Moonlight.App.Database.Entities; using Moonlight.App.Events; @@ -6,9 +9,6 @@ using Moonlight.App.Exceptions; using Moonlight.App.Helpers; using Moonlight.App.Helpers.Files; using Moonlight.App.Models.Misc; -using Moonlight.App.Models.Wings; -using Moonlight.App.Models.Wings.Requests; -using Moonlight.App.Models.Wings.Resources; using Moonlight.App.Repositories; using Moonlight.App.Repositories.Servers; using Moonlight.App.Services.LogServices; diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index c5da41f0..c1ffc6c3 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -3,6 +3,7 @@ using BlazorTable; using CurrieTechnologies.Razor.SweetAlert2; using Logging.Net; using Moonlight.App.ApiClients.CloudPanel; +using Moonlight.App.ApiClients.Wings; using Moonlight.App.Database; using Moonlight.App.Events; using Moonlight.App.Helpers; diff --git a/Moonlight/Shared/Components/ServerControl/ServerFiles.razor b/Moonlight/Shared/Components/ServerControl/ServerFiles.razor index 63a30dab..6267a9b8 100644 --- a/Moonlight/Shared/Components/ServerControl/ServerFiles.razor +++ b/Moonlight/Shared/Components/ServerControl/ServerFiles.razor @@ -3,6 +3,7 @@ @using Moonlight.App.Helpers @using Moonlight.App.Helpers.Files @using Moonlight.App.Services +@using Moonlight.App.ApiClients.Wings @inject WingsApiHelper WingsApiHelper @inject WingsJwtHelper WingsJwtHelper diff --git a/Moonlight/Shared/Views/Admin/Nodes/Index.razor b/Moonlight/Shared/Views/Admin/Nodes/Index.razor index c18205b6..ad259578 100644 --- a/Moonlight/Shared/Views/Admin/Nodes/Index.razor +++ b/Moonlight/Shared/Views/Admin/Nodes/Index.razor @@ -1,12 +1,12 @@ @page "/admin/nodes" @using Moonlight.App.Repositories @using Moonlight.App.Database.Entities -@using Moonlight.App.Models.Wings.Resources @using Moonlight.Shared.Components.Navigations @using Moonlight.App.Services @using Moonlight.App.Services.Interop @using Logging.Net @using BlazorTable +@using Moonlight.App.ApiClients.Wings.Resources @inject NodeRepository NodeRepository @inject AlertService AlertService diff --git a/Moonlight/Shared/Views/Admin/Nodes/View.razor b/Moonlight/Shared/Views/Admin/Nodes/View.razor index 4b64b6dd..e8bd25e5 100644 --- a/Moonlight/Shared/Views/Admin/Nodes/View.razor +++ b/Moonlight/Shared/Views/Admin/Nodes/View.razor @@ -4,8 +4,8 @@ @using Moonlight.App.Database.Entities @using Moonlight.App.Helpers @using Moonlight.App.Models.Daemon.Resources -@using Moonlight.App.Models.Wings.Resources @using Moonlight.App.Services +@using Moonlight.App.ApiClients.Wings.Resources @inject NodeRepository NodeRepository @inject NodeService NodeService diff --git a/Moonlight/Shared/Views/Admin/Servers/Manager.razor b/Moonlight/Shared/Views/Admin/Servers/Manager.razor index 1c96755e..c54e62e1 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Manager.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Manager.razor @@ -5,9 +5,9 @@ @using Moonlight.App.Services.Interop @using Moonlight.App.Database.Entities @using Moonlight.App.Models.Daemon.Resources -@using Moonlight.App.Models.Wings @using BlazorTable @using Microsoft.EntityFrameworkCore +@using Moonlight.App.ApiClients.Wings @using Moonlight.App.Helpers @inject NodeRepository NodeRepository From e54077fc5549c536075d30f8e838692e6d8be4e4 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:38:49 +0200 Subject: [PATCH 03/11] 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 From 3a47a67ec4c455b43017d121b7ed9ea78a4754ac Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:40:38 +0200 Subject: [PATCH 04/11] Moved daemon api client --- .../App/{Helpers => ApiClients/Daemon}/DaemonApiHelper.cs | 2 +- .../Daemon/Resources/ContainerStats.cs | 2 +- .../App/{Models => ApiClients}/Daemon/Resources/CpuStats.cs | 2 +- .../App/{Models => ApiClients}/Daemon/Resources/DiskStats.cs | 2 +- .../{Models => ApiClients}/Daemon/Resources/MemoryStats.cs | 2 +- Moonlight/App/Services/CleanupService.cs | 2 +- Moonlight/App/Services/NodeService.cs | 5 +++-- Moonlight/Moonlight.csproj | 3 ++- Moonlight/Program.cs | 1 + Moonlight/Shared/Views/Admin/Nodes/View.razor | 2 +- Moonlight/Shared/Views/Admin/Servers/Manager.razor | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) rename Moonlight/App/{Helpers => ApiClients/Daemon}/DaemonApiHelper.cs (97%) rename Moonlight/App/{Models => ApiClients}/Daemon/Resources/ContainerStats.cs (86%) rename Moonlight/App/{Models => ApiClients}/Daemon/Resources/CpuStats.cs (71%) rename Moonlight/App/{Models => ApiClients}/Daemon/Resources/DiskStats.cs (77%) rename Moonlight/App/{Models => ApiClients}/Daemon/Resources/MemoryStats.cs (85%) diff --git a/Moonlight/App/Helpers/DaemonApiHelper.cs b/Moonlight/App/ApiClients/Daemon/DaemonApiHelper.cs similarity index 97% rename from Moonlight/App/Helpers/DaemonApiHelper.cs rename to Moonlight/App/ApiClients/Daemon/DaemonApiHelper.cs index b9ffdcce..7cdf11ae 100644 --- a/Moonlight/App/Helpers/DaemonApiHelper.cs +++ b/Moonlight/App/ApiClients/Daemon/DaemonApiHelper.cs @@ -3,7 +3,7 @@ using Moonlight.App.Exceptions; using Newtonsoft.Json; using RestSharp; -namespace Moonlight.App.Helpers; +namespace Moonlight.App.ApiClients.Daemon; public class DaemonApiHelper { diff --git a/Moonlight/App/Models/Daemon/Resources/ContainerStats.cs b/Moonlight/App/ApiClients/Daemon/Resources/ContainerStats.cs similarity index 86% rename from Moonlight/App/Models/Daemon/Resources/ContainerStats.cs rename to Moonlight/App/ApiClients/Daemon/Resources/ContainerStats.cs index db1a2c8a..b8b30c25 100644 --- a/Moonlight/App/Models/Daemon/Resources/ContainerStats.cs +++ b/Moonlight/App/ApiClients/Daemon/Resources/ContainerStats.cs @@ -1,4 +1,4 @@ -namespace Moonlight.App.Models.Daemon.Resources; +namespace Moonlight.App.ApiClients.Daemon.Resources; public class ContainerStats { diff --git a/Moonlight/App/Models/Daemon/Resources/CpuStats.cs b/Moonlight/App/ApiClients/Daemon/Resources/CpuStats.cs similarity index 71% rename from Moonlight/App/Models/Daemon/Resources/CpuStats.cs rename to Moonlight/App/ApiClients/Daemon/Resources/CpuStats.cs index 9282627e..ff72425f 100644 --- a/Moonlight/App/Models/Daemon/Resources/CpuStats.cs +++ b/Moonlight/App/ApiClients/Daemon/Resources/CpuStats.cs @@ -1,4 +1,4 @@ -namespace Moonlight.App.Models.Daemon.Resources; +namespace Moonlight.App.ApiClients.Daemon.Resources; public class CpuStats { diff --git a/Moonlight/App/Models/Daemon/Resources/DiskStats.cs b/Moonlight/App/ApiClients/Daemon/Resources/DiskStats.cs similarity index 77% rename from Moonlight/App/Models/Daemon/Resources/DiskStats.cs rename to Moonlight/App/ApiClients/Daemon/Resources/DiskStats.cs index ea19ae90..4bcd8467 100644 --- a/Moonlight/App/Models/Daemon/Resources/DiskStats.cs +++ b/Moonlight/App/ApiClients/Daemon/Resources/DiskStats.cs @@ -1,4 +1,4 @@ -namespace Moonlight.App.Models.Daemon.Resources; +namespace Moonlight.App.ApiClients.Daemon.Resources; public class DiskStats { diff --git a/Moonlight/App/Models/Daemon/Resources/MemoryStats.cs b/Moonlight/App/ApiClients/Daemon/Resources/MemoryStats.cs similarity index 85% rename from Moonlight/App/Models/Daemon/Resources/MemoryStats.cs rename to Moonlight/App/ApiClients/Daemon/Resources/MemoryStats.cs index 26823099..6e3a20bf 100644 --- a/Moonlight/App/Models/Daemon/Resources/MemoryStats.cs +++ b/Moonlight/App/ApiClients/Daemon/Resources/MemoryStats.cs @@ -1,4 +1,4 @@ -namespace Moonlight.App.Models.Daemon.Resources; +namespace Moonlight.App.ApiClients.Daemon.Resources; public class MemoryStats { diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/CleanupService.cs index cbc854d0..ffd2d947 100644 --- a/Moonlight/App/Services/CleanupService.cs +++ b/Moonlight/App/Services/CleanupService.cs @@ -2,10 +2,10 @@ using Microsoft.EntityFrameworkCore; using MineStatLib; using Moonlight.App.Database.Entities; -using Moonlight.App.Models.Daemon.Resources; using Moonlight.App.Repositories; using Moonlight.App.Repositories.Servers; using Logging.Net; +using Moonlight.App.ApiClients.Daemon.Resources; using Moonlight.App.ApiClients.Wings; using Moonlight.App.Events; using Newtonsoft.Json; diff --git a/Moonlight/App/Services/NodeService.cs b/Moonlight/App/Services/NodeService.cs index 89910d8a..a2607086 100644 --- a/Moonlight/App/Services/NodeService.cs +++ b/Moonlight/App/Services/NodeService.cs @@ -1,8 +1,9 @@ -using Moonlight.App.ApiClients.Wings; +using Moonlight.App.ApiClients.Daemon; +using Moonlight.App.ApiClients.Daemon.Resources; +using Moonlight.App.ApiClients.Wings; using Moonlight.App.ApiClients.Wings.Resources; using Moonlight.App.Database.Entities; using Moonlight.App.Helpers; -using Moonlight.App.Models.Daemon.Resources; using Moonlight.App.Repositories; namespace Moonlight.App.Services; diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index feae4b72..0a03fbaa 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -71,8 +71,9 @@ + - + diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index c1ffc6c3..8a9e846a 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -3,6 +3,7 @@ using BlazorTable; using CurrieTechnologies.Razor.SweetAlert2; using Logging.Net; using Moonlight.App.ApiClients.CloudPanel; +using Moonlight.App.ApiClients.Daemon; using Moonlight.App.ApiClients.Wings; using Moonlight.App.Database; using Moonlight.App.Events; diff --git a/Moonlight/Shared/Views/Admin/Nodes/View.razor b/Moonlight/Shared/Views/Admin/Nodes/View.razor index e8bd25e5..de6f61ab 100644 --- a/Moonlight/Shared/Views/Admin/Nodes/View.razor +++ b/Moonlight/Shared/Views/Admin/Nodes/View.razor @@ -3,9 +3,9 @@ @using Moonlight.App.Repositories @using Moonlight.App.Database.Entities @using Moonlight.App.Helpers -@using Moonlight.App.Models.Daemon.Resources @using Moonlight.App.Services @using Moonlight.App.ApiClients.Wings.Resources +@using Moonlight.App.ApiClients.Daemon.Resources @inject NodeRepository NodeRepository @inject NodeService NodeService diff --git a/Moonlight/Shared/Views/Admin/Servers/Manager.razor b/Moonlight/Shared/Views/Admin/Servers/Manager.razor index c54e62e1..e399974b 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Manager.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Manager.razor @@ -4,9 +4,9 @@ @using Moonlight.App.Services @using Moonlight.App.Services.Interop @using Moonlight.App.Database.Entities -@using Moonlight.App.Models.Daemon.Resources @using BlazorTable @using Microsoft.EntityFrameworkCore +@using Moonlight.App.ApiClients.Daemon.Resources @using Moonlight.App.ApiClients.Wings @using Moonlight.App.Helpers From 0fc2a06db5f1e9ba6d8c01518a2d6f4519ea1b8e Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:42:07 +0200 Subject: [PATCH 05/11] Moved paper api client --- .../App/{Helpers => ApiClients/Paper}/PaperApiHelper.cs | 2 +- .../{Models => ApiClients}/Paper/Resources/PaperBuilds.cs | 2 +- .../{Models => ApiClients}/Paper/Resources/PaperVersions.cs | 2 +- Moonlight/App/Services/PaperService.cs | 5 +++-- Moonlight/Moonlight.csproj | 1 - Moonlight/Program.cs | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) rename Moonlight/App/{Helpers => ApiClients/Paper}/PaperApiHelper.cs (96%) rename Moonlight/App/{Models => ApiClients}/Paper/Resources/PaperBuilds.cs (87%) rename Moonlight/App/{Models => ApiClients}/Paper/Resources/PaperVersions.cs (88%) diff --git a/Moonlight/App/Helpers/PaperApiHelper.cs b/Moonlight/App/ApiClients/Paper/PaperApiHelper.cs similarity index 96% rename from Moonlight/App/Helpers/PaperApiHelper.cs rename to Moonlight/App/ApiClients/Paper/PaperApiHelper.cs index c8e1a3f8..601e1ac2 100644 --- a/Moonlight/App/Helpers/PaperApiHelper.cs +++ b/Moonlight/App/ApiClients/Paper/PaperApiHelper.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using RestSharp; -namespace Moonlight.App.Helpers; +namespace Moonlight.App.ApiClients.Paper; public class PaperApiHelper { diff --git a/Moonlight/App/Models/Paper/Resources/PaperBuilds.cs b/Moonlight/App/ApiClients/Paper/Resources/PaperBuilds.cs similarity index 87% rename from Moonlight/App/Models/Paper/Resources/PaperBuilds.cs rename to Moonlight/App/ApiClients/Paper/Resources/PaperBuilds.cs index 63b9cb4d..393b506d 100644 --- a/Moonlight/App/Models/Paper/Resources/PaperBuilds.cs +++ b/Moonlight/App/ApiClients/Paper/Resources/PaperBuilds.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Paper.Resources; +namespace Moonlight.App.ApiClients.Paper.Resources; public class PaperBuilds { diff --git a/Moonlight/App/Models/Paper/Resources/PaperVersions.cs b/Moonlight/App/ApiClients/Paper/Resources/PaperVersions.cs similarity index 88% rename from Moonlight/App/Models/Paper/Resources/PaperVersions.cs rename to Moonlight/App/ApiClients/Paper/Resources/PaperVersions.cs index 0cd29e5f..573b5786 100644 --- a/Moonlight/App/Models/Paper/Resources/PaperVersions.cs +++ b/Moonlight/App/ApiClients/Paper/Resources/PaperVersions.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Paper.Resources; +namespace Moonlight.App.ApiClients.Paper.Resources; public class PaperVersions { diff --git a/Moonlight/App/Services/PaperService.cs b/Moonlight/App/Services/PaperService.cs index 57d93d2c..2d31ebff 100644 --- a/Moonlight/App/Services/PaperService.cs +++ b/Moonlight/App/Services/PaperService.cs @@ -1,5 +1,6 @@ -using Moonlight.App.Helpers; -using Moonlight.App.Models.Paper.Resources; +using Moonlight.App.ApiClients.Paper; +using Moonlight.App.ApiClients.Paper.Resources; +using Moonlight.App.Helpers; namespace Moonlight.App.Services; diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index 0a03fbaa..28c30e5a 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -73,7 +73,6 @@ - diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index 8a9e846a..2993e7a0 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -4,6 +4,7 @@ using CurrieTechnologies.Razor.SweetAlert2; using Logging.Net; using Moonlight.App.ApiClients.CloudPanel; using Moonlight.App.ApiClients.Daemon; +using Moonlight.App.ApiClients.Paper; using Moonlight.App.ApiClients.Wings; using Moonlight.App.Database; using Moonlight.App.Events; From 30ff2a6350e332b0903e6ac3390e58170d76ab03 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:43:38 +0200 Subject: [PATCH 06/11] Moved api models --- .../Google/Requests/GoogleOAuth2CodePayload.cs | 2 +- .../App/{Models => ApiClients}/IpLocate/Resources/IpLocate.cs | 2 +- Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs | 1 - Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs | 2 +- Moonlight/App/Services/Sessions/IpLocateService.cs | 2 +- Moonlight/Moonlight.csproj | 1 - 6 files changed, 4 insertions(+), 6 deletions(-) rename Moonlight/App/{Models => ApiClients}/Google/Requests/GoogleOAuth2CodePayload.cs (90%) rename Moonlight/App/{Models => ApiClients}/IpLocate/Resources/IpLocate.cs (94%) diff --git a/Moonlight/App/Models/Google/Requests/GoogleOAuth2CodePayload.cs b/Moonlight/App/ApiClients/Google/Requests/GoogleOAuth2CodePayload.cs similarity index 90% rename from Moonlight/App/Models/Google/Requests/GoogleOAuth2CodePayload.cs rename to Moonlight/App/ApiClients/Google/Requests/GoogleOAuth2CodePayload.cs index 4d47dda2..a4ef4bb1 100644 --- a/Moonlight/App/Models/Google/Requests/GoogleOAuth2CodePayload.cs +++ b/Moonlight/App/ApiClients/Google/Requests/GoogleOAuth2CodePayload.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.Google.Requests; +namespace Moonlight.App.ApiClients.Google.Requests; public class GoogleOAuth2CodePayload { diff --git a/Moonlight/App/Models/IpLocate/Resources/IpLocate.cs b/Moonlight/App/ApiClients/IpLocate/Resources/IpLocate.cs similarity index 94% rename from Moonlight/App/Models/IpLocate/Resources/IpLocate.cs rename to Moonlight/App/ApiClients/IpLocate/Resources/IpLocate.cs index 58e6ced2..d75717cf 100644 --- a/Moonlight/App/Models/IpLocate/Resources/IpLocate.cs +++ b/Moonlight/App/ApiClients/IpLocate/Resources/IpLocate.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Moonlight.App.Models.IpLocate.Resources; +namespace Moonlight.App.ApiClients.IpLocate.Resources; public class IpLocate { diff --git a/Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs b/Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs index 4971b933..c387999e 100644 --- a/Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs +++ b/Moonlight/App/Services/OAuth2/DiscordOAuth2Service.cs @@ -2,7 +2,6 @@ using Logging.Net; using Moonlight.App.Database.Entities; using Moonlight.App.Exceptions; -using Moonlight.App.Models.Google.Requests; using Moonlight.App.Models.Misc; using RestSharp; diff --git a/Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs b/Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs index de742034..391308ab 100644 --- a/Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs +++ b/Moonlight/App/Services/OAuth2/GoogleOAuth2Service.cs @@ -1,8 +1,8 @@ using System.Text; using Logging.Net; +using Moonlight.App.ApiClients.Google.Requests; using Moonlight.App.Database.Entities; using Moonlight.App.Exceptions; -using Moonlight.App.Models.Google.Requests; using RestSharp; namespace Moonlight.App.Services.OAuth2; diff --git a/Moonlight/App/Services/Sessions/IpLocateService.cs b/Moonlight/App/Services/Sessions/IpLocateService.cs index 26af179d..95d59a8c 100644 --- a/Moonlight/App/Services/Sessions/IpLocateService.cs +++ b/Moonlight/App/Services/Sessions/IpLocateService.cs @@ -1,5 +1,5 @@ using System.Net; -using Moonlight.App.Models.IpLocate.Resources; +using Moonlight.App.ApiClients.IpLocate.Resources; using Newtonsoft.Json; namespace Moonlight.App.Services.Sessions; diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj index 28c30e5a..5b12d365 100644 --- a/Moonlight/Moonlight.csproj +++ b/Moonlight/Moonlight.csproj @@ -73,7 +73,6 @@ - From 0a9e9589fc3d612015be19634878ef7730e3b30b Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:45:55 +0200 Subject: [PATCH 07/11] Removed legacy setup and config save --- Moonlight/App/Helpers/ConfigUtils.cs | 43 ------ Moonlight/App/Services/ConfigService.cs | 5 - Moonlight/Shared/Views/Setup/Features.razor | 69 ---------- Moonlight/Shared/Views/Setup/Final.razor | 40 ------ Moonlight/Shared/Views/Setup/Index.razor | 53 -------- Moonlight/Shared/Views/Setup/Users.razor | 142 -------------------- 6 files changed, 352 deletions(-) delete mode 100644 Moonlight/App/Helpers/ConfigUtils.cs delete mode 100644 Moonlight/Shared/Views/Setup/Features.razor delete mode 100644 Moonlight/Shared/Views/Setup/Final.razor delete mode 100644 Moonlight/Shared/Views/Setup/Index.razor delete mode 100644 Moonlight/Shared/Views/Setup/Users.razor diff --git a/Moonlight/App/Helpers/ConfigUtils.cs b/Moonlight/App/Helpers/ConfigUtils.cs deleted file mode 100644 index 1f5196a4..00000000 --- a/Moonlight/App/Helpers/ConfigUtils.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Newtonsoft.Json; - -namespace Moonlight.App.Helpers; - -public class ConfigUtils -{ - public static void SaveConfigurationAsJson(IConfiguration configuration, string filePath) - { - // Serialize the configuration to a JSON object - var jsonObject = new Dictionary(); - foreach (var section in configuration.GetChildren()) - { - SerializeSection(section, jsonObject); - } - - // Convert the JSON object to a JSON string - var jsonString = JsonConvert.SerializeObject(jsonObject); - - // Write the JSON string to a file - File.WriteAllText(filePath, jsonString); - } - - private static void SerializeSection(IConfigurationSection section, IDictionary jsonObject) - { - var children = section.GetChildren(); - - if (!children.Any()) - { - // Leaf node - jsonObject[section.Key] = section.Value; - } - else - { - // Non-leaf node - var childObject = new Dictionary(); - foreach (var childSection in children) - { - SerializeSection(childSection, childObject); - } - jsonObject[section.Key] = childObject; - } - } -} \ No newline at end of file diff --git a/Moonlight/App/Services/ConfigService.cs b/Moonlight/App/Services/ConfigService.cs index 6aa11c43..f57d9c06 100644 --- a/Moonlight/App/Services/ConfigService.cs +++ b/Moonlight/App/Services/ConfigService.cs @@ -74,9 +74,4 @@ public class ConfigService : IConfiguration get => Configuration[key]; set => Configuration[key] = value; } - - public void Save() - { - ConfigUtils.SaveConfigurationAsJson(Configuration, "..\\..\\appsettings.json"); - } } \ No newline at end of file diff --git a/Moonlight/Shared/Views/Setup/Features.razor b/Moonlight/Shared/Views/Setup/Features.razor deleted file mode 100644 index 50febfd5..00000000 --- a/Moonlight/Shared/Views/Setup/Features.razor +++ /dev/null @@ -1,69 +0,0 @@ -@page "/setup/features" - -@using Moonlight.App.Services - -@inject ConfigService ConfigService -@inject NavigationManager NavigationManager -@inject SmartTranslateService SmartTranslateService - - -
-
- Configure features (3/4) -
-
-
- -
-
- - -
-
-
-
- - - - Next - - - Back - -
-
-
- - - - - -@code -{ - private bool EnableSupportChat - { - get => bool.Parse( - ConfigService - .GetSection("Moonlight") - .GetSection("SupportChat") - ["Enabled"]! - ); - set => ConfigService - .GetSection("Moonlight") - .GetSection("SupportChat") - ["Enabled"] = value.ToString(); - } - - private Task Save() - { - ConfigService.Save(); - NavigationManager.NavigateTo("/setup/final"); - - return Task.CompletedTask; - } -} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Setup/Final.razor b/Moonlight/Shared/Views/Setup/Final.razor deleted file mode 100644 index b259144c..00000000 --- a/Moonlight/Shared/Views/Setup/Final.razor +++ /dev/null @@ -1,40 +0,0 @@ -@page "/setup/final" - -@using Moonlight.App.Services -@using Moonlight.App.Services.Interop - -@inject ConfigService ConfigService -@inject NavigationManager NavigationManager -@inject SmartTranslateService SmartTranslateService -@inject ToastService ToastService - - -
-
- Finalize installation (4/4) -
-
-
- - -
-
-
- - - - - -@code -{ - private async Task Save() - { - ConfigService.GetSection("Moonlight")["SetupComplete"] = true.ToString(); - ConfigService.Save(); - await ToastService.Success(SmartTranslateService.Translate("Moonlight basic settings successfully configured")); - NavigationManager.NavigateTo("/"); - } -} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Setup/Index.razor b/Moonlight/Shared/Views/Setup/Index.razor deleted file mode 100644 index dbdf13b4..00000000 --- a/Moonlight/Shared/Views/Setup/Index.razor +++ /dev/null @@ -1,53 +0,0 @@ -@page "/setup" -@using Moonlight.App.Services - -@inject ConfigService ConfigService -@inject NavigationManager NavigationManager -@inject SmartTranslateService SmartTranslateService - - -
-
- Configure basics (1/4) -
-
- -
- - - - -
-
- - - - Next - -
-
-
- - - - - -@code -{ - private Task Save() - { - ConfigService.Save(); - NavigationManager.NavigateTo("/setup/users"); - - return Task.CompletedTask; - } -} \ No newline at end of file diff --git a/Moonlight/Shared/Views/Setup/Users.razor b/Moonlight/Shared/Views/Setup/Users.razor deleted file mode 100644 index ab887fcb..00000000 --- a/Moonlight/Shared/Views/Setup/Users.razor +++ /dev/null @@ -1,142 +0,0 @@ -@page "/setup/users" -@using Moonlight.App.Services -@using Microsoft.AspNetCore.Components -@using Moonlight.App.Database.Entities -@using Moonlight.App.Exceptions -@using Moonlight.App.Services.Interop -@using Logging.Net -@using Moonlight.App.Repositories - -@inject UserService UserService -@inject UserRepository UserRepository -@inject SmartTranslateService SmartTranslateService -@inject AlertService AlertService -@inject ToastService ToastService - - -
-
- Add admin accounts (2/4) -
-
- -
- - - - -
- -
- - - - -
- -
- - - - -
- -
- - - - -
-
- - - - Next - - - Back - -
-
-
- - - - - -@code -{ - private User NewUser = new(); - - private async Task Save() - { - try - { - await UserService.Register( - NewUser.Email, - NewUser.Password, - NewUser.FirstName, - NewUser.LastName - ); - - var user = UserRepository.Get().First(x => x.Email == NewUser.Email); - user.Admin = true; - UserRepository.Update(user); - - await ToastService.Success( - SmartTranslateService.Translate("User successfully created") - ); - } - catch (DisplayException e) - { - await AlertService.Error( - SmartTranslateService.Translate("Error"), - e.Message - ); - } - catch (Exception e) - { - await AlertService.Error( - SmartTranslateService.Translate("Error"), - SmartTranslateService.Translate("An error occured while creating user") - ); - - Logger.Error("Error while creating user"); - Logger.Error(e); - } - - NewUser = new(); - - await InvokeAsync(StateHasChanged); - } -} \ No newline at end of file From d26c98f131ceb19e3af36efea3f45e8db6b90457 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:49:45 +0200 Subject: [PATCH 08/11] Sorted services --- .../Controllers/Api/Moonlight/ResourcesController.cs | 1 + .../App/Services/{ => Background}/CleanupService.cs | 11 +++++------ .../{ => Background}/DiscordNotificationService.cs | 3 ++- Moonlight/App/Services/ConfigService.cs | 1 + Moonlight/App/Services/{ => Files}/BucketService.cs | 5 ++--- Moonlight/App/Services/{ => Files}/ResourceService.cs | 2 +- Moonlight/App/Services/{ => Files}/StorageService.cs | 2 +- .../App/Services/{ => LogServices}/LogService.cs | 2 +- Moonlight/App/Services/{ => Mail}/MailService.cs | 6 ++---- .../Services/{ => Mail}/TrashMailDetectorService.cs | 2 +- .../Services/SupportChat/SupportChatAdminService.cs | 1 + .../Services/SupportChat/SupportChatClientService.cs | 1 + Moonlight/App/Services/UserService.cs | 1 + Moonlight/Program.cs | 3 +++ Moonlight/Shared/Views/Admin/Servers/Cleanup.razor | 1 + Moonlight/Shared/Views/Admin/Support/View.razor | 1 + Moonlight/Shared/Views/Admin/Sys/Logs.razor | 1 + Moonlight/Shared/Views/Support.razor | 1 + 18 files changed, 27 insertions(+), 18 deletions(-) rename Moonlight/App/Services/{ => Background}/CleanupService.cs (99%) rename Moonlight/App/Services/{ => Background}/DiscordNotificationService.cs (97%) rename Moonlight/App/Services/{ => Files}/BucketService.cs (94%) rename Moonlight/App/Services/{ => Files}/ResourceService.cs (94%) rename Moonlight/App/Services/{ => Files}/StorageService.cs (97%) rename Moonlight/App/Services/{ => LogServices}/LogService.cs (95%) rename Moonlight/App/Services/{ => Mail}/MailService.cs (96%) rename Moonlight/App/Services/{ => Mail}/TrashMailDetectorService.cs (96%) diff --git a/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs b/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs index 24dbdc26..329fa63a 100644 --- a/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs +++ b/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Moonlight.App.Helpers; using Moonlight.App.Models.Misc; using Moonlight.App.Services; +using Moonlight.App.Services.Files; using Moonlight.App.Services.LogServices; namespace Moonlight.App.Http.Controllers.Api.Moonlight; diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/Background/CleanupService.cs similarity index 99% rename from Moonlight/App/Services/CleanupService.cs rename to Moonlight/App/Services/Background/CleanupService.cs index ffd2d947..6491db28 100644 --- a/Moonlight/App/Services/CleanupService.cs +++ b/Moonlight/App/Services/Background/CleanupService.cs @@ -1,16 +1,15 @@ -using System.Diagnostics; +using Logging.Net; using Microsoft.EntityFrameworkCore; using MineStatLib; -using Moonlight.App.Database.Entities; -using Moonlight.App.Repositories; -using Moonlight.App.Repositories.Servers; -using Logging.Net; using Moonlight.App.ApiClients.Daemon.Resources; using Moonlight.App.ApiClients.Wings; +using Moonlight.App.Database.Entities; using Moonlight.App.Events; +using Moonlight.App.Repositories; +using Moonlight.App.Repositories.Servers; using Newtonsoft.Json; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Background; public class CleanupService { diff --git a/Moonlight/App/Services/DiscordNotificationService.cs b/Moonlight/App/Services/Background/DiscordNotificationService.cs similarity index 97% rename from Moonlight/App/Services/DiscordNotificationService.cs rename to Moonlight/App/Services/Background/DiscordNotificationService.cs index c0e1e9db..f8157ad4 100644 --- a/Moonlight/App/Services/DiscordNotificationService.cs +++ b/Moonlight/App/Services/Background/DiscordNotificationService.cs @@ -3,8 +3,9 @@ using Discord.Webhook; using Logging.Net; using Moonlight.App.Database.Entities; using Moonlight.App.Events; +using Moonlight.App.Services.Files; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Background; public class DiscordNotificationService { diff --git a/Moonlight/App/Services/ConfigService.cs b/Moonlight/App/Services/ConfigService.cs index f57d9c06..94275e32 100644 --- a/Moonlight/App/Services/ConfigService.cs +++ b/Moonlight/App/Services/ConfigService.cs @@ -2,6 +2,7 @@ using Logging.Net; using Microsoft.Extensions.Primitives; using Moonlight.App.Helpers; +using Moonlight.App.Services.Files; namespace Moonlight.App.Services; diff --git a/Moonlight/App/Services/BucketService.cs b/Moonlight/App/Services/Files/BucketService.cs similarity index 94% rename from Moonlight/App/Services/BucketService.cs rename to Moonlight/App/Services/Files/BucketService.cs index a1417dfa..e85fdaa6 100644 --- a/Moonlight/App/Services/BucketService.cs +++ b/Moonlight/App/Services/Files/BucketService.cs @@ -1,7 +1,6 @@ -using Logging.Net; -using Moonlight.App.Helpers; +using Moonlight.App.Helpers; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Files; public class BucketService { diff --git a/Moonlight/App/Services/ResourceService.cs b/Moonlight/App/Services/Files/ResourceService.cs similarity index 94% rename from Moonlight/App/Services/ResourceService.cs rename to Moonlight/App/Services/Files/ResourceService.cs index 8b126340..5858fa9f 100644 --- a/Moonlight/App/Services/ResourceService.cs +++ b/Moonlight/App/Services/Files/ResourceService.cs @@ -1,6 +1,6 @@ using Moonlight.App.Database.Entities; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Files; public class ResourceService { diff --git a/Moonlight/App/Services/StorageService.cs b/Moonlight/App/Services/Files/StorageService.cs similarity index 97% rename from Moonlight/App/Services/StorageService.cs rename to Moonlight/App/Services/Files/StorageService.cs index f9474581..1bae49cc 100644 --- a/Moonlight/App/Services/StorageService.cs +++ b/Moonlight/App/Services/Files/StorageService.cs @@ -1,7 +1,7 @@ using Logging.Net; using Moonlight.App.Helpers; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Files; public class StorageService { diff --git a/Moonlight/App/Services/LogService.cs b/Moonlight/App/Services/LogServices/LogService.cs similarity index 95% rename from Moonlight/App/Services/LogService.cs rename to Moonlight/App/Services/LogServices/LogService.cs index 87a30a5f..10b1925a 100644 --- a/Moonlight/App/Services/LogService.cs +++ b/Moonlight/App/Services/LogServices/LogService.cs @@ -2,7 +2,7 @@ using Moonlight.App.Helpers; using Moonlight.App.Models.Misc; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.LogServices; public class LogService { diff --git a/Moonlight/App/Services/MailService.cs b/Moonlight/App/Services/Mail/MailService.cs similarity index 96% rename from Moonlight/App/Services/MailService.cs rename to Moonlight/App/Services/Mail/MailService.cs index 9bcab325..85e2d60c 100644 --- a/Moonlight/App/Services/MailService.cs +++ b/Moonlight/App/Services/Mail/MailService.cs @@ -1,13 +1,11 @@ -using System.Net; -using System.Net.Mail; -using Logging.Net; +using Logging.Net; using MimeKit; using Moonlight.App.Database.Entities; using Moonlight.App.Exceptions; using Moonlight.App.Helpers; using SmtpClient = MailKit.Net.Smtp.SmtpClient; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Mail; public class MailService { diff --git a/Moonlight/App/Services/TrashMailDetectorService.cs b/Moonlight/App/Services/Mail/TrashMailDetectorService.cs similarity index 96% rename from Moonlight/App/Services/TrashMailDetectorService.cs rename to Moonlight/App/Services/Mail/TrashMailDetectorService.cs index eba090b5..35d57aaf 100644 --- a/Moonlight/App/Services/TrashMailDetectorService.cs +++ b/Moonlight/App/Services/Mail/TrashMailDetectorService.cs @@ -1,7 +1,7 @@ using System.Net; using Logging.Net; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Mail; public class TrashMailDetectorService { diff --git a/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs b/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs index d77b355e..d9acc9ef 100644 --- a/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs +++ b/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Components.Forms; using Moonlight.App.Database.Entities; using Moonlight.App.Events; +using Moonlight.App.Services.Files; using Moonlight.App.Services.Sessions; namespace Moonlight.App.Services.SupportChat; diff --git a/Moonlight/App/Services/SupportChat/SupportChatClientService.cs b/Moonlight/App/Services/SupportChat/SupportChatClientService.cs index c6a10f9c..1c4918fc 100644 --- a/Moonlight/App/Services/SupportChat/SupportChatClientService.cs +++ b/Moonlight/App/Services/SupportChat/SupportChatClientService.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components.Forms; using Moonlight.App.Database.Entities; using Moonlight.App.Events; +using Moonlight.App.Services.Files; using Moonlight.App.Services.Sessions; namespace Moonlight.App.Services.SupportChat; diff --git a/Moonlight/App/Services/UserService.cs b/Moonlight/App/Services/UserService.cs index 81633b14..940f3c09 100644 --- a/Moonlight/App/Services/UserService.cs +++ b/Moonlight/App/Services/UserService.cs @@ -6,6 +6,7 @@ using Moonlight.App.Helpers; using Moonlight.App.Models.Misc; using Moonlight.App.Repositories; using Moonlight.App.Services.LogServices; +using Moonlight.App.Services.Mail; using Moonlight.App.Services.Sessions; namespace Moonlight.App.Services; diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index 2993e7a0..b6404a3b 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -15,9 +15,12 @@ using Moonlight.App.Repositories.Domains; using Moonlight.App.Repositories.LogEntries; using Moonlight.App.Repositories.Servers; using Moonlight.App.Services; +using Moonlight.App.Services.Background; using Moonlight.App.Services.DiscordBot; +using Moonlight.App.Services.Files; using Moonlight.App.Services.Interop; using Moonlight.App.Services.LogServices; +using Moonlight.App.Services.Mail; using Moonlight.App.Services.Notifications; using Moonlight.App.Services.OAuth2; using Moonlight.App.Services.Sessions; diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor index 360b8802..f4804368 100644 --- a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor +++ b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor @@ -4,6 +4,7 @@ @using Moonlight.App.Models.Misc @using Moonlight.App.Services.LogServices @using Moonlight.App.Events +@using Moonlight.App.Services.Background @inject CleanupService CleanupService @inject AuditLogService AuditLogService diff --git a/Moonlight/Shared/Views/Admin/Support/View.razor b/Moonlight/Shared/Views/Admin/Support/View.razor index a59c6a87..4edff144 100644 --- a/Moonlight/Shared/Views/Admin/Support/View.razor +++ b/Moonlight/Shared/Views/Admin/Support/View.razor @@ -5,6 +5,7 @@ @using Moonlight.App.Services @using Moonlight.App.Services.SupportChat @using System.Text.RegularExpressions +@using Moonlight.App.Services.Files @inject SupportChatAdminService AdminService @inject UserRepository UserRepository diff --git a/Moonlight/Shared/Views/Admin/Sys/Logs.razor b/Moonlight/Shared/Views/Admin/Sys/Logs.razor index deed919c..ac152a90 100644 --- a/Moonlight/Shared/Views/Admin/Sys/Logs.razor +++ b/Moonlight/Shared/Views/Admin/Sys/Logs.razor @@ -3,6 +3,7 @@ @using BlazorTable @using Moonlight.App.Models.Misc @using Moonlight.App.Services +@using Moonlight.App.Services.LogServices @using Moonlight.Shared.Components.Navigations @inject LogService LogService diff --git a/Moonlight/Shared/Views/Support.razor b/Moonlight/Shared/Views/Support.razor index f292a271..d7395f4b 100644 --- a/Moonlight/Shared/Views/Support.razor +++ b/Moonlight/Shared/Views/Support.razor @@ -5,6 +5,7 @@ @using Moonlight.App.Services.SupportChat @using Logging.Net @using System.Text.RegularExpressions +@using Moonlight.App.Services.Files @inject ResourceService ResourceService @inject SupportChatClientService ClientService From 07961822a01872ba456950017beb772b325327be Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:51:00 +0200 Subject: [PATCH 09/11] Moved minecraft specific services --- Moonlight/App/Services/{ => Minecraft}/FabricService.cs | 2 +- Moonlight/App/Services/{ => Minecraft}/ForgeService.cs | 3 +-- Moonlight/App/Services/{ => Minecraft}/PaperService.cs | 3 +-- Moonlight/Program.cs | 1 + .../ServerControl/Settings/FabricVersionSetting.razor | 1 + .../ServerControl/Settings/ForgeVersionSetting.razor | 1 + .../ServerControl/Settings/PaperVersionSetting.razor | 1 + 7 files changed, 7 insertions(+), 5 deletions(-) rename Moonlight/App/Services/{ => Minecraft}/FabricService.cs (98%) rename Moonlight/App/Services/{ => Minecraft}/ForgeService.cs (93%) rename Moonlight/App/Services/{ => Minecraft}/PaperService.cs (90%) diff --git a/Moonlight/App/Services/FabricService.cs b/Moonlight/App/Services/Minecraft/FabricService.cs similarity index 98% rename from Moonlight/App/Services/FabricService.cs rename to Moonlight/App/Services/Minecraft/FabricService.cs index 650ce155..8498a93b 100644 --- a/Moonlight/App/Services/FabricService.cs +++ b/Moonlight/App/Services/Minecraft/FabricService.cs @@ -3,7 +3,7 @@ using Moonlight.App.Helpers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Minecraft; public class FabricService { diff --git a/Moonlight/App/Services/ForgeService.cs b/Moonlight/App/Services/Minecraft/ForgeService.cs similarity index 93% rename from Moonlight/App/Services/ForgeService.cs rename to Moonlight/App/Services/Minecraft/ForgeService.cs index 6171ef44..a268ec5d 100644 --- a/Moonlight/App/Services/ForgeService.cs +++ b/Moonlight/App/Services/Minecraft/ForgeService.cs @@ -1,7 +1,6 @@ using System.Text; -using Moonlight.App.Helpers; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Minecraft; public class ForgeService { diff --git a/Moonlight/App/Services/PaperService.cs b/Moonlight/App/Services/Minecraft/PaperService.cs similarity index 90% rename from Moonlight/App/Services/PaperService.cs rename to Moonlight/App/Services/Minecraft/PaperService.cs index 2d31ebff..239f9d6d 100644 --- a/Moonlight/App/Services/PaperService.cs +++ b/Moonlight/App/Services/Minecraft/PaperService.cs @@ -1,8 +1,7 @@ using Moonlight.App.ApiClients.Paper; using Moonlight.App.ApiClients.Paper.Resources; -using Moonlight.App.Helpers; -namespace Moonlight.App.Services; +namespace Moonlight.App.Services.Minecraft; public class PaperService { diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs index b6404a3b..aba2a203 100644 --- a/Moonlight/Program.cs +++ b/Moonlight/Program.cs @@ -21,6 +21,7 @@ using Moonlight.App.Services.Files; using Moonlight.App.Services.Interop; using Moonlight.App.Services.LogServices; using Moonlight.App.Services.Mail; +using Moonlight.App.Services.Minecraft; using Moonlight.App.Services.Notifications; using Moonlight.App.Services.OAuth2; using Moonlight.App.Services.Sessions; diff --git a/Moonlight/Shared/Components/ServerControl/Settings/FabricVersionSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/FabricVersionSetting.razor index 0a22b159..ca337729 100644 --- a/Moonlight/Shared/Components/ServerControl/Settings/FabricVersionSetting.razor +++ b/Moonlight/Shared/Components/ServerControl/Settings/FabricVersionSetting.razor @@ -4,6 +4,7 @@ @using Moonlight.App.Repositories @using Moonlight.App.Repositories.Servers @using Moonlight.App.Helpers +@using Moonlight.App.Services.Minecraft @inject ServerService ServerService @inject ServerRepository ServerRepository diff --git a/Moonlight/Shared/Components/ServerControl/Settings/ForgeVersionSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/ForgeVersionSetting.razor index c1f75be4..115cd388 100644 --- a/Moonlight/Shared/Components/ServerControl/Settings/ForgeVersionSetting.razor +++ b/Moonlight/Shared/Components/ServerControl/Settings/ForgeVersionSetting.razor @@ -5,6 +5,7 @@ @using Moonlight.App.Repositories.Servers @using Logging.Net @using Moonlight.App.Helpers +@using Moonlight.App.Services.Minecraft @inject ServerService ServerService @inject ServerRepository ServerRepository diff --git a/Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor b/Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor index 1500f8f9..4d236d6d 100644 --- a/Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor +++ b/Moonlight/Shared/Components/ServerControl/Settings/PaperVersionSetting.razor @@ -4,6 +4,7 @@ @using Moonlight.App.Database.Entities @using Moonlight.App.Repositories @using Moonlight.App.Repositories.Servers +@using Moonlight.App.Services.Minecraft @inject ServerService ServerService @inject ServerRepository ServerRepository From 62d700c3cf5c75c4d015c550a35fd6e9933f5f15 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:51:39 +0200 Subject: [PATCH 10/11] Delete Test.razor --- Moonlight/Shared/Views/Test.razor | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 Moonlight/Shared/Views/Test.razor diff --git a/Moonlight/Shared/Views/Test.razor b/Moonlight/Shared/Views/Test.razor deleted file mode 100644 index 906f4241..00000000 --- a/Moonlight/Shared/Views/Test.razor +++ /dev/null @@ -1,12 +0,0 @@ -@page "/test" - - - - -@code -{ - private Task Load(LazyLoader arg) - { - throw new Exception("Nein"); - } -} From 82005a62fb8bc3d3964f171880b6444cc2bc679f Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Fri, 5 May 2023 04:53:36 +0200 Subject: [PATCH 11/11] Moved api specific exceptions. Deleted plesk exception --- .../Daemon}/DaemonException.cs | 2 +- .../Paper}/PaperException.cs | 2 +- .../Wings}/WingsException.cs | 2 +- Moonlight/App/Exceptions/PleskException.cs | 32 ------------------- .../ErrorBoundaries/SoftErrorBoundary.razor | 1 + 5 files changed, 4 insertions(+), 35 deletions(-) rename Moonlight/App/{Exceptions => ApiClients/Daemon}/DaemonException.cs (93%) rename Moonlight/App/{Exceptions => ApiClients/Paper}/PaperException.cs (84%) rename Moonlight/App/{Exceptions => ApiClients/Wings}/WingsException.cs (93%) delete mode 100644 Moonlight/App/Exceptions/PleskException.cs diff --git a/Moonlight/App/Exceptions/DaemonException.cs b/Moonlight/App/ApiClients/Daemon/DaemonException.cs similarity index 93% rename from Moonlight/App/Exceptions/DaemonException.cs rename to Moonlight/App/ApiClients/Daemon/DaemonException.cs index 845c908f..58ca2e9e 100644 --- a/Moonlight/App/Exceptions/DaemonException.cs +++ b/Moonlight/App/ApiClients/Daemon/DaemonException.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace Moonlight.App.Exceptions; +namespace Moonlight.App.ApiClients.Daemon; [Serializable] public class DaemonException : Exception diff --git a/Moonlight/App/Exceptions/PaperException.cs b/Moonlight/App/ApiClients/Paper/PaperException.cs similarity index 84% rename from Moonlight/App/Exceptions/PaperException.cs rename to Moonlight/App/ApiClients/Paper/PaperException.cs index 02dbc4cf..da62fcd2 100644 --- a/Moonlight/App/Exceptions/PaperException.cs +++ b/Moonlight/App/ApiClients/Paper/PaperException.cs @@ -1,4 +1,4 @@ -namespace Moonlight.App.Exceptions; +namespace Moonlight.App.ApiClients.Paper; public class PaperException : Exception { diff --git a/Moonlight/App/Exceptions/WingsException.cs b/Moonlight/App/ApiClients/Wings/WingsException.cs similarity index 93% rename from Moonlight/App/Exceptions/WingsException.cs rename to Moonlight/App/ApiClients/Wings/WingsException.cs index 92b83b3f..5cb1d789 100644 --- a/Moonlight/App/Exceptions/WingsException.cs +++ b/Moonlight/App/ApiClients/Wings/WingsException.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace Moonlight.App.Exceptions; +namespace Moonlight.App.ApiClients.Wings; [Serializable] public class WingsException : Exception diff --git a/Moonlight/App/Exceptions/PleskException.cs b/Moonlight/App/Exceptions/PleskException.cs deleted file mode 100644 index 5ad8aa82..00000000 --- a/Moonlight/App/Exceptions/PleskException.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Runtime.Serialization; - -namespace Moonlight.App.Exceptions; - -[Serializable] -public class PleskException : Exception -{ - public int StatusCode { get; set; } - - public PleskException() - { - } - - public PleskException(string message, int statusCode) : base(message) - { - StatusCode = statusCode; - } - - public PleskException(string message) : base(message) - { - } - - public PleskException(string message, Exception inner) : base(message, inner) - { - } - - protected PleskException( - SerializationInfo info, - StreamingContext context) : base(info, context) - { - } -} \ No newline at end of file diff --git a/Moonlight/Shared/Components/ErrorBoundaries/SoftErrorBoundary.razor b/Moonlight/Shared/Components/ErrorBoundaries/SoftErrorBoundary.razor index bff6a292..6a417c56 100644 --- a/Moonlight/Shared/Components/ErrorBoundaries/SoftErrorBoundary.razor +++ b/Moonlight/Shared/Components/ErrorBoundaries/SoftErrorBoundary.razor @@ -3,6 +3,7 @@ @using Moonlight.App.Services @using Logging.Net @using Moonlight.App.ApiClients.CloudPanel +@using Moonlight.App.ApiClients.Wings @inherits ErrorBoundaryBase @inject AlertService AlertService