From fd3487f9b003018515bb8cdbfac32c54975fd8a7 Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 4 Jul 2024 17:41:31 +1000 Subject: [PATCH] More updates as a result of no longer using Orchestra/Asset --- src/Controllers/SwitchUserController.php | 3 +- src/Providers/CustomBladeServiceProvider.php | 113 +++++++++---------- 2 files changed, 57 insertions(+), 59 deletions(-) diff --git a/src/Controllers/SwitchUserController.php b/src/Controllers/SwitchUserController.php index d89c901..09dc4e4 100644 --- a/src/Controllers/SwitchUserController.php +++ b/src/Controllers/SwitchUserController.php @@ -3,7 +3,6 @@ namespace Leenooks\Controllers; use App\Http\Controllers\Controller; -use App\Providers\RouteServiceProvider; use Illuminate\Support\Facades\Auth; use Redirect; use Session; @@ -57,6 +56,6 @@ class SwitchUserController extends Controller if ($user = Session::pull('orig_user')) Auth::login($user); - return Redirect::to(RouteServiceProvider::HOME); + return Redirect::to('/home'); } } \ No newline at end of file diff --git a/src/Providers/CustomBladeServiceProvider.php b/src/Providers/CustomBladeServiceProvider.php index 32d2793..9e3230f 100644 --- a/src/Providers/CustomBladeServiceProvider.php +++ b/src/Providers/CustomBladeServiceProvider.php @@ -5,7 +5,6 @@ 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 { @@ -37,48 +36,49 @@ class CustomBladeServiceProvider extends ServiceProvider } $return = collect(); - $urls = collect(); + $css = collect(); + $js = 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'); + $css->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'); + $css->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'); + $css->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'); + $css->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'); + $css->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'); + $css->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'); + $css->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'); + $css->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'); + $css->put($key,'https://cdn.datatables.net/select/1.3.1/css/select.dataTables.min.css'); break; default: @@ -90,40 +90,40 @@ class CustomBladeServiceProvider extends ServiceProvider case 'js': // Base - $urls->put($type,'https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js'); + $js->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'); + $js->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'); + $js->put($key,'https://cdn.datatables.net/buttons/1.6.5/js/dataTables.buttons.min.js'); + $js->put($key.'html5','https://cdn.datatables.net/buttons/1.6.5/js/buttons.html5.min.js'); + $js->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'); + $js->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'); + $js->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'); + $js->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'); + $js->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'); + $js->put($key,'https://cdn.datatables.net/select/1.3.1/js/dataTables.select.min.js'); break; default: @@ -137,11 +137,11 @@ class CustomBladeServiceProvider extends ServiceProvider 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'); + $css->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'); + $js->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js'); } break; @@ -149,7 +149,7 @@ class CustomBladeServiceProvider extends ServiceProvider case 'debounce': switch ($content) { case 'js': - $urls->put($type,'js/debounce.js'); + $js->put($type,'js/debounce.js'); } break; @@ -158,49 +158,49 @@ class CustomBladeServiceProvider extends ServiceProvider switch ($content) { case 'js': // Base - $urls->put($type,'https://code.highcharts.com/highcharts.js'); + $js->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'); + $js->put($key,'https://code.highcharts.com/highcharts-3d.js'); + $js->put($key.'mouseover','/plugin/highcharts/3dmouseover.js'); break; case 'data': - $urls->put($key,'https://code.highcharts.com/modules/data.js'); + $js->put($key,'https://code.highcharts.com/modules/data.js'); break; case 'defaults': - $urls->put($key,'/plugin/highcharts/defaults.js'); + $js->put($key,'/plugin/highcharts/defaults.js'); break; case 'drilldown': - $urls->put($key,'https://code.highcharts.com/modules/drilldown.js'); + $js->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'); + $js->put($key,'https://code.highcharts.com/modules/exporting.js'); + $js->put($key.'data','https://code.highcharts.com/modules/export-data.js'); break; case 'funnel': - $urls->put($key,'https://code.highcharts.com/modules/funnel.js'); + $js->put($key,'https://code.highcharts.com/modules/funnel.js'); break; case 'heatmap': - $urls->put($key,'https://code.highcharts.com/modules/heatmap.js'); + $js->put($key,'https://code.highcharts.com/modules/heatmap.js'); break; case 'solidguage': - $urls->put($key,'https://code.highcharts.com/highcharts-more.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'); + $js->put($key,'https://code.highcharts.com/highcharts-more.js'); + $js->put($key.'accessiblity','https://code.highcharts.com/modules/accessibility.js'); + $js->put($key.'solid-guage','https://code.highcharts.com/modules/solid-gauge.js'); break; case 'theme-dark': - $urls->put($key,'https://code.highcharts.com/themes/dark-unica.js'); + $js->put($key,'https://code.highcharts.com/themes/dark-unica.js'); break; default: @@ -215,17 +215,17 @@ class CustomBladeServiceProvider extends ServiceProvider switch ($content) { case 'js': // Base - $urls->put($type,'https://code.highcharts.com/stock/highstock.js'); + $js->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'); + $js->put($key,'https://code.highcharts.com/stock/modules/data.js'); break; case 'export': - $urls->put($key,'https://code.highcharts.com/stock/modules/exporting.js'); + $js->put($key,'https://code.highcharts.com/stock/modules/exporting.js'); break; default: @@ -240,19 +240,19 @@ class CustomBladeServiceProvider extends ServiceProvider switch ($content) { case 'css': // Base - $urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css'); + $css->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css'); break; case 'js': // Base - $urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js'); + $js->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js'); foreach ($arguments as $option) { $key = $type.':'.$option; switch ($option) { case 'autofocus': - $urls->put($key,'plugin/select2/fix-autofocus.js'); + $js->put($key,'plugin/select2/fix-autofocus.js'); break; default: @@ -267,13 +267,13 @@ class CustomBladeServiceProvider extends ServiceProvider switch ($content) { case 'css': // Base - $urls->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css'); + $css->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css'); break; case 'js': // Base - $urls->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js'); + $js->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js'); } break; @@ -282,13 +282,13 @@ class CustomBladeServiceProvider extends ServiceProvider switch ($content) { case 'css': // Base - $urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.css'); + $css->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.css'); break; case 'js': // Base - $urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.js'); + $js->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.js'); } break; @@ -297,8 +297,8 @@ class CustomBladeServiceProvider extends ServiceProvider 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'); + $js->put('validate','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/jquery.validate.min.js'); + $js->put('validate.additional','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/additional-methods.min.js'); } break; @@ -307,13 +307,12 @@ class CustomBladeServiceProvider extends ServiceProvider 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); + if ($js->count()) + $return = $return->merge($js->map(fn($item)=>sprintf('