From ca481829c5ee547aaee5c6d9c4af2f3989a3915e Mon Sep 17 00:00:00 2001 From: 1Day Date: Tue, 12 Jul 2022 07:57:16 +0200 Subject: [PATCH 1/2] Logo on Loginpage --- app/Classes/Settings/System.php | 6 +++- .../admin/settings/tabs/system.blade.php | 28 ++++++++++++++++++- resources/views/auth/login.blade.php | 6 ++++ resources/views/layouts/main.blade.php | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php index 66202ed6..5a6013e0 100644 --- a/app/Classes/Settings/System.php +++ b/app/Classes/Settings/System.php @@ -62,6 +62,7 @@ class System "SETTINGS::MISC:PHPMYADMIN:URL" => "phpmyadmin-url", "SETTINGS::SYSTEM:PTERODACTYL:URL" => "pterodactyl-url", "SETTINGS::SYSTEM:PTERODACTYL:TOKEN" => "pterodactyl-api-key", + "SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO" => "enable-login-logo", ]; @@ -78,13 +79,16 @@ class System { $request->validate([ 'icon' => 'nullable|max:10000|mimes:jpg,png,jpeg', + 'logo' => 'nullable|max:10000|mimes:jpg,png,jpeg', 'favicon' => 'nullable|max:10000|mimes:ico', ]); if ($request->hasFile('icon')) { $request->file('icon')->storeAs('public', 'icon.png'); } - + if ($request->hasFile('logo')) { + $request->file('logo')->storeAs('public', 'logo.png'); + } if ($request->hasFile('favicon')) { $request->file('favicon')->storeAs('public', 'favicon.ico'); } diff --git a/resources/views/admin/settings/tabs/system.blade.php b/resources/views/admin/settings/tabs/system.blade.php index aece6bee..d3acbd5b 100644 --- a/resources/views/admin/settings/tabs/system.blade.php +++ b/resources/views/admin/settings/tabs/system.blade.php @@ -173,6 +173,21 @@ class="form-control @error('allocation-limit') is-invalid @enderror" required> + + + {{-- Design --}} +
+
+
+

{{ __('Design') }}

+
+
+
+ + +
@enderror +
+
+ + +
+ @error('logo') + + {{ $message }} + + @enderror +
-
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 02e25132..90d556d5 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -7,6 +7,12 @@
{{config('app.name', 'Laravel')}} + @if(config("SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO")) + {{ config('app.name', 'Controlpanel.gg') }} Logo + @endif
diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 347b4acf..298a1ef0 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -188,7 +188,7 @@ src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png')? asset('storage/icon.png'): asset('images/controlpanel_logo.png') }}" alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle" style="opacity: .8"> - {{ config('app.name', 'Laravel') }} + {{ config('app.name', 'Controlpanel.gg') }} From 2854db13fffcc4413aef2e214038aa0ce46337d7 Mon Sep 17 00:00:00 2001 From: 1Day Date: Tue, 12 Jul 2022 07:59:55 +0200 Subject: [PATCH 2/2] Update app.php --- config/app.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/app.php b/config/app.php index 4eb2700b..565a7a15 100644 --- a/config/app.php +++ b/config/app.php @@ -4,7 +4,7 @@ use App\Models\Settings; return [ - 'version' => '0.7.6', + 'version' => '0.7.7', /* |-------------------------------------------------------------------------- @@ -17,7 +17,7 @@ return [ | */ - 'name' => env('APP_NAME', 'Laravel'), + 'name' => env('APP_NAME', 'Controlpanel.gg'), /* |--------------------------------------------------------------------------