From 5d18b360830ec92b03a13e8893c8365447b70367 Mon Sep 17 00:00:00 2001 From: IceToast <> Date: Thu, 22 Dec 2022 22:28:52 +0100 Subject: [PATCH] feat: added new settings --- app/Classes/Settings/System.php | 4 + database/seeders/Seeds/SettingsSeeder.php | 16 ++- .../admin/settings/tabs/system.blade.php | 116 +++++++++++------- 3 files changed, 92 insertions(+), 44 deletions(-) diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php index ed85b3b8..e217b987 100644 --- a/app/Classes/Settings/System.php +++ b/app/Classes/Settings/System.php @@ -46,6 +46,8 @@ public function checkPteroClientkey(){ "pterodactyl-admin-api-key" => "required|string", "enable-upgrades" => "string", "enable-disable-servers" => "string", + "show-imprint" => "string", + "show-privacy" => "string", ]); $validator->after(function ($validator) use ($request) { @@ -87,6 +89,8 @@ public function checkPteroClientkey(){ "SETTINGS::SYSTEM:ENABLE_UPGRADE" => "enable-upgrade", "SETTINGS::SYSTEM:CREATION_OF_NEW_SERVERS" => "enable-disable-servers", "SETTINGS::SYSTEM:CREATION_OF_NEW_USERS" => "enable-disable-new-users", + "SETTINGS::SYSTEM:SHOW_IMPRINT" => "show-imprint", + "SETTINGS::SYSTEM:SHOW_PRIVACY" => "show-privacy", ]; diff --git a/database/seeders/Seeds/SettingsSeeder.php b/database/seeders/Seeds/SettingsSeeder.php index 9e6f0035..6a6479ef 100644 --- a/database/seeders/Seeds/SettingsSeeder.php +++ b/database/seeders/Seeds/SettingsSeeder.php @@ -532,9 +532,23 @@ class SettingsSeeder extends Seeder Settings::firstOrCreate([ 'key' => 'SETTINGS::SYSTEM:CREATION_OF_NEW_USERS', ], [ - 'value' => "true", + 'value' => "false", 'type' => 'boolean', 'description' => 'Enable/disable the creation of new users' ]); + Settings::firstOrCreate([ + 'key' => 'SETTINGS::SYSTEM:SHOW_IMPRINT', + ], [ + 'value' => "true", + 'type' => 'boolean', + 'description' => 'Enable/disable imprint in footer' + ]); + Settings::firstOrCreate([ + 'key' => 'SETTINGS::SYSTEM:SHOW_PRIVACY', + ], [ + 'value' => "true", + 'type' => 'boolean', + 'description' => 'Enable/disable privacy policy in footer' + ]); } } diff --git a/resources/views/admin/settings/tabs/system.blade.php b/resources/views/admin/settings/tabs/system.blade.php index c74c7999..fcfc19d5 100644 --- a/resources/views/admin/settings/tabs/system.blade.php +++ b/resources/views/admin/settings/tabs/system.blade.php @@ -13,6 +13,32 @@
+
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
@@ -26,6 +52,7 @@ class="fas fa-info-circle">
+
@@ -94,21 +121,24 @@
- + + data-content="{{ __('Enter the Client-API Key to a Pterodactyl-Admin-User here.') }}" + class="fas fa-info-circle">
- + @error('pterodactyl-admin-api-key') -
- {{$message}} -
+
+ {{ $message }} +
@enderror
- +
@@ -157,8 +187,7 @@ class="form-control @error('initial-server-limit') is-invalid @enderror" required>
- +
- +
@@ -241,31 +270,31 @@ data-content="{{ __('The maximum amount of allocations to pull per node for automatic deployment, if more allocations are being used than this limit is set to, no new servers can be created!') }}" class="fas fa-info-circle"> - - {{-- Design --}} -
-
-
-

{{ __('Design') }}

-
-
-
- - + {{-- Design --}} +
+
+
+

{{ __('Design') }}

+
+
+ + +
- - + +
@error('icon') @@ -275,14 +304,15 @@
- - + +
@error('logo') - - {{ $message }} - + + {{ $message }} + @enderror
@@ -300,9 +330,9 @@ @enderror
-
-
- -
+
+
+ +