Change metronic to use @asset instead of @css

composer.json

@@ -10,9 +10,8 @@
         }
     ],
     "require": {
-      "igaster/laravel-theme": "^2.0.17",
-      "creativeorange/gravatar": "^1.0",
-      "orchestra/asset": "^6.0"
+        "creativeorange/gravatar": "^1.0",
+        "orchestra/asset": "^6.0"
     },
     "require-dev": {
     },
@@ -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/auth/login.blade.php

@@ -45,14 +45,14 @@
 				<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
 
 				<form method="post">
-					{{ csrf_field() }}
+					@csrf
 
 					<div class="row">
 						<div class="col-12">
 							<div class="input-group mb-3">
 								<input type="email" name="email" class="form-control" placeholder="Email">
 								<div class="input-group-append">
-									<span class="input-group-text"><i class="fas fa-envelope fa-fw"></i></span>
+									<span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
 								</div>
 							</div>
 						</div>
@@ -61,7 +61,7 @@
 							<div class="input-group mb-3">
 								<input type="password" name="password" class="form-control" placeholder="Password">
 								<div class="input-group-append">
-									<span class="input-group-text"><i class="fas fa-key fa-fw"></i></span>
+									<span class="input-group-text"><i class="fas fa-fw fa-key"></i></span>
 								</div>
 							</div>
 						</div>

resources/themes/adminlte/views/auth/passwords/email.blade.php

@@ -35,13 +35,15 @@
 				<p class="login-box-msg">You forgot your password? Here you can easily retrieve a new password.</p>
 
 				<form method="post" action="{{ url('password/email') }}">
-					{{ csrf_field() }}
+					@csrf
+
 					<div class="input-group mb-3">
 						<input type="email" name="email" class="form-control" placeholder="Email" required>
 						<div class="input-group-append">
-							<span class="fas fa-envelope input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
 						</div>
 					</div>
+
 					<div class="row">
 						<div class="col-12">
 							<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.sendpassword') }}</button>

resources/themes/adminlte/views/auth/passwords/reset.blade.php

@@ -27,32 +27,36 @@
 				<p class="login-box-msg">You are only one step a way from your new password, set your new password now.</p>
 
 				<form method="post" action="{{ url('password/reset') }}">
-					{{ csrf_field() }}
+					<input type="hidden" name="token" value="{{ $token }}">
+					@csrf
+
 					<div class="input-group mb-3">
 						<input type="email" name="email" class="form-control" placeholder="Email" required>
 						<div class="input-group-append">
-							<span class="fas fa-envelope fa-fw input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
 						</div>
 					</div>
+
 					<div class="input-group mb-3">
 						<input type="password" name="password" class="form-control" placeholder="Password" required>
 						<div class="input-group-append">
-							<span class="fas fa-lock input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-lock"></i></span>
 						</div>
 					</div>
+
 					<div class="input-group mb-3">
 						<input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required>
 						<div class="input-group-append">
-							<span class="fas fa-lock input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-clone"></i></span>
 						</div>
 					</div>
+
 					<div class="row">
 						<div class="col-12">
 							<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.passwordreset') }}</button>
 						</div>
 						<!-- /.col -->
 					</div>
-					<input type="hidden" name="token" value="{{ $token }}">
 				</form>
 
 				<p class="mt-3 mb-1">

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/metronic/views/layouts/partials/htmlheader.blade.php

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

src/Carbon.php

@@ -15,15 +15,38 @@ class Carbon extends CarbonBase
 
     public function __get($name)
     {
-       switch (true) {
-            case $name === 'half':
+       switch ($name) {
+            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
@@ -35,7 +58,7 @@ class Carbon extends CarbonBase
      * @return static
      */
     public function startOfHalf($dayOfWeek = null)
-    {   
+    {
         return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
     }
 
@@ -50,7 +73,7 @@ class Carbon extends CarbonBase
      * @return static
      */
     public function endOfHalf($dayOfWeek = null)
-    {   
+    {
         return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
     }
 }

src/Providers/CustomBladeServiceProvider.php

@@ -0,0 +1,235 @@
+<?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);
+
+		else {
+			$type = $expression;
+			$arguments = '';
+		}
+
+		$arguments = explode('|',$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 '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 'heatmap':
+									$urls->put($key,'https://code.highcharts.com/modules/heatmap.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 '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;
+
+			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('');
+	}
+}