Change metronic to use @asset instead of @css

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/Providers/CustomBladeServiceProvider.php

@@ -5,7 +5,7 @@ namespace Leenooks\Providers;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
-use Ramsey\Collection\Collection;
+use Orchestra\Support\Facades\Asset;
 
 class CustomBladeServiceProvider extends ServiceProvider
 {
@@ -18,38 +18,10 @@ class CustomBladeServiceProvider extends ServiceProvider
     {
 		Blade::directive('css',function(string $expression,array $args=[]) {
 			return $this->resolve('css',$expression);
-
-			switch (trim($expression,"'")) {
-				case 'select2':
-					return
-						'<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">';
-
-				case 'simplemde':
-					return
-						'<link type="text/css" rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">';
-
-				default:
-					throw new \Exception('Unknown CSS: '.$expression);
-			}
 		});
 
 		Blade::directive('js',function($expression,string $options=NULL) {
-			Log::debug('JS: '.$expression);
 			return $this->resolve('js',$expression);
-
-			switch (trim($expression,"'")) {
-				case 'select2':
-					return
-						'<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>'.
-						'<script type="text/javascript" src="'.asset('plugin/select2/fix-autofocus.js').'"></script>';
-
-				case 'simplemde':
-					return
-						'<script type="text/javascript" src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>';
-
-				default:
-					throw new \Exception('Unknown JS: '.$expression);
-			}
 		});
     }
 
@@ -63,61 +35,55 @@ class CustomBladeServiceProvider extends ServiceProvider
 			$arguments = '';
 		}
 
-		$arguments = explode('|',trim($arguments,"'"));
+		$arguments = explode('|',$arguments);
 
 		$return = collect();
+		$urls = collect();
 
-		switch ($x=trim($type,"'")) {
-			case '':
-				Log::debug('Render ...');
-				dd(__METHOD__,'here');
-				break;
-
+		switch ($type) {
 			case 'datatables':
 				switch ($content) {
 					case 'css':
 						// Base
-						$return->push('https://cdn.datatables.net/1.10.23/css/jquery.dataTables.min.css');
+						$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 '':
-									break;
-
 								case 'bootstrap4':
-									$return->push('/plugin/dataTables/dataTables.bootstrap4.css');
+									$urls->put($key,'/plugin/dataTables/dataTables.bootstrap4.css');
 									break;
 
 								case 'buttons':
-									$return->push('https://cdn.datatables.net/buttons/1.6.5/css/buttons.dataTables.min.css');
+									$urls->put($key,'https://cdn.datatables.net/buttons/1.6.5/css/buttons.dataTables.min.css');
 									break;
 
 								case 'fixedheader':
-									$return->push('https://cdn.datatables.net/fixedheader/3.1.7/css/fixedHeader.dataTables.min.css');
+									$urls->put($key,'https://cdn.datatables.net/fixedheader/3.1.7/css/fixedHeader.dataTables.min.css');
 									break;
 
 								case 'rowgroup':
-									$return->push('https://cdn.datatables.net/rowgroup/1.1.2/css/rowGroup.dataTables.min.css');
+									$urls->put($key,'https://cdn.datatables.net/rowgroup/1.1.2/css/rowGroup.dataTables.min.css');
 									break;
 
 								case 'responsive':
-									$return->push('http://cdn.datatables.net/responsive/2.2.6/css/responsive.dataTables.min.css');
+									$urls->put($key,'http://cdn.datatables.net/responsive/2.2.6/css/responsive.dataTables.min.css');
 									break;
 
 								case 'searchpanes':
-									$return->push('https://cdn.datatables.net/searchpanes/1.2.1/css/searchPanes.dataTables.min.css');
+									$urls->put($key,'https://cdn.datatables.net/searchpanes/1.2.1/css/searchPanes.dataTables.min.css');
 									break;
 
 								case 'searchpanes-left':
-									$return->push('/plugin/dataTables/leftSearchPanes.css');
+									$urls->put('searchpanes:searchpanes-left','/plugin/dataTables/leftSearchPanes.css');
 									break;
 
 								case 'select':
-									$return->push('https://cdn.datatables.net/select/1.3.1/css/select.dataTables.min.css');
+									$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]',$x,$content,$option));
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
 							}
 						}
 
@@ -125,46 +91,44 @@ class CustomBladeServiceProvider extends ServiceProvider
 
 					case 'js':
 						// Base
-						$return->push('https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js');
+						$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':
-									$return->push('/plugin/dataTables/dataTables.bootstrap4.js');
+									$urls->put($key,'/plugin/dataTables/dataTables.bootstrap4.js');
 									break;
 
 								case 'buttons':
-									$return->push('https://cdn.datatables.net/buttons/1.6.5/js/dataTables.buttons.min.js');
-									$return->push('https://cdn.datatables.net/buttons/1.6.5/js/buttons.html5.min.js');
-									$return->push('https://cdnjs.cloudflare.com/ajax/libs/jszip/3.2.0/jszip.min.js');
+									$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':
-									$return->push('https://cdn.datatables.net/fixedheader/3.1.7/js/dataTables.fixedHeader.min.js');
+									$urls->put($key,'https://cdn.datatables.net/fixedheader/3.1.7/js/dataTables.fixedHeader.min.js');
 									break;
 
 								case 'responsive':
-									$return->push('https://cdn.datatables.net/responsive/2.2.6/js/dataTables.responsive.min.js');
+									$urls->put($key,'https://cdn.datatables.net/responsive/2.2.6/js/dataTables.responsive.min.js');
 									break;
 
 								case 'rowgroup':
-									$return->push('https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js');
+									$urls->put($key,'https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js');
 									break;
 
 								case 'searchpanes':
-									$return->push('https://cdn.datatables.net/searchpanes/1.2.1/js/dataTables.searchPanes.min.js');
+									$urls->put($key,'https://cdn.datatables.net/searchpanes/1.2.1/js/dataTables.searchPanes.min.js');
 									break;
 
 								case 'select':
-									$return->push('https://cdn.datatables.net/select/1.3.1/js/dataTables.select.min.js');
-									break;
-
-								case 'default':
-									$return->push('');
+									$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]',$x,$content,$option));
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
 							}
 						}
 				}
@@ -174,11 +138,11 @@ class CustomBladeServiceProvider extends ServiceProvider
 			case 'datepick':
 				switch ($content) {
 					case 'css':
-						$return->push('https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css');
+						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css');
 						break;
 
 					case 'js':
-						$return->push('https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js');
+						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js');
 				}
 
 				break;
@@ -187,40 +151,68 @@ class CustomBladeServiceProvider extends ServiceProvider
 				switch ($content) {
 					case 'js':
 						// Base
-						$return->push('https://code.highcharts.com/highcharts.js');
+						$urls->put($type,'https://code.highcharts.com/highcharts.js');
 
 						foreach ($arguments as $option) {
+							$key = $type.':'.$option;
 							switch ($option) {
-								case '':
+								case '3d':
+									$urls->put($key,'https://code.highcharts.com/highcharts-3d.js');
+									$urls->put($key.'mouseover','/plugin/highcharts/3dmouseover.js');
 									break;
 
 								case 'data':
-									$return->push('https://code.highcharts.com/modules/data.js');
+									$urls->put($key,'https://code.highcharts.com/modules/data.js');
 									break;
 
 								case 'defaults':
-									$return->push('/plugin/highcharts/defaults.js');
+									$urls->put($key,'/plugin/highcharts/defaults.js');
 									break;
 
 								case 'drilldown':
-									$return->push('https://code.highcharts.com/modules/drilldown.js');
+									$urls->put($key,'https://code.highcharts.com/modules/drilldown.js');
 									break;
 
 								case 'heatmap':
-									$return->push('https://code.highcharts.com/modules/heatmap.js');
+									$urls->put($key,'https://code.highcharts.com/modules/heatmap.js');
 									break;
 
 								case 'export':
-									$return->push('https://code.highcharts.com/modules/exporting.js');
-									$return->push('https://code.highcharts.com/modules/export-data.js');
+									$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':
-									$return->push('https://code.highcharts.com/themes/dark-unica.js');
+									$urls->put($key,'https://code.highcharts.com/themes/dark-unica.js');
 									break;
 
 								default:
-									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$x,$content,$option));
+									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));
 							}
 						}
 				}
@@ -231,12 +223,13 @@ class CustomBladeServiceProvider extends ServiceProvider
 				throw new \Exception(sprintf('Unknown Expression: [%s]',$expression));
 		}
 
-		switch ($content) {
-			case 'css':
-				return '<link type="text/css" rel="stylesheet" href="'.$return->join('"><link type="text/css" rel="stylesheet" href="').'">';
+		if ($urls->count())
+			return $urls->map(function($item,$key) {
+				$dependancy='';
+				if (str_contains($key,':'))
+					[$dependancy,$key] = explode(':',$key);
 
-			case 'js':
-				return '<script type="text/javascript" src="'.$return->join('"></script><script type="text/javascript" src="').'"></script>';
-		}
+				return "<?php Asset::add('$key','$item','$dependancy'); ?>";
+			})->join('');
 	}
 }