From 9b583e8479d34e73f7dc1ef16460a663b13c43ad Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 23 Apr 2021 16:03:39 +1000
Subject: [PATCH] Update links to CSS and JS libraries. Disable shims

---
 .../views/layouts/partials/htmlheader.blade.php  | 16 ++++++++++------
 .../views/layouts/partials/mainheader.blade.php  |  6 ++----
 .../views/layouts/partials/scripts.blade.php     | 12 ++++++++----
 .../layouts/partials/contentheader.blade.php     |  4 ++--
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
index e609e26..f4b267b 100644
--- a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
@@ -6,11 +6,16 @@
 	<!-- CSRF Token -->
 	<meta name="csrf-token" content="{{ csrf_token() }}">
 
-	<link rel="stylesheet" href="{{ asset('/css/app.css') }}">
+	<link rel="stylesheet" href="{{ asset('//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="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/all.css') }}">
-	<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/v4-shims.css') }}">
+	<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.15.3/css/all.css') }}">
+	{{--
+	<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.15.3/css/v4-shims.css') }}">
+	--}}
+
+	<!-- Theme style -->
+	<link rel="stylesheet" href="{{ asset('//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">
@@ -24,19 +29,18 @@
 		<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
 	@endif
 
+	{{--
 	<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
 	<!--[if lt IE 9]>
 		<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
 		<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 	<![endif]-->
+	--}}
 
 	<!-- STYLESHEETS -->
 	{!! Asset::styles() !!}
 
-	<!-- Theme style -->
-	<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
-
 	@if(file_exists('css/fixes.css'))
 		<!-- CSS Fixes -->
 		<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
diff --git a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
index 1dfe676..1d2feae 100644
--- a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
@@ -13,11 +13,9 @@
 		<div class="input-group input-group-sm">
 			<input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search" autocomplete="off">
 			<div class="input-group-append">
-				<button class="btn btn-navbar" type="submit">
-					<i class="fas fa-search"></i>
-				</button>
+				<span class="input-group-text"><i class="fas fa-search"></i></span>
+				<span class="p-1 d-none" name="searching"><i class="fas fa-spinner fa-spin" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
 			</div>
-			<span name="searching" class="d-none"><i class="fas fa-spinner fa-spin fa-fw" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
 			<div id="search_results"></div>
 		</div>
 	</form>
diff --git a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
index 593e9d1..4b8405b 100644
--- a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
@@ -1,9 +1,13 @@
 <!-- REQUIRED JS SCRIPTS -->
-<!-- JQuery and bootstrap are required by Laravel 5.7 in resources/js/bootstrap.js-->
-<!-- Laravel App -->
-<script src="{{ asset('/js/app.js') }}" type="text/javascript"></script>
+<!-- Bootstrap & Jquery App -->
+<script type="text/javascript" src="{{ asset('//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="{{ asset('//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="{{ asset('//cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.bundle.min.js') }}" integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns" crossorigin="anonymous"></script>
 <!-- AdminLTE -->
-<script src="{{ asset('/js/adminlte.min.js') }}"></script>
+<script src="{{ asset('//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>
 
 <script type="text/javascript">
 	// Our CSRF token to each interaction
diff --git a/resources/themes/architect/views/layouts/partials/contentheader.blade.php b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
index de4d992..16feb61 100644
--- a/resources/themes/architect/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
@@ -14,13 +14,13 @@
 		<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>
+				<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="fa fa-business-time fa-w-20"></i>
+						<i class="fas fa-business-time fa-w-20"></i>
 					</span>
 					Item Menu
 				</button>