diff --git a/.github/README.md b/.github/README.md index 456891d..8985445 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,7 +1,7 @@ ![Logo](https://i.imgur.com/xI3GLFc.jpeg) -# PteroController +# Pterodactyl A Pterodactyl Panel desktop app that uses the Client API! diff --git a/.github/SECURITY.md b/.github/SECURITY.md index ed6e59d..d338617 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -1,4 +1,4 @@ -# PteroController GitHub Security Policy +# Pterodactyl GitHub Security Policy ## Table of Contents 1. [Introduction](#introduction) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index d12a6a1..74de26d 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -17,7 +17,7 @@ jobs: runs-on: windows-latest env: - Solution_Name: PteroController.sln + Solution_Name: Pterodactyl.sln steps: - name: Checkout @@ -33,10 +33,10 @@ jobs: # Execute all unit tests in the solution - name: Execute unit tests - run: dotnet test PteroController.csproj + run: dotnet test Pterodactyl.csproj # Restore the application to populate the obj folder with RuntimeIdentifiers - name: Restore and build the application - run: dotnet build PteroController.csproj + run: dotnet build Pterodactyl.csproj env: Configuration: ${{ matrix.configuration }} diff --git a/.gitignore b/.gitignore index 85a2577..e1f9fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ bin/ obj/ .vs/ -PteroControllerSetup/Debug/ -PteroControllerSetup/Release/ \ No newline at end of file +PterodactylSetup/Debug/ +PterodactylSetup/Release/ \ No newline at end of file diff --git a/Forms/FrmAlert.Designer.cs b/Forms/FrmAlert.Designer.cs index abddd29..4a9394e 100644 --- a/Forms/FrmAlert.Designer.cs +++ b/Forms/FrmAlert.Designer.cs @@ -1,4 +1,4 @@ -namespace PteroController.Forms +namespace Pterodactyl.Forms { partial class FrmAlert { @@ -52,7 +52,7 @@ private void InitializeComponent() // // icontype // - this.icontype.Image = global::PteroController.Properties.Resources.happycloud; + this.icontype.Image = global::Pterodactyl.Properties.Resources.happycloud; this.icontype.Location = new System.Drawing.Point(12, 29); this.icontype.Name = "icontype"; this.icontype.Size = new System.Drawing.Size(47, 43); diff --git a/Forms/FrmAlert.cs b/Forms/FrmAlert.cs index 50367b2..5d2fcb8 100644 --- a/Forms/FrmAlert.cs +++ b/Forms/FrmAlert.cs @@ -1,8 +1,8 @@  -using PteroController.Properties; +using Pterodactyl.Properties; # pragma warning disable -namespace PteroController.Forms +namespace Pterodactyl.Forms { public partial class FrmAlert : Form { diff --git a/Forms/FrmInstallTools.Designer.cs b/Forms/FrmInstallTools.Designer.cs index 2ceec79..e5337d2 100644 --- a/Forms/FrmInstallTools.Designer.cs +++ b/Forms/FrmInstallTools.Designer.cs @@ -1,4 +1,4 @@ -namespace PteroController.Forms +namespace Pterodactyl.Forms { partial class FrmInstallTools { @@ -71,9 +71,9 @@ private void InitializeComponent() lblappname.ForeColor = Color.WhiteSmoke; lblappname.Location = new Point(29, 3); lblappname.Name = "lblappname"; - lblappname.Size = new Size(160, 19); + lblappname.Size = new Size(192, 19); lblappname.TabIndex = 4; - lblappname.Text = "PteroController (1.0.0)"; + lblappname.Text = "Pterodactyl Desktop (1.0.0)"; // // lblminimize // @@ -144,7 +144,7 @@ private void InitializeComponent() lblinstalldesc.Name = "lblinstalldesc"; lblinstalldesc.Size = new Size(992, 25); lblinstalldesc.TabIndex = 6; - lblinstalldesc.Text = "To use the PteroController, we will have to install additional packages for a smooth and up-to-date experience!"; + lblinstalldesc.Text = "To use the Pterodactyl, we will have to install additional packages for a smooth and up-to-date experience!"; lblinstalldesc.TextAlign = ContentAlignment.MiddleCenter; // // btnaccpetinstall @@ -220,7 +220,7 @@ private void InitializeComponent() Name = "FrmInstallTools"; ShowInTaskbar = false; StartPosition = FormStartPosition.CenterScreen; - Text = "PteroController"; + Text = "Pterodactyl"; navbar.ResumeLayout(false); navbar.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pbappicon).EndInit(); diff --git a/Forms/FrmInstallTools.cs b/Forms/FrmInstallTools.cs index 7e86a20..4cf5b84 100644 --- a/Forms/FrmInstallTools.cs +++ b/Forms/FrmInstallTools.cs @@ -2,7 +2,7 @@ using System.IO.Compression; using System.Net.Http; -namespace PteroController.Forms +namespace Pterodactyl.Forms { public partial class FrmInstallTools : Form { diff --git a/Forms/FrmLoading.Designer.cs b/Forms/FrmLoading.Designer.cs index f312443..a143c60 100644 --- a/Forms/FrmLoading.Designer.cs +++ b/Forms/FrmLoading.Designer.cs @@ -1,4 +1,4 @@ -namespace PteroController.Forms +namespace Pterodactyl.Forms { partial class FrmLoading { @@ -40,6 +40,7 @@ private void InitializeComponent() Elipse = new Guna.UI2.WinForms.Guna2Elipse(components); AnimateWindow = new Guna.UI2.WinForms.Guna2AnimateWindow(components); LoaderElipse = new Guna.UI2.WinForms.Guna2Elipse(components); + label1 = new Label(); ((System.ComponentModel.ISupportInitialize)appicon).BeginInit(); panel1.SuspendLayout(); SuspendLayout(); @@ -71,16 +72,16 @@ private void InitializeComponent() // // lblappname // - lblappname.AutoSize = true; lblappname.BackColor = Color.Transparent; lblappname.Font = new Font("Arial", 20F, FontStyle.Bold, GraphicsUnit.Point); lblappname.ForeColor = Color.FromArgb(236, 240, 243); - lblappname.Location = new Point(275, 156); + lblappname.Location = new Point(107, 158); lblappname.Margin = new Padding(4, 0, 4, 0); lblappname.Name = "lblappname"; - lblappname.Size = new Size(217, 32); + lblappname.Size = new Size(558, 32); lblappname.TabIndex = 12; - lblappname.Text = "PteroController"; + lblappname.Text = "Pterodactyl Desktop"; + lblappname.TextAlign = ContentAlignment.MiddleCenter; // // drag // @@ -105,7 +106,7 @@ private void InitializeComponent() // panel2 // panel2.BackColor = Color.FromArgb(0, 110, 179); - panel2.Location = new Point(17, 0); + panel2.Location = new Point(0, 0); panel2.Margin = new Padding(4, 3, 4, 3); panel2.Name = "panel2"; panel2.Size = new Size(1, 29); @@ -125,12 +126,26 @@ private void InitializeComponent() LoaderElipse.BorderRadius = 20; LoaderElipse.TargetControl = panel1; // + // label1 + // + label1.BackColor = Color.Transparent; + label1.Font = new Font("Arial", 8F, FontStyle.Bold, GraphicsUnit.Point); + label1.ForeColor = Color.FromArgb(236, 240, 243); + label1.Location = new Point(70, 312); + label1.Margin = new Padding(4, 0, 4, 0); + label1.Name = "label1"; + label1.Size = new Size(640, 20); + label1.TabIndex = 14; + label1.Text = "We not affiliated with pterodactyl this is not an official product released by pterodactyl"; + label1.TextAlign = ContentAlignment.MiddleCenter; + // // FrmLoading // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - BackColor = Color.FromArgb(30, 45, 59); + BackColor = Color.FromArgb(27, 28, 46); ClientSize = new Size(765, 331); + Controls.Add(label1); Controls.Add(panel1); Controls.Add(lblappname); Controls.Add(lblexit); @@ -144,7 +159,7 @@ private void InitializeComponent() ShowIcon = false; ShowInTaskbar = false; StartPosition = FormStartPosition.CenterScreen; - Text = "PteroController"; + Text = "Pterodactyl"; Load += FrmLoading_Load; ((System.ComponentModel.ISupportInitialize)appicon).EndInit(); panel1.ResumeLayout(false); @@ -163,5 +178,6 @@ private void InitializeComponent() private Guna.UI2.WinForms.Guna2Elipse Elipse; private Guna.UI2.WinForms.Guna2AnimateWindow AnimateWindow; private Guna.UI2.WinForms.Guna2Elipse LoaderElipse; + private Label label1; } } \ No newline at end of file diff --git a/Forms/FrmLoading.cs b/Forms/FrmLoading.cs index 3ee88d4..802ef3f 100644 --- a/Forms/FrmLoading.cs +++ b/Forms/FrmLoading.cs @@ -1,9 +1,9 @@  -using PteroController.Properties; +using Pterodactyl.Properties; using System.Diagnostics; using System.Text.RegularExpressions; -namespace PteroController.Forms +namespace Pterodactyl.Forms { public partial class FrmLoading : Form { @@ -19,7 +19,7 @@ private void lblexit_Click(object sender, EventArgs e) private async void CheckForUpdate() { - string url = "https://raw.githubusercontent.com/MythicalLTD/PteroController/v2develop/Program.cs"; + string url = "https://raw.githubusercontent.com/MythicalLTD/Pterodactyl-Desktop/v2develop/Program.cs"; using (HttpClient httpClient = new HttpClient()) { @@ -62,11 +62,11 @@ private async void CheckForUpdate() } private void RunInstallerWithBatchScript() { - if (File.Exists("PteroControllerSetup.msi")) + if (File.Exists("PterodactylSetup.msi")) { string batchScript = @" @echo off - start /b PteroControllerSetup.msi + start /b PterodactylSetup.msi exit "; @@ -97,7 +97,7 @@ private void FrmLoading_Load(object sender, EventArgs e) } public static async Task Download() { - string releaseURL = "https://github.com/MythicalLTD/PteroController/releases/latest/download/PteroControllerSetup.msi"; + string releaseURL = "https://github.com/MythicalLTD/Pterodactyl-Desktop/releases/latest/download/PterodactylSetup.msi"; using (HttpClient client = new HttpClient()) { HttpResponseMessage response = await client.GetAsync(releaseURL); @@ -106,7 +106,7 @@ public static async Task Download() { using (Stream contentStream = await response.Content.ReadAsStreamAsync()) { - using (FileStream fileStream = new FileStream("PteroControllerSetup.msi", FileMode.Create)) + using (FileStream fileStream = new FileStream("PterodactylSetup.msi", FileMode.Create)) { await contentStream.CopyToAsync(fileStream); Console.WriteLine("Updater has been downloaded successfully!"); diff --git a/Forms/FrmLogin.Designer.cs b/Forms/FrmLogin.Designer.cs index ee58bd4..abd7bbf 100644 --- a/Forms/FrmLogin.Designer.cs +++ b/Forms/FrmLogin.Designer.cs @@ -1,4 +1,4 @@ -namespace PteroController.Forms +namespace Pterodactyl.Forms { partial class FrmLogin { @@ -29,16 +29,18 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { components = new System.ComponentModel.Container(); - Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges19 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); - Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges20 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); - Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges17 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); - Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges18 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); - Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges15 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); - Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges16 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); - Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges13 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); - Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges14 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges7 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges8 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges9 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges10 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges11 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges12 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges1 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges2 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges3 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges4 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges5 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges6 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLogin)); lblpanelname = new Label(); navbar = new Panel(); @@ -51,29 +53,34 @@ private void InitializeComponent() AnimateWindow = new Guna.UI2.WinForms.Guna2AnimateWindow(components); btnaddsession = new Guna.UI2.WinForms.Guna2Button(); txtpanelname = new Guna.UI2.WinForms.Guna2TextBox(); - txtpanelurl = new Guna.UI2.WinForms.Guna2TextBox(); - lblpanelurl = new Label(); + cbdirectlogin = new Guna.UI2.WinForms.Guna2CheckBox(); + LoginPanel = new Guna.UI2.WinForms.Guna2GradientPanel(); txtpanelapikey = new Guna.UI2.WinForms.Guna2TextBox(); - label4 = new Label(); txtpanelpwd = new Guna.UI2.WinForms.Guna2TextBox(); - label5 = new Label(); - cbdirectlogin = new Guna.UI2.WinForms.Guna2CheckBox(); + txtpanelurl = new Guna.UI2.WinForms.Guna2TextBox(); + lbladdsession = new Label(); + lblpanelurl = new Label(); + lblpanelapikey = new Label(); + lblpanelpwd = new Label(); navbar.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pbappicon).BeginInit(); + LoginPanel.SuspendLayout(); SuspendLayout(); // // lblpanelname // - lblpanelname.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - lblpanelname.Location = new Point(29, 50); + lblpanelname.AutoSize = true; + lblpanelname.BackColor = Color.Transparent; + lblpanelname.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); + lblpanelname.Location = new Point(21, 18); lblpanelname.Name = "lblpanelname"; - lblpanelname.Size = new Size(293, 15); + lblpanelname.Size = new Size(94, 19); lblpanelname.TabIndex = 14; lblpanelname.Text = "Panel Name:"; // // navbar // - navbar.BackColor = Color.FromArgb(29, 37, 49); + navbar.BackColor = Color.FromArgb(26, 21, 44); navbar.Controls.Add(lblappname); navbar.Controls.Add(lblminimize); navbar.Controls.Add(lblexit); @@ -81,7 +88,7 @@ private void InitializeComponent() navbar.Dock = DockStyle.Top; navbar.Location = new Point(0, 0); navbar.Name = "navbar"; - navbar.Size = new Size(350, 28); + navbar.Size = new Size(770, 28); navbar.TabIndex = 15; // // lblappname @@ -91,16 +98,16 @@ private void InitializeComponent() lblappname.ForeColor = Color.WhiteSmoke; lblappname.Location = new Point(29, 3); lblappname.Name = "lblappname"; - lblappname.Size = new Size(160, 19); + lblappname.Size = new Size(192, 19); lblappname.TabIndex = 4; - lblappname.Text = "PteroController (1.0.0)"; + lblappname.Text = "Pterodactyl Desktop (1.0.0)"; // // lblminimize // lblminimize.AutoSize = true; lblminimize.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); lblminimize.ForeColor = Color.WhiteSmoke; - lblminimize.Location = new Point(309, 2); + lblminimize.Location = new Point(724, 2); lblminimize.Name = "lblminimize"; lblminimize.Size = new Size(15, 19); lblminimize.TabIndex = 3; @@ -112,7 +119,7 @@ private void InitializeComponent() lblexit.AutoSize = true; lblexit.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); lblexit.ForeColor = Color.WhiteSmoke; - lblexit.Location = new Point(325, 4); + lblexit.Location = new Point(740, 4); lblexit.Name = "lblexit"; lblexit.Size = new Size(18, 19); lblexit.TabIndex = 2; @@ -147,179 +154,249 @@ private void InitializeComponent() // // btnaddsession // + btnaddsession.Animated = true; + btnaddsession.BackColor = Color.Transparent; btnaddsession.BorderColor = Color.Transparent; btnaddsession.BorderRadius = 12; btnaddsession.BorderStyle = System.Drawing.Drawing2D.DashStyle.Custom; btnaddsession.BorderThickness = 2; - btnaddsession.CustomizableEdges = customizableEdges19; + btnaddsession.CustomBorderColor = Color.Transparent; + btnaddsession.CustomizableEdges = customizableEdges7; btnaddsession.DisabledState.BorderColor = Color.DarkGray; btnaddsession.DisabledState.CustomBorderColor = Color.DarkGray; btnaddsession.DisabledState.FillColor = Color.FromArgb(169, 169, 169); btnaddsession.DisabledState.ForeColor = Color.FromArgb(141, 141, 141); - btnaddsession.FillColor = Color.FromArgb(59, 130, 246); + btnaddsession.FillColor = Color.FromArgb(0, 110, 179); btnaddsession.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); btnaddsession.ForeColor = Color.White; - btnaddsession.Location = new Point(130, 269); + btnaddsession.Location = new Point(21, 330); btnaddsession.Name = "btnaddsession"; - btnaddsession.ShadowDecoration.CustomizableEdges = customizableEdges20; - btnaddsession.Size = new Size(92, 30); + btnaddsession.PressedColor = Color.FromArgb(0, 212, 240); + btnaddsession.ShadowDecoration.CustomizableEdges = customizableEdges8; + btnaddsession.Size = new Size(455, 45); btnaddsession.TabIndex = 6; btnaddsession.Text = "Connect"; btnaddsession.Click += btnaddsession_Click; // // txtpanelname // - txtpanelname.CustomizableEdges = customizableEdges17; + txtpanelname.AutoSizeMode = AutoSizeMode.GrowAndShrink; + txtpanelname.BackColor = Color.Transparent; + txtpanelname.BorderColor = Color.FromArgb(42, 47, 65); + txtpanelname.BorderRadius = 12; + txtpanelname.Cursor = Cursors.IBeam; + txtpanelname.CustomizableEdges = customizableEdges9; txtpanelname.DefaultText = ""; txtpanelname.DisabledState.BorderColor = Color.FromArgb(208, 208, 208); txtpanelname.DisabledState.FillColor = Color.FromArgb(226, 226, 226); txtpanelname.DisabledState.ForeColor = Color.FromArgb(138, 138, 138); txtpanelname.DisabledState.PlaceholderForeColor = Color.FromArgb(138, 138, 138); + txtpanelname.FillColor = Color.FromArgb(42, 47, 65); txtpanelname.FocusedState.BorderColor = Color.FromArgb(94, 148, 255); - txtpanelname.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + txtpanelname.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); txtpanelname.HoverState.BorderColor = Color.FromArgb(94, 148, 255); - txtpanelname.Location = new Point(29, 68); + txtpanelname.Location = new Point(17, 41); + txtpanelname.MaxLength = 32; txtpanelname.Name = "txtpanelname"; txtpanelname.PasswordChar = '\0'; txtpanelname.PlaceholderText = "MythicalSystems"; txtpanelname.SelectedText = ""; - txtpanelname.ShadowDecoration.CustomizableEdges = customizableEdges18; - txtpanelname.Size = new Size(295, 26); + txtpanelname.ShadowDecoration.CustomizableEdges = customizableEdges10; + txtpanelname.Size = new Size(460, 45); txtpanelname.TabIndex = 1; // - // txtpanelurl - // - txtpanelurl.CustomizableEdges = customizableEdges15; - txtpanelurl.DefaultText = ""; - txtpanelurl.DisabledState.BorderColor = Color.FromArgb(208, 208, 208); - txtpanelurl.DisabledState.FillColor = Color.FromArgb(226, 226, 226); - txtpanelurl.DisabledState.ForeColor = Color.FromArgb(138, 138, 138); - txtpanelurl.DisabledState.PlaceholderForeColor = Color.FromArgb(138, 138, 138); - txtpanelurl.FocusedState.BorderColor = Color.FromArgb(94, 148, 255); - txtpanelurl.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); - txtpanelurl.HoverState.BorderColor = Color.FromArgb(94, 148, 255); - txtpanelurl.Location = new Point(29, 115); - txtpanelurl.Name = "txtpanelurl"; - txtpanelurl.PasswordChar = '\0'; - txtpanelurl.PlaceholderText = "https://panel.mythicalsystems.me"; - txtpanelurl.SelectedText = ""; - txtpanelurl.ShadowDecoration.CustomizableEdges = customizableEdges16; - txtpanelurl.Size = new Size(295, 26); - txtpanelurl.TabIndex = 2; - // - // lblpanelurl + // cbdirectlogin // - lblpanelurl.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - lblpanelurl.Location = new Point(29, 97); - lblpanelurl.Name = "lblpanelurl"; - lblpanelurl.Size = new Size(295, 15); - lblpanelurl.TabIndex = 18; - lblpanelurl.Text = "Panel URL:"; + cbdirectlogin.AutoSize = true; + cbdirectlogin.BackColor = Color.Transparent; + cbdirectlogin.CheckedState.BorderColor = Color.FromArgb(94, 148, 255); + cbdirectlogin.CheckedState.BorderRadius = 0; + cbdirectlogin.CheckedState.BorderThickness = 0; + cbdirectlogin.CheckedState.FillColor = Color.FromArgb(94, 148, 255); + cbdirectlogin.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); + cbdirectlogin.Location = new Point(21, 301); + cbdirectlogin.Name = "cbdirectlogin"; + cbdirectlogin.Size = new Size(288, 23); + cbdirectlogin.TabIndex = 5; + cbdirectlogin.Text = "Do not save sessions on the session list."; + cbdirectlogin.UncheckedState.BorderColor = Color.FromArgb(125, 137, 149); + cbdirectlogin.UncheckedState.BorderRadius = 0; + cbdirectlogin.UncheckedState.BorderThickness = 0; + cbdirectlogin.UncheckedState.FillColor = Color.FromArgb(125, 137, 149); + cbdirectlogin.UseVisualStyleBackColor = false; + // + // LoginPanel + // + LoginPanel.BorderColor = Color.FromArgb(34, 39, 57); + LoginPanel.BorderRadius = 20; + LoginPanel.Controls.Add(lblpanelpwd); + LoginPanel.Controls.Add(lblpanelapikey); + LoginPanel.Controls.Add(lblpanelurl); + LoginPanel.Controls.Add(txtpanelapikey); + LoginPanel.Controls.Add(txtpanelpwd); + LoginPanel.Controls.Add(txtpanelurl); + LoginPanel.Controls.Add(btnaddsession); + LoginPanel.Controls.Add(cbdirectlogin); + LoginPanel.Controls.Add(txtpanelname); + LoginPanel.Controls.Add(lblpanelname); + LoginPanel.CustomBorderColor = Color.FromArgb(34, 39, 57); + LoginPanel.CustomizableEdges = customizableEdges11; + LoginPanel.FillColor = Color.FromArgb(34, 39, 57); + LoginPanel.FillColor2 = Color.FromArgb(34, 39, 57); + LoginPanel.Location = new Point(135, 94); + LoginPanel.Name = "LoginPanel"; + LoginPanel.ShadowDecoration.CustomizableEdges = customizableEdges12; + LoginPanel.Size = new Size(496, 402); + LoginPanel.TabIndex = 23; // // txtpanelapikey // - txtpanelapikey.CustomizableEdges = customizableEdges13; + txtpanelapikey.AutoSizeMode = AutoSizeMode.GrowAndShrink; + txtpanelapikey.BackColor = Color.Transparent; + txtpanelapikey.BorderColor = Color.FromArgb(42, 47, 65); + txtpanelapikey.BorderRadius = 12; + txtpanelapikey.Cursor = Cursors.IBeam; + txtpanelapikey.CustomizableEdges = customizableEdges1; txtpanelapikey.DefaultText = ""; txtpanelapikey.DisabledState.BorderColor = Color.FromArgb(208, 208, 208); txtpanelapikey.DisabledState.FillColor = Color.FromArgb(226, 226, 226); txtpanelapikey.DisabledState.ForeColor = Color.FromArgb(138, 138, 138); txtpanelapikey.DisabledState.PlaceholderForeColor = Color.FromArgb(138, 138, 138); + txtpanelapikey.FillColor = Color.FromArgb(42, 47, 65); txtpanelapikey.FocusedState.BorderColor = Color.FromArgb(94, 148, 255); - txtpanelapikey.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + txtpanelapikey.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); txtpanelapikey.HoverState.BorderColor = Color.FromArgb(94, 148, 255); - txtpanelapikey.Location = new Point(29, 162); + txtpanelapikey.Location = new Point(17, 180); + txtpanelapikey.MaxLength = 32; txtpanelapikey.Name = "txtpanelapikey"; - txtpanelapikey.PasswordChar = '\0'; - txtpanelapikey.PlaceholderText = "*************"; + txtpanelapikey.PasswordChar = '●'; + txtpanelapikey.PlaceholderText = "●●●●●●●●●●●●●●●●●●●"; txtpanelapikey.SelectedText = ""; - txtpanelapikey.ShadowDecoration.CustomizableEdges = customizableEdges14; - txtpanelapikey.Size = new Size(295, 26); + txtpanelapikey.ShadowDecoration.CustomizableEdges = customizableEdges2; + txtpanelapikey.Size = new Size(460, 45); txtpanelapikey.TabIndex = 3; - // - // label4 - // - label4.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - label4.Location = new Point(29, 144); - label4.Name = "label4"; - label4.Size = new Size(295, 15); - label4.TabIndex = 20; - label4.Text = "Panel Client Key:"; + txtpanelapikey.UseSystemPasswordChar = true; // // txtpanelpwd // - txtpanelpwd.CustomizableEdges = customizableEdges11; + txtpanelpwd.AutoSizeMode = AutoSizeMode.GrowAndShrink; + txtpanelpwd.BackColor = Color.Transparent; + txtpanelpwd.BorderColor = Color.FromArgb(42, 47, 65); + txtpanelpwd.BorderRadius = 12; + txtpanelpwd.Cursor = Cursors.IBeam; + txtpanelpwd.CustomizableEdges = customizableEdges3; txtpanelpwd.DefaultText = ""; txtpanelpwd.DisabledState.BorderColor = Color.FromArgb(208, 208, 208); txtpanelpwd.DisabledState.FillColor = Color.FromArgb(226, 226, 226); txtpanelpwd.DisabledState.ForeColor = Color.FromArgb(138, 138, 138); txtpanelpwd.DisabledState.PlaceholderForeColor = Color.FromArgb(138, 138, 138); + txtpanelpwd.FillColor = Color.FromArgb(42, 47, 65); txtpanelpwd.FocusedState.BorderColor = Color.FromArgb(94, 148, 255); - txtpanelpwd.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + txtpanelpwd.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); txtpanelpwd.HoverState.BorderColor = Color.FromArgb(94, 148, 255); - txtpanelpwd.Location = new Point(29, 209); + txtpanelpwd.Location = new Point(17, 250); + txtpanelpwd.MaxLength = 64; txtpanelpwd.Name = "txtpanelpwd"; txtpanelpwd.PasswordChar = '●'; - txtpanelpwd.PlaceholderText = "*************"; + txtpanelpwd.PlaceholderText = "●●●●●●●●●●●●●●●●●●●"; txtpanelpwd.SelectedText = ""; - txtpanelpwd.ShadowDecoration.CustomizableEdges = customizableEdges12; - txtpanelpwd.Size = new Size(295, 26); + txtpanelpwd.ShadowDecoration.CustomizableEdges = customizableEdges4; + txtpanelpwd.Size = new Size(460, 45); txtpanelpwd.TabIndex = 4; txtpanelpwd.UseSystemPasswordChar = true; // - // label5 + // txtpanelurl + // + txtpanelurl.AutoSizeMode = AutoSizeMode.GrowAndShrink; + txtpanelurl.BackColor = Color.Transparent; + txtpanelurl.BorderColor = Color.FromArgb(42, 47, 65); + txtpanelurl.BorderRadius = 12; + txtpanelurl.Cursor = Cursors.IBeam; + txtpanelurl.CustomizableEdges = customizableEdges5; + txtpanelurl.DefaultText = ""; + txtpanelurl.DisabledState.BorderColor = Color.FromArgb(208, 208, 208); + txtpanelurl.DisabledState.FillColor = Color.FromArgb(226, 226, 226); + txtpanelurl.DisabledState.ForeColor = Color.FromArgb(138, 138, 138); + txtpanelurl.DisabledState.PlaceholderForeColor = Color.FromArgb(138, 138, 138); + txtpanelurl.FillColor = Color.FromArgb(42, 47, 65); + txtpanelurl.FocusedState.BorderColor = Color.FromArgb(94, 148, 255); + txtpanelurl.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); + txtpanelurl.HoverState.BorderColor = Color.FromArgb(94, 148, 255); + txtpanelurl.Location = new Point(17, 110); + txtpanelurl.MaxLength = 64; + txtpanelurl.Name = "txtpanelurl"; + txtpanelurl.PasswordChar = '\0'; + txtpanelurl.PlaceholderText = "https://devpanel.mythicalsystems.me"; + txtpanelurl.SelectedText = ""; + txtpanelurl.ShadowDecoration.CustomizableEdges = customizableEdges6; + txtpanelurl.Size = new Size(460, 45); + txtpanelurl.TabIndex = 2; // - label5.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - label5.Location = new Point(29, 191); - label5.Name = "label5"; - label5.Size = new Size(295, 15); - label5.TabIndex = 22; - label5.Text = "Panel Client Password:"; + // lbladdsession // - // cbdirectlogin + lbladdsession.AutoSize = true; + lbladdsession.Font = new Font("Arial", 18F, FontStyle.Bold, GraphicsUnit.Point); + lbladdsession.ForeColor = Color.WhiteSmoke; + lbladdsession.Location = new Point(274, 46); + lbladdsession.Name = "lbladdsession"; + lbladdsession.Size = new Size(222, 29); + lbladdsession.TabIndex = 5; + lbladdsession.Text = "Login to Continue"; // - cbdirectlogin.AutoSize = true; - cbdirectlogin.CheckedState.BorderColor = Color.FromArgb(94, 148, 255); - cbdirectlogin.CheckedState.BorderRadius = 0; - cbdirectlogin.CheckedState.BorderThickness = 0; - cbdirectlogin.CheckedState.FillColor = Color.FromArgb(94, 148, 255); - cbdirectlogin.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); - cbdirectlogin.Location = new Point(29, 241); - cbdirectlogin.Name = "cbdirectlogin"; - cbdirectlogin.Size = new Size(94, 19); - cbdirectlogin.TabIndex = 5; - cbdirectlogin.Text = "Direct Login"; - cbdirectlogin.UncheckedState.BorderColor = Color.FromArgb(125, 137, 149); - cbdirectlogin.UncheckedState.BorderRadius = 0; - cbdirectlogin.UncheckedState.BorderThickness = 0; - cbdirectlogin.UncheckedState.FillColor = Color.FromArgb(125, 137, 149); + // lblpanelurl + // + lblpanelurl.AutoSize = true; + lblpanelurl.BackColor = Color.Transparent; + lblpanelurl.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); + lblpanelurl.Location = new Point(21, 88); + lblpanelurl.Name = "lblpanelurl"; + lblpanelurl.Size = new Size(80, 19); + lblpanelurl.TabIndex = 19; + lblpanelurl.Text = "Panel URL:"; + // + // lblpanelapikey + // + lblpanelapikey.AutoSize = true; + lblpanelapikey.BackColor = Color.Transparent; + lblpanelapikey.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); + lblpanelapikey.Location = new Point(21, 158); + lblpanelapikey.Name = "lblpanelapikey"; + lblpanelapikey.Size = new Size(121, 19); + lblpanelapikey.TabIndex = 20; + lblpanelapikey.Text = "Panel Client Key:"; + // + // lblpanelpwd // - // FrmAddSession + lblpanelpwd.AutoSize = true; + lblpanelpwd.BackColor = Color.Transparent; + lblpanelpwd.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); + lblpanelpwd.Location = new Point(21, 228); + lblpanelpwd.Name = "lblpanelpwd"; + lblpanelpwd.Size = new Size(118, 19); + lblpanelpwd.TabIndex = 21; + lblpanelpwd.Text = "Panel Password:"; + // + // FrmLogin // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - BackColor = Color.FromArgb(30, 45, 59); - ClientSize = new Size(350, 311); - Controls.Add(cbdirectlogin); - Controls.Add(txtpanelpwd); - Controls.Add(label5); - Controls.Add(txtpanelapikey); - Controls.Add(label4); - Controls.Add(txtpanelurl); - Controls.Add(lblpanelurl); - Controls.Add(txtpanelname); - Controls.Add(btnaddsession); + BackColor = Color.FromArgb(27, 28, 46); + ClientSize = new Size(770, 550); + Controls.Add(lbladdsession); + Controls.Add(LoginPanel); Controls.Add(navbar); - Controls.Add(lblpanelname); ForeColor = Color.White; FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); - Name = "FrmAddSession"; + Name = "FrmLogin"; StartPosition = FormStartPosition.CenterScreen; Text = "FrmAddSession"; Load += FrmAddSession_Load; navbar.ResumeLayout(false); navbar.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pbappicon).EndInit(); + LoginPanel.ResumeLayout(false); + LoginPanel.PerformLayout(); ResumeLayout(false); PerformLayout(); } @@ -335,13 +412,15 @@ private void InitializeComponent() private Guna.UI2.WinForms.Guna2DragControl DragController; private Guna.UI2.WinForms.Guna2AnimateWindow AnimateWindow; private Guna.UI2.WinForms.Guna2Button btnaddsession; - private Guna.UI2.WinForms.Guna2TextBox txtpanelapikey; - private Label label4; - private Guna.UI2.WinForms.Guna2TextBox txtpanelurl; - private Label lblpanelurl; private Guna.UI2.WinForms.Guna2TextBox txtpanelname; - private Guna.UI2.WinForms.Guna2TextBox txtpanelpwd; - private Label label5; private Guna.UI2.WinForms.Guna2CheckBox cbdirectlogin; + private Guna.UI2.WinForms.Guna2GradientPanel LoginPanel; + private Label lbladdsession; + private Guna.UI2.WinForms.Guna2TextBox txtpanelurl; + private Guna.UI2.WinForms.Guna2TextBox txtpanelpwd; + private Guna.UI2.WinForms.Guna2TextBox txtpanelapikey; + private Label lblpanelpwd; + private Label lblpanelapikey; + private Label lblpanelurl; } } \ No newline at end of file diff --git a/Forms/FrmLogin.cs b/Forms/FrmLogin.cs index 812c171..3e129d0 100644 --- a/Forms/FrmLogin.cs +++ b/Forms/FrmLogin.cs @@ -1,6 +1,6 @@ -using PteroController.Handlers; +using Pterodactyl.Handlers; -namespace PteroController.Forms +namespace Pterodactyl.Forms { public partial class FrmLogin : Form { diff --git a/Forms/FrmServerController.Designer.cs b/Forms/FrmServerController.Designer.cs index bda0539..102a03a 100644 --- a/Forms/FrmServerController.Designer.cs +++ b/Forms/FrmServerController.Designer.cs @@ -1,4 +1,4 @@ -namespace PteroController.Forms +namespace Pterodactyl.Forms { partial class FrmServerController { @@ -29,55 +29,75 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { components = new System.ComponentModel.Container(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges1 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges2 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges3 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges4 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges5 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); + Guna.UI2.WinForms.Suite.CustomizableEdges customizableEdges6 = new Guna.UI2.WinForms.Suite.CustomizableEdges(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmServerController)); Pages = new Guna.UI2.WinForms.Guna2TabControl(); PageHome = new TabPage(); + pcsvimg = new PictureBox(); + panel1 = new Panel(); + lblsvcpu = new Label(); + lblsvdisk = new Label(); + lblsvram = new Label(); + lblsvlimitations = new Label(); + pnlsvinfo = new Panel(); + lblsvnode = new Label(); + lblsvip = new Label(); + lblsvname = new Label(); + lblsvinfo = new Label(); lblram = new Label(); - guna2RadialGauge1 = new Guna.UI2.WinForms.Guna2RadialGauge(); + statsram = new Guna.UI2.WinForms.Guna2RadialGauge(); lblcpu = new Label(); - cpu = new Guna.UI2.WinForms.Guna2RadialGauge(); + statscpu = new Guna.UI2.WinForms.Guna2RadialGauge(); PageFiles = new TabPage(); PageDatabases = new TabPage(); PageBackups = new TabPage(); navbar = new Panel(); lblappname = new Label(); pbappicon = new PictureBox(); - separator = new Guna.UI2.WinForms.Guna2Separator(); lblminimize = new Label(); lblexit = new Label(); - subnavbar = new Panel(); - btnservers = new PictureBox(); - btnlogout = new PictureBox(); - pbavatar = new PictureBox(); - txtpanelname = new Label(); - pblblpanellogo = new PictureBox(); DragController = new Guna.UI2.WinForms.Guna2DragControl(components); AnimateWindow = new Guna.UI2.WinForms.Guna2AnimateWindow(components); Elipse = new Guna.UI2.WinForms.Guna2Elipse(components); + sidebar = new Panel(); + btntest = new Guna.UI2.WinForms.Guna2Button(); + btnfilemanager = new Guna.UI2.WinForms.Guna2Button(); + btnhome = new Guna.UI2.WinForms.Guna2Button(); + lblpanelname = new Label(); + pbpanellogo = new PictureBox(); + panel2 = new Panel(); + panel3 = new Panel(); + lblsvstatus = new Label(); Pages.SuspendLayout(); PageHome.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pcsvimg).BeginInit(); + panel1.SuspendLayout(); + pnlsvinfo.SuspendLayout(); navbar.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pbappicon).BeginInit(); - subnavbar.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)btnservers).BeginInit(); - ((System.ComponentModel.ISupportInitialize)btnlogout).BeginInit(); - ((System.ComponentModel.ISupportInitialize)pbavatar).BeginInit(); - ((System.ComponentModel.ISupportInitialize)pblblpanellogo).BeginInit(); + sidebar.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pbpanellogo).BeginInit(); + panel2.SuspendLayout(); + panel3.SuspendLayout(); SuspendLayout(); // // Pages // - Pages.Alignment = TabAlignment.Left; Pages.Controls.Add(PageHome); Pages.Controls.Add(PageFiles); Pages.Controls.Add(PageDatabases); Pages.Controls.Add(PageBackups); Pages.Dock = DockStyle.Fill; Pages.ItemSize = new Size(180, 40); - Pages.Location = new Point(0, 62); + Pages.Location = new Point(248, 31); Pages.Name = "Pages"; Pages.SelectedIndex = 0; - Pages.Size = new Size(1018, 590); + Pages.Size = new Size(945, 790); Pages.TabButtonHoverState.BorderColor = Color.Empty; Pages.TabButtonHoverState.FillColor = Color.FromArgb(40, 52, 70); Pages.TabButtonHoverState.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Regular, GraphicsUnit.Point); @@ -96,106 +116,251 @@ private void InitializeComponent() Pages.TabButtonSize = new Size(180, 40); Pages.TabIndex = 0; Pages.TabMenuBackColor = Color.FromArgb(33, 42, 57); + Pages.TabMenuOrientation = Guna.UI2.WinForms.TabMenuOrientation.HorizontalTop; + Pages.TabMenuVisible = false; // // PageHome // - PageHome.BackColor = Color.FromArgb(30, 45, 59); - PageHome.Controls.Add(lblram); - PageHome.Controls.Add(guna2RadialGauge1); - PageHome.Controls.Add(lblcpu); - PageHome.Controls.Add(cpu); - PageHome.Location = new Point(184, 4); + PageHome.BackColor = Color.FromArgb(27, 28, 46); + PageHome.Controls.Add(panel3); + PageHome.Controls.Add(panel2); + PageHome.Controls.Add(pcsvimg); + PageHome.Controls.Add(panel1); + PageHome.Controls.Add(pnlsvinfo); + PageHome.Location = new Point(4, 5); PageHome.Name = "PageHome"; PageHome.Padding = new Padding(3); - PageHome.Size = new Size(830, 582); + PageHome.Size = new Size(937, 781); PageHome.TabIndex = 0; PageHome.Text = "Home"; // + // pcsvimg + // + pcsvimg.Location = new Point(419, 11); + pcsvimg.Name = "pcsvimg"; + pcsvimg.Size = new Size(64, 64); + pcsvimg.TabIndex = 6; + pcsvimg.TabStop = false; + // + // panel1 + // + panel1.BackColor = Color.FromArgb(34, 39, 57); + panel1.Controls.Add(lblsvcpu); + panel1.Controls.Add(lblsvdisk); + panel1.Controls.Add(lblsvram); + panel1.Controls.Add(lblsvlimitations); + panel1.ForeColor = Color.FromArgb(236, 240, 243); + panel1.Location = new Point(684, 6); + panel1.Name = "panel1"; + panel1.Size = new Size(245, 105); + panel1.TabIndex = 5; + // + // lblsvcpu + // + lblsvcpu.AutoSize = true; + lblsvcpu.Font = new Font("Arial", 12F, FontStyle.Bold, GraphicsUnit.Point); + lblsvcpu.ForeColor = Color.WhiteSmoke; + lblsvcpu.Location = new Point(3, 42); + lblsvcpu.Name = "lblsvcpu"; + lblsvcpu.Size = new Size(94, 19); + lblsvcpu.TabIndex = 10; + lblsvcpu.Text = "Processor:"; + lblsvcpu.TextAlign = ContentAlignment.MiddleCenter; + // + // lblsvdisk + // + lblsvdisk.AutoSize = true; + lblsvdisk.Font = new Font("Arial", 12F, FontStyle.Bold, GraphicsUnit.Point); + lblsvdisk.ForeColor = Color.WhiteSmoke; + lblsvdisk.Location = new Point(3, 61); + lblsvdisk.Name = "lblsvdisk"; + lblsvdisk.Size = new Size(49, 19); + lblsvdisk.TabIndex = 9; + lblsvdisk.Text = "Disk:"; + lblsvdisk.TextAlign = ContentAlignment.MiddleCenter; + lblsvdisk.Click += lblsvdisk_Click; + // + // lblsvram + // + lblsvram.AutoSize = true; + lblsvram.Font = new Font("Arial", 12F, FontStyle.Bold, GraphicsUnit.Point); + lblsvram.ForeColor = Color.WhiteSmoke; + lblsvram.Location = new Point(3, 23); + lblsvram.Name = "lblsvram"; + lblsvram.Size = new Size(76, 19); + lblsvram.TabIndex = 8; + lblsvram.Text = "Memory:"; + lblsvram.TextAlign = ContentAlignment.MiddleCenter; + // + // lblsvlimitations + // + lblsvlimitations.AutoSize = true; + lblsvlimitations.Font = new Font("Arial", 14F, FontStyle.Bold, GraphicsUnit.Point); + lblsvlimitations.ForeColor = Color.WhiteSmoke; + lblsvlimitations.Location = new Point(3, 1); + lblsvlimitations.Name = "lblsvlimitations"; + lblsvlimitations.Size = new Size(186, 22); + lblsvlimitations.TabIndex = 7; + lblsvlimitations.Text = "Server Limitations:"; + lblsvlimitations.TextAlign = ContentAlignment.MiddleCenter; + // + // pnlsvinfo + // + pnlsvinfo.BackColor = Color.FromArgb(34, 39, 57); + pnlsvinfo.Controls.Add(lblsvstatus); + pnlsvinfo.Controls.Add(lblsvnode); + pnlsvinfo.Controls.Add(lblsvip); + pnlsvinfo.Controls.Add(lblsvname); + pnlsvinfo.Controls.Add(lblsvinfo); + pnlsvinfo.ForeColor = Color.FromArgb(236, 240, 243); + pnlsvinfo.Location = new Point(12, 11); + pnlsvinfo.Name = "pnlsvinfo"; + pnlsvinfo.Size = new Size(245, 105); + pnlsvinfo.TabIndex = 4; + // + // lblsvnode + // + lblsvnode.AutoSize = true; + lblsvnode.Font = new Font("Arial", 12F, FontStyle.Bold, GraphicsUnit.Point); + lblsvnode.ForeColor = Color.WhiteSmoke; + lblsvnode.Location = new Point(3, 60); + lblsvnode.Name = "lblsvnode"; + lblsvnode.Size = new Size(56, 19); + lblsvnode.TabIndex = 10; + lblsvnode.Text = "Node:"; + lblsvnode.TextAlign = ContentAlignment.MiddleCenter; + // + // lblsvip + // + lblsvip.AutoSize = true; + lblsvip.Font = new Font("Arial", 12F, FontStyle.Bold, GraphicsUnit.Point); + lblsvip.ForeColor = Color.WhiteSmoke; + lblsvip.Location = new Point(3, 79); + lblsvip.Name = "lblsvip"; + lblsvip.Size = new Size(30, 19); + lblsvip.TabIndex = 9; + lblsvip.Text = "IP:"; + lblsvip.TextAlign = ContentAlignment.MiddleCenter; + // + // lblsvname + // + lblsvname.AutoSize = true; + lblsvname.Font = new Font("Arial", 12F, FontStyle.Bold, GraphicsUnit.Point); + lblsvname.ForeColor = Color.WhiteSmoke; + lblsvname.Location = new Point(3, 22); + lblsvname.Name = "lblsvname"; + lblsvname.Size = new Size(59, 19); + lblsvname.TabIndex = 8; + lblsvname.Text = "Name:"; + lblsvname.TextAlign = ContentAlignment.MiddleCenter; + // + // lblsvinfo + // + lblsvinfo.AutoSize = true; + lblsvinfo.Font = new Font("Arial", 14F, FontStyle.Bold, GraphicsUnit.Point); + lblsvinfo.ForeColor = Color.WhiteSmoke; + lblsvinfo.Location = new Point(3, 0); + lblsvinfo.Name = "lblsvinfo"; + lblsvinfo.Size = new Size(190, 22); + lblsvinfo.TabIndex = 7; + lblsvinfo.Text = "Server Information:"; + lblsvinfo.TextAlign = ContentAlignment.MiddleCenter; + // // lblram // lblram.AutoSize = true; - lblram.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); + lblram.Font = new Font("Segoe UI", 15F, FontStyle.Bold, GraphicsUnit.Point); lblram.ForeColor = Color.White; - lblram.Location = new Point(674, 249); + lblram.Location = new Point(14, 7); lblram.Name = "lblram"; - lblram.Size = new Size(45, 19); + lblram.Size = new Size(162, 28); lblram.TabIndex = 3; - lblram.Text = "RAM:"; - // - // guna2RadialGauge1 - // - guna2RadialGauge1.BackColor = Color.Transparent; - guna2RadialGauge1.Font = new Font("Verdana", 8.2F, FontStyle.Regular, GraphicsUnit.Point); - guna2RadialGauge1.ForeColor = Color.FromArgb(139, 152, 166); - guna2RadialGauge1.Location = new Point(571, 6); - guna2RadialGauge1.MinimumSize = new Size(30, 30); - guna2RadialGauge1.Name = "guna2RadialGauge1"; - guna2RadialGauge1.Size = new Size(240, 240); - guna2RadialGauge1.TabIndex = 2; + lblram.Text = "Memory Status:"; + // + // statsram + // + statsram.ArrowThickness = 3; + statsram.BackColor = Color.Transparent; + statsram.Font = new Font("Verdana", 8.2F, FontStyle.Regular, GraphicsUnit.Point); + statsram.ForeColor = Color.FromArgb(139, 152, 166); + statsram.Location = new Point(43, 50); + statsram.MinimumSize = new Size(34, 34); + statsram.Name = "statsram"; + statsram.ProgressBrushMode = Guna.UI2.WinForms.Enums.BrushMode.Solid; + statsram.ProgressEndCap = System.Drawing.Drawing2D.LineCap.DiamondAnchor; + statsram.ProgressStartCap = System.Drawing.Drawing2D.LineCap.DiamondAnchor; + statsram.ProgressThickness = 10; + statsram.ShowPercentage = false; + statsram.Size = new Size(265, 265); + statsram.TabIndex = 2; // // lblcpu // lblcpu.AutoSize = true; - lblcpu.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); + lblcpu.Font = new Font("Segoe UI", 15F, FontStyle.Bold, GraphicsUnit.Point); lblcpu.ForeColor = Color.White; - lblcpu.Location = new Point(100, 249); + lblcpu.Location = new Point(14, 7); lblcpu.Name = "lblcpu"; - lblcpu.Size = new Size(41, 19); + lblcpu.Size = new Size(173, 28); lblcpu.TabIndex = 1; - lblcpu.Text = "CPU:"; - // - // cpu - // - cpu.BackColor = Color.Transparent; - cpu.Font = new Font("Verdana", 8.2F, FontStyle.Regular, GraphicsUnit.Point); - cpu.ForeColor = Color.FromArgb(139, 152, 166); - cpu.Location = new Point(6, 6); - cpu.MinimumSize = new Size(30, 30); - cpu.Name = "cpu"; - cpu.Size = new Size(240, 240); - cpu.TabIndex = 0; + lblcpu.Text = "Processor Status:"; + // + // statscpu + // + statscpu.ArrowThickness = 3; + statscpu.BackColor = Color.Transparent; + statscpu.Font = new Font("Verdana", 8.2F, FontStyle.Regular, GraphicsUnit.Point); + statscpu.ForeColor = Color.FromArgb(139, 152, 166); + statscpu.Location = new Point(43, 50); + statscpu.MinimumSize = new Size(34, 34); + statscpu.Name = "statscpu"; + statscpu.ProgressBrushMode = Guna.UI2.WinForms.Enums.BrushMode.Solid; + statscpu.ProgressEndCap = System.Drawing.Drawing2D.LineCap.DiamondAnchor; + statscpu.ProgressStartCap = System.Drawing.Drawing2D.LineCap.DiamondAnchor; + statscpu.ProgressThickness = 10; + statscpu.ShowPercentage = false; + statscpu.Size = new Size(265, 265); + statscpu.TabIndex = 0; // // PageFiles // - PageFiles.Location = new Point(184, 4); + PageFiles.Location = new Point(4, 5); PageFiles.Name = "PageFiles"; PageFiles.Padding = new Padding(3); - PageFiles.Size = new Size(830, 582); + PageFiles.Size = new Size(937, 781); PageFiles.TabIndex = 1; PageFiles.Text = "Files"; PageFiles.UseVisualStyleBackColor = true; // // PageDatabases // - PageDatabases.Location = new Point(184, 4); + PageDatabases.Location = new Point(4, 5); PageDatabases.Name = "PageDatabases"; - PageDatabases.Size = new Size(830, 582); + PageDatabases.Size = new Size(937, 781); PageDatabases.TabIndex = 2; PageDatabases.Text = "Databases"; PageDatabases.UseVisualStyleBackColor = true; // // PageBackups // - PageBackups.Location = new Point(184, 4); + PageBackups.Location = new Point(4, 5); PageBackups.Name = "PageBackups"; - PageBackups.Size = new Size(830, 582); + PageBackups.Size = new Size(937, 781); PageBackups.TabIndex = 3; PageBackups.Text = "Backups"; PageBackups.UseVisualStyleBackColor = true; // // navbar // - navbar.BackColor = Color.FromArgb(29, 37, 49); + navbar.BackColor = Color.FromArgb(26, 21, 44); navbar.Controls.Add(lblappname); navbar.Controls.Add(pbappicon); - navbar.Controls.Add(separator); navbar.Controls.Add(lblminimize); navbar.Controls.Add(lblexit); - navbar.Controls.Add(subnavbar); navbar.Dock = DockStyle.Top; navbar.Location = new Point(0, 0); navbar.Name = "navbar"; - navbar.Size = new Size(1018, 62); + navbar.Size = new Size(1193, 31); navbar.TabIndex = 1; // // lblappname @@ -203,36 +368,28 @@ private void InitializeComponent() lblappname.AutoSize = true; lblappname.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); lblappname.ForeColor = Color.WhiteSmoke; - lblappname.Location = new Point(29, 3); + lblappname.Location = new Point(33, 3); lblappname.Name = "lblappname"; - lblappname.Size = new Size(160, 19); + lblappname.Size = new Size(192, 19); lblappname.TabIndex = 4; - lblappname.Text = "PteroController (1.0.0)"; + lblappname.Text = "Pterodactyl Desktop (1.0.0)"; // // pbappicon // pbappicon.Image = Properties.Resources.pterry1; pbappicon.Location = new Point(3, 3); pbappicon.Name = "pbappicon"; - pbappicon.Size = new Size(20, 20); + pbappicon.Size = new Size(23, 23); pbappicon.SizeMode = PictureBoxSizeMode.StretchImage; pbappicon.TabIndex = 1; pbappicon.TabStop = false; // - // separator - // - separator.BackColor = Color.Transparent; - separator.Location = new Point(-79, 20); - separator.Name = "separator"; - separator.Size = new Size(1180, 10); - separator.TabIndex = 9; - // // lblminimize // lblminimize.AutoSize = true; lblminimize.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); lblminimize.ForeColor = Color.WhiteSmoke; - lblminimize.Location = new Point(980, 0); + lblminimize.Location = new Point(1153, 4); lblminimize.Name = "lblminimize"; lblminimize.Size = new Size(15, 19); lblminimize.TabIndex = 3; @@ -244,80 +401,13 @@ private void InitializeComponent() lblexit.AutoSize = true; lblexit.Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); lblexit.ForeColor = Color.WhiteSmoke; - lblexit.Location = new Point(996, 2); + lblexit.Location = new Point(1172, 7); lblexit.Name = "lblexit"; lblexit.Size = new Size(18, 19); lblexit.TabIndex = 2; lblexit.Text = "X"; lblexit.Click += lblexit_Click; // - // subnavbar - // - subnavbar.BackColor = Color.FromArgb(33, 42, 57); - subnavbar.Controls.Add(btnservers); - subnavbar.Controls.Add(btnlogout); - subnavbar.Controls.Add(pbavatar); - subnavbar.Controls.Add(txtpanelname); - subnavbar.Controls.Add(pblblpanellogo); - subnavbar.Dock = DockStyle.Bottom; - subnavbar.Location = new Point(0, 24); - subnavbar.Name = "subnavbar"; - subnavbar.Size = new Size(1018, 38); - subnavbar.TabIndex = 0; - // - // btnservers - // - btnservers.Image = (Image)resources.GetObject("btnservers.Image"); - btnservers.Location = new Point(898, 4); - btnservers.Name = "btnservers"; - btnservers.Size = new Size(32, 32); - btnservers.SizeMode = PictureBoxSizeMode.StretchImage; - btnservers.TabIndex = 2; - btnservers.TabStop = false; - btnservers.Click += btnservers_Click; - // - // btnlogout - // - btnlogout.Image = (Image)resources.GetObject("btnlogout.Image"); - btnlogout.Location = new Point(974, 4); - btnlogout.Name = "btnlogout"; - btnlogout.Size = new Size(32, 32); - btnlogout.SizeMode = PictureBoxSizeMode.StretchImage; - btnlogout.TabIndex = 1; - btnlogout.TabStop = false; - btnlogout.Click += btnlogout_Click; - // - // pbavatar - // - pbavatar.Image = Properties.Resources.test; - pbavatar.Location = new Point(936, 4); - pbavatar.Name = "pbavatar"; - pbavatar.Size = new Size(32, 32); - pbavatar.SizeMode = PictureBoxSizeMode.StretchImage; - pbavatar.TabIndex = 0; - pbavatar.TabStop = false; - // - // txtpanelname - // - txtpanelname.AutoSize = true; - txtpanelname.Font = new Font("Segoe UI", 15F, FontStyle.Bold, GraphicsUnit.Point); - txtpanelname.ForeColor = Color.WhiteSmoke; - txtpanelname.Location = new Point(46, 3); - txtpanelname.Name = "txtpanelname"; - txtpanelname.Size = new Size(179, 28); - txtpanelname.TabIndex = 5; - txtpanelname.Text = "Pterodactyl Panel"; - // - // pblblpanellogo - // - pblblpanellogo.Image = Properties.Resources.pterry1; - pblblpanellogo.Location = new Point(8, 3); - pblblpanellogo.Name = "pblblpanellogo"; - pblblpanellogo.Size = new Size(32, 32); - pblblpanellogo.SizeMode = PictureBoxSizeMode.StretchImage; - pblblpanellogo.TabIndex = 6; - pblblpanellogo.TabStop = false; - // // DragController // DragController.DockIndicatorTransparencyValue = 0.6D; @@ -334,13 +424,145 @@ private void InitializeComponent() Elipse.BorderRadius = 20; Elipse.TargetControl = this; // + // sidebar + // + sidebar.BackColor = Color.FromArgb(34, 39, 57); + sidebar.Controls.Add(btntest); + sidebar.Controls.Add(btnfilemanager); + sidebar.Controls.Add(btnhome); + sidebar.Controls.Add(lblpanelname); + sidebar.Controls.Add(pbpanellogo); + sidebar.Dock = DockStyle.Left; + sidebar.Location = new Point(0, 31); + sidebar.Name = "sidebar"; + sidebar.Size = new Size(248, 790); + sidebar.TabIndex = 2; + // + // btntest + // + btntest.BorderColor = Color.Transparent; + btntest.BorderRadius = 10; + btntest.CustomizableEdges = customizableEdges1; + btntest.DisabledState.BorderColor = Color.DarkGray; + btntest.DisabledState.CustomBorderColor = Color.DarkGray; + btntest.DisabledState.FillColor = Color.FromArgb(169, 169, 169); + btntest.DisabledState.ForeColor = Color.FromArgb(141, 141, 141); + btntest.FillColor = Color.FromArgb(0, 110, 179); + btntest.Font = new Font("Segoe UI", 12F, FontStyle.Bold, GraphicsUnit.Point); + btntest.ForeColor = Color.White; + btntest.Location = new Point(12, 316); + btntest.Name = "btntest"; + btntest.ShadowDecoration.CustomizableEdges = customizableEdges2; + btntest.Size = new Size(230, 48); + btntest.TabIndex = 9; + btntest.Text = "Home"; + // + // btnfilemanager + // + btnfilemanager.BorderColor = Color.Transparent; + btnfilemanager.BorderRadius = 10; + btnfilemanager.CustomizableEdges = customizableEdges3; + btnfilemanager.DisabledState.BorderColor = Color.DarkGray; + btnfilemanager.DisabledState.CustomBorderColor = Color.DarkGray; + btnfilemanager.DisabledState.FillColor = Color.FromArgb(169, 169, 169); + btnfilemanager.DisabledState.ForeColor = Color.FromArgb(141, 141, 141); + btnfilemanager.FillColor = Color.FromArgb(0, 110, 179); + btnfilemanager.Font = new Font("Segoe UI", 12F, FontStyle.Bold, GraphicsUnit.Point); + btnfilemanager.ForeColor = Color.White; + btnfilemanager.Location = new Point(12, 265); + btnfilemanager.Name = "btnfilemanager"; + btnfilemanager.ShadowDecoration.CustomizableEdges = customizableEdges4; + btnfilemanager.Size = new Size(230, 45); + btnfilemanager.TabIndex = 8; + btnfilemanager.Text = "File Manager"; + btnfilemanager.Click += btnfilemanager_Click; + // + // btnhome + // + btnhome.BorderColor = Color.Transparent; + btnhome.BorderRadius = 10; + btnhome.CustomizableEdges = customizableEdges5; + btnhome.DisabledState.BorderColor = Color.DarkGray; + btnhome.DisabledState.CustomBorderColor = Color.DarkGray; + btnhome.DisabledState.FillColor = Color.FromArgb(169, 169, 169); + btnhome.DisabledState.ForeColor = Color.FromArgb(141, 141, 141); + btnhome.FillColor = Color.FromArgb(0, 110, 179); + btnhome.Font = new Font("Segoe UI", 12F, FontStyle.Bold, GraphicsUnit.Point); + btnhome.ForeColor = Color.White; + btnhome.Location = new Point(12, 214); + btnhome.Name = "btnhome"; + btnhome.ShadowDecoration.CustomizableEdges = customizableEdges6; + btnhome.Size = new Size(230, 45); + btnhome.TabIndex = 7; + btnhome.Text = "Home"; + btnhome.Click += btnhome_Click; + // + // lblpanelname + // + lblpanelname.Font = new Font("Segoe UI", 17F, FontStyle.Bold, GraphicsUnit.Point); + lblpanelname.ForeColor = Color.WhiteSmoke; + lblpanelname.Location = new Point(3, 147); + lblpanelname.Name = "lblpanelname"; + lblpanelname.Size = new Size(239, 33); + lblpanelname.TabIndex = 6; + lblpanelname.Text = "Pterodactyl Desktop"; + lblpanelname.TextAlign = ContentAlignment.MiddleCenter; + // + // pbpanellogo + // + pbpanellogo.Image = Properties.Resources.pterry1; + pbpanellogo.Location = new Point(56, 12); + pbpanellogo.Name = "pbpanellogo"; + pbpanellogo.Size = new Size(132, 132); + pbpanellogo.SizeMode = PictureBoxSizeMode.StretchImage; + pbpanellogo.TabIndex = 5; + pbpanellogo.TabStop = false; + // + // panel2 + // + panel2.BackColor = Color.FromArgb(34, 39, 57); + panel2.Controls.Add(statsram); + panel2.Controls.Add(lblcpu); + panel2.ForeColor = Color.FromArgb(236, 240, 243); + panel2.Location = new Point(12, 455); + panel2.Name = "panel2"; + panel2.Size = new Size(339, 318); + panel2.TabIndex = 7; + // + // panel3 + // + panel3.BackColor = Color.FromArgb(34, 39, 57); + panel3.Controls.Add(lblram); + panel3.Controls.Add(statscpu); + panel3.ForeColor = Color.FromArgb(236, 240, 243); + panel3.Location = new Point(590, 455); + panel3.Name = "panel3"; + panel3.Size = new Size(339, 318); + panel3.TabIndex = 8; + // + // lblsvstatus + // + lblsvstatus.AutoSize = true; + lblsvstatus.Font = new Font("Arial", 12F, FontStyle.Bold, GraphicsUnit.Point); + lblsvstatus.ForeColor = Color.WhiteSmoke; + lblsvstatus.Location = new Point(3, 41); + lblsvstatus.Name = "lblsvstatus"; + lblsvstatus.Size = new Size(64, 19); + lblsvstatus.TabIndex = 11; + lblsvstatus.Text = "Status:"; + lblsvstatus.TextAlign = ContentAlignment.MiddleCenter; + // // FrmServerController // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 17F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1018, 652); + BackColor = Color.FromArgb(27, 28, 46); + ClientSize = new Size(1193, 821); Controls.Add(Pages); + Controls.Add(sidebar); Controls.Add(navbar); + Font = new Font("Segoe UI", 10F, FontStyle.Bold, GraphicsUnit.Point); + ForeColor = Color.White; FormBorderStyle = FormBorderStyle.None; Icon = (Icon)resources.GetObject("$this.Icon"); Name = "FrmServerController"; @@ -349,16 +571,20 @@ private void InitializeComponent() Load += FrmServerController_Load; Pages.ResumeLayout(false); PageHome.ResumeLayout(false); - PageHome.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)pcsvimg).EndInit(); + panel1.ResumeLayout(false); + panel1.PerformLayout(); + pnlsvinfo.ResumeLayout(false); + pnlsvinfo.PerformLayout(); navbar.ResumeLayout(false); navbar.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pbappicon).EndInit(); - subnavbar.ResumeLayout(false); - subnavbar.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)btnservers).EndInit(); - ((System.ComponentModel.ISupportInitialize)btnlogout).EndInit(); - ((System.ComponentModel.ISupportInitialize)pbavatar).EndInit(); - ((System.ComponentModel.ISupportInitialize)pblblpanellogo).EndInit(); + sidebar.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)pbpanellogo).EndInit(); + panel2.ResumeLayout(false); + panel2.PerformLayout(); + panel3.ResumeLayout(false); + panel3.PerformLayout(); ResumeLayout(false); } @@ -369,7 +595,6 @@ private void InitializeComponent() private TabPage PageFiles; private Panel navbar; private Guna.UI2.WinForms.Guna2DragControl DragController; - private Panel subnavbar; private PictureBox pbappicon; private Label lblminimize; private Label lblexit; @@ -378,15 +603,29 @@ private void InitializeComponent() private TabPage PageBackups; private Guna.UI2.WinForms.Guna2AnimateWindow AnimateWindow; private Guna.UI2.WinForms.Guna2Elipse Elipse; - private PictureBox pbavatar; - private PictureBox btnlogout; - private PictureBox btnservers; - private Label txtpanelname; - private PictureBox pblblpanellogo; - private Guna.UI2.WinForms.Guna2Separator separator; - private Guna.UI2.WinForms.Guna2RadialGauge cpu; + private Guna.UI2.WinForms.Guna2RadialGauge statscpu; private Label lblcpu; private Label lblram; - private Guna.UI2.WinForms.Guna2RadialGauge guna2RadialGauge1; + private Guna.UI2.WinForms.Guna2RadialGauge statsram; + private Panel sidebar; + private PictureBox pbpanellogo; + private Label lblpanelname; + private Guna.UI2.WinForms.Guna2Button btnhome; + private Guna.UI2.WinForms.Guna2Button btntest; + private Guna.UI2.WinForms.Guna2Button btnfilemanager; + private Panel pnlsvinfo; + private Label lblsvname; + private Label lblsvinfo; + private Panel panel1; + private Label lblsvcpu; + private Label lblsvdisk; + private Label lblsvram; + private Label lblsvlimitations; + private Label lblsvnode; + private Label lblsvip; + private PictureBox pcsvimg; + private Panel panel2; + private Panel panel3; + private Label lblsvstatus; } } \ No newline at end of file diff --git a/Forms/FrmServerController.cs b/Forms/FrmServerController.cs index 94eab50..f3d504e 100644 --- a/Forms/FrmServerController.cs +++ b/Forms/FrmServerController.cs @@ -1,18 +1,22 @@ -using Guna.UI2.WinForms; -using Newtonsoft.Json; -using PteroController.PteroConsoleHook; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Pterodactyl.PteroConsoleHook; +using RestSharp; +using System.Diagnostics; using System.Net; - -namespace PteroController.Forms +namespace Pterodactyl.Forms { public partial class FrmServerController : Form { private string? serverIdentifier; + public static string? sftp_ip; + public static string? sftp_port; + public static string? ipAlias; + public static string? svmport; public FrmServerController(string serverIdentifier) { InitializeComponent(); this.serverIdentifier = serverIdentifier; - } private async void initPteroConsole() { @@ -21,19 +25,25 @@ private async void initPteroConsole() var console = new PteroConsole.NET.PteroConsole(); console.OnServerResourceUpdated += (sender, resource) => { - Console.WriteLine($"Stats: {resource.Uptime}, State: {resource.State}"); - //cpu.Value = resource.State; + long uptimeInMilliseconds = (long)(resource.Uptime); + TimeSpan uptime = TimeSpan.FromMilliseconds(uptimeInMilliseconds); + string formattedUptime = $"{uptime.Days}D {uptime.Hours}H {uptime.Minutes}M {uptime.Seconds}S"; + Console.WriteLine(formattedUptime); + statscpu.Value = (int)(resource.CpuAbsolute); + statsram.Value = (int)((resource.MemoryBytes / (double)resource.MemoryLimitBytes) * 100); + lblsvstatus.Text = $"Status: {resource.State}"; + }; console.RequestToken += pteroConsole => { Console.WriteLine("Revoking token"); - var wc = new WebClient(); + WebClient wc = new WebClient(); wc.Headers.Add("Authorization", "Bearer " + Pterodactyl.User.Info.panel_api_key); var raw = wc.DownloadString($"{Pterodactyl.User.Info.panel_url}/api/client/servers/{serverIdentifier}/websocket"); var data = JsonConvert.DeserializeObject(raw).Data; return data.Token; }; - var wc = new WebClient(); + WebClient wc = new WebClient(); wc.Headers.Add("Authorization", "Bearer " + Pterodactyl.User.Info.panel_api_key); var raw = wc.DownloadString($"{Pterodactyl.User.Info.panel_url}/api/client/servers/{serverIdentifier}/websocket"); var data = JsonConvert.DeserializeObject(raw).Data; @@ -48,6 +58,8 @@ private async void initPteroConsole() private void FrmServerController_Load(object sender, EventArgs e) { initPteroConsole(); + getServerInfo(); + isMinecraftServer(); } private void lblminimize_Click(object sender, EventArgs e) @@ -60,19 +72,134 @@ private void lblexit_Click(object sender, EventArgs e) Application.Exit(); } - private void btnlogout_Click(object sender, EventArgs e) + private void btnhome_Click(object sender, EventArgs e) { - FrmSessions x = new FrmSessions(); - x.Show(); - this.Hide(); + Pages.SelectedTab = PageHome; } - private void btnservers_Click(object sender, EventArgs e) + + private void btnfilemanager_Click(object sender, EventArgs e) { - FrmServerSelector x = new FrmServerSelector(); - x.Show(); - this.Hide(); + try + { + if (File.Exists(Application.StartupPath + @"\WinSCP.exe")) + { + string command = Application.StartupPath + @"\WinSCP.exe"; + string arguments = @"sftp://" + Pterodactyl.User.Info.panel_username + "." + serverIdentifier + ":" + Pterodactyl.User.Info.panel_password + "@" + sftp_ip + ":" + sftp_port + ""; + ProcessStartInfo processInfo = new ProcessStartInfo(command, arguments); + processInfo.RedirectStandardOutput = true; + processInfo.UseShellExecute = false; + + Process process = Process.Start(processInfo); + } + else + { + Program.Alert("WinSCP missing please reinstall", FrmAlert.enmType.Error); + } + } + catch (Exception ex) + { + Program.Alert("WinSCP failed to start", FrmAlert.enmType.Error); + Program.logger.Log(Managers.LogType.Error, "[Pterodactyl.Forms.FrmServerController.cs]: \n" + ex.Message); + } } - } + private void isMinecraftServer() + { + try + { + string url = "https://api.mcsrvstat.us/2/" + ipAlias + ":" + svmport; + string json = new WebClient().DownloadString(url); + JObject data = JObject.Parse(json); + bool isOnline = (bool)data["online"]; + if (isOnline) + { + string imageDataUri = (string)data["icon"]; + if (imageDataUri != null) + { + string base64Data = imageDataUri.Split(',')[1]; + byte[] imageData = Convert.FromBase64String(base64Data); + using (MemoryStream ms = new MemoryStream(imageData)) + { + Image image = Image.FromStream(ms); + pcsvimg.Image = image; + } + } + else + { + Program.Alert("Failed to get the icon", FrmAlert.enmType.Warning); + } + } + } + catch (Exception ex) + { + Program.Alert("Failed to check for a minecraft server", FrmAlert.enmType.Warning); + Program.logger.Log(Managers.LogType.Error, "[Pterodactyl.Forms.FrmServerController.cs]: \n" + ex.Message); + } + } + private void getServerInfo() + { + try + { + var client = new RestClient(Pterodactyl.User.Info.panel_url); + var request = new RestRequest($"/api/client/servers/{serverIdentifier}", Method.GET); + request.AddHeader("Authorization", $"Bearer {Pterodactyl.User.Info.panel_api_key}"); + request.AddHeader("Accept", "Application/vnd.pterodactyl.v1+json"); + + var response = client.Execute(request); + if (response.IsSuccessful) + { + var serverInfo = JObject.Parse(response.Content); + + string serverName = serverInfo["attributes"]["name"].ToString(); + string serverNode = serverInfo["attributes"]["node"].ToString(); + string serverDescription = serverInfo["attributes"]["description"].ToString(); + string serverMaxRam = serverInfo["attributes"]["limits"]["memory"].ToString(); + string serverMaxDisk = serverInfo["attributes"]["limits"]["disk"].ToString(); + string serverMaxCpu = serverInfo["attributes"]["limits"]["cpu"].ToString(); + sftp_port = serverInfo["attributes"]["sftp_details"]["port"].ToString(); + sftp_ip = serverInfo["attributes"]["sftp_details"]["ip"].ToString(); + if (serverMaxRam == "0") + { + lblsvram.Text = "Memory: Unlimited"; + } + if (serverMaxDisk == "0") + { + lblsvdisk.Text = "Disk: Unlimited"; + } + if (serverMaxCpu == "") + { + lblsvcpu.Text = "Processor: Unlimited"; + } + lblsvname.Text = "Name: " + serverName; + lblsvnode.Text = "Node: " + serverNode; + var allocations = serverInfo["attributes"]["relationships"]["allocations"]["data"]; + foreach (var allocation in allocations) + { + if (allocation["attributes"]["is_default"].ToObject()) + { + ipAlias = allocation["attributes"]["ip_alias"].ToString(); + svmport = allocation["attributes"]["port"].ToString(); + lblsvip.Text = "IP: " + (string.IsNullOrEmpty(ipAlias) ? "N/A" : ipAlias) + ":" + (string.IsNullOrEmpty(svmport) ? "N/A" : svmport); + break; + } + } + } + else + { + Program.Alert("Failed to get the server info", FrmAlert.enmType.Warning); + } + } + catch (Exception ex) + { + Program.logger.Log(Managers.LogType.Error, "[Pterodactyl.Forms.FrmServerController.cs]: \n" + ex.Message); + Program.Alert("Failed to get the server info", FrmAlert.enmType.Warning); + } + } + + private void lblsvdisk_Click(object sender, EventArgs e) + { + + } + } } \ No newline at end of file diff --git a/Forms/FrmServerController.resx b/Forms/FrmServerController.resx index 807ebea..314645f 100644 --- a/Forms/FrmServerController.resx +++ b/Forms/FrmServerController.resx @@ -117,45 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - iVBORw0KGgoAAAANSUhEUgAAAEIAAABCCAYAAADjVADoAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - DAAACwwBP0AiyAAAAzdJREFUeF7tm02IjVEcxu/MhBoLWRhlwoKUlAWasJgy2RiRj0lShs3MRpGS2FBE - 1EQWForNYImVDQ0pdmPnY8dGSigWvvJxPf/zf+ad933dxft5nXM6v3o259z/c57/ae69877nvY1AIBAI - BNpHs9nsgrZDV6FH0GQb9QC6BPUzzv8BAdZAzyEbkE1ZzGjtA4sOQF8kgUW8hZYxYv1gsR7og6xsIc+g - mYxaL1hI3pc2c4BR6wOLzIA+muXsZZJx6wOL9OtaVvMHmsfI9YAFzpil7GcbI9cDFniq61jPBUauHpjP - h+TPzgXq+5yA+bCu4QS/oDmMXi0wvmmWcIdNjF4dMO2E3hl7dzjL+NUB0z71dorHjF8dMD2h3k7xA+pm - C9UAwyfG2j02sIXywGwu9NPYusdJtlEemO1STyeZYBvlgdk19XSSr1D5y3KYdEBvxNFh1rOd4sBkpXo5 - zTG2UxyYHFUvp7nLdooDkwn1cprPUBdbyg+KZ0PfxckDVrGt/KB4q3p4wWG2lR8UX1YPL7jNtvKD4lfq - 4QXvoU62lh0UrTblftHH9rKDor1am2AI2uiIJGuaYbaXHRSNau00nHIGxo4zyqnsSJHWTsMpK0Ccbug8 - dB86xOEEGE/j5UaMaaqI3ZyK4HgcLzfioaaKGONUBMfjeLkRRzSVQc5a/rkTpVMJvNwIuT0g32wXoQEO - J8B4Gv82IguMHafQRrT6Hj4OyQa5IMmaZojtZQdFSyFXzjmzIL0sYXv5QOEdY+EHt9hWflB8XT28YJxt - 5QOFvZCcKPuC9LKA7WUHRYOmPMlOqIMvsRbJCLX6sB/kS7KDohGtTWD9JkwhWTVyghFOZwdF8hWUgFNW - gDjy1pWnbT9BN6BZnIrAWBov/7Mc11QRBzkVwfE4Xm6EXH7HOcepCI7H8XIjdkBTJ/RybrGcUxE6lcDP - aw1EWgHtgXo5lEAypyi0Ea2eoOvhtPUgqzwKmabQPct1WpvgBXTFEb2E0qxle9lBkfwy57Up9wM5o8l/ - riGgcAvkwxXob2gz2yoGDPZD38TNUeSJmX1spxwwWgSdhu5BrX5kZqMk6yloIdsIBAKBQKASGo2/tFuN - z5leC5YAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - DAAACwwBP0AiyAAAArpJREFUeF7tmktPFFEQhUfjBl1BcOdCwKDga0E0blzjz9BfQDRujMYY16Ib/RPu - fPwRE18s3EHia6NC1IWOp24dMeCtMXTf7mrp+pKTMN01p85UmDu3e2YQBEEQBEEQFGQ4HB6A5qGFQhKv - /bTvLgh5DnoKfYNKI55PoLNs1y0Q7Cb0E2oa6XGDbbsBAl1N0drlMtv7giBT0PcUqV2k5wxj+IEQ91Ic - H5YZww+EeKVZXHjBGH4gxIZmyfIRelNT4mGxwRh+MIjFFMsqA49ptcrDMj+Yw+IQyyojHmqVh2V+MIdF - DIBllYHHPmgc2gsdhW5Dm+sOy/xgDovaA8gB32NQ+vThIT8kxAgaGYAA70noGR/6kV6mTZEBwOcCdAma - 4KEEHk/yTz8QYhQl1oBltUqsQXM81Q00l0mtAeD5e6DtG6230DxL/NFMJiX+A1bUagvvoOMs8UXzmJQY - wHkot92WIZxgmR+axaTUIihD+JIct/IeOsUyHzSHSXYAOD4L3YUe7kCvoRwfoNO0bh/NYPLXAHBMLm4+ - p7PlkCHUvvCqhPY3yQ3glp4qzgO2aBc2t2hzAPfZol3Y3CI3ALmH+CmdLcf/8xYQcPwIJDu83GJnadQi - 6PdJoBlMsgPYKfAZ9TF4kmU+aA6T2gOAR783QvDIbYXlemD3b4XxfLkYWk9Of+jdxdAdtUqsQv25HP4N - fBahi9A4DyXwePffELGA90GoH7fEtgPf/twUhYfcFp+AZEGUq0jZSm8ujCzzgzksSgwgvhlSqzws84M5 - LKZZVhnxUKs8LPMDGTy/Hl9nDD8Q4qVmceE5Y/iBEL3/icxhqInfBf4L+ZFU7TWmCAhyJUVqlyW27wYI - dB36kaI1i/S4xrbdAsHOQI+hJt4SX6FH0ALbdReEHIPmJGwhidcY7YMgCIIgCIL6DAa/AAOc7ejs57x3 - AAAAAElFTkSuQmCC - - 17, 17 @@ -163,8 +124,9 @@ 149, 17 - 51 + 55 + AAABAAgAEBAAAAEAIABoBAAAhgAAABgYAAABACAAiAkAAO4EAAAgIAAAAQAgAKgQAAB2DgAAMDAAAAEA diff --git a/Forms/FrmServerSelector.Designer.cs b/Forms/FrmServerSelector.Designer.cs index cc47575..016d53f 100644 --- a/Forms/FrmServerSelector.Designer.cs +++ b/Forms/FrmServerSelector.Designer.cs @@ -1,4 +1,4 @@ -namespace PteroController.Forms +namespace Pterodactyl.Forms { partial class FrmServerSelector { @@ -180,9 +180,9 @@ private void InitializeComponent() lblappname.ForeColor = Color.WhiteSmoke; lblappname.Location = new Point(29, 3); lblappname.Name = "lblappname"; - lblappname.Size = new Size(160, 19); + lblappname.Size = new Size(192, 19); lblappname.TabIndex = 4; - lblappname.Text = "PteroController (1.0.0)"; + lblappname.Text = "Pterodactyl Desktop (1.0.0)"; // // lblminimize // @@ -241,9 +241,9 @@ private void InitializeComponent() lblwlcdsc.ForeColor = Color.White; lblwlcdsc.Location = new Point(12, 97); lblwlcdsc.Name = "lblwlcdsc"; - lblwlcdsc.Size = new Size(596, 19); + lblwlcdsc.Size = new Size(569, 19); lblwlcdsc.TabIndex = 5; - lblwlcdsc.Text = "Welcome to PteroController! Let's start by selecting the server that you want to control."; + lblwlcdsc.Text = "Welcome to Pterodactyl! Let's start by selecting the server that you want to control."; // // FrmServerSelector // @@ -259,7 +259,7 @@ private void InitializeComponent() Icon = (Icon)resources.GetObject("$this.Icon"); Name = "FrmServerSelector"; StartPosition = FormStartPosition.CenterScreen; - Text = "PteroController"; + Text = "Pterodactyl"; Load += FrmServerSelector_Load; navbar.ResumeLayout(false); navbar.PerformLayout(); diff --git a/Forms/FrmServerSelector.cs b/Forms/FrmServerSelector.cs index 119fbbc..7063261 100644 --- a/Forms/FrmServerSelector.cs +++ b/Forms/FrmServerSelector.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; using System.Net.Http; -namespace PteroController.Forms; +namespace Pterodactyl.Forms; public partial class FrmServerSelector : Form { diff --git a/Forms/FrmSessions.Designer.cs b/Forms/FrmSessions.Designer.cs index e5cd774..7630118 100644 --- a/Forms/FrmSessions.Designer.cs +++ b/Forms/FrmSessions.Designer.cs @@ -1,4 +1,4 @@ -namespace PteroController.Forms +namespace Pterodactyl.Forms { partial class FrmSessions { @@ -70,9 +70,9 @@ private void InitializeComponent() lblappname.ForeColor = Color.WhiteSmoke; lblappname.Location = new Point(29, 3); lblappname.Name = "lblappname"; - lblappname.Size = new Size(160, 19); + lblappname.Size = new Size(192, 19); lblappname.TabIndex = 4; - lblappname.Text = "PteroController (1.0.0)"; + lblappname.Text = "Pterodactyl Desktop (1.0.0)"; // // lblminimize // @@ -146,9 +146,9 @@ private void InitializeComponent() lblwlc.ForeColor = Color.WhiteSmoke; lblwlc.Location = new Point(41, 49); lblwlc.Name = "lblwlc"; - lblwlc.Size = new Size(588, 21); + lblwlc.Size = new Size(558, 21); lblwlc.TabIndex = 5; - lblwlc.Text = "Welcome to PteroController! Please select your panel to start using our app!"; + lblwlc.Text = "Welcome to Pterodactyl! Please select your panel to start using our app!"; // // btnaddsession // @@ -209,7 +209,7 @@ private void InitializeComponent() Icon = (Icon)resources.GetObject("$this.Icon"); Name = "FrmSessions"; StartPosition = FormStartPosition.CenterScreen; - Text = "PteroController"; + Text = "Pterodactyl"; Load += FrmSessions_Load; navbar.ResumeLayout(false); navbar.PerformLayout(); diff --git a/Forms/FrmSessions.cs b/Forms/FrmSessions.cs index ff30e3c..c42fa21 100644 --- a/Forms/FrmSessions.cs +++ b/Forms/FrmSessions.cs @@ -1,7 +1,7 @@ -using PteroController.Handlers; -using PteroController.Pterodactyl; +using Pterodactyl.Handlers; +using Pterodactyl.Pterodactyl; #pragma warning disable -namespace PteroController.Forms +namespace Pterodactyl.Forms { public partial class FrmSessions : Form { diff --git a/Handlers/DiscordRPCHandler.cs b/Handlers/DiscordRPCHandler.cs index d2482fc..25c023d 100644 --- a/Handlers/DiscordRPCHandler.cs +++ b/Handlers/DiscordRPCHandler.cs @@ -1,7 +1,7 @@ using DiscordRPC.Logging; using DiscordRPC; -namespace PteroController.Handlers +namespace Pterodactyl.Handlers { public class DiscordRPCHandler { @@ -26,16 +26,16 @@ public void InitializeRPC() btns.Label = "Pterodactyl"; btns.Url = "https://pterodactyl.io"; btns2.Label = "Download app"; - btns2.Url = "https://github.com/MythicalLTD/PteroController"; + btns2.Url = "https://github.com/MythicalLTD/Pterodactyl"; client.SetPresence(new RichPresence() { - Details = "Using PteroController", + Details = "Using Pterodactyl", State = "A Pterodactyl Panel Desktop App! <3", Assets = new Assets() { LargeImageKey = "logo", - LargeImageText = "PteroController", + LargeImageText = "Pterodactyl", }, Buttons = new DiscordRPC.Button[] { diff --git a/Handlers/RegistryHandler.cs b/Handlers/RegistryHandler.cs index 3e03ac8..47c14b3 100644 --- a/Handlers/RegistryHandler.cs +++ b/Handlers/RegistryHandler.cs @@ -1,12 +1,12 @@ using Microsoft.Win32; -using PteroController.Pterodactyl; +using Pterodactyl.Pterodactyl; -namespace PteroController.Handlers +namespace Pterodactyl.Handlers { public class RegistryHandler { - private const string RegistryAccountBasePath = "Software\\MythicalSystems\\PteroController\\Sessions"; - private const string RegistrySettingsBasePath = "Software\\MythicalSystems\\PteroController\\Settings"; + private const string RegistryAccountBasePath = "Software\\MythicalSystems\\Pterodactyl\\Sessions"; + private const string RegistrySettingsBasePath = "Software\\MythicalSystems\\Pterodactyl\\Settings"; public void CreateAccountData(string sessionName, string url, string password, string apiKey) diff --git a/Managers/LoggerManager.cs b/Managers/LoggerManager.cs index 996756c..d0de85d 100644 --- a/Managers/LoggerManager.cs +++ b/Managers/LoggerManager.cs @@ -1,4 +1,4 @@ -namespace PteroController.Managers +namespace Pterodactyl.Managers { public enum LogType { diff --git a/Program.cs b/Program.cs index 4d562af..d0b44ab 100644 --- a/Program.cs +++ b/Program.cs @@ -1,7 +1,7 @@ -using PteroController.Forms; -using PteroController.Managers; +using Pterodactyl.Forms; +using Pterodactyl.Managers; -namespace PteroController +namespace Pterodactyl { internal static class Program { @@ -28,7 +28,7 @@ public static void Main() logger.Log(LogType.Error, "We are sorry, but we blocked this app from running on any other OS than Windows!"); Application.Exit(); } - if (!File.Exists(Application.StartupPath + @"\PteroConsole.exe")) + if (!File.Exists(Application.StartupPath + @"\PteroConsole.exe") && !File.Exists(Application.StartupPath + @"\WinSCP.exe")) { Application.Run(new FrmInstallTools()); } diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 72593e6..a7efffc 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace PteroController.Properties { +namespace Pterodactyl.Properties { using System; @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PteroController.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Pterodactyl.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/PteroConsoleHook/WebsocketData.cs b/PteroConsoleHook/WebsocketData.cs index 4e28523..7d3fa95 100644 --- a/PteroConsoleHook/WebsocketData.cs +++ b/PteroConsoleHook/WebsocketData.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace PteroController.PteroConsoleHook +namespace Pterodactyl.PteroConsoleHook { public class WebsocketData { diff --git a/PteroConsoleHook/WebsocketDataResource.cs b/PteroConsoleHook/WebsocketDataResource.cs index 70df1e9..c98787b 100644 --- a/PteroConsoleHook/WebsocketDataResource.cs +++ b/PteroConsoleHook/WebsocketDataResource.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace PteroController.PteroConsoleHook +namespace Pterodactyl.PteroConsoleHook { public class WebsocketDataResource { diff --git a/PteroController.csproj b/Pterodactyl.csproj similarity index 85% rename from PteroController.csproj rename to Pterodactyl.csproj index ac01d90..c4fa2ea 100644 --- a/PteroController.csproj +++ b/Pterodactyl.csproj @@ -6,7 +6,7 @@ enable true enable - PteroController.Program + pterry.ico False True @@ -14,19 +14,27 @@ LICENSE True false - https://github.com/MythicalLTD/PteroController + https://github.com/MythicalLTD/Pterodactyl pterry.png - https://github.com/MythicalLTD/PteroController + https://github.com/MythicalLTD/Pterodactyl Pterodactyl 2023 MythicalSystems LTD MythicalSystems LTD true + $(MSBuildProjectName) Desktop True + 1701;1702;SYSLIB0014 + 0 + + + + 1701;1702;SYSLIB0014 + 0 diff --git a/PteroController.csproj.user b/Pterodactyl.csproj.user similarity index 100% rename from PteroController.csproj.user rename to Pterodactyl.csproj.user diff --git a/PteroController.sln b/Pterodactyl.sln similarity index 80% rename from PteroController.sln rename to Pterodactyl.sln index 9b41412..8051187 100644 --- a/PteroController.sln +++ b/Pterodactyl.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.6.33815.320 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PteroController", "PteroController.csproj", "{E8F91865-3849-4773-B205-2DCFF069F11F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pterodactyl", "Pterodactyl.csproj", "{E8F91865-3849-4773-B205-2DCFF069F11F}" EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "PteroControllerSetup", "PteroControllerSetup\PteroControllerSetup.vdproj", "{29BB4937-3D0E-458E-AA47-DB83EA05235A}" +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "PterodactylSetup", "PterodactylSetup\PterodactylSetup.vdproj", "{29BB4937-3D0E-458E-AA47-DB83EA05235A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Pterodactyl/SessionInfo.cs b/Pterodactyl/SessionInfo.cs index 45a53ad..20553f2 100644 --- a/Pterodactyl/SessionInfo.cs +++ b/Pterodactyl/SessionInfo.cs @@ -1,4 +1,4 @@ -namespace PteroController.Pterodactyl +namespace Pterodactyl.Pterodactyl { public class SessionInfo { diff --git a/Pterodactyl/User/Info.cs b/Pterodactyl/User/Info.cs index 50f27e8..ad0f141 100644 --- a/Pterodactyl/User/Info.cs +++ b/Pterodactyl/User/Info.cs @@ -2,7 +2,7 @@ using System.Net.Http; using System.Net.Http.Headers; #pragma warning disable -namespace PteroController.Pterodactyl.User +namespace Pterodactyl.Pterodactyl.User { public class Info { diff --git a/Pterodactyl/User/Login.cs b/Pterodactyl/User/Login.cs index 55fc105..87b1167 100644 --- a/Pterodactyl/User/Login.cs +++ b/Pterodactyl/User/Login.cs @@ -2,7 +2,7 @@ using System.Net.Http.Headers; using System.Runtime.CompilerServices; -namespace PteroController.Pterodactyl.User +namespace Pterodactyl.Pterodactyl.User { public class Login { diff --git a/PteroControllerSetup/PteroControllerSetup.vdproj b/PterodactylSetup/PterodactylSetup.vdproj similarity index 98% rename from PteroControllerSetup/PteroControllerSetup.vdproj rename to PterodactylSetup/PterodactylSetup.vdproj index 3b900ce..934ab15 100644 --- a/PteroControllerSetup/PteroControllerSetup.vdproj +++ b/PterodactylSetup/PterodactylSetup.vdproj @@ -3,7 +3,7 @@ "VSVersion" = "3:800" "ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" "IsWebType" = "8:FALSE" -"ProjectName" = "8:PteroControllerSetup" +"ProjectName" = "8:PterodactylSetup" "LanguageId" = "3:1033" "CodePage" = "3:1252" "UILanguageId" = "3:1033" @@ -27,7 +27,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\PteroControllerSetup.msi" + "OutputFilename" = "8:Debug\\PterodactylSetup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -43,7 +43,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\PteroControllerSetup.msi" + "OutputFilename" = "8:Release\\PterodactylSetup.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -102,7 +102,7 @@ { "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DA5E5D646E3848CABB836652E2FF05BD" { - "SourcePath" = "8:..\\PteroController\\pterry.ico" + "SourcePath" = "8:..\\Pterodactyl\\pterry.ico" "TargetName" = "8:pterry.ico" "Tag" = "8:" "Folder" = "8:_9474E6585448407592667FEF4DDCA69D" @@ -186,7 +186,7 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:PteroController" + "ProductName" = "8:Pterodactyl" "ProductCode" = "8:{67AA2F1D-A663-4DFE-A362-F1AA9412A4B9}" "PackageCode" = "8:{C50E8EF4-8094-4CE0-836C-2C7D1EF06C74}" "UpgradeCode" = "8:{BC46F3E1-71B1-4568-94FE-7D00B1DC00BA}" @@ -199,10 +199,10 @@ "Manufacturer" = "8:MythicalSystems" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:https://discord.gg/P65Ehaez8u" - "Title" = "8:PteroController" + "Title" = "8:Pterodactyl" "Subject" = "8:" "ARPCONTACT" = "8:MythicalSystems" - "Keywords" = "8:PteroController" + "Keywords" = "8:Pterodactyl" "ARPCOMMENTS" = "8:A Pterodactyl Panel desktop app that uses the Client API!" "ARPURLINFOABOUT" = "8:" "ARPPRODUCTICON" = "8:" @@ -310,7 +310,7 @@ { "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_5342217ED94E4828870258A179B53F0D" { - "Name" = "8:PteroController" + "Name" = "8:Pterodactyl" "Arguments" = "8:" "Description" = "8:" "ShowCmd" = "3:1" @@ -324,7 +324,7 @@ } "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_B78A63900E0842268A7DEBAB76650C16" { - "Name" = "8:PteroController" + "Name" = "8:Pterodactyl" "Arguments" = "8:" "Description" = "8:" "ShowCmd" = "3:1" @@ -737,7 +737,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FDEDB0FF89444804BEE41E2851D9D7E5" { - "SourcePath" = "8:..\\PteroController\\obj\\Release\\net7.0-windows\\apphost.exe" + "SourcePath" = "8:..\\Pterodactyl\\obj\\Release\\net7.0-windows\\apphost.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_9474E6585448407592667FEF4DDCA69D"