Update for Laravel 7.x

composer.json

@@ -12,7 +12,7 @@
     "require": {
       "igaster/laravel-theme": "^2.0.15",
       "creativeorange/gravatar": "^1.0",
-      "orchestra/asset": "^4.0"
+      "orchestra/asset": "^5.0"
     },
     "require-dev": {
     },

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

@@ -13,7 +13,7 @@
 	<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/v4-shims.css') }}">
 
 	<!-- Google Font: Source Sans Pro -->
-	<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@300&display=swap" rel="stylesheet">
+	<link href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap" rel="stylesheet">
 
 	@if(file_exists('css/social.css'))
 		<!-- Social Logins -->

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

@@ -75,15 +75,25 @@
 </nav>
 
 @section('page-scripts')
-	@js('/plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js','bs-typeahead')
+	<style>
+		/* Solid border */
+		div.typeahead.dropdown-menu > .dropdown-header {
+			color: #000000;
+			text-align: left;
+		}
+	</style>
 
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("input[name=q]").typeahead({
+				autoSelect: false,
+				scrollHeight: 10,
+				theme: 'bootstrap4',
 				delay: 500,
 				minLength: 2,
-				items: {{ isset($search_limit) ? $search_limit : 15 }},
+				items: {{ isset($search_limit) ? $search_limit : 100 }},
 				fitToElement: false,
+				selectOnBlur: false,
 				appendTo: "#search_results",
 				source: function (query,process) {
 					search('{{ url("search",['date'=>isset($ido) ? $ido->id : NULL]) }}',query,process);
@@ -91,8 +101,13 @@
 
 				matcher: function () { return true; },
 
+				// Disable sorting and just return the items (items should by the ajax method)
+				sorter: function(items) {
+					return items;
+				},
+
 				updater: function (item) {
-					window.parent.location.href = '{{ url("/") }}'+users[item];
+					window.parent.location.href = item.value;
 				},
 			})
 			.on('keyup keypress', function(event) {
@@ -126,17 +141,7 @@
 					// if json is null, means no match, won't do again.
 					if(data==null || (data.length===0)) return;
 
-					users = {};
-					userLabels = [];
-					_.each(data,function(item,ix,list) {
-						if (_.includes(users,item.label))
-							item.label = item.label + ' #' + item.value;
-
-						userLabels.push(item.label);
-						users[item.label] = item.value;
-					});
-
-					process(userLabels);
+					process(data);
 				},
 				complete : function() {
 					if (--c == 0) {

src/Controllers/AdminController.php

@@ -26,9 +26,6 @@ class AdminController extends Controller
 		return ! Session::get('orig_user');
 	}
 
-	/**
-	 * @todo Change the background color (or something) so we know we are switched
-	 */
 	public function user_switch_start($id)
 	{
 		if ($this->switch_session() AND $this->switch_authorised($id))