Update style sheets

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

@@ -6,16 +6,19 @@
 	<!-- CSRF Token -->
 	<meta name="csrf-token" content="{{ csrf_token() }}">
 
-	<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">
+	{{--
+	<!-- 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">
+	--}}
 
 	<!-- Font Awesome Icons -->
-	<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/all.css">
 	{{--
-	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.3/css/v4-shims.css">
+	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.4/css/v4-shims.css">
 	--}}
 
 	<!-- Theme style -->
-	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/admin-lte@3.1.0/dist/css/adminlte.min.css">
+	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/admin-lte@3.2.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.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns" 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>
 <!-- AdminLTE -->
-<script type="text/javascript" src="//cdn.jsdelivr.net/npm/admin-lte@3.1.0/dist/js/adminlte.min.js"></script>
+<script type="text/javascript" src="//cdn.jsdelivr.net/npm/admin-lte@3.2.0/dist/js/adminlte.min.js"></script>
 
 <!-- Additional Utilities -->
 <script src="{{ asset('plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js') }}"></script>

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>
-<html lang="en">
+<!DOCTYPE html>
+<html>
 	@section('htmlheader')
 		@include('architect::layouts.partials.htmlheader')
 	@show
@@ -8,22 +8,24 @@
 		<div class="app-container app-theme-white body-tabs-shadow fixed-sidebar">
 			@include('architect::layouts.partials.topmenu')
 
-			{{--
-			@include('architect::layouts.partials.controlsidebar')
-			--}}
+			@includeIf('architect::layouts.partials.controlsidebar')
 
 			<div class="app-main">
 				@include('architect::layouts.partials.sidebarmenu')
 
 				<div class="app-main__outer">
 					<div class="app-main__inner">
-						@include('architect::layouts.partials.contentheader')
+						<div class="main-content">
+							@if (trim($__env->yieldContent('page_title')))
+								@include('architect::layouts.partials.contentheader')
+							@endif
 
-						<!-- Main content -->
-						<div class="row">
-							<div class="col-12">
-								<!-- Your Page Content Here -->
-								@yield('main-content')
+							<!-- Main content -->
+							<div class="row">
+								<div class="col-12">
+									<!-- Your Page Content Here -->
+									@yield('main-content')
+								</div>
 							</div>
 						</div>
 					</div>
@@ -42,4 +44,4 @@
 			@yield('page-scripts')
 		@show
 	</body>
-</html>
+</html>

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>
 					--}}
@@ -26,4 +26,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>

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

@@ -1,44 +1,49 @@
 <div class="app-page-title">
 	<div class="page-title-wrapper">
 		<div class="page-title-heading">
-			<div class="page-title-icon">
-				<i class="@yield('page_icon','pe-7s-car')"></i>
-			</div>
+			@if (trim($__env->yieldContent('page_icon')))
+				<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>
-		<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>
-			</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>
-					</span>
-					Item Menu
-				</button>
 
-				<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
-					<ul class="nav flex-column">
-						{{--
-						<li class="nav-item">
-							<a href="javascript:void(0);" class="nav-link">
-								<i class="nav-link-icon lnr-inbox"></i>
-								<span>Inbox</span>
-								<div class="ml-auto badge badge-pill badge-secondary">86</div>
-							</a>
-						</li>
-						--}}
-					</ul>
+		@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="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="fa fa-business-time fa-w-20"></i>
+						</span>
+						Item Menu
+					</button>
+
+					<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
+						<ul class="nav flex-column">
+							{{--
+							<li class="nav-item">
+								<a href="javascript:void(0);" class="nav-link">
+									<i class="nav-link-icon lnr-inbox"></i>
+									<span>Inbox</span>
+									<div class="ml-auto badge badge-pill badge-secondary">86</div>
+								</a>
+							</li>
+							--}}
+						</ul>
+					</div>
 				</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>
 				--}}
@@ -70,7 +70,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="widget-content-left  ml-3 header-user-info">
+						<div class="widget-content-left ml-3 header-user-info">
 							<div class="widget-heading">
 								{{ $user->name ?? 'John Smith' }}
 							</div>

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

@@ -14,10 +14,10 @@
 	--}}
 
 	<!-- Theme style -->
-	@asset('css/components.css')
-	@asset('css/style.css')
-	@asset('css/style-responsive.css')
-	@asset('css/themes/blue.css')
+	@themecss('/css/components.css','components-css')
+	@themecss('/css/style.css','style-css')
+	@themecss('/css/style-responsive.css','style-responsive-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,10 +32,10 @@
 	<link rel="shortcut icon" href="{{ object_get($site,'favicon','favicon.ico') }}" />
 
 	<!-- Custom CSS -->
-	@asset('css/custom.css')
+	@php(Asset::add('custom-css','/css/custom.css'))
 
 	<!-- STYLESHEETS -->
 	{!! Asset::styles() !!}
 
 	@yield('page-styles')
-</head>
+</head>

src/Controllers/AdminController.php

@@ -1,54 +0,0 @@
-<?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

@@ -0,0 +1,62 @@
+<?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

@@ -27,16 +27,15 @@ class CustomBladeServiceProvider extends ServiceProvider
 
 	private function resolve(string $content,string $expression): string
 	{
-		if (str_contains($expression,','))
+		if (str_contains($expression,',')) {
 			[$type,$arguments] = explode(',',$expression,2);
+			$arguments = explode('|',$arguments);
 
-		else {
+		} else {
 			$type = $expression;
-			$arguments = '';
+			$arguments = [];
 		}
 
-		$arguments = explode('|',$arguments);
-
 		$return = collect();
 		$urls = collect();
 
@@ -219,6 +218,63 @@ class CustomBladeServiceProvider extends ServiceProvider
 
 				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;
+
 			default:
 				throw new \Exception(sprintf('Unknown Expression: [%s]',$expression));
 		}

src/Traits/SingleOrFail.php

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

src/Traits/UserSwitch.php

@@ -7,14 +7,27 @@ 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');
 	}
 
-	public function isAdmin($id)
+	/**
+	 * 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)
 	{
 		return isset($this->admin) ? $this->admin : FALSE;
 	}