Added validation, debounce and highcharts funnel/solidguage

resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php

@@ -6,19 +6,16 @@
 	<!-- CSRF Token -->
 	<meta name="csrf-token" content="{{ csrf_token() }}">
 
-	{{--
-	<!-- Included in adminlte -->
-	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
-	--}}
+	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
 
 	<!-- Font Awesome Icons -->
-	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.4/css/all.css">
+	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.3/css/all.css">
 	{{--
-	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.4/css/v4-shims.css">
+	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.3/css/v4-shims.css">
 	--}}
 
 	<!-- Theme style -->
-	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/admin-lte@3.2.0/dist/css/adminlte.min.css">
+	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/admin-lte@3.1.0/dist/css/adminlte.min.css">
 
 	<!-- Google Font: Source Sans Pro -->
 	<link href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap" rel="stylesheet">

resources/themes/adminlte/views/layouts/partials/scripts.blade.php

@@ -2,9 +2,9 @@
 <!-- Bootstrap & Jquery App -->
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js" integrity="sha512-WFN04846sdKMIP5LKNphMaWzU7YpMyCU245etK3g/2ARYbPK9Ub18eG+ljU96qKRCWh+quCY7yefSmlkQw1ANQ==" crossorigin="anonymous"></script>
-<script type="text/javascript" src="//cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+<script type="text/javascript" src="//cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns" crossorigin="anonymous"></script>
 <!-- AdminLTE -->
-<script type="text/javascript" src="//cdn.jsdelivr.net/npm/admin-lte@3.2.0/dist/js/adminlte.min.js"></script>
+<script type="text/javascript" src="//cdn.jsdelivr.net/npm/admin-lte@3.1.0/dist/js/adminlte.min.js"></script>
 
 <!-- Additional Utilities -->
 <script src="{{ asset('plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js') }}"></script>

resources/themes/adminlte/views/widget/errors.blade.php

@@ -1,12 +0,0 @@
-<!-- Errors -->
-@if ($errors->any())
-	<div class="alert alert-danger alert-dismissible">
-		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-		<h5><i class="icon fas fa-ban"></i> Whoops!</h5>
-		<ul>
-			@foreach ($errors->all() as $error)
-				<li>{!! $error !!}</li>
-			@endforeach
-		</ul>
-	</div>
-@endif

resources/themes/adminlte/views/widget/form_date.blade.php

@@ -1,14 +0,0 @@
-<div class="form-group">
-	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group">
-		<div class="input-group-prepend">
-			<span class="input-group-text"><i class="fa-fw {{ $icon ?? 'fas fa-calendar' }}"></i></span>
-		</div>
-		<input type="date" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}" value="{{ old($id,$value) }}">
-		<span class="invalid-feedback" role="alert">
-			@error($id)
-				{{ $message }}
-			@enderror
-		</span>
-	</div>
-</div>

resources/themes/adminlte/views/widget/form_text.blade.php

@@ -1,14 +0,0 @@
-<div class="form-group">
-	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group">
-		<div class="input-group-prepend">
-			<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
-		</div>
-		<input type="text" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?: $id}}" value="{{ old($old ?? $name,$value) }}">
-		<span class="invalid-feedback" role="alert">
-			@error($id)
-				{{ $message }}
-			@enderror
-		</span>
-	</div>
-</div>

resources/themes/adminlte/views/widget/status.blade.php

@@ -1,3 +1,23 @@
-@include('adminlte::widget.success')
+<!-- Success -->
+@if(session()->has('success'))
+	<div class="alert alert-success alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+		<h5><i class="icon fas fa-check"></i> Success!</h5>
+		<ul>
+			<li>{{ session()->get('success') }}</li>
+		</ul>
+	</div>
+@endif
 
-@include('adminlte::widget.errors')
+<!-- Errors -->
+@if ($errors->any())
+	<div class="alert alert-danger alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+		<h5><i class="icon fas fa-ban"></i> Whoops!</h5>
+		<ul>
+			@foreach ($errors->all() as $error)
+				<li>{!! $error !!}</li>
+			@endforeach
+		</ul>
+	</div>
+@endif

resources/themes/adminlte/views/widget/success.blade.php

@@ -1,10 +0,0 @@
-<!-- Success -->
-@if(session()->has('success'))
-	<div class="alert alert-success alert-dismissible">
-		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-		<h5><i class="icon fas fa-check"></i> Success!</h5>
-		<ul>
-			<li>{{ session()->get('success') }}</li>
-		</ul>
-	</div>
-@endif

src/Controllers/AdminController.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Leenooks\Controllers;
+
+use Illuminate\Support\Facades\Auth;
+use App\Http\Controllers\Controller;
+use Redirect;
+use Session;
+
+use App\Models\User;
+
+class AdminController extends Controller
+{
+	public function __construct()
+	{
+		$this->middleware('auth');
+	}
+
+	public function switch_authorised($id)
+	{
+		return (method_exists(Auth::user(),'isAdmin') && Auth::user()->isAdmin($id)) ? TRUE : FALSE;
+	}
+
+	public function switch_session()
+	{
+		return ! Session::get('orig_user');
+	}
+
+	public function user_switch_start($id)
+	{
+		if ($this->switch_session() AND $this->switch_authorised($id))
+		{
+			$uo = User::find($id);
+
+			if (! $uo)
+				abort(404,'User not found');
+
+			Session::put('orig_user',Auth::id());
+			Auth::login($uo);
+		}
+
+		return Redirect::to('/home');
+	}
+
+	public function user_switch_stop()
+	{
+		if ($id = Session::pull('orig_user')) {
+			$uo = User::find($id);
+			Auth::login($uo);
+		}
+
+		return Redirect::to('/home');
+	}
+}

src/Controllers/SwitchUserController.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace Leenooks\Controllers;
-
-use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
-use Illuminate\Support\Facades\Auth;
-use Redirect;
-use Session;
-
-use App\Models\User;
-
-class SwitchUserController extends Controller
-{
-	public function __construct()
-	{
-		$this->middleware('auth');
-	}
-
-	/**
-	 * Determine if the user is authorised to switch to another user
-	 *
-	 * @param User $user
-	 * @return bool
-	 */
-	public function switch_authorised(User $user): bool
-	{
-		return (method_exists(Auth::user(),'isAdmin') && Auth::user()->isAdmin($user)) ? TRUE : FALSE;
-	}
-
-	/**
-	 * Switch to a different user
-	 *
-	 * @param User $user
-	 * @return mixed
-	 */
-	public function switch_start(User $user)
-	{
-		if ($user->switched)
-			abort(403,'User already switched');
-
-		if ($this->switch_authorised($user)) {
-			Session::put('orig_user',Auth::user());
-			Auth::login($user);
-		}
-
-		return Redirect::to('/home');
-	}
-
-	/**
-	 * Return back from the switch users
-	 *
-	 * @return mixed
-	 */
-	public function switch_stop()
-	{
-		if ($user = Session::pull('orig_user'))
-			Auth::login($user);
-
-		return Redirect::to(RouteServiceProvider::HOME);
-	}
-}

src/Providers/CustomBladeServiceProvider.php

@@ -146,6 +146,14 @@ class CustomBladeServiceProvider extends ServiceProvider
 
 				break;
 
+			case 'debounce':
+				switch ($content) {
+					case 'js':
+						$urls->put($type,'js/debounce.js');
+				}
+
+				break;
+
 			case 'highcharts':
 				switch ($content) {
 					case 'js':
@@ -172,13 +180,23 @@ class CustomBladeServiceProvider extends ServiceProvider
 									$urls->put($key,'https://code.highcharts.com/modules/drilldown.js');
 									break;
 
+								case 'export':
+									$urls->put($key,'https://code.highcharts.com/modules/exporting.js');
+									$urls->put($key.'data','https://code.highcharts.com/modules/export-data.js');
+									break;
+
+								case 'funnel':
+									$urls->put($key,'https://code.highcharts.com/modules/funnel.js');
+									break;
+
 								case 'heatmap':
 									$urls->put($key,'https://code.highcharts.com/modules/heatmap.js');
 									break;
 
-								case 'export':
-									$urls->put($key,'https://code.highcharts.com/modules/exporting.js');
-									$urls->put($key.'data','https://code.highcharts.com/modules/export-data.js');
+								case 'solidguage':
+									$urls->put($key,'https://code.highcharts.com/highcharts-more.js');
+									$urls->put($key.'accessiblity','https://code.highcharts.com/modules/accessibility.js');
+									$urls->put($key.'solid-guage','https://code.highcharts.com/modules/solid-gauge.js');
 									break;
 
 								case 'theme-dark':
@@ -275,6 +293,16 @@ class CustomBladeServiceProvider extends ServiceProvider
 
 				break;
 
+			case 'validation':
+				switch ($content) {
+					case 'js':
+						// Base
+						$urls->put('validate','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/jquery.validate.min.js');
+						$urls->put('validate.additional','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/additional-methods.min.js');
+				}
+
+				break;
+
 			default:
 				throw new \Exception(sprintf('Unknown Expression: [%s]',$expression));
 		}

src/Traits/UserSwitch.php

@@ -7,27 +7,14 @@ namespace Leenooks\Traits;
 
 use Session;
 
-use App\Models\User;
-
 trait UserSwitch
 {
-	/**
-	 * Return if this is a switched user
-	 *
-	 * @return mixed
-	 */
 	public function getSwitchedAttribute()
 	{
 		return Session::get('orig_user');
 	}
 
-	/**
-	 * If the user record has an admin attribute, we'll return that
-	 *
-	 * @param User|null $user
-	 * @return false|mixed
-	 */
-	public function isAdmin(User $user=NULL)
+	public function isAdmin($id)
 	{
 		return isset($this->admin) ? $this->admin : FALSE;
 	}