Merge pull request #482 from 1day2die/logo-on-login-page
Logo on Loginpage
This commit is contained in:
commit
10dcc4233a
|
@ -64,6 +64,7 @@ class System
|
||||||
"SETTINGS::MISC:PHPMYADMIN:URL" => "phpmyadmin-url",
|
"SETTINGS::MISC:PHPMYADMIN:URL" => "phpmyadmin-url",
|
||||||
"SETTINGS::SYSTEM:PTERODACTYL:URL" => "pterodactyl-url",
|
"SETTINGS::SYSTEM:PTERODACTYL:URL" => "pterodactyl-url",
|
||||||
"SETTINGS::SYSTEM:PTERODACTYL:TOKEN" => "pterodactyl-api-key",
|
"SETTINGS::SYSTEM:PTERODACTYL:TOKEN" => "pterodactyl-api-key",
|
||||||
|
"SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO" => "enable-login-logo",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
@ -80,13 +81,16 @@ class System
|
||||||
{
|
{
|
||||||
$request->validate([
|
$request->validate([
|
||||||
'icon' => 'nullable|max:10000|mimes:jpg,png,jpeg',
|
'icon' => 'nullable|max:10000|mimes:jpg,png,jpeg',
|
||||||
|
'logo' => 'nullable|max:10000|mimes:jpg,png,jpeg',
|
||||||
'favicon' => 'nullable|max:10000|mimes:ico',
|
'favicon' => 'nullable|max:10000|mimes:ico',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($request->hasFile('icon')) {
|
if ($request->hasFile('icon')) {
|
||||||
$request->file('icon')->storeAs('public', 'icon.png');
|
$request->file('icon')->storeAs('public', 'icon.png');
|
||||||
}
|
}
|
||||||
|
if ($request->hasFile('logo')) {
|
||||||
|
$request->file('logo')->storeAs('public', 'logo.png');
|
||||||
|
}
|
||||||
if ($request->hasFile('favicon')) {
|
if ($request->hasFile('favicon')) {
|
||||||
$request->file('favicon')->storeAs('public', 'favicon.ico');
|
$request->file('favicon')->storeAs('public', 'favicon.ico');
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ use App\Models\Settings;
|
||||||
|
|
||||||
return [
|
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'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
@ -180,6 +180,21 @@
|
||||||
class="form-control @error('allocation-limit') is-invalid @enderror" required>
|
class="form-control @error('allocation-limit') is-invalid @enderror" required>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{-- Design --}}
|
||||||
|
<div class="col-md-3 px-3">
|
||||||
|
<div class="row mb-2">
|
||||||
|
<div class="col text-center">
|
||||||
|
<h1>{{ __('Design') }}</h1>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="custom-control mb-3 p-0">
|
||||||
|
<input value="true" id="enable-login-logo" name="enable-login-logo"
|
||||||
|
{{ config('SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO') == 'true' ? 'checked' : '' }}
|
||||||
|
type="checkbox">
|
||||||
|
<label for="enable-login-logo">{{ __('Enable Logo on Loginpage') }} </label>
|
||||||
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="custom-file mb-3 mt-3">
|
<div class="custom-file mb-3 mt-3">
|
||||||
<input type="file" accept="image/png,image/jpeg,image/jpg" class="custom-file-input" name="icon"
|
<input type="file" accept="image/png,image/jpeg,image/jpg" class="custom-file-input" name="icon"
|
||||||
|
@ -192,7 +207,19 @@
|
||||||
</span>
|
</span>
|
||||||
@enderror
|
@enderror
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="custom-file mb-3 mt-3">
|
||||||
|
<input type="file" accept="image/png,image/jpeg,image/jpg" class="custom-file-input" name="logo"
|
||||||
|
id="logo">
|
||||||
|
<label class="custom-file-label selected" for="logo">{{ __('Select Login-page Logo') }}</label>
|
||||||
|
</div>
|
||||||
|
@error('logo')
|
||||||
|
<span class="text-danger">
|
||||||
|
{{ $message }}
|
||||||
|
</span>
|
||||||
|
@enderror
|
||||||
|
|
||||||
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="custom-file mb-3">
|
<div class="custom-file mb-3">
|
||||||
<input type="file" accept="image/x-icon" class="custom-file-input" name="favicon"
|
<input type="file" accept="image/x-icon" class="custom-file-input" name="favicon"
|
||||||
|
@ -207,7 +234,6 @@
|
||||||
@enderror
|
@enderror
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<button class="btn btn-primary ml-3 mt-3">{{ __('Submit') }}</button>
|
<button class="btn btn-primary ml-3 mt-3">{{ __('Submit') }}</button>
|
||||||
|
|
|
@ -7,6 +7,12 @@
|
||||||
<div class="card card-outline card-primary">
|
<div class="card card-outline card-primary">
|
||||||
<div class="card-header text-center">
|
<div class="card-header text-center">
|
||||||
<a href="{{route('welcome')}}" class="h1"><b class="mr-1">{{config('app.name', 'Laravel')}}</b></a>
|
<a href="{{route('welcome')}}" class="h1"><b class="mr-1">{{config('app.name', 'Laravel')}}</b></a>
|
||||||
|
@if(config("SETTINGS::SYSTEM:ENABLE_LOGIN_LOGO"))
|
||||||
|
<img
|
||||||
|
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('logo.png')? asset('storage/logo.png'): asset('images/controlpanel_logo.png') }}"
|
||||||
|
alt="{{ config('app.name', 'Controlpanel.gg') }} Logo"
|
||||||
|
style="opacity: .8;max-width:100%">
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<p class="login-box-msg">{{__('Sign in to start your session')}}</p>
|
<p class="login-box-msg">{{__('Sign in to start your session')}}</p>
|
||||||
|
|
|
@ -188,7 +188,7 @@
|
||||||
src="{{ \Illuminate\Support\Facades\Storage::disk('public')->exists('icon.png')? asset('storage/icon.png'): asset('images/controlpanel_logo.png') }}"
|
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"
|
alt="{{ config('app.name', 'Laravel') }} Logo" class="brand-image img-circle"
|
||||||
style="opacity: .8">
|
style="opacity: .8">
|
||||||
<span class="brand-text font-weight-light">{{ config('app.name', 'Laravel') }}</span>
|
<span class="brand-text font-weight-light">{{ config('app.name', 'Controlpanel.gg') }}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<!-- Sidebar -->
|
<!-- Sidebar -->
|
||||||
|
|
Loading…
Reference in a new issue