Upgrade boilerplate

resources/views/vendor/boilerplate/layout/contentheader.blade.php

@@ -2,7 +2,7 @@
     <div class="container-fluid">
         <div class="row mb-2 align-items-end">
             <div class="col-sm-6">
-                <h1 class="m-0 text-dark">
+                <h1 class="m-0">
                     {{ $title }}
                     @if(isset($subtitle))
                         <small class="font-weight-light ml-1 text-md">{{ $subtitle }}</small>

resources/views/vendor/boilerplate/layout/header.blade.php

@@ -1,4 +1,4 @@
-<nav class="main-header navbar navbar-expand navbar-{{ config('boilerplate.theme.navbar.bg') }} navbar-{{ config('boilerplate.theme.navbar.type') }} {{ config('boilerplate.theme.navbar.border') ? "" : "border-bottom-0" }}">
+<nav class="main-header navbar navbar-expand{{ config('boilerplate.theme.navbar.bg') === 'white' ? '' : ' navbar-'.config('boilerplate.theme.navbar.bg') }} navbar-{{ setting('darkmode', false) && config('boilerplate.theme.darkmode') ? 'dark' : config('boilerplate.theme.navbar.type') }} {{ config('boilerplate.theme.navbar.border') ? "" : "border-bottom-0" }}" data-type="{{ config('boilerplate.theme.navbar.type') }}">
     <div class="navbar-left d-flex">
         <ul class="nav navbar-nav">
             <li class="nav-item">
@@ -8,26 +8,60 @@
             </li>
         </ul>
         @foreach(app('boilerplate.navbar.items')->getItems('left') as $view)
-            {!! $view !!}
+        {!! $view !!}
         @endforeach
     </div>
     <div class="navbar-right ml-auto d-flex">
         @foreach(app('boilerplate.navbar.items')->getItems('right') as $view)
-            {!! $view !!}
+        {!! $view !!}
         @endforeach
         <ul class="nav navbar-nav">
+            @if(config('boilerplate.locale.switch', false))
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle px-2" data-toggle="dropdown" href="#" aria-expanded="false">
+                    {{ Config::get('boilerplate.locale.languages.'.App::getLocale().'.label') }}
+                </a>
+                <div class="dropdown-menu dropdown-menu-right" style="left: inherit; right: 0px;">
+                    @foreach(collect(config('boilerplate.locale.languages'))->map(function($e){return $e['label'];})->toArray() as $lang => $label)
+                        @if ($lang !== App::getLocale())
+                            <a href="{{ route('boilerplate.lang.switch', $lang) }}" class="dropdown-item">
+                                {{ $label }}
+                            </a>
+                        @endif
+                    @endforeach
+                </div>
+            </li>
+            @endif
             @if(config('boilerplate.theme.navbar.user.visible'))
             <li class="nav-item">
-                <a href="{{ route('boilerplate.user.profile') }}" class="nav-link d-flex align-items-center">
-                    <img src="{{ Auth::user()->avatar_url }}" class="avatar-img img-circle bg-gray mr-2 elevation-{{ config('boilerplate.theme.navbar.user.shadow') }}" alt="{{ Auth::user()->name }}" height="32">
-                    {{ Auth::user()->name }}
+                <a href="{{ route('boilerplate.user.profile') }}" class="nav-link d-flex align-items-center px-2">
+                    <img src="{{ Auth::user()->avatar_url }}" class="avatar-img img-circle bg-gray mr-0 mr-md-2 elevation-{{ config('boilerplate.theme.navbar.user.shadow') }}" alt="{{ Auth::user()->name }}" height="32">
+                    <span class="d-none d-md-block">{{ Auth::user()->name }}</span>
+                </a>
+            </li>
+            @endif
+            @if(config('boilerplate.theme.darkmode', false))
+            <li class="nav-item">
+                <a class="nav-link px-2" data-widget="darkmode" href="#" role="button">
+                    @if(setting('darkmode', false))
+                    <i class="fas fa-fw fa-sun"></i>
+                    @else
+                    <i class="far fa-moon"></i>
+                    @endif
+                </a>
+            </li>
+            @endif
+            @if(config('boilerplate.theme.fullscreen', false))
+            <li class="nav-item">
+                <a class="nav-link px-2" data-widget="fullscreen" href="#" role="button">
+                    <i class="fas fa-fw fa-expand-arrows-alt"></i>
                 </a>
             </li>
             @endif
             <li class="nav-item">
                 {!! Form::open(['route' => 'boilerplate.logout', 'method' => 'post', 'id' => 'logout-form']) !!}
-                <button type="submit" class="btn nav-link d-flex align-items-center logout px-2" data-question="{{ __('boilerplate::layout.logoutconfirm') }}" data-toggle="tooltip" title="{{ __('boilerplate::layout.logout') }}">
-                    <span class="fa fa-power-off hidden-xs pr-1"></span>
+                <button type="submit" class="btn nav-link d-flex align-items-center logout px-2" data-question="{{ __('boilerplate::layout.logoutconfirm') }}">
+                    <span class="fa fa-fw fa-power-off hidden-xs pr-1"></span>
                 </button>
                 {!! Form::close() !!}
             </li>

resources/views/vendor/boilerplate/layout/index.blade.php

@@ -7,13 +7,15 @@
     <meta name="robots" content="noindex, nofollow">
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <title>{{ $title }} | {{ config('app.name') }}</title>
-@stack('css')
+    <link rel="shortcut icon" href="{{ config('boilerplate.theme.favicon') ?? mix('favicon.svg', '/assets/vendor/boilerplate') }}">
+@stack('plugin-css')
     <link rel="stylesheet" href="{{ mix('/plugins/fontawesome/fontawesome.min.css', '/assets/vendor/boilerplate') }}">
     <link rel="stylesheet" href="{{ mix('/adminlte.min.css', '/assets/vendor/boilerplate') }}">
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet">
+@stack('css')
 </head>
-<body class="layout-fixed layout-navbar-fixed sidebar-mini">
+<body class="layout-fixed layout-navbar-fixed sidebar-mini{{ setting('darkmode', false) && config('boilerplate.theme.darkmode') ? ' dark-mode accent-light' : '' }}{{ setting('sidebar-collapsed', false) ? ' sidebar-collapse' : '' }}">
     <div class="wrapper">
         @include('boilerplate::layout.header')
         @include('boilerplate::layout.mainsidebar')
@@ -42,24 +44,23 @@
     <script>
         $.ajaxSetup({headers: {'X-CSRF-TOKEN': '{{ csrf_token() }}'}});
         bootbox.setLocale('{{ App::getLocale() }}');
+        var bpRoutes = {
+            settings: "{{ route('boilerplate.settings', null, false) }}",
+        }
         var session = {
             keepalive: "{{ route('boilerplate.keepalive', null, false) }}",
             expire: {{ time() +  config('session.lifetime') * 60 }},
             lifetime:  {{ config('session.lifetime') * 60 }},
             id: "{{ session()->getId() }}"
         }
-    </script>
 @if(Session::has('growl'))
-    <script>
-        $(function() {
-            @if(is_array(Session::get('growl')))
-                growl("{!! Session::get('growl')[0] !!}", "{{ Session::get('growl')[1] }}");
-            @else
-                growl("{{Session::get('growl')}}");
-            @endif
-        });
-    </script>
+@if(is_array(Session::get('growl')))
+        growl("{!! Session::get('growl')[0] !!}", "{{ Session::get('growl')[1] }}");
+@else
+        growl("{{Session::get('growl')}}");
 @endif
+@endif
+    </script>
 @stack('js')
 </body>
 </html>

resources/views/vendor/boilerplate/layout/mainsidebar.blade.php

@@ -1,4 +1,4 @@
-<aside class="main-sidebar {{ config('boilerplate.theme.sidebar.border') ? 'border-right' : ''}} sidebar-{{ config('boilerplate.theme.sidebar.type') }}-{{ config('boilerplate.theme.sidebar.links.bg') }} elevation-{{ config('boilerplate.theme.sidebar.shadow') }}">
+<aside class="main-sidebar sidebar-{{ config('boilerplate.theme.sidebar.type') }}-{{ config('boilerplate.theme.sidebar.links.bg') }} elevation-{{ config('boilerplate.theme.sidebar.shadow') }}">
     <a href="{{ route('boilerplate.dashboard') }}" class="brand-link {{ !empty(config('boilerplate.theme.sidebar.brand.bg')) ? 'bg-'.config('boilerplate.theme.sidebar.brand.bg') : ''}}">
         <span class="brand-logo bg-{{ config('boilerplate.theme.sidebar.brand.logo.bg') }} elevation-{{ config('boilerplate.theme.sidebar.brand.logo.shadow') }}">
             {!! config('boilerplate.theme.sidebar.brand.logo.icon') !!}