From 28cdedb32770734e1651bbdd4247dbdd7ed933b6 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sat, 13 Nov 2021 17:00:08 +1100
Subject: [PATCH] Centralise dependant js/css files

---
 app/Providers/CustomBladeServiceProvider.php  | 79 +++++++++++++++++++
 config/app.php                                |  3 +-
 .../views/auth/partials/scripts.blade.php     |  3 +-
 resources/views/dashboard.blade.php           | 12 +--
 resources/views/domain/addedit.blade.php      |  8 +-
 resources/views/domain/home.blade.php         | 12 ++-
 resources/views/domain/view.blade.php         | 10 +--
 resources/views/echoarea/home.blade.php       | 13 ++-
 resources/views/filearea/home.blade.php       | 13 ++-
 .../views/layouts/partials/scripts.blade.php  |  4 +-
 resources/views/setup.blade.php               |  8 +-
 resources/views/system/home.blade.php         | 12 ++-
 resources/views/system/moveaddr.blade.php     |  5 +-
 resources/views/system/ours.blade.php         | 13 ++-
 resources/views/user/home.blade.php           | 12 ++-
 resources/views/zone/addedit.blade.php        |  7 +-
 resources/views/zone/home.blade.php           | 12 ++-
 17 files changed, 140 insertions(+), 86 deletions(-)
 create mode 100644 app/Providers/CustomBladeServiceProvider.php

diff --git a/app/Providers/CustomBladeServiceProvider.php b/app/Providers/CustomBladeServiceProvider.php
new file mode 100644
index 0000000..00e7dbe
--- /dev/null
+++ b/app/Providers/CustomBladeServiceProvider.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\ServiceProvider;
+
+class CustomBladeServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+		Blade::directive('css',function($expression) {
+			switch (trim($expression,"'")) {
+				case 'datatables':
+					return
+						'<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">'.
+						'<link type="text/css" rel="stylesheet" href="'.asset('plugin/dataTables/dataTables.bootstrap5.css').'" media="screen">';
+
+				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) {
+			switch (trim($expression,"'")) {
+				case 'datatables':
+					return
+						'<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>'.
+						'<script type="text/javascript" src="'.asset('plugin/dataTables/dataTables.conditionalPaging.js').'"></script>'.
+						'<script type="text/javascript" src="https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js"></script>'.
+						'<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>';
+
+				case 'highcharts':
+					return
+						'<script type="text/javascript" src="https://code.highcharts.com/highcharts.js"></script>'.
+						'<script type="text/javascript" src="https://code.highcharts.com/modules/data.js"></script>'.
+						'<script type="text/javascript" src="https://code.highcharts.com/modules/drilldown.js"></script>'.
+						'<script type="text/javascript" src="https://code.highcharts.com/modules/exporting.js"></script>'.
+						'<script type="text/javascript" src="https://code.highcharts.com/modules/export-data.js"></script>'.
+						'<script type="text/javascript" src="https://code.highcharts.com/themes/dark-unica.js"></script>';
+
+				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);
+			}
+		});
+    }
+}
\ No newline at end of file
diff --git a/config/app.php b/config/app.php
index f89224d..fb260e7 100644
--- a/config/app.php
+++ b/config/app.php
@@ -180,6 +180,7 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
+        App\Providers\CustomBladeServiceProvider::class,
 
         /*
          * Other Service Providers...
@@ -241,4 +242,4 @@ return [
 
     ],
 
-];
+];
\ No newline at end of file
diff --git a/resources/views/auth/partials/scripts.blade.php b/resources/views/auth/partials/scripts.blade.php
index faa490d..bd8f1a2 100644
--- a/resources/views/auth/partials/scripts.blade.php
+++ b/resources/views/auth/partials/scripts.blade.php
@@ -1,6 +1,5 @@
 <!-- Bootstrap & Jquery App -->
-<script type="text/javascript" src="{{ asset('//cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js') }}" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous"></script>
-<script type="text/javascript" src="{{ asset('/bootstra.386/js/bootstrap.bundle.min.js') }}"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous"></script>
 
 @if(file_exists('js/custom-auth.js'))
 	<!-- Any Custom JS -->
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index fd7b431..1d04146 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -56,14 +56,7 @@
 	</div>
 @endsection
 
-@section('page-scripts')
-	<script src="https://code.highcharts.com/highcharts.js"></script>
-	<script src="https://code.highcharts.com/modules/data.js"></script>
-	<script src="https://code.highcharts.com/modules/drilldown.js"></script>
-	<script src="https://code.highcharts.com/modules/exporting.js"></script>
-	<script src="https://code.highcharts.com/modules/export-data.js"></script>
-	<script src="https://code.highcharts.com/themes/dark-unica.js"></script>
-
+@section('page-css')
 	<style>
 		.highcharts-data-table table {
 			min-width: 310px;
@@ -99,6 +92,9 @@
 		}
 		--}}
 	</style>
+@append
+@section('page-scripts')
+	@js('highcharts')
 
 	<script>
 		@if($user->systems->count())
diff --git a/resources/views/domain/addedit.blade.php b/resources/views/domain/addedit.blade.php
index d5bca0f..604eb71 100644
--- a/resources/views/domain/addedit.blade.php
+++ b/resources/views/domain/addedit.blade.php
@@ -109,11 +109,13 @@
 	</form>
 @endsection
 
+@section('page-css')
+	@css('simplemde')
+@append
 @section('page-scripts')
-	@can('admin',$o)
-		<link type="text/css" rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
-		<script type="text/javascript" src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
+	@js('simplemde')
 
+	@can('admin',$o)
 		<script type="text/javascript">
 			var simplemde = new SimpleMDE({ element: $("#homepage")[0] });
 		</script>
diff --git a/resources/views/domain/home.blade.php b/resources/views/domain/home.blade.php
index b5e798b..8a7cc9d 100644
--- a/resources/views/domain/home.blade.php
+++ b/resources/views/domain/home.blade.php
@@ -51,13 +51,11 @@
 	</div>
 @endsection
 
+@section('page-css')
+	@css('datatables')
+@append
 @section('page-scripts')
-	<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">
-	<link type="text/css" rel="stylesheet" href="{{ asset('plugin/dataTables/dataTables.bootstrap5.css') }}" media="screen">
-
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
-	<script type="text/javascript" src="{{ asset('plugin/dataTables/dataTables.conditionalPaging.js') }}"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>
+	@js('datatables')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -86,4 +84,4 @@
 			});
 		});
 	</script>
-@append
+@append
\ No newline at end of file
diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php
index edfe09b..35210e4 100644
--- a/resources/views/domain/view.blade.php
+++ b/resources/views/domain/view.blade.php
@@ -161,13 +161,11 @@
 	</div>
 @endsection
 
+@section('page-css')
+	@css('datatables')
+@append
 @section('page-scripts')
-	<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">
-	<link type="text/css" rel="stylesheet" href="{{ asset('plugin/dataTables/dataTables.bootstrap5.css') }}" media="screen">
-
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
-	<script type="text/javascript" src="{{ asset('plugin/dataTables/dataTables.conditionalPaging.js') }}"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>
+	@js('datatables')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
diff --git a/resources/views/echoarea/home.blade.php b/resources/views/echoarea/home.blade.php
index 43e6618..7161c27 100644
--- a/resources/views/echoarea/home.blade.php
+++ b/resources/views/echoarea/home.blade.php
@@ -51,14 +51,11 @@
 	</div>
 @endsection
 
+@section('page-css')
+	@css('datatables')
+@append
 @section('page-scripts')
-	<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">
-	<link type="text/css" rel="stylesheet" href="{{ asset('plugin/dataTables/dataTables.bootstrap5.css') }}" media="screen">
-
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js"></script>
-	<script type="text/javascript" src="{{ asset('plugin/dataTables/dataTables.conditionalPaging.js') }}"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>
+	@js('datatables')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -96,4 +93,4 @@
 			});
 		});
 	</script>
-@append
+@append
\ No newline at end of file
diff --git a/resources/views/filearea/home.blade.php b/resources/views/filearea/home.blade.php
index c342881..20ec600 100644
--- a/resources/views/filearea/home.blade.php
+++ b/resources/views/filearea/home.blade.php
@@ -51,14 +51,11 @@
 	</div>
 @endsection
 
+@section('page-css')
+	@css('datatables')
+@append
 @section('page-scripts')
-	<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">
-	<link type="text/css" rel="stylesheet" href="{{ asset('plugin/dataTables/dataTables.bootstrap5.css') }}" media="screen">
-
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js"></script>
-	<script type="text/javascript" src="{{ asset('plugin/dataTables/dataTables.conditionalPaging.js') }}"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>
+	@js('datatables')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -96,4 +93,4 @@
 			});
 		});
 	</script>
-@append
+@append
\ No newline at end of file
diff --git a/resources/views/layouts/partials/scripts.blade.php b/resources/views/layouts/partials/scripts.blade.php
index 7fe1747..0f8df5e 100644
--- a/resources/views/layouts/partials/scripts.blade.php
+++ b/resources/views/layouts/partials/scripts.blade.php
@@ -1,6 +1,6 @@
 <!-- Bootstrap & Jquery App -->
-<script type="text/javascript" src="{{ asset('//cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js') }}" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous"></script>
-<script type="text/javascript" src="{{ asset('//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js') }}" integrity="sha512-WFN04846sdKMIP5LKNphMaWzU7YpMyCU245etK3g/2ARYbPK9Ub18eG+ljU96qKRCWh+quCY7yefSmlkQw1ANQ==" crossorigin="anonymous"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous"></script>
+<script type="text/javascript" src="https:///cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js" integrity="sha512-WFN04846sdKMIP5LKNphMaWzU7YpMyCU245etK3g/2ARYbPK9Ub18eG+ljU96qKRCWh+quCY7yefSmlkQw1ANQ==" crossorigin="anonymous"></script>
 
 <!-- JavaScript Bundle with Popper -->
 <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-gtEjrD/SeCtmISkJkNUaaKMoLD0//ElJ19smozuHV6z3Iehds+3Ulb9Bn9Plx0x4" crossorigin="anonymous"></script>
diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php
index f15abad..e1d1529 100644
--- a/resources/views/setup.blade.php
+++ b/resources/views/setup.blade.php
@@ -189,7 +189,6 @@ use App\Models\Setup;
 								<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
 							</div>
 						@endcan
-						</div>
 					</div>
 				</form>
 			</div>
@@ -198,15 +197,14 @@ use App\Models\Setup;
 @endsection
 
 @section('page-css')
-	<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">
+	@css('select2')
 @append
 @section('page-scripts')
-	<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>
+	@js('select2')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$('#system_id').select2();
 		});
 	</script>
-@append
+@append
\ No newline at end of file
diff --git a/resources/views/system/home.blade.php b/resources/views/system/home.blade.php
index 7f3f93f..215c1ec 100644
--- a/resources/views/system/home.blade.php
+++ b/resources/views/system/home.blade.php
@@ -63,13 +63,11 @@
 	</div>
 @endsection
 
+@section('page-css')
+	@css('datatables')
+@append
 @section('page-scripts')
-	<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">
-	<link type="text/css" rel="stylesheet" href="{{ asset('plugin/dataTables/dataTables.bootstrap5.css') }}" media="screen">
-
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
-	<script type="text/javascript" src="{{ asset('plugin/dataTables/dataTables.conditionalPaging.js') }}"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>
+	@js('datatables')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -104,4 +102,4 @@
 			});
 		});
 	</script>
-@append
+@append
\ No newline at end of file
diff --git a/resources/views/system/moveaddr.blade.php b/resources/views/system/moveaddr.blade.php
index 5761f7d..dbed049 100644
--- a/resources/views/system/moveaddr.blade.php
+++ b/resources/views/system/moveaddr.blade.php
@@ -112,11 +112,10 @@ Move Address
 @endsection
 
 @section('page-css')
-	<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">
+	@css('select2')
 @append
 @section('page-scripts')
-	<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>
+	@js('select2')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
diff --git a/resources/views/system/ours.blade.php b/resources/views/system/ours.blade.php
index b4ac7c2..d43fd7b 100644
--- a/resources/views/system/ours.blade.php
+++ b/resources/views/system/ours.blade.php
@@ -47,14 +47,11 @@
 	</div>
 @endsection
 
+@section('page-css')
+	@css('datatables')
+@append
 @section('page-scripts')
-	<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">
-	<link type="text/css" rel="stylesheet" href="{{ asset('plugin/dataTables/dataTables.bootstrap5.css') }}" media="screen">
-
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js"></script>
-	<script type="text/javascript" src="{{ asset('plugin/dataTables/dataTables.conditionalPaging.js') }}"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>
+	@js('datatables')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -96,4 +93,4 @@
 			});
 		});
 	</script>
-@append
+@append
\ No newline at end of file
diff --git a/resources/views/user/home.blade.php b/resources/views/user/home.blade.php
index ecb08d0..1cb4062 100644
--- a/resources/views/user/home.blade.php
+++ b/resources/views/user/home.blade.php
@@ -42,13 +42,11 @@
 	</div>
 @endsection
 
+@section('page-css')
+	@css('datatables')
+@append
 @section('page-scripts')
-	<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">
-	<link type="text/css" rel="stylesheet" href="{{ asset('plugin/dataTables/dataTables.bootstrap5.css') }}" media="screen">
-
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
-	<script type="text/javascript" src="{{ asset('plugin/dataTables/dataTables.conditionalPaging.js') }}"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>
+	@js('datatables')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -77,4 +75,4 @@
 			});
 		});
 	</script>
-@append
+@append
\ No newline at end of file
diff --git a/resources/views/zone/addedit.blade.php b/resources/views/zone/addedit.blade.php
index 9c4b97c..7e53a39 100644
--- a/resources/views/zone/addedit.blade.php
+++ b/resources/views/zone/addedit.blade.php
@@ -178,15 +178,14 @@
 @endsection
 
 @section('page-css')
-	<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">
+	@css('select2')
 @append
 @section('page-scripts')
-	<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>
+	@js('select2')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$('#system').select2();
 		});
 	</script>
-@append
+@append
\ No newline at end of file
diff --git a/resources/views/zone/home.blade.php b/resources/views/zone/home.blade.php
index 19f7929..1c027b7 100644
--- a/resources/views/zone/home.blade.php
+++ b/resources/views/zone/home.blade.php
@@ -51,13 +51,11 @@
 	</div>
 @endsection
 
+@section('page-css')
+	@css('datatables')
+@append
 @section('page-scripts')
-	<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/dataTables.bootstrap5.min.css" media="screen">
-	<link type="text/css" rel="stylesheet" href="{{ asset('plugin/dataTables/dataTables.bootstrap5.css') }}" media="screen">
-
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
-	<script type="text/javascript" src="{{ asset('plugin/dataTables/dataTables.conditionalPaging.js') }}"></script>
-	<script type="text/javascript" src="https://cdn.datatables.net/1.10.25/js/dataTables.bootstrap5.min.js"></script>
+	@js('datatables')
 
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -86,4 +84,4 @@
 			});
 		});
 	</script>
-@append
+@append
\ No newline at end of file