updating to L5.6 and BS4

Author: jeremykenedy

README.md

@@ -1,4 +1,4 @@
-# Laravel Logger
+# Laravel Activity Logger
 
 [![Latest Stable Version](https://poser.pugx.org/jeremykenedy/laravel-logger/v/stable)](https://packagist.org/packages/jeremykenedy/laravel-logger)
 [![Total Downloads](https://poser.pugx.org/jeremykenedy/laravel-logger/downloads)](https://packagist.org/packages/jeremykenedy/laravel-logger)
@@ -32,7 +32,7 @@ Laravel logger can work out the box with or without the following roles packages
 
 ### Features
 
-| Laravel Logger Features  |
+| Laravel Activity Logger Features  |
 | :------------ |
 |Logs login page visits|
 |Logs user logins|
@@ -60,7 +60,7 @@ Laravel logger can work out the box with or without the following roles packages
 |Lots of [configuration](#configuration) options|
 
 ### Requirements
-* [Laravel 5.1, 5.2, 5.3, 5.4, or 5.5+](https://laravel.com/docs/installation)
+* [Laravel 5.1, 5.2, 5.3, 5.4, 5.5, and 5.6+](https://laravel.com/docs/installation)
 * [jaybizzle/laravel-crawler-detect](https://github.com/JayBizzle/Laravel-Crawler-Detect) included dependency in composer.json (for crawler detection)
 
 ### Installation Instructions
@@ -101,7 +101,7 @@ Register the package with laravel in `config/app.php` under `providers` with the
 ```
 
 ### Configuration
-Laravel Logger can be configured in directly in `/config/laravel-logger.php` if you published the assets.
+Laravel Activity Logger can be configured in directly in `/config/laravel-logger.php` if you published the assets.
 Or you can variables to your `.env` file.
 
 
@@ -128,11 +128,12 @@ LARAVEL_LOGGER_JQUERY_CDN_URL=https://code.jquery.com/jquery-2.2.4.min.js
 LARAVEL_LOGGER_BLADE_CSS_PLACEMENT_ENABLED=false
 LARAVEL_LOGGER_BLADE_JS_PLACEMENT_ENABLED=false
 LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_ENABLED=true
-LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js
+LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js
 LARAVEL_LOGGER_FONT_AWESOME_CDN_ENABLED=true
 LARAVEL_LOGGER_FONT_AWESOME_CDN_URL=https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css
 LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_ENABLED=true
-LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css
+LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
+LARAVEL_LOGGER_POPPER_JS_CDN_URL=https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js
 ```
 
 ### Usage

src/.env.example

@@ -17,8 +17,9 @@ LARAVEL_LOGGER_JQUERY_CDN_URL=https://code.jquery.com/jquery-2.2.4.min.js
 LARAVEL_LOGGER_BLADE_CSS_PLACEMENT_ENABLED=false
 LARAVEL_LOGGER_BLADE_JS_PLACEMENT_ENABLED=false
 LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_ENABLED=true
-LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js
+LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js
 LARAVEL_LOGGER_FONT_AWESOME_CDN_ENABLED=true
 LARAVEL_LOGGER_FONT_AWESOME_CDN_URL=https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css
 LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_ENABLED=true
-LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css
+LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL=https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
+LARAVEL_LOGGER_POPPER_JS_CDN_URL=https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js

src/app/Logic/helpers.php

@@ -4,6 +4,7 @@
 {
     /**
      * Clean the url for the front end to display
+     *
      * @param  string $link
      * @return echo string
      */

src/config/laravel-logger.php

@@ -95,23 +95,42 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Laravel Logger Dependencies - allows for easier builds into other projects
+    | Blade settings
     |--------------------------------------------------------------------------
     */
 
-    // jQuery
-    'enablejQueryCDN'           => env('LARAVEL_LOGGER_JQUERY_CDN_ENABLED', true),
-    'JQueryCDN'                 => env('LARAVEL_LOGGER_JQUERY_CDN_URL', 'https://code.jquery.com/jquery-2.2.4.min.js'),
+    // The parent Blade file
+    'loggerBladeExtended'       => 'layouts.app',
+
+    // Switch Between bootstrap 3 `panel` and bootstrap 4 `card` classes
+    'bootstapVersion'           => '4',
+
+    // Additional Card classes for styling -
+    // See: https://getbootstrap.com/docs/4.0/components/card/#background-and-color
+    // Example classes: 'text-white bg-primary mb-3'
+    'bootstrapCardClasses'          => '',
 
     // Blade Extension Placement
     'enableBladeCssPlacement'   => env('LARAVEL_LOGGER_BLADE_CSS_PLACEMENT_ENABLED', false),
     'enableBladeJsPlacement'    => env('LARAVEL_LOGGER_BLADE_JS_PLACEMENT_ENABLED', false),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Laravel Logger Dependencies - allows for easier builds into other projects
+    |--------------------------------------------------------------------------
+    */
+
+    // jQuery
+    'enablejQueryCDN'           => env('LARAVEL_LOGGER_JQUERY_CDN_ENABLED', true),
+    'JQueryCDN'                 => env('LARAVEL_LOGGER_JQUERY_CDN_URL', 'https://code.jquery.com/jquery-3.2.1.slim.min.js'),
+
     // Bootstrap
     'enableBootstrapCssCDN'     => env('LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_ENABLED', true),
-    'bootstrapCssCDN'           => env('LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL', 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css'),
+    'bootstrapCssCDN'           => env('LARAVEL_LOGGER_BOOTSTRAP_CSS_CDN_URL', 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css'),
     'enableBootstrapJsCDN'      => env('LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_ENABLED', true),
-    'bootstrapJsCDN'            => env('LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_URL', 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js'),
+    'bootstrapJsCDN'            => env('LARAVEL_LOGGER_BOOTSTRAP_JS_CDN_URL', 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js'),
+    'enablePopperJsCDN'         => env('LARAVEL_LOGGER_POPPER_JS_CDN_ENABLED', true),
+    'popperJsCDN'               => env('LARAVEL_LOGGER_POPPER_JS_CDN_URL', 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js'),
 
     // Font Awesome
     'enableFontAwesomeCDN'      => env('LARAVEL_LOGGER_FONT_AWESOME_CDN_ENABLED', true),

src/resources/views/forms/clear-activity-log.blade.php

@@ -1,4 +1,4 @@
 {!! Form::open(array('route' => 'clear-activity')) !!}
     {!! Form::hidden('_method', 'DELETE') !!}
-    {!! Form::button('<i class="fa fa-fw fa-trash" aria-hidden="true"></i>' . trans('LaravelLogger::laravel-logger.dashboard.menu.clear'), array('type' => 'button', 'data-toggle' => 'modal', 'data-target' => '#confirmDelete', 'data-title' => trans('LaravelLogger::laravel-logger.modals.clearLog.title'),'data-message' => trans('LaravelLogger::laravel-logger.modals.clearLog.message'))) !!}
+    {!! Form::button('<i class="fa fa-fw fa-trash" aria-hidden="true"></i>' . trans('LaravelLogger::laravel-logger.dashboard.menu.clear'), array('type' => 'button', 'data-toggle' => 'modal', 'data-target' => '#confirmDelete', 'data-title' => trans('LaravelLogger::laravel-logger.modals.clearLog.title'),'data-message' => trans('LaravelLogger::laravel-logger.modals.clearLog.message'), 'class' => 'dropdown-item')) !!}
 {!! Form::close() !!}

src/resources/views/logger/activity-log-cleared.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends(config('LaravelLogger.loggerBladeExtended'))
 
 @section('template_title')
     @lang('LaravelLogger::laravel-logger.dashboardCleared.title')
@@ -85,6 +85,10 @@
         <script type="text/javascript" src="{{ config('LaravelLogger.bootstrapJsCDN') }}"></script>
     @endif
 
+    @if(config('LaravelLogger.enablePopperJsCDN'))
+        <script type="text/javascript" src="{{ config('LaravelLogger.popperJsCDN') }}"></script>
+    @endif
+
     @include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmDelete'])
     @include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmRestore'])
 
@@ -101,4 +105,4 @@
 
 @if(config('LaravelLogger.enableBladeJsPlacement'))
     @endsection
-@endif
+@endif

src/resources/views/logger/activity-log-item.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends(config('LaravelLogger.loggerBladeExtended'))
 
 @section('template_title')
     @lang('LaravelLogger::laravel-logger.drilldown.title', ['id' => $activity->id])
@@ -363,6 +363,10 @@
         <script type="text/javascript" src="{{ config('LaravelLogger.bootstrapJsCDN') }}"></script>
     @endif
 
+    @if(config('LaravelLogger.enablePopperJsCDN'))
+        <script type="text/javascript" src="{{ config('LaravelLogger.popperJsCDN') }}"></script>
+    @endif
+
     @if(config('LaravelLogger.loggerDatatables'))
         @if (count($activities) > 10)
             @include('LaravelLogger::scripts.datatables')
@@ -371,4 +375,4 @@
 
 @if(config('LaravelLogger.enableBladeJsPlacement'))
     @endsection
-@endif
+@endif

src/resources/views/logger/activity-log.blade.php

@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends(config('LaravelLogger.loggerBladeExtended'))
 
 @section('template_title')
     @lang('LaravelLogger::laravel-logger.dashboard.title')
@@ -12,6 +12,22 @@
     @include('LaravelLogger::partials.styles')
 @endif
 
+@php
+    switch (config('LaravelLogger.bootstapVersion')) {
+        case '4':
+            $containerClass = 'card';
+            $containerHeaderClass = 'card-header';
+            $containerBodyClass = 'card-body';
+            break;
+        case '3':
+        default:
+            $containerClass = 'panel panel-default';
+            $containerHeaderClass = 'panel-heading';
+            $containerBodyClass = 'panel-body';
+    }
+    $bootstrapCardClasses = (is_null(config('LaravelLogger.bootstrapCardClasses')) ? '' : config('LaravelLogger.bootstrapCardClasses'));
+@endphp
+
 @section('content')
 
     <div class="container-fluid">
@@ -22,36 +38,53 @@
 
         <div class="row">
             <div class="col-sm-12">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <div style="display: flesx; justify-content: spacse-between; align-items: censter;">
-                            @lang('LaravelLogger::laravel-logger.dashboard.title')
+                <div class="{{ $containerClass }} {{ $bootstrapCardClasses }}">
+                    <div class="{{ $containerHeaderClass }}">
+                        <div style="display: flex; justify-content: space-between; align-items: center;">
+
                             @if(config('LaravelLogger.enableSubMenu'))
-                                <small>
-                                    <sup class="label label-default">
-                                        {{ $totalActivities }} @lang('LaravelLogger::laravel-logger.dashboard.subtitle')
-                                    </sup>
-                                </small>
+
+                                <span>
+                                    @lang('LaravelLogger::laravel-logger.dashboard.title')
+                                    <small>
+                                        <sup class="label label-default">
+                                            {{ $totalActivities }} @lang('LaravelLogger::laravel-logger.dashboard.subtitle')
+                                        </sup>
+                                    </small>
+                                </span>
+
                                 <div class="btn-group pull-right btn-group-xs">
                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                         <i class="fa fa-ellipsis-v fa-fw" aria-hidden="true"></i>
                                         <span class="sr-only">
                                             @lang('LaravelLogger::laravel-logger.dashboard.menu.alt')
                                         </span>
                                     </button>
-                                    <ul class="dropdown-menu">
-                                        <li>
+                                    @if(config('LaravelLogger.bootstapVersion') == '4')
+                                        <div class="dropdown-menu dropdown-menu-right">
                                             @include('LaravelLogger::forms.clear-activity-log')
-                                        </li>
-                                        <li>
-                                            <a href="{{route('cleared')}}">
+                                            <a href="{{route('cleared')}}" class="dropdown-item">
                                                 <i class="fa fa-fw fa-history" aria-hidden="true"></i>
                                                 @lang('LaravelLogger::laravel-logger.dashboard.menu.show')
                                             </a>
-                                        </li>
-                                    </ul>
+                                        </div>
+                                    @else
+                                        <ul class="dropdown-menu dropdown-menu-right">
+                                            <li class="dropdown-item">
+                                                @include('LaravelLogger::forms.clear-activity-log')
+                                            </li>
+                                            <li class="dropdown-item">
+                                                <a href="{{route('cleared')}}">
+                                                    <i class="fa fa-fw fa-history" aria-hidden="true"></i>
+                                                    @lang('LaravelLogger::laravel-logger.dashboard.menu.show')
+                                                </a>
+                                            </li>
+                                        </ul>
+                                    @endif
                                 </div>
+
                             @else
+                                @lang('LaravelLogger::laravel-logger.dashboard.title')
                                 <span class="pull-right label label-default">
                                     {{ $totalActivities }}
                                     <span class="hidden-sms">
@@ -62,7 +95,7 @@
 
                         </div>
                     </div>
-                    <div class="panel-body">
+                    <div class="{{ $containerBodyClass }}">
                         @include('LaravelLogger::logger.partials.activity-table', ['activities' => $activities, 'hoverable' => true])
                     </div>
                 </div>
@@ -86,6 +119,10 @@
         <script type="text/javascript" src="{{ config('LaravelLogger.bootstrapJsCDN') }}"></script>
     @endif
 
+    @if(config('LaravelLogger.enablePopperJsCDN'))
+        <script type="text/javascript" src="{{ config('LaravelLogger.popperJsCDN') }}"></script>
+    @endif
+
     @include('LaravelLogger::scripts.confirm-modal', ['formTrigger' => '#confirmDelete'])
 
     @if(config('LaravelLogger.loggerDatatables'))
@@ -101,4 +138,4 @@
 
 @if(config('LaravelLogger.enableBladeJsPlacement'))
     @endsection
-@endif
+@endif

src/resources/views/logger/partials/activity-table.blade.php

@@ -16,7 +16,7 @@
 @endphp
 
 <div class="table-responsive activity-table">
-    <table class="table table-striped table-condensed @if(config('LaravelLogger.enableDrillDown') && $hoverable) table-hover @endif data-table">
+    <table class="table table-striped table-condensed table-sm @if(config('LaravelLogger.enableDrillDown') && $hoverable) table-hover @endif data-table">
         <thead>
             <tr>
                 <th>

src/resources/views/modals/confirm-modal.blade.php

@@ -12,11 +12,13 @@
 }
 @endphp
 <div class="modal fade modal-{{$modalClass}}" id="{{$formTrigger}}" role="dialog" aria-labelledby="{{$formTrigger}}Label" aria-hidden="true">
-  <div class="modal-dialog">
+  <div class="modal-dialog" role="document">
     <div class="modal-content">
-      <div class="modal-header">
+      <div class="modal-header {{$modalClass}}">
+        <h5 class="modal-title">
+          Confirm
+        </h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title">Confirm</h4>
       </div>
       <div class="modal-body">
         <p>Are you sure?</p>