Added validation, debounce and highcharts funnel/solidguage

composer.json

@@ -10,7 +10,6 @@
         }
     ],
     "require": {
-      "igaster/laravel-theme": "^2.0.17",
         "creativeorange/gravatar": "^1.0",
         "orchestra/asset": "^6.0"
     },
@@ -27,7 +26,10 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Leenooks\\Providers\\LeenooksServiceProvider"
+                "Orchestra\\Asset\\AssetServiceProvider",
+                "Collective\\Html\\HtmlServiceProvider",
+                "Leenooks\\Providers\\LeenooksServiceProvider",
+                "Leenooks\\Providers\\CustomBladeServiceProvider"
             ]
         }
     },

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

@@ -46,7 +46,7 @@
 
 					<div class="dropdown-divider"></div>
 					@if ($user->switched)
-						<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
+						<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item">
 							<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
 						</a>
 					@else

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

@@ -2,7 +2,7 @@
 <aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
 	<!-- Brand Logo -->
 	<a href="{{ url('home') }}" class="brand-link">
-		<img src="{{ asset('img/logo.png') }}" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
+		<img src="{{ asset('img/logo.png') }}" alt="Logo" style="margin-left: 0; padding: 5px;" class="brand-image">
 		<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
 	</a>
 

resources/themes/architect/views/auth/login.blade.php

@@ -0,0 +1,114 @@
+@extends('architect::layouts.auth')
+
+@section('htmlheader_title')
+	Log in
+@endsection
+
+@section('content')
+	<!-- /.login-logo -->
+	<div class="app-container app-theme-white body-tabs-shadow">
+		<div class="app-container">
+			<div class="h-100 bg-animation">
+				<div class="d-flex h-100 justify-content-center align-items-center">
+					<div class="mx-auto app-login-box col-md-8">
+						@if(file_exists('login-note.html'))
+							<div class="mx-auto card text-white card-body bg-primary w-50">
+								<h5 class="text-white card-title"><i class="icon fa-2x fas fa-info pr-3"></i><span class="font-size-xlg">NOTE</span></h5>
+								<span class="w-100 pb-0">
+									{!! file_get_contents('login-note.html') !!}
+								</span>
+							</div>
+						@endif
+
+						<div class="modal-dialog w-100 mx-auto">
+							<div class="modal-content">
+								<form class="needs-validation" novalidate method="post">
+									{{ csrf_field() }}
+
+									<div class="modal-body">
+										<div class="h5 modal-title text-center">
+											<h4 class="mt-2">
+												<div class="app-logo mx-auto mb-3"><img class="w-75" src="{{ url('img/logo-h-lg.png') }}"></div>
+												<small>@lang('Sign in to <strong>:server</strong>',['server'=>'Foo'])</small>
+											</h4>
+										</div>
+
+										<div class="form-row">
+											<div class="col-md-12 mt-3">
+												<label class="mb-1">Email</label>
+												<input name="email" id="user" placeholder="" type="email" class="form-control" required="">
+												<div class="invalid-feedback">
+													@lang('Please enter your email')
+												</div>
+											</div>
+
+											<div class="col-md-12 mt-2">
+												<label class="mb-1">@lang('Password')</label>
+												<input name="password" id="password" placeholder="" type="password" class="form-control" required>
+												<div class="invalid-feedback">
+													@lang('Please enter your password')
+												</div>
+											</div>
+										</div>
+									</div>
+
+									<div class="modal-footer">
+										@if (count($errors) > 0)
+											<div class="alert alert-danger w-100">
+												<strong>Whoops!</strong> Something went wrong?<br><br>
+												<ul>
+													@foreach ($errors->all() as $error)
+														<li>{{ $error }}</li>
+													@endforeach
+												</ul>
+											</div>
+										@endif
+										<div class="float-right">
+											<button class="btn btn-primary btn-lg">Login</button>
+										</div>
+									</div>
+								</form>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+@endsection
+
+@section('page-scripts')
+	<style>
+		label {
+			text-transform: uppercase;
+			letter-spacing: 0.05em;
+			font-size: 85%;
+			font-weight: bold;
+		}
+
+		table.table tr:last-child {
+			border-bottom: 1px solid #e9ecef;
+		}
+	</style>
+
+	<script>
+		// Example starter JavaScript for disabling form submissions if there are invalid fields
+		(function () {
+			'use strict';
+			window.addEventListener('load',function () {
+				// Fetch all the forms we want to apply custom Bootstrap validation styles to
+				var forms = document.getElementsByClassName('needs-validation');
+				// Loop over them and prevent submission
+				var validation = Array.prototype.filter.call(forms, function (form) {
+					form.addEventListener('submit', function (event) {
+						if (form.checkValidity() === false) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+						form.classList.add('was-validated');
+					}, false);
+				});
+			}, false);
+		})();
+	</script>
+@append

resources/themes/architect/views/layouts/app.blade.php

@@ -1,5 +1,5 @@
-<!doctype html>
+<!DOCTYPE html>
-<html lang="en">
+<html>
 	@section('htmlheader')
 		@include('architect::layouts.partials.htmlheader')
 	@show
@@ -8,16 +8,17 @@
 		<div class="app-container app-theme-white body-tabs-shadow fixed-sidebar">
 			@include('architect::layouts.partials.topmenu')
 
-			{{--
+			@includeIf('architect::layouts.partials.controlsidebar')
-			@include('architect::layouts.partials.controlsidebar')
-			--}}
 
 			<div class="app-main">
 				@include('architect::layouts.partials.sidebarmenu')
 
 				<div class="app-main__outer">
 					<div class="app-main__inner">
+						<div class="main-content">
+							@if (trim($__env->yieldContent('page_title')))
 								@include('architect::layouts.partials.contentheader')
+							@endif
 
 							<!-- Main content -->
 							<div class="row">
@@ -27,6 +28,7 @@
 								</div>
 							</div>
 						</div>
+					</div>
 
 					@include('architect::layouts.partials.contentfooter')
 				</div>

resources/themes/architect/views/layouts/auth.blade.php

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+	@section('htmlheader')
+		@include('architect::layouts.partials.htmlheader')
+	@show
+
+	<body class="hold-transition login-page">
+		<div id="app">
+			@yield('content')
+		</div>
+
+		@section('scripts')
+			@include('architect::auth.partials.scripts')
+
+			{{-- Scripts --}}
+			{!! Asset::scripts() !!}
+
+			@yield('page-scripts')
+		@show
+	</body>
+</html>

resources/themes/architect/views/layouts/partials/contentfooter.blade.php

@@ -5,7 +5,7 @@
 				<ul class="nav">
 					{{--
 					<li class="nav-item">
-						<a href="javascript:void(0);" class="nav-link">Footer Link 1</a>
+						<a href="javascript:void(0);" class="nav-link">Footer Link</a>
 					</li>
 					--}}
 				</ul>
@@ -18,7 +18,7 @@
 							<div class="badge badge-success mr-1 ml-0">
 								<small>NEW</small>
 							</div>
-							Footer Link 4
+							Footer Link
 						</a>
 					</li>
 					--}}

resources/themes/architect/views/layouts/partials/contentheader.blade.php

@@ -1,26 +1,30 @@
 <div class="app-page-title">
 	<div class="page-title-wrapper">
 		<div class="page-title-heading">
-			<div class="page-title-icon">
+			@if (trim($__env->yieldContent('page_icon')))
-				<i class="@yield('page_icon','pe-7s-car')"></i>
+				<div class="page-title-icon f32">
+					<i class="@yield('page_icon','')"></i>
 				</div>
+			@endif
 			<div>
 				@yield('page_title','Page Title')
 				<div class="page-title-subheading">
-					@yield('page_subtitle','Page Sub Title')
+					@yield('page_subtitle','')
 				</div>
 			</div>
 		</div>
+
+		@isset($page_actions)
 			<div class="page-title-actions">
 				{{--
 				<button type="button" data-toggle="tooltip" title="Example Tooltip" data-placement="bottom" class="btn-shadow mr-3 btn btn-dark">
-				<i class="fas fa-star"></i>
+					<i class="fa fa-star"></i>
 				</button>
 				--}}
 				<div class="d-inline-block dropdown">
 					<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn-shadow dropdown-toggle btn btn-info">
 						<span class="btn-icon-wrapper pr-2 opacity-7">
-						<i class="fas fa-business-time fa-w-20"></i>
+							<i class="fa fa-business-time fa-w-20"></i>
 						</span>
 						Item Menu
 					</button>
@@ -40,5 +44,6 @@
 					</div>
 				</div>
 			</div>
+		@endif
 	</div>
 </div>

resources/themes/architect/views/layouts/partials/topmenu.blade.php

@@ -43,7 +43,7 @@
 				{{--
 				<li class="nav-item">
 					<a href="javascript:void(0);" class="nav-link">
-						<i class="nav-link-icon fas fa-database"></i> Statistics
+						<i class="nav-link-icon fas fa-database"></i> Link
 					</a>
 				</li>
 				--}}

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

@@ -14,10 +14,10 @@
 	--}}
 
 	<!-- Theme style -->
-	@css('css/components.css')
+	@themecss('/css/components.css','components-css')
-	@css('css/style.css')
+	@themecss('/css/style.css','style-css')
-	@css('css/style-responsive.css')
+	@themecss('/css/style-responsive.css','style-responsive-css')
-	@css('css/themes/blue.css')
+	@themecss('/css/themes/blue.css','theme-blue-css')
 
 	<!-- Google Font: Source Sans Pro -->
 	<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
@@ -32,7 +32,7 @@
 	<link rel="shortcut icon" href="{{ object_get($site,'favicon','favicon.ico') }}" />
 
 	<!-- Custom CSS -->
-	@css('css/custom.css')
+	@php(Asset::add('custom-css','/css/custom.css'))
 
 	<!-- STYLESHEETS -->
 	{!! Asset::styles() !!}

src/Carbon.php

@@ -15,15 +15,38 @@ class Carbon extends CarbonBase
 
     public function __get($name)
     {
-       switch (true) {
+       switch ($name) {
-            case $name === 'half':
+            case 'half':
                 return (int) ceil($this->month / static::MONTHS_PER_HALF);
 
+           case 'quarter_string':
+               return sprintf('%dQ%d',$this->year,$this->quarter);
+
             default:
                 return parent::__get($name);
        }
     }
 
+    public function addHalf(): self
+    {
+        return $this->addHalves(1);
+    }
+
+    public function addHalves(int $unit): self
+    {
+        return $this->addQuarters(2*$unit);
+    }
+
+    public function subHalf(): self
+    {
+        return $this->subHalves(1);
+    }
+
+    public function subHalves(int $unit): self
+    {
+        return $this->subQuarters(2*$unit);
+    }
+
     /**
      * Modify to the first occurrence of a given day of the week
      * in the current quarter. If no dayOfWeek is provided, modify to the

src/Providers/CustomBladeServiceProvider.php

@@ -0,0 +1,319 @@
+<?php
+
+namespace Leenooks\Providers;
+
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\ServiceProvider;
+use Orchestra\Support\Facades\Asset;
+
+class CustomBladeServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+		Blade::directive('css',function(string $expression,array $args=[]) {
+			return $this->resolve('css',$expression);
+		});
+
+		Blade::directive('js',function($expression,string $options=NULL) {
+			return $this->resolve('js',$expression);
+		});
+    }
+
+	private function resolve(string $content,string $expression): string
+	{
+		if (str_contains($expression,',')) {
+			[$type,$arguments] = explode(',',$expression,2);
+			$arguments = explode('|',$arguments);
+
+		} else {
+			$type = $expression;
+			$arguments = [];
+		}
+
+		$return = collect();
+		$urls = collect();
+
+		switch ($type) {
+			case 'datatables':
+				switch ($content) {
+					case 'css':
+						// Base
+						$urls->put($type,'https://cdn.datatables.net/1.10.23/css/jquery.dataTables.min.css');
+
+						foreach ($arguments as $option) {
+							$key = $type.':'.$option;
+							switch ($option) {
+								case 'bootstrap4':
+									$urls->put($key,'/plugin/dataTables/dataTables.bootstrap4.css');
+									break;
+
+								case 'buttons':
+									$urls->put($key,'https://cdn.datatables.net/buttons/1.6.5/css/buttons.dataTables.min.css');
+									break;
+
+								case 'fixedheader':
+									$urls->put($key,'https://cdn.datatables.net/fixedheader/3.1.7/css/fixedHeader.dataTables.min.css');
+									break;
+
+								case 'rowgroup':
+									$urls->put($key,'https://cdn.datatables.net/rowgroup/1.1.2/css/rowGroup.dataTables.min.css');
+									break;
+
+								case 'responsive':
+									$urls->put($key,'http://cdn.datatables.net/responsive/2.2.6/css/responsive.dataTables.min.css');
+									break;
+
+								case 'searchpanes':
+									$urls->put($key,'https://cdn.datatables.net/searchpanes/1.2.1/css/searchPanes.dataTables.min.css');
+									break;
+
+								case 'searchpanes-left':
+									$urls->put('searchpanes:searchpanes-left','/plugin/dataTables/leftSearchPanes.css');
+									break;
+
+								case 'select':
+									$urls->put($key,'https://cdn.datatables.net/select/1.3.1/css/select.dataTables.min.css');
+									break;
+
+								default:
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
+							}
+						}
+
+						break;
+
+					case 'js':
+						// Base
+						$urls->put($type,'https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js');
+
+						foreach ($arguments as $option) {
+							$key = $type.':'.$option;
+
+							switch ($option) {
+								case 'bootstrap4':
+									$urls->put($key,'/plugin/dataTables/dataTables.bootstrap4.js');
+									break;
+
+								case 'buttons':
+									$urls->put($key,'https://cdn.datatables.net/buttons/1.6.5/js/dataTables.buttons.min.js');
+									$urls->put($key.'html5','https://cdn.datatables.net/buttons/1.6.5/js/buttons.html5.min.js');
+									$urls->put($key.'jszip','https://cdnjs.cloudflare.com/ajax/libs/jszip/3.2.0/jszip.min.js');
+									break;
+
+								case 'fixedheader':
+									$urls->put($key,'https://cdn.datatables.net/fixedheader/3.1.7/js/dataTables.fixedHeader.min.js');
+									break;
+
+								case 'responsive':
+									$urls->put($key,'https://cdn.datatables.net/responsive/2.2.6/js/dataTables.responsive.min.js');
+									break;
+
+								case 'rowgroup':
+									$urls->put($key,'https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js');
+									break;
+
+								case 'searchpanes':
+									$urls->put($key,'https://cdn.datatables.net/searchpanes/1.2.1/js/dataTables.searchPanes.min.js');
+									break;
+
+								case 'select':
+									$urls->put($key,'https://cdn.datatables.net/select/1.3.1/js/dataTables.select.min.js');
+									break;
+
+								default:
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
+							}
+						}
+				}
+
+				break;
+
+			case 'datepick':
+				switch ($content) {
+					case 'css':
+						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css');
+						break;
+
+					case 'js':
+						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js');
+				}
+
+				break;
+
+			case 'debounce':
+				switch ($content) {
+					case 'js':
+						$urls->put($type,'js/debounce.js');
+				}
+
+				break;
+
+			case 'highcharts':
+				switch ($content) {
+					case 'js':
+						// Base
+						$urls->put($type,'https://code.highcharts.com/highcharts.js');
+
+						foreach ($arguments as $option) {
+							$key = $type.':'.$option;
+							switch ($option) {
+								case '3d':
+									$urls->put($key,'https://code.highcharts.com/highcharts-3d.js');
+									$urls->put($key.'mouseover','/plugin/highcharts/3dmouseover.js');
+									break;
+
+								case 'data':
+									$urls->put($key,'https://code.highcharts.com/modules/data.js');
+									break;
+
+								case 'defaults':
+									$urls->put($key,'/plugin/highcharts/defaults.js');
+									break;
+
+								case 'drilldown':
+									$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 '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':
+									$urls->put($key,'https://code.highcharts.com/themes/dark-unica.js');
+									break;
+
+								default:
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
+							}
+						}
+				}
+
+				break;
+
+			case 'highcharts-stock':
+				switch ($content) {
+					case 'js':
+						// Base
+						$urls->put($type,'https://code.highcharts.com/stock/highstock.js');
+
+						foreach ($arguments as $option) {
+							$key = $type.':'.$option;
+							switch ($option) {
+								case 'data':
+									$urls->put($key,'https://code.highcharts.com/stock/modules/data.js');
+									break;
+
+								case 'export':
+									$urls->put($key,'https://code.highcharts.com/stock/modules/exporting.js');
+									break;
+
+								default:
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
+							}
+						}
+				}
+
+				break;
+
+			case 'select2':
+				switch ($content) {
+					case 'css':
+						// Base
+						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css');
+
+						break;
+
+					case 'js':
+						// Base
+						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js');
+
+						foreach ($arguments as $option) {
+							$key = $type.':'.$option;
+							switch ($option) {
+								case 'autofocus':
+									$urls->put($key,'plugin/select2/fix-autofocus.js');
+									break;
+
+								default:
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
+							}
+						}
+				}
+
+				break;
+
+			case 'simplemde':
+				switch ($content) {
+					case 'css':
+						// Base
+						$urls->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css');
+
+						break;
+
+					case 'js':
+						// Base
+						$urls->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js');
+				}
+
+				break;
+
+			case 'summernote':
+				switch ($content) {
+					case 'css':
+						// Base
+						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.css');
+
+						break;
+
+					case 'js':
+						// Base
+						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.js');
+				}
+
+				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));
+		}
+
+		if ($urls->count())
+			return $urls->map(function($item,$key) {
+				$dependancy='';
+				if (str_contains($key,':'))
+					[$dependancy,$key] = explode(':',$key);
+
+				return "<?php Asset::add('$key','$item','$dependancy'); ?>";
+			})->join('');
+	}
+}

src/Traits/SingleOrFail.php

@@ -32,8 +32,8 @@ trait SingleOrFail
 			return NULL;
 		});
 
-		// When a query should return 1 object, or NULL if it doesnt
+		// When a query should return 1 object, or setup to create a new object
-		Builder::macro('singleOrNew',function ($args) {
+		Builder::macro('singleOrNew',function (array $args=[]) {
 			$result = $this->where($args)->get();
 
 			if ($result->count() == 1)