chore(deps): update AdminLTE

This commit is contained in:
Miguel Nogueira 2025-03-10 11:23:28 +00:00
parent 8e0cb453ba
commit 4e4a1c659f
16 changed files with 198 additions and 134 deletions

18
composer.lock generated
View File

@ -1910,25 +1910,25 @@
}, },
{ {
"name": "jeroennoten/laravel-adminlte", "name": "jeroennoten/laravel-adminlte",
"version": "v3.11.0", "version": "v3.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/jeroennoten/Laravel-AdminLTE.git", "url": "https://github.com/jeroennoten/Laravel-AdminLTE.git",
"reference": "4c031a6f45d182847010fc841deaa298602460c9" "reference": "0269331f55fa8385413895225d6d89b85babe3de"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/jeroennoten/Laravel-AdminLTE/zipball/4c031a6f45d182847010fc841deaa298602460c9", "url": "https://api.github.com/repos/jeroennoten/Laravel-AdminLTE/zipball/0269331f55fa8385413895225d6d89b85babe3de",
"reference": "4c031a6f45d182847010fc841deaa298602460c9", "reference": "0269331f55fa8385413895225d6d89b85babe3de",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"almasaeed2010/adminlte": "3.2.*", "almasaeed2010/adminlte": "3.2.*",
"laravel/framework": ">=7.0", "laravel/framework": ">=8.0",
"php": ">=7.2.5" "php": ">=7.3"
}, },
"require-dev": { "require-dev": {
"orchestra/testbench": ">=4.0", "orchestra/testbench": ">=6.0",
"phpunit/phpunit": ">=9.1" "phpunit/phpunit": ">=9.1"
}, },
"type": "library", "type": "library",
@ -1963,9 +1963,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/jeroennoten/Laravel-AdminLTE/issues", "issues": "https://github.com/jeroennoten/Laravel-AdminLTE/issues",
"source": "https://github.com/jeroennoten/Laravel-AdminLTE/tree/v3.11.0" "source": "https://github.com/jeroennoten/Laravel-AdminLTE/tree/v3.15.0"
}, },
"time": "2024-03-18T14:42:51+00:00" "time": "2025-02-24T22:20:15+00:00"
}, },
{ {
"name": "laravel-notification-channels/discord", "name": "laravel-notification-channels/discord",

View File

@ -1,26 +1,35 @@
@extends('adminlte::master') @extends('adminlte::master')
@php( $dashboard_url = View::getSection('dashboard_url') ?? config('adminlte.dashboard_url', 'home') ) @php
$authType = $authType ?? 'login';
$dashboardUrl = View::getSection('dashboard_url') ?? config('adminlte.dashboard_url', 'home');
@if (config('adminlte.use_route_url', false)) if (config('adminlte.use_route_url', false)) {
@php( $dashboard_url = $dashboard_url ? route($dashboard_url) : '' ) $dashboardUrl = $dashboardUrl ? route($dashboardUrl) : '';
@else } else {
@php( $dashboard_url = $dashboard_url ? url($dashboard_url) : '' ) $dashboardUrl = $dashboardUrl ? url($dashboardUrl) : '';
@endif }
$bodyClasses = "{$authType}-page";
if (! empty(config('adminlte.layout_dark_mode', null))) {
$bodyClasses .= ' dark-mode';
}
@endphp
@section('adminlte_css') @section('adminlte_css')
@stack('css') @stack('css')
@yield('css') @yield('css')
@stop @stop
@section('classes_body'){{ ($auth_type ?? 'login') . '-page' }}@stop @section('classes_body'){{ $bodyClasses }}@stop
@section('body') @section('body')
<div class="{{ $auth_type ?? 'login' }}-box"> <div class="{{ $authType }}-box">
{{-- Logo --}} {{-- Logo --}}
<div class="{{ $auth_type ?? 'login' }}-logo"> <div class="{{ $authType }}-logo">
<a href="{{ $dashboard_url }}"> <a href="{{ $dashboardUrl }}">
{{-- Logo Image --}} {{-- Logo Image --}}
@if (config('adminlte.auth_logo.enabled', false)) @if (config('adminlte.auth_logo.enabled', false))
@ -59,7 +68,7 @@
@endif @endif
{{-- Card Body --}} {{-- Card Body --}}
<div class="card-body {{ $auth_type ?? 'login' }}-card-body {{ config('adminlte.classes_auth_body', '') }}"> <div class="card-body {{ $authType }}-card-body {{ config('adminlte.classes_auth_body', '') }}">
@yield('auth_body') @yield('auth_body')
</div> </div>

View File

@ -1,33 +1,35 @@
@extends('adminlte::auth.auth-page', ['auth_type' => 'login']) @extends('adminlte::auth.auth-page', ['authType' => 'login'])
@section('adminlte_css_pre') @section('adminlte_css_pre')
<link rel="stylesheet" href="{{ asset('vendor/icheck-bootstrap/icheck-bootstrap.min.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/icheck-bootstrap/icheck-bootstrap.min.css') }}">
@stop @stop
@php( $login_url = View::getSection('login_url') ?? config('adminlte.login_url', 'login') ) @php
@php( $register_url = View::getSection('register_url') ?? config('adminlte.register_url', 'register') ) $loginUrl = View::getSection('login_url') ?? config('adminlte.login_url', 'login');
@php( $password_reset_url = View::getSection('password_reset_url') ?? config('adminlte.password_reset_url', 'password/reset') ) $registerUrl = View::getSection('register_url') ?? config('adminlte.register_url', 'register');
$passResetUrl = View::getSection('password_reset_url') ?? config('adminlte.password_reset_url', 'password/reset');
@if (config('adminlte.use_route_url', false)) if (config('adminlte.use_route_url', false)) {
@php( $login_url = $login_url ? route($login_url) : '' ) $loginUrl = $loginUrl ? route($loginUrl) : '';
@php( $register_url = $register_url ? route($register_url) : '' ) $registerUrl = $registerUrl ? route($registerUrl) : '';
@php( $password_reset_url = $password_reset_url ? route($password_reset_url) : '' ) $passResetUrl = $passResetUrl ? route($passResetUrl) : '';
@else } else {
@php( $login_url = $login_url ? url($login_url) : '' ) $loginUrl = $loginUrl ? url($loginUrl) : '';
@php( $register_url = $register_url ? url($register_url) : '' ) $registerUrl = $registerUrl ? url($registerUrl) : '';
@php( $password_reset_url = $password_reset_url ? url($password_reset_url) : '' ) $passResetUrl = $passResetUrl ? url($passResetUrl) : '';
@endif }
@endphp
@section('auth_header', __('adminlte::adminlte.login_message')) @section('auth_header', __('adminlte::adminlte.login_message'))
@section('auth_body') @section('auth_body')
<form action="{{ $login_url }}" method="post"> <form action="{{ $loginUrl }}" method="post">
@csrf @csrf
{{-- Email field --}} {{-- Email field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="email" name="email" class="form-control @error('email') is-invalid @enderror" <input type="email" name="email" class="form-control @error('email') is-invalid @enderror"
value="{{ old('email') }}" placeholder="{{ __('adminlte::adminlte.email') }}" autofocus> value="{{ old('email') }}" placeholder="{{ __('adminlte::adminlte.email') }}" autofocus>
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -45,7 +47,7 @@
{{-- Password field --}} {{-- Password field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password" class="form-control @error('password') is-invalid @enderror" <input type="password" name="password" class="form-control @error('password') is-invalid @enderror"
placeholder="{{ __('adminlte::adminlte.password') }}"> placeholder="{{ __('adminlte::adminlte.password') }}">
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -79,24 +81,23 @@
</button> </button>
</div> </div>
</div> </div>
</form> </form>
@stop @stop
@section('auth_footer') @section('auth_footer')
{{-- Password reset link --}} {{-- Password reset link --}}
@if($password_reset_url) @if($passResetUrl)
<p class="my-0"> <p class="my-0">
<a href="{{ $password_reset_url }}"> <a href="{{ $passResetUrl }}">
{{ __('adminlte::adminlte.i_forgot_my_password') }} {{ __('adminlte::adminlte.i_forgot_my_password') }}
</a> </a>
</p> </p>
@endif @endif
{{-- Register link --}} {{-- Register link --}}
@if($register_url) @if($registerUrl)
<p class="my-0"> <p class="my-0">
<a href="{{ $register_url }}"> <a href="{{ $registerUrl }}">
{{ __('adminlte::adminlte.register_a_new_membership') }} {{ __('adminlte::adminlte.register_a_new_membership') }}
</a> </a>
</p> </p>

View File

@ -6,23 +6,25 @@
@section('classes_body', 'lockscreen') @section('classes_body', 'lockscreen')
@php( $password_reset_url = View::getSection('password_reset_url') ?? config('adminlte.password_reset_url', 'password/reset') ) @php
@php( $dashboard_url = View::getSection('dashboard_url') ?? config('adminlte.dashboard_url', 'home') ) $passResetUrl = View::getSection('password_reset_url') ?? config('adminlte.password_reset_url', 'password/reset');
$dashboardUrl = View::getSection('dashboard_url') ?? config('adminlte.dashboard_url', 'home');
@if (config('adminlte.use_route_url', false)) if (config('adminlte.use_route_url', false)) {
@php( $password_reset_url = $password_reset_url ? route($password_reset_url) : '' ) $passResetUrl = $passResetUrl ? route($passResetUrl) : '';
@php( $dashboard_url = $dashboard_url ? route($dashboard_url) : '' ) $dashboardUrl = $dashboardUrl ? route($dashboardUrl) : '';
@else } else {
@php( $password_reset_url = $password_reset_url ? url($password_reset_url) : '' ) $passResetUrl = $passResetUrl ? url($passResetUrl) : '';
@php( $dashboard_url = $dashboard_url ? url($dashboard_url) : '' ) $dashboardUrl = $dashboardUrl ? url($dashboardUrl) : '';
@endif }
@endphp
@section('body') @section('body')
<div class="lockscreen-wrapper"> <div class="lockscreen-wrapper">
{{-- Lockscreen logo --}} {{-- Lockscreen logo --}}
<div class="lockscreen-logo"> <div class="lockscreen-logo">
<a href="{{ $dashboard_url }}"> <a href="{{ $dashboardUrl }}">
<img src="{{ asset(config('adminlte.logo_img')) }}" height="50"> <img src="{{ asset(config('adminlte.logo_img')) }}" height="50">
{!! config('adminlte.logo', '<b>Admin</b>LTE') !!} {!! config('adminlte.logo', '<b>Admin</b>LTE') !!}
</a> </a>
@ -42,13 +44,13 @@
@endif @endif
<form method="POST" action="{{ route('password.confirm') }}" <form method="POST" action="{{ route('password.confirm') }}"
class="lockscreen-credentials @if(!config('adminlte.usermenu_image'))ml-0 @endif"> class="lockscreen-credentials @if(! config('adminlte.usermenu_image')) ml-0 @endif">
@csrf @csrf
<div class="input-group"> <div class="input-group">
<input id="password" type="password" name="password" <input id="password" type="password" name="password"
class="form-control @error('password') is-invalid @enderror" class="form-control @error('password') is-invalid @enderror"
placeholder="{{ __('adminlte::adminlte.password') }}" required autofocus> placeholder="{{ __('adminlte::adminlte.password') }}" required autofocus>
<div class="input-group-append"> <div class="input-group-append">
<button type="submit" class="btn"> <button type="submit" class="btn">
@ -56,7 +58,6 @@
</button> </button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
@ -74,7 +75,7 @@
{{-- Additional links --}} {{-- Additional links --}}
<div class="text-center"> <div class="text-center">
<a href="{{ $password_reset_url }}"> <a href="{{ $passResetUrl }}">
{{ __('adminlte::adminlte.i_forgot_my_password') }} {{ __('adminlte::adminlte.i_forgot_my_password') }}
</a> </a>
</div> </div>

View File

@ -1,12 +1,14 @@
@extends('adminlte::auth.auth-page', ['auth_type' => 'login']) @extends('adminlte::auth.auth-page', ['authType' => 'login'])
@php( $password_email_url = View::getSection('password_email_url') ?? config('adminlte.password_email_url', 'password/email') ) @php
$passEmailUrl = View::getSection('password_email_url') ?? config('adminlte.password_email_url', 'password/email');
@if (config('adminlte.use_route_url', false)) if (config('adminlte.use_route_url', false)) {
@php( $password_email_url = $password_email_url ? route($password_email_url) : '' ) $passEmailUrl = $passEmailUrl ? route($passEmailUrl) : '';
@else } else {
@php( $password_email_url = $password_email_url ? url($password_email_url) : '' ) $passEmailUrl = $passEmailUrl ? url($passEmailUrl) : '';
@endif }
@endphp
@section('auth_header', __('adminlte::adminlte.password_reset_message')) @section('auth_header', __('adminlte::adminlte.password_reset_message'))
@ -18,13 +20,13 @@
</div> </div>
@endif @endif
<form action="{{ $password_email_url }}" method="post"> <form action="{{ $passEmailUrl }}" method="post">
@csrf @csrf
{{-- Email field --}} {{-- Email field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="email" name="email" class="form-control @error('email') is-invalid @enderror" <input type="email" name="email" class="form-control @error('email') is-invalid @enderror"
value="{{ old('email') }}" placeholder="{{ __('adminlte::adminlte.email') }}" autofocus> value="{{ old('email') }}" placeholder="{{ __('adminlte::adminlte.email') }}" autofocus>
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -44,7 +46,6 @@
<span class="fas fa-share-square"></span> <span class="fas fa-share-square"></span>
{{ __('adminlte::adminlte.send_password_reset_link') }} {{ __('adminlte::adminlte.send_password_reset_link') }}
</button> </button>
</form> </form>
@stop @stop

View File

@ -1,17 +1,19 @@
@extends('adminlte::auth.auth-page', ['auth_type' => 'login']) @extends('adminlte::auth.auth-page', ['authType' => 'login'])
@php( $password_reset_url = View::getSection('password_reset_url') ?? config('adminlte.password_reset_url', 'password/reset') ) @php
$passResetUrl = View::getSection('password_reset_url') ?? config('adminlte.password_reset_url', 'password/reset');
@if (config('adminlte.use_route_url', false)) if (config('adminlte.use_route_url', false)) {
@php( $password_reset_url = $password_reset_url ? route($password_reset_url) : '' ) $passResetUrl = $passResetUrl ? route($passResetUrl) : '';
@else } else {
@php( $password_reset_url = $password_reset_url ? url($password_reset_url) : '' ) $passResetUrl = $passResetUrl ? url($passResetUrl) : '';
@endif }
@endphp
@section('auth_header', __('adminlte::adminlte.password_reset_message')) @section('auth_header', __('adminlte::adminlte.password_reset_message'))
@section('auth_body') @section('auth_body')
<form action="{{ $password_reset_url }}" method="post"> <form action="{{ $passResetUrl }}" method="post">
@csrf @csrf
{{-- Token field --}} {{-- Token field --}}
@ -20,7 +22,7 @@
{{-- Email field --}} {{-- Email field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="email" name="email" class="form-control @error('email') is-invalid @enderror" <input type="email" name="email" class="form-control @error('email') is-invalid @enderror"
value="{{ old('email') }}" placeholder="{{ __('adminlte::adminlte.email') }}" autofocus> value="{{ old('email') }}" placeholder="{{ __('adminlte::adminlte.email') }}" autofocus>
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -38,7 +40,7 @@
{{-- Password field --}} {{-- Password field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password" class="form-control @error('password') is-invalid @enderror" <input type="password" name="password" class="form-control @error('password') is-invalid @enderror"
placeholder="{{ __('adminlte::adminlte.password') }}"> placeholder="{{ __('adminlte::adminlte.password') }}">
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -56,8 +58,8 @@
{{-- Password confirmation field --}} {{-- Password confirmation field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password_confirmation" <input type="password" name="password_confirmation"
class="form-control @error('password_confirmation') is-invalid @enderror" class="form-control @error('password_confirmation') is-invalid @enderror"
placeholder="{{ trans('adminlte::adminlte.retype_password') }}"> placeholder="{{ trans('adminlte::adminlte.retype_password') }}">
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -77,6 +79,5 @@
<span class="fas fa-sync-alt"></span> <span class="fas fa-sync-alt"></span>
{{ __('adminlte::adminlte.reset_password') }} {{ __('adminlte::adminlte.reset_password') }}
</button> </button>
</form> </form>
@stop @stop

View File

@ -1,26 +1,28 @@
@extends('adminlte::auth.auth-page', ['auth_type' => 'register']) @extends('adminlte::auth.auth-page', ['authType' => 'register'])
@php( $login_url = View::getSection('login_url') ?? config('adminlte.login_url', 'login') ) @php
@php( $register_url = View::getSection('register_url') ?? config('adminlte.register_url', 'register') ) $loginUrl = View::getSection('login_url') ?? config('adminlte.login_url', 'login');
$registerUrl = View::getSection('register_url') ?? config('adminlte.register_url', 'register');
@if (config('adminlte.use_route_url', false)) if (config('adminlte.use_route_url', false)) {
@php( $login_url = $login_url ? route($login_url) : '' ) $loginUrl = $loginUrl ? route($loginUrl) : '';
@php( $register_url = $register_url ? route($register_url) : '' ) $registerUrl = $registerUrl ? route($registerUrl) : '';
@else } else {
@php( $login_url = $login_url ? url($login_url) : '' ) $loginUrl = $loginUrl ? url($loginUrl) : '';
@php( $register_url = $register_url ? url($register_url) : '' ) $registerUrl = $registerUrl ? url($registerUrl) : '';
@endif }
@endphp
@section('auth_header', __('adminlte::adminlte.register_message')) @section('auth_header', __('adminlte::adminlte.register_message'))
@section('auth_body') @section('auth_body')
<form action="{{ $register_url }}" method="post"> <form action="{{ $registerUrl }}" method="post">
@csrf @csrf
{{-- Name field --}} {{-- Name field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="text" name="name" class="form-control @error('name') is-invalid @enderror" <input type="text" name="name" class="form-control @error('name') is-invalid @enderror"
value="{{ old('name') }}" placeholder="{{ __('adminlte::adminlte.full_name') }}" autofocus> value="{{ old('name') }}" placeholder="{{ __('adminlte::adminlte.full_name') }}" autofocus>
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -38,7 +40,7 @@
{{-- Email field --}} {{-- Email field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="email" name="email" class="form-control @error('email') is-invalid @enderror" <input type="email" name="email" class="form-control @error('email') is-invalid @enderror"
value="{{ old('email') }}" placeholder="{{ __('adminlte::adminlte.email') }}"> value="{{ old('email') }}" placeholder="{{ __('adminlte::adminlte.email') }}">
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -56,7 +58,7 @@
{{-- Password field --}} {{-- Password field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password" class="form-control @error('password') is-invalid @enderror" <input type="password" name="password" class="form-control @error('password') is-invalid @enderror"
placeholder="{{ __('adminlte::adminlte.password') }}"> placeholder="{{ __('adminlte::adminlte.password') }}">
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -74,8 +76,8 @@
{{-- Confirm password field --}} {{-- Confirm password field --}}
<div class="input-group mb-3"> <div class="input-group mb-3">
<input type="password" name="password_confirmation" <input type="password" name="password_confirmation"
class="form-control @error('password_confirmation') is-invalid @enderror" class="form-control @error('password_confirmation') is-invalid @enderror"
placeholder="{{ __('adminlte::adminlte.retype_password') }}"> placeholder="{{ __('adminlte::adminlte.retype_password') }}">
<div class="input-group-append"> <div class="input-group-append">
<div class="input-group-text"> <div class="input-group-text">
@ -95,13 +97,12 @@
<span class="fas fa-user-plus"></span> <span class="fas fa-user-plus"></span>
{{ __('adminlte::adminlte.register') }} {{ __('adminlte::adminlte.register') }}
</button> </button>
</form> </form>
@stop @stop
@section('auth_footer') @section('auth_footer')
<p class="my-0"> <p class="my-0">
<a href="{{ $login_url }}"> <a href="{{ $loginUrl }}">
{{ __('adminlte::adminlte.i_already_have_a_membership') }} {{ __('adminlte::adminlte.i_already_have_a_membership') }}
</a> </a>
</p> </p>

View File

@ -1,4 +1,4 @@
@extends('adminlte::auth.auth-page', ['auth_type' => 'login']) @extends('adminlte::auth.auth-page', ['authType' => 'login'])
@section('auth_header', __('adminlte::adminlte.verify_message')) @section('auth_header', __('adminlte::adminlte.verify_message'))
@ -17,7 +17,7 @@
@csrf @csrf
<button type="submit" class="btn btn-link p-0 m-0 align-baseline"> <button type="submit" class="btn btn-link p-0 m-0 align-baseline">
{{ __('adminlte::adminlte.verify_request_another') }} {{ __('adminlte::adminlte.verify_request_another') }}
</button>. </button>
</form> </form>
@stop @stop

View File

@ -22,17 +22,32 @@
{{-- Custom stylesheets (pre AdminLTE) --}} {{-- Custom stylesheets (pre AdminLTE) --}}
@yield('adminlte_css_pre') @yield('adminlte_css_pre')
{{-- Base Stylesheets --}} {{-- Base Stylesheets (depends on Laravel asset bundling tool) --}}
@if(!config('adminlte.enabled_laravel_mix')) @if(config('adminlte.enabled_laravel_mix', false))
<link rel="stylesheet" href="{{ asset('vendor/fontawesome-free/css/all.min.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/overlayScrollbars/css/OverlayScrollbars.min.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/adminlte/dist/css/adminlte.min.css') }}">
@if(config('adminlte.google_fonts.allowed', true))
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
@endif
@else
<link rel="stylesheet" href="{{ mix(config('adminlte.laravel_mix_css_path', 'css/app.css')) }}"> <link rel="stylesheet" href="{{ mix(config('adminlte.laravel_mix_css_path', 'css/app.css')) }}">
@else
@switch(config('adminlte.laravel_asset_bundling', false))
@case('mix')
<link rel="stylesheet" href="{{ mix(config('adminlte.laravel_css_path', 'css/app.css')) }}">
@break
@case('vite')
@vite([config('adminlte.laravel_css_path', 'resources/css/app.css'), config('adminlte.laravel_js_path', 'resources/js/app.js')])
@break
@case('vite_js_only')
@vite(config('adminlte.laravel_js_path', 'resources/js/app.js'))
@break
@default
<link rel="stylesheet" href="{{ asset('vendor/fontawesome-free/css/all.min.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/overlayScrollbars/css/OverlayScrollbars.min.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/adminlte/dist/css/adminlte.min.css') }}">
@if(config('adminlte.google_fonts.allowed', true))
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
@endif
@endswitch
@endif @endif
{{-- Extra Configured Plugins Stylesheets --}} {{-- Extra Configured Plugins Stylesheets --}}
@ -40,7 +55,7 @@
{{-- Livewire Styles --}} {{-- Livewire Styles --}}
@if(config('adminlte.livewire')) @if(config('adminlte.livewire'))
@if(app()->version() >= 7) @if(intval(app()->version()) >= 7)
@livewireStyles @livewireStyles
@else @else
<livewire:styles /> <livewire:styles />
@ -67,7 +82,7 @@
<link rel="icon" type="image/png" sizes="16x16" href="{{ asset('favicons/favicon-16x16.png') }}"> <link rel="icon" type="image/png" sizes="16x16" href="{{ asset('favicons/favicon-16x16.png') }}">
<link rel="icon" type="image/png" sizes="32x32" href="{{ asset('favicons/favicon-32x32.png') }}"> <link rel="icon" type="image/png" sizes="32x32" href="{{ asset('favicons/favicon-32x32.png') }}">
<link rel="icon" type="image/png" sizes="96x96" href="{{ asset('favicons/favicon-96x96.png') }}"> <link rel="icon" type="image/png" sizes="96x96" href="{{ asset('favicons/favicon-96x96.png') }}">
<link rel="icon" type="image/png" sizes="192x192" href="{{ asset('favicons/android-icon-192x192.png') }}"> <link rel="icon" type="image/png" sizes="192x192" href="{{ asset('favicons/android-icon-192x192.png') }}">
<link rel="manifest" crossorigin="use-credentials" href="{{ asset('favicons/manifest.json') }}"> <link rel="manifest" crossorigin="use-credentials" href="{{ asset('favicons/manifest.json') }}">
<meta name="msapplication-TileColor" content="#ffffff"> <meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="{{ asset('favicon/ms-icon-144x144.png') }}"> <meta name="msapplication-TileImage" content="{{ asset('favicon/ms-icon-144x144.png') }}">
@ -80,14 +95,25 @@
{{-- Body Content --}} {{-- Body Content --}}
@yield('body') @yield('body')
{{-- Base Scripts --}} {{-- Base Scripts (depends on Laravel asset bundling tool) --}}
@if(!config('adminlte.enabled_laravel_mix')) @if(config('adminlte.enabled_laravel_mix', false))
<script src="{{ asset('vendor/jquery/jquery.min.js') }}"></script>
<script src="{{ asset('vendor/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('vendor/overlayScrollbars/js/jquery.overlayScrollbars.min.js') }}"></script>
<script src="{{ asset('vendor/adminlte/dist/js/adminlte.min.js') }}"></script>
@else
<script src="{{ mix(config('adminlte.laravel_mix_js_path', 'js/app.js')) }}"></script> <script src="{{ mix(config('adminlte.laravel_mix_js_path', 'js/app.js')) }}"></script>
@else
@switch(config('adminlte.laravel_asset_bundling', false))
@case('mix')
<script src="{{ mix(config('adminlte.laravel_js_path', 'js/app.js')) }}"></script>
@break
@case('vite')
@case('vite_js_only')
@break
@default
<script src="{{ asset('vendor/jquery/jquery.min.js') }}"></script>
<script src="{{ asset('vendor/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('vendor/overlayScrollbars/js/jquery.overlayScrollbars.min.js') }}"></script>
<script src="{{ asset('vendor/adminlte/dist/js/adminlte.min.js') }}"></script>
@endswitch
@endif @endif
{{-- Extra Configured Plugins Scripts --}} {{-- Extra Configured Plugins Scripts --}}
@ -95,7 +121,7 @@
{{-- Livewire Script --}} {{-- Livewire Script --}}
@if(config('adminlte.livewire')) @if(config('adminlte.livewire'))
@if(app()->version() >= 7) @if(intval(app()->version()) >= 7)
@livewireScripts @livewireScripts
@else @else
<livewire:scripts /> <livewire:scripts />

View File

@ -1,6 +1,7 @@
@extends('adminlte::master') @extends('adminlte::master')
@inject('layoutHelper', 'JeroenNoten\LaravelAdminLte\Helpers\LayoutHelper') @inject('layoutHelper', 'JeroenNoten\LaravelAdminLte\Helpers\LayoutHelper')
@inject('preloaderHelper', 'JeroenNoten\LaravelAdminLte\Helpers\PreloaderHelper')
@section('adminlte_css') @section('adminlte_css')
@stack('css') @stack('css')
@ -14,8 +15,8 @@
@section('body') @section('body')
<div class="wrapper"> <div class="wrapper">
{{-- Preloader Animation --}} {{-- Preloader Animation (fullscreen mode) --}}
@if($layoutHelper->isPreloaderEnabled()) @if($preloaderHelper->isPreloaderEnabled())
@include('adminlte::partials.common.preloader') @include('adminlte::partials.common.preloader')
@endif @endif
@ -44,7 +45,7 @@
@endif @endif
{{-- Right Control Sidebar --}} {{-- Right Control Sidebar --}}
@if(config('adminlte.right_sidebar')) @if($layoutHelper->isRightSidebarEnabled())
@include('adminlte::partials.sidebar.right-sidebar') @include('adminlte::partials.sidebar.right-sidebar')
@endif @endif

View File

@ -1,10 +1,22 @@
<div class="preloader flex-column justify-content-center align-items-center"> @inject('preloaderHelper', 'JeroenNoten\LaravelAdminLte\Helpers\PreloaderHelper')
{{-- Preloader logo --}} <div class="{{ $preloaderHelper->makePreloaderClasses() }}" style="{{ $preloaderHelper->makePreloaderStyle() }}">
<img src="{{ asset(config('adminlte.preloader.img.path', 'vendor/adminlte/dist/img/AdminLTELogo.png')) }}"
class="{{ config('adminlte.preloader.img.effect', 'animation__shake') }}" @hasSection('preloader')
alt="{{ config('adminlte.preloader.img.alt', 'AdminLTE Preloader Image') }}"
width="{{ config('adminlte.preloader.img.width', 60) }}" {{-- Use a custom preloader content --}}
height="{{ config('adminlte.preloader.img.height', 60) }}"> @yield('preloader')
@else
{{-- Use the default preloader content --}}
<img src="{{ asset(config('adminlte.preloader.img.path', 'vendor/adminlte/dist/img/AdminLTELogo.png')) }}"
class="img-circle {{ config('adminlte.preloader.img.effect', 'animation__shake') }}"
alt="{{ config('adminlte.preloader.img.alt', 'AdminLTE Preloader Image') }}"
width="{{ config('adminlte.preloader.img.width', 60) }}"
height="{{ config('adminlte.preloader.img.height', 60) }}"
style="animation-iteration-count:infinite;">
@endif
</div> </div>

View File

@ -1,4 +1,5 @@
@inject('layoutHelper', 'JeroenNoten\LaravelAdminLte\Helpers\LayoutHelper') @inject('layoutHelper', 'JeroenNoten\LaravelAdminLte\Helpers\LayoutHelper')
@inject('preloaderHelper', 'JeroenNoten\LaravelAdminLte\Helpers\preloaderHelper')
@if($layoutHelper->isLayoutTopnavEnabled()) @if($layoutHelper->isLayoutTopnavEnabled())
@php( $def_container_class = 'container' ) @php( $def_container_class = 'container' )
@ -7,7 +8,12 @@
@endif @endif
{{-- Default Content Wrapper --}} {{-- Default Content Wrapper --}}
<div class="content-wrapper {{ config('adminlte.classes_content_wrapper', '') }}"> <div class="{{ $layoutHelper->makeContentWrapperClasses() }}">
{{-- Preloader Animation (cwrapper mode) --}}
@if($preloaderHelper->isPreloaderEnabled('cwrapper'))
@include('adminlte::partials.common.preloader')
@endif
{{-- Content Header --}} {{-- Content Header --}}
@hasSection('content_header') @hasSection('content_header')
@ -21,6 +27,7 @@
{{-- Main Content --}} {{-- Main Content --}}
<div class="content"> <div class="content">
<div class="{{ config('adminlte.classes_content') ?: $def_container_class }}"> <div class="{{ config('adminlte.classes_content') ?: $def_container_class }}">
@stack('content')
@yield('content') @yield('content')
</div> </div>
</div> </div>

View File

@ -63,7 +63,7 @@
{{-- User menu footer --}} {{-- User menu footer --}}
<li class="user-footer"> <li class="user-footer">
@if($profile_url) @if($profile_url)
<a href="{{ $profile_url }}" class="btn btn-default btn-flat"> <a href="{{ $profile_url }}" class="nav-link btn btn-default btn-flat d-inline-block">
<i class="fa fa-fw fa-user text-lightblue"></i> <i class="fa fa-fw fa-user text-lightblue"></i>
{{ __('adminlte::menu.profile') }} {{ __('adminlte::menu.profile') }}
</a> </a>

View File

@ -1,3 +1,5 @@
@inject('layoutHelper', 'JeroenNoten\LaravelAdminLte\Helpers\LayoutHelper')
<nav class="main-header navbar <nav class="main-header navbar
{{ config('adminlte.classes_topnav_nav', 'navbar-expand-md') }} {{ config('adminlte.classes_topnav_nav', 'navbar-expand-md') }}
{{ config('adminlte.classes_topnav', 'navbar-white navbar-light') }}"> {{ config('adminlte.classes_topnav', 'navbar-white navbar-light') }}">
@ -47,7 +49,7 @@
@endif @endif
{{-- Right sidebar toggler link --}} {{-- Right sidebar toggler link --}}
@if(config('adminlte.right_sidebar')) @if($layoutHelper->isRightSidebarEnabled())
@include('adminlte::partials.navbar.menu-item-right-sidebar-toggler') @include('adminlte::partials.navbar.menu-item-right-sidebar-toggler')
@endif @endif
</ul> </ul>

View File

@ -1,3 +1,5 @@
@inject('layoutHelper', 'JeroenNoten\LaravelAdminLte\Helpers\LayoutHelper')
<nav class="main-header navbar <nav class="main-header navbar
{{ config('adminlte.classes_topnav_nav', 'navbar-expand') }} {{ config('adminlte.classes_topnav_nav', 'navbar-expand') }}
{{ config('adminlte.classes_topnav', 'navbar-white navbar-light') }}"> {{ config('adminlte.classes_topnav', 'navbar-white navbar-light') }}">
@ -32,7 +34,7 @@
@endif @endif
{{-- Right sidebar toggler link --}} {{-- Right sidebar toggler link --}}
@if(config('adminlte.right_sidebar')) @if($layoutHelper->isRightSidebarEnabled())
@include('adminlte::partials.navbar.menu-item-right-sidebar-toggler') @include('adminlte::partials.navbar.menu-item-right-sidebar-toggler')
@endif @endif
</ul> </ul>

View File

@ -1,3 +1,3 @@
<aside class="control-sidebar control-sidebar-{{ config('adminlte.right_sidebar_theme') }}"> <aside class="control-sidebar control-sidebar-{{ config('adminlte.right_sidebar_theme') }}">
@yield('right-sidebar') @yield('right_sidebar')
</aside> </aside>