Update Adminlte/Architect as we no longer use Orchestra/Asset

composer.json

@@ -1,17 +1,15 @@
 {
-    "name": "leenooks/laravel",
+	"name": "laravel/leenooks",
 	"description": "Leenooks standard templates and tools.",
-    "keywords": ["laravel", "leenooks"],
+	"keywords": ["laravel","leenooks"],
 	"license": "MIT",
 	"authors": [
 		{
 			"name": "Deon George",
-            "email": "deon@leenooks.net"
+			"email": "deon@dege.au"
 		}
 	],
 	"require": {
-        "creativeorange/gravatar": "^1.0",
-        "orchestra/asset": "^6.0"
 	},
 	"require-dev": {
 	},
@@ -26,8 +24,6 @@
 	"extra": {
 		"laravel": {
 			"providers": [
-                "Orchestra\\Asset\\AssetServiceProvider",
-                "Collective\\Html\\HtmlServiceProvider",
 				"Leenooks\\Providers\\LeenooksServiceProvider",
 				"Leenooks\\Providers\\CustomBladeServiceProvider"
 			]

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

@@ -39,9 +39,6 @@
 		@section('scripts')
 			@include('adminlte::layouts.partials.scripts')
 
-			{{-- Scripts --}}
-			{!! Asset::scripts() !!}
-
 			@yield('page-scripts')
 		@show
 	</body>

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

@@ -41,9 +41,6 @@
 	<![endif]-->
 	--}}
 
-	<!-- STYLESHEETS -->
-	{!! Asset::styles() !!}
-
 	@yield('page-styles')
 
 	@if(file_exists('css/fixes.css'))

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

@@ -12,7 +12,7 @@
 		<div class="user-panel mt-3 pb-3 mb-3 d-flex">
 			<div class="image">
 				@if(isset($user) AND $user->exists)
-					<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
+					<i class="fa fa-fw fa-2x fa-user text-white"></i>
 				@else
 					<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fas fa-lock fa-2x"></i></a>
 				@endif

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

@@ -12,7 +12,7 @@
 			@if(! isset($addvalues) || ! $addvalues)
 				<option id="new"></option>
 			@endif
-			@empty($groupby))
+			@empty($groupby)
 				@foreach($options as $option)
 					@empty(Arr::get($option,'value')) @continue @endempty
 					<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ Arr::get($option,'value') }}</option>

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

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

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

@@ -38,9 +38,6 @@
 		@section('scripts')
 			@include('architect::layouts.partials.scripts')
 
-			{{-- Scripts --}}
-			{!! Asset::scripts() !!}
-
 			@yield('page-scripts')
 		@show
 	</body>

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

@@ -12,9 +12,6 @@
 		@section('scripts')
 			@include('architect::auth.partials.scripts')
 
-			{{-- Scripts --}}
-			{!! Asset::scripts() !!}
-
 			@yield('page-scripts')
 		@show
 	</body>

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

@@ -35,9 +35,6 @@
 		<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
 	@endif
 
-	<!-- STYLESHEETS -->
-	{!! Asset::styles() !!}
-
 	<!-- Theme style -->
 	<link rel="stylesheet" href="{{ asset('/css/architect.min.css') }}">
 

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

@@ -38,9 +38,6 @@
 		@section('scripts')
 			@include('metronic::layouts.partials.scripts')
 
-			{{-- Scripts --}}
-			{!! Asset::scripts() !!}
-
 			@yield('page-scripts')
 		@show
 	</body>

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

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

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

@@ -18,5 +18,5 @@
 
 @if(file_exists('js/custom.js'))
 	<!-- Any Custom JS -->
-	<script src="{{ asset('js/custom.js') }}"></script>
+	<script type="text/javascript" src="{{ asset('js/custom.js') }}"></script>
 @endif

src/Carbon.php

@@ -13,7 +13,7 @@ class Carbon extends CarbonBase
 {
     const MONTHS_PER_HALF = 6;
 
-    public function __get($name)
+    public function __get(string $name): mixed
     {
        switch ($name) {
             case 'half':
@@ -57,7 +57,7 @@ class Carbon extends CarbonBase
      *
      * @return static
      */
-    public function startOfHalf($dayOfWeek = null)
+    public function startOfHalf(int $dayOfWeek=NULL)
     {
         return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
     }
@@ -72,7 +72,7 @@ class Carbon extends CarbonBase
      *
      * @return static
      */
-    public function endOfHalf($dayOfWeek = null)
+    public function endOfHalf(int $dayOfWeek=NULL)
     {
         return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
     }

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':
+								case 'solidguage':
-									$urls->put($key,'https://code.highcharts.com/modules/exporting.js');
+									$urls->put($key,'https://code.highcharts.com/highcharts-more.js');
-									$urls->put($key.'data','https://code.highcharts.com/modules/export-data.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));
 		}