From c059e9946c553ee93c355c245c8d6d6c7fb4b3dd Mon Sep 17 00:00:00 2001 From: IceToast Date: Sat, 15 Jan 2022 18:16:22 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=91=EF=B8=8F=20Added=20Pteroda?= =?UTF-8?q?ctyl=20Data=20to=20Settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Classes/Settings/System.php | 4 ++ .../admin/settings/tabs/system.blade.php | 50 +++++++++++++------ 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php index da6c6856..a9e32b08 100644 --- a/app/Classes/Settings/System.php +++ b/app/Classes/Settings/System.php @@ -33,6 +33,8 @@ class System "credits-reward-amount-email" => "required|min:0|integer", "server-limit-discord" => "required|min:0|integer", "server-limit-email" => "required|min:0|integer", + "pterodactyl-api-key" => "required|string", + "pterodactyl-url" => "required|string", ]); if ($validator->fails()) { @@ -55,6 +57,8 @@ class System "SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD" => "server-limit-discord", "SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL" => "server-limit-email", "SETTINGS::MISC:PHPMYADMIN:URL" => "phpmyadmin-url", + "SETTINGS::SYSTEM:PTERODACTYL:URL" => "pterodactyl-url", + "SETTINGS::SYSTEM:PTERODACTYL:TOKEN" => "pterodactyl-api-key", ]; diff --git a/resources/views/admin/settings/tabs/system.blade.php b/resources/views/admin/settings/tabs/system.blade.php index b8fc58a3..e8524463 100644 --- a/resources/views/admin/settings/tabs/system.blade.php +++ b/resources/views/admin/settings/tabs/system.blade.php @@ -47,11 +47,45 @@ type="text" value="{{ config('SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME', 'Credits') }}" class="form-control @error('credits-display-name') is-invalid @enderror" required> +
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+ + +
+ +
+ - + {{-- User --}}
@@ -118,6 +152,7 @@
+ {{-- Server --}}
@@ -136,19 +171,6 @@ value="{{ config('SETTINGS::SERVER:ALLOCATION_LIMIT') }}" class="form-control @error('allocation-limit') is-invalid @enderror" required>
- - -
-
- - -
- -