diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php index 3c86c68a..d98ca015 100644 --- a/app/Http/Controllers/Admin/SettingsController.php +++ b/app/Http/Controllers/Admin/SettingsController.php @@ -38,8 +38,8 @@ class SettingsController extends Controller $optionInputData = []; } + // collect all option input data $optionsData = []; - foreach ($options as $key => $value) { $optionsData[$key] = [ 'value' => $value, @@ -50,6 +50,11 @@ class SettingsController extends Controller ]; } + // collect category icon if available + if (isset($optionInputData['category_icon'])) { + $optionsData['category_icon'] = $optionInputData['category_icon']; + } + $settings[str_replace('Settings.php', '', $file)] = $optionsData; } diff --git a/app/Settings/DiscordSettings.php b/app/Settings/DiscordSettings.php index 08bc603a..ecb35c07 100644 --- a/app/Settings/DiscordSettings.php +++ b/app/Settings/DiscordSettings.php @@ -56,6 +56,7 @@ class DiscordSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-user-friends', 'bot_token' => [ 'label' => 'Bot Token', 'type' => 'string', diff --git a/app/Settings/GeneralSettings.php b/app/Settings/GeneralSettings.php index 97bd67f7..0b479cd0 100644 --- a/app/Settings/GeneralSettings.php +++ b/app/Settings/GeneralSettings.php @@ -38,7 +38,6 @@ class GeneralSettings extends Settings public static function getValidations() { return [ - 'main_site' => 'nullable|string', 'credits_display_name' => 'required|string', 'initial_user_credits' => 'required|numeric', 'initial_server_limit' => 'required|numeric', @@ -61,11 +60,7 @@ class GeneralSettings extends Settings public static function getOptionInputData() { return [ - 'main_site' => [ - 'type' => 'string', - 'label' => 'Main Site URL', - 'description' => 'The URL of your main site.' - ], + 'category_icon' => "fas fa-cog", 'credits_display_name' => [ 'type' => 'string', 'label' => 'Credits Display Name', diff --git a/app/Settings/InvoiceSettings.php b/app/Settings/InvoiceSettings.php index 878107cd..099565a7 100644 --- a/app/Settings/InvoiceSettings.php +++ b/app/Settings/InvoiceSettings.php @@ -53,6 +53,7 @@ class InvoiceSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-file-invoice-dollar', 'company_address' => [ 'label' => 'Company Address', 'type' => 'string', diff --git a/app/Settings/LocaleSettings.php b/app/Settings/LocaleSettings.php index 3a62aeab..35755797 100644 --- a/app/Settings/LocaleSettings.php +++ b/app/Settings/LocaleSettings.php @@ -44,6 +44,7 @@ class LocaleSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-globe', 'available' => [ 'label' => 'Available Locales', 'type' => 'multiselect', diff --git a/app/Settings/MailSettings.php b/app/Settings/MailSettings.php index 73ba93a3..f43158c1 100644 --- a/app/Settings/MailSettings.php +++ b/app/Settings/MailSettings.php @@ -77,6 +77,7 @@ class MailSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-envelope', 'mail_host' => [ 'label' => 'Mail Host', 'type' => 'string', diff --git a/app/Settings/PterodactylSettings.php b/app/Settings/PterodactylSettings.php index 2f180483..11f1b006 100644 --- a/app/Settings/PterodactylSettings.php +++ b/app/Settings/PterodactylSettings.php @@ -59,6 +59,7 @@ class PterodactylSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-server', 'panel_url' => [ 'label' => 'Panel URL', 'type' => 'string', diff --git a/app/Settings/ReferralSettings.php b/app/Settings/ReferralSettings.php index d88cd8b2..d2be01ad 100644 --- a/app/Settings/ReferralSettings.php +++ b/app/Settings/ReferralSettings.php @@ -47,6 +47,7 @@ class ReferralSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-user-friends', 'allowed' => [ 'label' => 'Allowed', 'type' => 'select', diff --git a/app/Settings/ServerSettings.php b/app/Settings/ServerSettings.php index 181bd51a..5a4a4708 100644 --- a/app/Settings/ServerSettings.php +++ b/app/Settings/ServerSettings.php @@ -41,6 +41,7 @@ class ServerSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-server', 'allocation_limit' => [ 'label' => 'Allocation Limit', 'type' => 'number', diff --git a/app/Settings/TicketSettings.php b/app/Settings/TicketSettings.php index b794f06f..d5dfeb4b 100644 --- a/app/Settings/TicketSettings.php +++ b/app/Settings/TicketSettings.php @@ -35,6 +35,7 @@ class TicketSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-ticket-alt', 'enabled' => [ 'label' => 'Enabled', 'type' => 'boolean', diff --git a/app/Settings/UserSettings.php b/app/Settings/UserSettings.php index fa14bba0..18f872ee 100644 --- a/app/Settings/UserSettings.php +++ b/app/Settings/UserSettings.php @@ -65,6 +65,7 @@ class UserSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-user', 'credits_reward_after_verify_discord' => [ 'label' => 'Credits Reward After Verify Discord', 'type' => 'number', diff --git a/app/Settings/WebsiteSettings.php b/app/Settings/WebsiteSettings.php index 95ee6393..a8da99e4 100644 --- a/app/Settings/WebsiteSettings.php +++ b/app/Settings/WebsiteSettings.php @@ -56,6 +56,7 @@ class WebsiteSettings extends Settings public static function getOptionInputData() { return [ + 'category_icon' => 'fas fa-globe', 'motd_enabled' => [ 'label' => 'Enable MOTD', 'type' => 'boolean', diff --git a/themes/default/views/admin/settings/index.blade.php b/themes/default/views/admin/settings/index.blade.php index 56096f99..12af0aab 100644 --- a/themes/default/views/admin/settings/index.blade.php +++ b/themes/default/views/admin/settings/index.blade.php @@ -49,7 +49,8 @@ - +

{{ $category }}

@@ -73,6 +74,9 @@ @foreach ($options as $key => $value) + @if ($key == 'category_icon') + @continue + @endif