From 16a48cd2aabc450a45fc2878a80250b0feb36eda Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 10 Jan 2023 19:12:07 +0100 Subject: [PATCH 1/3] allow login via username --- app/Http/Controllers/Auth/LoginController.php | 13 +++++++++++++ resources/views/auth/login.blade.php | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 0b40b07e..e809da37 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -41,6 +41,19 @@ class LoginController extends Controller $this->middleware('guest')->except('logout'); } + /** + * Get the login username to be used by the controller. + * + * @return string + */ + public function username() + { + $login = request()->input('email'); + $field = filter_var($login, FILTER_VALIDATE_EMAIL) ? 'email' : 'name'; + request()->merge([$field => $login]); + return $field; + } + public function login(Request $request) { $validationRules = [ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 727e23f2..06438326 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -31,9 +31,9 @@
- + placeholder="{{ __('Email or Username') }}">
From 94fe7d245c3cad98294bf0ca22867c33efa40012 Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 10 Jan 2023 19:45:19 +0100 Subject: [PATCH 2/3] Alert on Homepage --- app/Classes/Settings/System.php | 6 +++ app/Models/User.php | 2 +- database/seeders/Seeds/SettingsSeeder.php | 23 ++++++++++ .../admin/settings/tabs/system.blade.php | 43 ++++++++++++++++++- resources/views/home.blade.php | 6 +++ 5 files changed, 78 insertions(+), 2 deletions(-) diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php index 756f1dd3..286fa6ee 100644 --- a/app/Classes/Settings/System.php +++ b/app/Classes/Settings/System.php @@ -51,6 +51,9 @@ class System 'show-imprint' => 'string', 'show-privacy' => 'string', 'show-tos' => 'string', + 'alert-enabled' => 'string', + 'alter-type' => 'string', + 'alert-message' => 'string', ]); $validator->after(function ($validator) use ($request) { @@ -96,6 +99,9 @@ class System "SETTINGS::SYSTEM:SHOW_IMPRINT" => "show-imprint", "SETTINGS::SYSTEM:SHOW_PRIVACY" => "show-privacy", "SETTINGS::SYSTEM:SHOW_TOS" => "show-tos", + "SETTINGS::SYSTEM:ALERT_ENABLED" => "alert-enabled", + "SETTINGS::SYSTEM:ALERT_TYPE" => "alert-type", + "SETTINGS::SYSTEM:ALERT_MESSAGE" => "alert-message", ]; foreach ($values as $key => $value) { diff --git a/app/Models/User.php b/app/Models/User.php index f8f8ecc3..cd660da7 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -298,7 +298,7 @@ class User extends Authenticatable implements MustVerifyEmail public function getActivitylogOptions(): LogOptions { return LogOptions::defaults() - -> logOnly(['*']) + -> logOnly(['role', 'name', 'server_limit', 'pterodactyl_id', 'email']) -> logOnlyDirty() -> dontSubmitEmptyLogs(); } diff --git a/database/seeders/Seeds/SettingsSeeder.php b/database/seeders/Seeds/SettingsSeeder.php index 1b744204..15a8acb3 100644 --- a/database/seeders/Seeds/SettingsSeeder.php +++ b/database/seeders/Seeds/SettingsSeeder.php @@ -574,5 +574,28 @@ class SettingsSeeder extends Seeder 'type' => 'boolean', 'description' => 'Enable/disable Terms of Service in footer', ]); + + Settings::firstOrCreate([ + 'key' => 'SETTINGS::SYSTEM:ALERT_ENABLED', + ], [ + 'value' => 'false', + 'type' => 'boolean', + 'description' => 'Enable/disable Alerts on Homepage', + ]); + Settings::firstOrCreate([ + 'key' => 'SETTINGS::SYSTEM:ALERT_TYPE', + ], [ + 'value' => 'dark', + 'type' => 'text', + 'description' => 'Changes the Color of the Alert', + ]); + + Settings::firstOrCreate([ + 'key' => 'SETTINGS::SYSTEM:ALERT_MESSAGE', + ], [ + 'value' => '', + 'type' => 'text', + 'description' => 'Changes the Content the Alert', + ]); } } diff --git a/resources/views/admin/settings/tabs/system.blade.php b/resources/views/admin/settings/tabs/system.blade.php index 4a36e218..d153a893 100644 --- a/resources/views/admin/settings/tabs/system.blade.php +++ b/resources/views/admin/settings/tabs/system.blade.php @@ -195,7 +195,7 @@
-
@@ -299,8 +299,49 @@ class="form-control @error('minimum-credits') is-invalid @enderror" required>
+ {{-- ALERT --}} +
+
+

Alert

+
+
+
+ + +
+ +
+ + +
+ +
+ + +
+
+ + {{-- Design --}}
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index e7c90b95..fabf81f8 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -26,6 +26,12 @@
@endif + + @if(config("SETTINGS::SYSTEM:ALERT_ENABLED") && !empty(config("SETTINGS::SYSTEM:ALERT_MESSAGE"))) + + @endif
From f12f95bce7eb5528616834c2935575d2f4f949ef Mon Sep 17 00:00:00 2001 From: 1day2die Date: Tue, 10 Jan 2023 19:48:46 +0100 Subject: [PATCH 3/3] language fix --- config/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/app.php b/config/app.php index 778d9120..4ffbd18a 100644 --- a/config/app.php +++ b/config/app.php @@ -97,7 +97,7 @@ return [ | */ - 'available_locales' => array_map('basename', preg_replace('/\\.[^.\\s]{3,4}$/', '', glob(resource_path().'/lang/*.json', GLOB_BRACE))), + 'available_locales' => array_map('basename', preg_replace('/\\.[^.\\s]{3,4}$/', '', glob(base_path("lang").'/*.json', GLOB_BRACE))), /* |--------------------------------------------------------------------------