Load all frontend packages conditionally

views/barcodescannertesting.blade.php

@@ -1,12 +1,9 @@
+@php require_frontend_packages(['animatecss']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Barcode scanner testing'))
 
-@push('pageScripts')
-<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row">
 	<div class="col">

views/batteries.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Batteries'))

views/batteriesjournal.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Batteries journal'))

views/batteriesoverview.blade.php

@@ -1,12 +1,9 @@
+@php require_frontend_packages(['datatables', 'animatecss']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Batteries overview'))
 
-@push('pageStyles')
-<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row">
 	<div class="col">

views/batterytracking.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['bootstrap-combobox']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Battery tracking'))

views/calendar.blade.php

@@ -1,18 +1,9 @@
+@php require_frontend_packages(['fullcalendar', 'bwipjs']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Calendar'))
 
-@push('pageScripts')
-<script src="{{ $U('/node_modules/fullcalendar/dist/fullcalendar.min.js?v=', true) }}{{ $version }}"></script>
-@if(!empty($__t('fullcalendar_locale') && $__t('fullcalendar_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/fullcalendar/dist/locale/{{ $__t('fullcalendar_locale') }}.js?v={{ $version }}"></script>@endif
-<script src="{{ $U('/node_modules/bwip-js/dist/bwip-js-min.js?v=', true) }}{{ $version }}"></script>
-@endpush
-
-@push('pageStyles')
-<link href="{{ $U('/node_modules/fullcalendar/dist/fullcalendar.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row">
 	<div class="col">

views/choreform.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['bootstrap-select']); @endphp
+
 @extends('layout.default')
 
 @if($mode == 'edit')

views/chores.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Chores'))

views/choresjournal.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Chores journal'))

views/choresoverview.blade.php

@@ -1,12 +1,9 @@
+@php require_frontend_packages(['datatables', 'animatecss']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Chores overview'))
 
-@push('pageStyles')
-<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row">
 	<div class="col">

views/choretracking.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['bootstrap-combobox']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Chore tracking'))

views/components/barcodescanner.blade.php

@@ -1,17 +1,13 @@
 @if (!GROCY_FEATURE_FLAG_DISABLE_BROWSER_BARCODE_CAMERA_SCANNING)
 
+@php require_frontend_packages(['quagga2']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/barcodescanner.js', true) }}?v={{ $version }}"></script>
 @endpush
 @endonce
 
-@once
-@push('pageScripts')
-<script src="{{ $U('/node_modules/@ericblade/quagga2/dist/quagga.min.js?v=', true) }}{{ $version }}"></script>
-@endpush
-@endonce
-
 @push('pageStyles')
 <style>
 	#barcodescanner-start-button {
@@ -25,7 +21,6 @@
 	.combobox-container #barcodescanner-start-button {
 		margin-right: 36px !important;
 	}
-
 </style>
 @endpush
 

views/components/calendarcard.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['tempusdominus']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/calendarcard.js', true) }}?v={{ $version }}"></script>

views/components/datetimepicker.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['tempusdominus']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/datetimepicker.js', true) }}?v={{ $version }}"></script>

views/components/datetimepicker2.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['tempusdominus']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/datetimepicker2.js', true) }}?v={{ $version }}"></script>

views/components/locationpicker.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['bootstrap-combobox']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/locationpicker.js', true) }}?v={{ $version }}"></script>

views/components/productcard.blade.php

@@ -1,6 +1,7 @@
+@php require_frontend_packages(['chartjs']); @endphp
+
 @once
 @push('componentScripts')
-<script src="{{ $U('/node_modules/chart.js/dist/Chart.min.js?v=', true) }}{{ $version }}"></script>
 <script src="{{ $U('/viewjs/components/productcard.js', true) }}?v={{ $version }}"></script>
 @endpush
 @endonce

views/components/productpicker.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['bootstrap-combobox']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/productpicker.js', true) }}?v={{ $version }}"></script>

views/components/recipepicker.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['bootstrap-combobox']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/recipepicker.js', true) }}?v={{ $version }}"></script>

views/components/shoppinglocationpicker.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['bootstrap-combobox']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/shoppinglocationpicker.js', true) }}?v={{ $version }}"></script>

views/components/userfieldsform.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['bootstrap-select']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/userfieldsform.js', true) }}?v={{ $version }}"></script>

views/components/userpicker.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['bootstrap-combobox']); @endphp
+
 @once
 @push('componentScripts')
 <script src="{{ $U('/viewjs/components/userpicker.js', true) }}?v={{ $version }}"></script>

views/equipment.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Equipment'))

views/equipmentform.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['summernote']); @endphp
+
 @extends('layout.default')
 
 @if($mode == 'edit')

views/layout/default.blade.php

@@ -1,3 +1,5 @@
+@php global $GROCY_REQUIRED_FRONTEND_PACKAGES; @endphp
+
 <!DOCTYPE html>
 <html lang="{{ GROCY_LOCALE }}"
 	dir="{{ $dir }}">
@@ -6,7 +8,6 @@
 	<meta charset="utf-8">
 	<meta name="viewport"
 		content="width=device-width, initial-scale=1">
-
 	<meta name="robots"
 		content="noindex,nofollow">
 
@@ -19,12 +20,24 @@
 
 	<title>@yield('title') | Grocy</title>
 
+	<link href="{{ $U('/node_modules/@fontsource/open-sans/latin.css?v=', true) }}{{ $version }}"
+		rel="stylesheet">
 	<link href="{{ $U('/node_modules/bootstrap/dist/css/bootstrap.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
 	<link href="{{ $U('/node_modules/@fortawesome/fontawesome-free/css/all.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
+	<link href="{{ $U('/node_modules/toastr/build/toastr.min.css?v=', true) }}{{ $version }}"
+		rel="stylesheet">
+
+	@if(in_array('bootstrap-combobox', $GROCY_REQUIRED_FRONTEND_PACKAGES))
 	<link href="{{ $U('/node_modules/@danielfarrell/bootstrap-combobox/css/bootstrap-combobox.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
+	@endif
+	@if(in_array('bootstrap-select', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<link href="{{ $U('/node_modules/bootstrap-select/dist/css/bootstrap-select.min.css?v=', true) }}{{ $version }}"
+		rel="stylesheet">
+	@endif
+	@if(in_array('datatables', $GROCY_REQUIRED_FRONTEND_PACKAGES))
 	<link href="{{ $U('/node_modules/datatables.net-bs4/css/dataTables.bootstrap4.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
 	<link href="{{ $U('/node_modules/datatables.net-colreorder-bs4/css/colReorder.bootstrap4.min.css?v=', true) }}{{ $version }}"
@@ -33,16 +46,28 @@
 		rel="stylesheet">
 	<link href="{{ $U('/node_modules/datatables.net-select-bs4/css/select.bootstrap4.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
-	<link href="{{ $U('/node_modules/toastr/build/toastr.min.css?v=', true) }}{{ $version }}"
-		rel="stylesheet">
+	@endif
+	@if(in_array('tempusdominus', $GROCY_REQUIRED_FRONTEND_PACKAGES))
 	<link href="{{ $U('/node_modules/tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
+	@endif
+	@if(in_array('summernote', $GROCY_REQUIRED_FRONTEND_PACKAGES))
 	<link href="{{ $U('/node_modules/summernote/dist/summernote-bs4.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
-	<link href="{{ $U('/node_modules/bootstrap-select/dist/css/bootstrap-select.min.css?v=', true) }}{{ $version }}"
+	@endif
+	@if(in_array('animatecss', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
-	<link href="{{ $U('/node_modules/@fontsource/open-sans/latin.css?v=', true) }}{{ $version }}"
+	@endif
+	@if(in_array('fullcalendar', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<link href="{{ $U('/node_modules/fullcalendar/dist/fullcalendar.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
+	@endif
+	@if(in_array('daterangepicker', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<link href="{{ $U('/node_modules/daterangepicker/daterangepicker.css?v=', true) }}{{ $version }}"
+		rel="stylesheet">
+	@endif
+
 	<link href="{{ $U('/css/grocy_menu_layout.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
 	<link href="{{ $U('/css/grocy.css?v=', true) }}{{ $version }}"
@@ -670,7 +695,16 @@
 	<script src="{{ $U('/node_modules/jquery-serializejson/jquery.serializejson.min.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/node_modules/moment/min/moment.min.js?v=', true) }}{{ $version }}"></script>
 	@if(!empty($__t('moment_locale') && $__t('moment_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/moment/locale/{{ $__t('moment_locale') }}.js?v={{ $version }}"></script>@endif
+	<script src="{{ $U('/node_modules/toastr/build/toastr.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/sprintf-js/dist/sprintf.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/gettext-translator/dist/translator.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/jquery-lazy/jquery.lazy.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/nosleep.js/dist/NoSleep.min.js?v=', true) }}{{ $version }}"></script>
+
+	@if(in_array('bootstrap-combobox', $GROCY_REQUIRED_FRONTEND_PACKAGES))
 	<script src="{{ $U('/node_modules/@danielfarrell/bootstrap-combobox/js/bootstrap-combobox.js?v=', true) }}{{ $version }}"></script>
+	@endif
+	@if(in_array('datatables', $GROCY_REQUIRED_FRONTEND_PACKAGES))
 	<script src="{{ $U('/node_modules/datatables.net/js/jquery.dataTables.min.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/node_modules/datatables.net-colreorder/js/dataTables.colReorder.min.js?v=', true) }}{{ $version }}"></script>
@@ -681,16 +715,37 @@
 	<script src="{{ $U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/node_modules/datatables.net-select/js/dataTables.select.min.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/node_modules/datatables.net-select-bs4/js/select.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/toastr/build/toastr.min.js?v=', true) }}{{ $version }}"></script>
+	@endif
+	@if(in_array('tempusdominus', $GROCY_REQUIRED_FRONTEND_PACKAGES))
 	<script src="{{ $U('/node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/sprintf-js/dist/sprintf.min.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/gettext-translator/dist/translator.js?v=', true) }}{{ $version }}"></script>
+	@endif
+	@if(in_array('summernote', $GROCY_REQUIRED_FRONTEND_PACKAGES))
 	<script src="{{ $U('/node_modules/summernote/dist/summernote-bs4.js?v=', true) }}{{ $version }}"></script>
 	@if(!empty($__t('summernote_locale') && $__t('summernote_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/summernote/dist/lang/summernote-{{ $__t('summernote_locale') }}.js?v={{ $version }}"></script>@endif
+	@endif
+	@if(in_array('bootstrap-select', $GROCY_REQUIRED_FRONTEND_PACKAGES))
 	<script src="{{ $U('/node_modules/bootstrap-select/dist/js/bootstrap-select.min.js?v=', true) }}{{ $version }}"></script>
 	@if(!empty($__t('bootstrap-select_locale') && $__t('bootstrap-select_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/bootstrap-select/dist/js/i18n/defaults-{{ $__t('bootstrap-select_locale') }}.js?v={{ $version }}"></script>@endif
-	<script src="{{ $U('/node_modules/jquery-lazy/jquery.lazy.min.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/nosleep.js/dist/NoSleep.min.js?v=', true) }}{{ $version }}"></script>
+	@endif
+	@if(in_array('fullcalendar', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<script src="{{ $U('/node_modules/fullcalendar/dist/fullcalendar.min.js?v=', true) }}{{ $version }}"></script>
+	@if(!empty($__t('fullcalendar_locale') && $__t('fullcalendar_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/fullcalendar/dist/locale/{{ $__t('fullcalendar_locale') }}.js?v={{ $version }}"></script>@endif
+	@endif
+	@if(in_array('daterangepicker', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<script src="{{ $U('/node_modules/daterangepicker/daterangepicker.js?v=', true) }}{{ $version }}"></script>
+	@endif
+	@if(in_array('quagga2', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<script src="{{ $U('/node_modules/@ericblade/quagga2/dist/quagga.min.js?v=', true) }}{{ $version }}"></script>
+	@endif
+	@if(in_array('bwipjs', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<script src="{{ $U('/node_modules/bwip-js/dist/bwip-js-min.js?v=', true) }}{{ $version }}"></script>
+	@endif
+	@if(in_array('chartjs', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<script src="{{ $U('/node_modules/chart.js/dist/Chart.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/chartjs-plugin-colorschemes/dist/chartjs-plugin-colorschemes.min.js?v=', true) }}{{ $version}}"></script>
+	<script src="{{ $U('/node_modules/chartjs-plugin-doughnutlabel/dist/chartjs-plugin-doughnutlabel.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/node_modules/chartjs-plugin-piechart-outlabels/dist/chartjs-plugin-piechart-outlabels.min.js?v=', true) }}{{ $version}}"></script>
+	@endif
 
 	<script src="{{ $U('/js/extensions.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/js/grocy_menu_layout.js?v=', true) }}{{ $version }}"></script>
@@ -700,6 +755,13 @@
 	<script src="{{ $U('/js/grocy_nightmode.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/js/grocy_clock.js?v=', true) }}{{ $version }}"></script>
 
+	@if(in_array('datatables', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<script src="{{ $U('/js/grocy_datatables.js?v=', true) }}{{ $version }}"></script>
+	@endif
+	@if(in_array('summernote', $GROCY_REQUIRED_FRONTEND_PACKAGES))
+	<script src="{{ $U('/js/grocy_summernote.js?v=', true) }}{{ $version }}"></script>
+	@endif
+
 	@stack('pageScripts')
 	@stack('componentScripts')
 	<script src="{{ $U('/viewjs/' . $viewName . '.js?v=', true) }}{{ $version }}"></script>

views/locationcontentsheet.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Location Content Sheet'))

views/locations.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Locations'))

views/manageapikeys.blade.php

@@ -1,16 +1,9 @@
+@php require_frontend_packages(['datatables', 'animatecss', 'bwipjs']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('API keys'))
 
-@push('pageScripts')
-<script src="{{ $U('/node_modules/bwip-js/dist/bwip-js-min.js?v=', true) }}{{ $version }}"></script>
-@endpush
-
-@push('pageStyles')
-<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row">
 	<div class="col">

views/mealplan.blade.php

@@ -1,16 +1,10 @@
+@php require_frontend_packages(['fullcalendar']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Meal plan'))
 
-@push('pageScripts')
-<script src="{{ $U('/node_modules/fullcalendar/dist/fullcalendar.min.js?v=', true) }}{{ $version }}"></script>
-@if(!empty($__t('fullcalendar_locale') && $__t('fullcalendar_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/fullcalendar/dist/locale/{{ $__t('fullcalendar_locale') }}.js?v={{ $version }}"></script>@endif
-@endpush
-
 @push('pageStyles')
-<link href="{{ $U('/node_modules/fullcalendar/dist/fullcalendar.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-
 <style>
 	.fc-event-container {
 		border-bottom: 1px solid !important;

views/mealplansections.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Meal plan sections'))

views/productform.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables', 'summernote']); @endphp
+
 @extends('layout.default')
 
 @if($mode == 'edit')

views/productgroups.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Product groups'))

views/products.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Products'))

views/quantityunitconversionsresolved.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('QU conversions resolved'))

views/quantityunitform.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @if($mode == 'edit')

views/quantityunitpluraltesting.blade.php

@@ -1,12 +1,9 @@
+@php require_frontend_packages(['animatecss']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Quantity unit plural form testing'))
 
-@push('pageStyles')
-<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row">
 	<div class="col">

views/quantityunits.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Quantity units'))

views/recipeform.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables', 'summernote']); @endphp
+
 @extends('layout.default')
 
 @if($mode == 'edit')

views/recipes.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Recipes'))

views/shoppinglist.blade.php

@@ -1,17 +1,13 @@
+@php require_frontend_packages(['datatables', 'summernote', 'animatecss', 'bwipjs']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Shopping list'))
 
 @push('pageScripts')
-<script src="{{ $U('/node_modules/bwip-js/dist/bwip-js-min.js?v=', true) }}{{ $version }}"></script>
 <script src="{{ $U('/viewjs/purchase.js?v=', true) }}{{ $version }}"></script>
 @endpush
 
-@push('pageStyles')
-<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row d-print-none hide-on-fullscreen-card">
 	<div class="col">
@@ -270,12 +266,14 @@
 						{{ $listItem->default_shopping_location_name }}
 					</td>
 					<td>
+						@if($listItem->product_barcodes != null)
 						@foreach(explode(',', $listItem->product_barcodes) as $barcode)
 						@if(!empty($barcode))
 						<img class="barcode img-fluid pr-2"
 							data-barcode="{{ $barcode }}">
 						@endif
 						@endforeach
+						@endif
 					</td>
 
 					@include('components.userfields_tbody', array(

views/shoppinglocations.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Stores'))

views/stockentries.blade.php

@@ -1,12 +1,9 @@
+@php require_frontend_packages(['datatables', 'animatecss']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Stock entries'))
 
-@push('pageStyles')
-<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @push('pageScripts')
 <script src="{{ $U('/viewjs/purchase.js?v=', true) }}{{ $version }}"></script>
 @endpush

views/stockjournal.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Stock journal'))

views/stockjournalsummary.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Stock journal summary'))

views/stockoverview.blade.php

@@ -1,12 +1,9 @@
+@php require_frontend_packages(['datatables', 'animatecss']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Stock overview'))
 
-@push('pageStyles')
-<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @push('pageScripts')
 <script src="{{ $U('/viewjs/purchase.js?v=', true) }}{{ $version }}"></script>
 @endpush

views/stockreportspendings.blade.php

@@ -1,20 +1,9 @@
+@php require_frontend_packages(['datatables', 'daterangepicker', 'chartjs']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Stock report') . ' / ' . $__t('Spendings'))
 
-@push('pageScripts')
-<script src="{{ $U('/node_modules/chart.js/dist/Chart.min.js?v=', true) }}{{ $version }}"></script>
-<script src="{{ $U('/node_modules/chartjs-plugin-colorschemes/dist/chartjs-plugin-colorschemes.min.js?v=', true) }}{{ $version}}"></script>
-<script src="{{ $U('/node_modules/chartjs-plugin-doughnutlabel/dist/chartjs-plugin-doughnutlabel.js?v=', true) }}{{ $version }}"></script>
-<script src="{{ $U('/node_modules/chartjs-plugin-piechart-outlabels/dist/chartjs-plugin-piechart-outlabels.min.js?v=', true) }}{{ $version}}"></script>
-<script src="{{ $U('/node_modules/daterangepicker/daterangepicker.js?v=', true) }}{{ $version }}"></script>
-@endpush
-
-@push('pageStyles')
-<link href="{{ $U('/node_modules/daterangepicker/daterangepicker.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row">
 	<div class="col">

views/taskcategories.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Task categories'))

views/tasks.blade.php

@@ -1,12 +1,9 @@
+@php require_frontend_packages(['datatables', 'animatecss']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Tasks'))
 
-@push('pageStyles')
-<link href="{{ $U('/node_modules/animate.css/animate.min.css?v=', true) }}{{ $version }}"
-	rel="stylesheet">
-@endpush
-
 @section('content')
 <div class="row">
 	<div class="col">

views/userentities.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Userentities'))

views/userfields.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Userfields'))

views/userobjects.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $userentity->caption)

views/users.blade.php

@@ -1,3 +1,5 @@
+@php require_frontend_packages(['datatables']); @endphp
+
 @extends('layout.default')
 
 @section('title', $__t('Users'))