Update leenooks/laravel and now using @js @css shortcuts

This commit is contained in:
Deon George 2021-12-20 14:08:00 +11:00
parent b7b6a575bc
commit 0aa7ff3b2c
30 changed files with 922 additions and 1778 deletions

View File

@ -22,10 +22,11 @@
"laravel/socialite": "^5.2", "laravel/socialite": "^5.2",
"laravel/ui": "^3.2", "laravel/ui": "^3.2",
"leenooks/laravel": "^9.0", "leenooks/laravel": "^9.0",
"rennokki/laravel-eloquent-query-cache": "^2.6", "leenooks/laravel-theme": "^v2.0.17.2",
"romanzipp/laravel-queue-monitor": "^2.0",
"repat/laravel-job-models": "^0.5.1",
"paypal/paypal-checkout-sdk": "^1.0", "paypal/paypal-checkout-sdk": "^1.0",
"rennokki/laravel-eloquent-query-cache": "^2.6",
"repat/laravel-job-models": "^0.5.1",
"romanzipp/laravel-queue-monitor": "^2.0",
"spatie/laravel-demo-mode": "^2.5", "spatie/laravel-demo-mode": "^2.5",
"spinen/laravel-quickbooks-client": "^4.0" "spinen/laravel-quickbooks-client": "^4.0"
}, },

2507
composer.lock generated

File diff suppressed because it is too large Load Diff

11
public/css/fixes.css vendored
View File

@ -79,3 +79,14 @@ table.dataTable thead .sorting {
.card-header h3.card-title { .card-header h3.card-title {
font-size: 1.0rem; font-size: 1.0rem;
} }
/* Fix selected item is positioned correctly */
span.select2-selection.select2-selection--single > span.select2-selection__rendered {
margin-top: -9px;
margin-left: -9px;
}
/* Fix height when used with form-group */
.select2-selection.select2-selection--single {
height: calc(2.25rem + 2px) !important;
}

View File

@ -1,8 +0,0 @@
$(document).on('select2:open',(event) => {
const searchField = document.querySelector(
`.select2-search__field[aria-controls="select2-${event.target.getAttribute('data-select2-id')}-results"]`,
);
if (searchField) {
searchField.focus();
}
});

View File

@ -1,3 +0,0 @@
.select2-selection.select2-selection--single {
height: calc(2.25rem + 2px) !important;
}

View File

@ -260,10 +260,8 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@css('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css','select-css') @css(select2)
@js('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js','select-js') @js(select2,autofocus)
@js('/select2/fix-autofocus.js','select-fix-js','select-js')
@css('/select2/fix-select-height.css','select-fix-css','select-css')
<script type="text/javascript"> <script type="text/javascript">
function populate(account,spinner) { function populate(account,spinner) {

View File

@ -52,9 +52,8 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

View File

@ -191,10 +191,8 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@css('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css','select-css') @css(select2)
@js('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js','select-js') @js(select2,autofocus)
@js('/select2/fix-autofocus.js','select-fix-js','select-js')
@css('/select2/fix-select-height.css','select-fix-css','select-css')
<script type="text/javascript"> <script type="text/javascript">
function populate(account,spinner) { function populate(account,spinner) {

View File

@ -53,9 +53,8 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

View File

@ -44,21 +44,8 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','datatables-css') @css(datatables,bootstrap4|fixedheader|responsive|rowgroup|buttons)
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','datatables-js') @js(datatables,bootstrap4|fixedheader|responsive|rowgroup|buttons)
@css('//cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','datatables-responsive-css')
@js('//cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','datatables-responsive-js')
@css('//cdn.datatables.net/rowgroup/1.1.0/css/rowGroup.dataTables.min.css','datatables-rowgroup-css')
@js('//cdn.datatables.net/rowgroup/1.1.0/js/dataTables.rowGroup.min.js','datatables-rowgroup-js')
@css('//cdn.datatables.net/buttons/1.5.6/css/buttons.dataTables.min.css','datatables-button-css')
@js('//cdn.datatables.net/buttons/1.5.6/js/dataTables.buttons.min.js','datatables-button-js')
@css('//cdn.datatables.net/fixedheader/3.1.5/css/fixedHeader.dataTables.min.css','datatables-fixed-css')
@js('//cdn.datatables.net/fixedheader/3.1.5/js/dataTables.fixedHeader.min.js','datatables-fixed-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','datatables-bootstrap4-css')
@js('/plugin/dataTables/dataTables.bootstrap4.js','datatables-bootstrap4-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','datatables-bootstrap4-css')
@js('//cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js','jszip')
@js('//cdn.datatables.net/buttons/1.5.6/js/buttons.html5.min.js','datatables-buttons-html5')
<style> <style>
tr.odd td:first-child, tr.odd td:first-child,

View File

@ -144,8 +144,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css','s2-css') @css(select2)
@js('//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js','s2-js','jquery') @js(select2,autofocus)
<style> <style>
.select2-selection.select2-selection--single { .select2-selection.select2-selection--single {

View File

@ -25,12 +25,8 @@
</table> </table>
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css') @css(datatables,bootstrap4)
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4|responsive)
@css('//cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','jq-dt-r-css','jq-dt-css')
@js('//cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','jq-dt-r-js','jq-dt-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')
@js('/plugin/dataTables/dataTables.bootstrap4.js','dt-bootstrap4-js','jq-dt-js')
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

View File

@ -30,9 +30,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

View File

@ -33,10 +33,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css') @css(datatables,bootstrap4|rowgroup)
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css') @js(datatables,bootstrap4|rowgroup)
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js')
<style> <style>
table.dataTable td { table.dataTable td {

View File

@ -36,10 +36,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('https://cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css') @css(datatables,bootstrap4|rowgroup)
@css('https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css') @js(datatables,bootstrap4|rowgroup)
@js('https://cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js')
@js('https://cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js')
<style> <style>
table.dataTable td { table.dataTable td {

View File

@ -41,11 +41,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
@js('//cdn.datatables.net/rowgroup/1.1.3/js/dataTables.rowGroup.min.js','jq-dt-rowgroup-js','jq-dt-js')
@css('//cdn.datatables.net/rowgroup/1.1.3/css/rowGroup.bootstrap4.min.css','jq-dt-rowgroup-css','jq-dt-jss')
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

View File

@ -57,11 +57,8 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
@js('//cdn.datatables.net/rowgroup/1.1.3/js/dataTables.rowGroup.min.js','jq-dt-rowgroup-js','jq-dt-js')
@css('//cdn.datatables.net/rowgroup/1.1.3/css/rowGroup.bootstrap4.min.css','jq-dt-rowgroup-css','jq-dt-jss')
<style> <style>
.strike { .strike {

View File

@ -60,11 +60,13 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@css('//cdnjs.cloudflare.com/ajax/libs/summernote/0.8.12/summernote-bs4.css','summernote-css') @css(summernote)
@js('//cdnjs.cloudflare.com/ajax/libs/summernote/0.8.12/summernote-bs4.js','summernote-js') @js(summernote)
@js('//cdn.jsdelivr.net/momentjs/latest/moment.min.js','moment-js')
@js('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js','daterange-js') <!-- @todo Put this into blade service provider -->
@css('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css','daterange-css') @themejs('//cdn.jsdelivr.net/momentjs/latest/moment.min.js','moment-js')
@themejs('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js','daterange-js')
@themecss('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css','daterange-css')
<script> <script>
$(document).ready(function() { $(document).ready(function() {

View File

@ -60,8 +60,8 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@css('//cdnjs.cloudflare.com/ajax/libs/summernote/0.8.12/summernote-bs4.css','summernote-css') @css(summernote)
@js('//cdnjs.cloudflare.com/ajax/libs/summernote/0.8.12/summernote-bs4.js','summernote-js') @js(summernote)
<script> <script>
$(document).ready(function() { $(document).ready(function() {

View File

@ -56,11 +56,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
@js('//cdn.datatables.net/rowgroup/1.1.3/js/dataTables.rowGroup.min.js','jq-dt-rowgroup-js','jq-dt-js')
@css('//cdn.datatables.net/rowgroup/1.1.3/css/rowGroup.bootstrap4.min.css','jq-dt-rowgroup-css','jq-dt-jss')
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

View File

@ -41,11 +41,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
@js('//cdn.datatables.net/rowgroup/1.1.3/js/dataTables.rowGroup.min.js','jq-dt-rowgroup-js','jq-dt-js')
@css('//cdn.datatables.net/rowgroup/1.1.3/css/rowGroup.bootstrap4.min.css','jq-dt-rowgroup-css','jq-dt-jss')
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

View File

@ -39,11 +39,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
@js('//cdn.datatables.net/rowgroup/1.1.3/js/dataTables.rowGroup.min.js','jq-dt-rowgroup-js','jq-dt-js')
@css('//cdn.datatables.net/rowgroup/1.1.3/css/rowGroup.bootstrap4.min.css','jq-dt-rowgroup-css','jq-dt-jss')
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

View File

@ -44,11 +44,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
@js('//cdn.datatables.net/rowgroup/1.1.3/js/dataTables.rowGroup.min.js','jq-dt-rowgroup-js','jq-dt-js')
@css('//cdn.datatables.net/rowgroup/1.1.3/css/rowGroup.bootstrap4.min.css','jq-dt-rowgroup-css','jq-dt-jss')
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

View File

@ -67,9 +67,9 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@js('//cdn.jsdelivr.net/momentjs/latest/moment.min.js','moment-js') @themejs('//cdn.jsdelivr.net/momentjs/latest/moment.min.js','moment-js')
@js('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js','daterange-js') @themejs('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js','daterange-js')
@css('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css','daterange-css') @themecss('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css','daterange-css')
<script> <script>
$(document).ready(function() { $(document).ready(function() {

View File

@ -71,9 +71,9 @@
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@js('//cdn.jsdelivr.net/momentjs/latest/moment.min.js','moment-js') @themejs('//cdn.jsdelivr.net/momentjs/latest/moment.min.js','moment-js')
@js('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js','daterange-js') @themejsc('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js','daterange-js')
@css('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css','daterange-css') @themecss('//cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css','daterange-css')
<script> <script>
$(document).ready(function() { $(document).ready(function() {

View File

@ -43,11 +43,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@css('//cdn.datatables.net/1.10.25/css/dataTables.bootstrap4.min.css','jq-dt-css') @css(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js','jq-dt-js') @js(datatables,bootstrap4|rowgroup)
@js('//cdn.datatables.net/1.10.25/js/dataTables.bootstrap4.min.js','jq-dt-bs5-js','jq-dt-js')
@js('//cdn.datatables.net/rowgroup/1.1.3/js/dataTables.rowGroup.min.js','jq-dt-rowgroup-js','jq-dt-js')
@css('//cdn.datatables.net/rowgroup/1.1.3/css/rowGroup.bootstrap4.min.css','jq-dt-rowgroup-css','jq-dt-jss')
<style> <style>
table.dataTable tr.dtrg-group.dtrg-end.dtrg-level-0 { table.dataTable tr.dtrg-group.dtrg-end.dtrg-level-0 {

View File

@ -31,11 +31,8 @@
</div> </div>
@section('page-scripts') @section('page-scripts')
@js('//code.highcharts.com/highcharts.js','highcharts') @js(highcharts)
@js('//code.highcharts.com/highcharts-more.js','highcharts-more','highcharts')
@js('//code.highcharts.com/modules/xrange.js','highcharts-xrange','highcharts')
@js('//code.highcharts.com/modules/exporting.js','highcharts-export','highcharts')
@js('//code.highcharts.com/modules/offline-exporting.js','highcharts-export-offline','highcharts-export')
<script> <script>
const timezone = new Date().getTimezoneOffset() const timezone = new Date().getTimezoneOffset()

View File

@ -263,8 +263,9 @@ DO NOT request making changes to an active service here, it will not be processe
@endsection @endsection
@section('page-scripts') @section('page-scripts')
@js('plugin/jqBootstrapValidation/jqBootstrapValidation.js','jq-validation','jquery') <!-- @todo change to blade service provider -->
@js('//code.jquery.com/ui/1.12.1/jquery-ui.js','jquery-ui-js','jqery') @themejs('plugin/jqBootstrapValidation/jqBootstrapValidation.js','jq-validation','jquery')
@themejs('//code.jquery.com/ui/1.12.1/jquery-ui.js','jquery-ui-js','jqery')
<script> <script>
$(function () { $("input,select,textarea").not("[type=submit]").jqBootstrapValidation(); } ); $(function () { $("input,select,textarea").not("[type=submit]").jqBootstrapValidation(); } );

View File

@ -49,7 +49,7 @@
</div> </div>
</div> </div>
@js('js/layout.js','layout','jquery') @themejs('js/layout.js','layout','jquery')
@endsection @endsection
@section('page-scripts') @section('page-scripts')

View File

@ -30,8 +30,9 @@
@section('page-scripts') @section('page-scripts')
<!-- END SLIDER --> <!-- END SLIDER -->
@css('/site/js/jquery/plugins/owl.carousel/2.0.0/css/owl.carousel.css') <!-- @todo change to Blade Service Provider -->
@js('/site/js/jquery/plugins/owl.carousel/2.0.0/js/owl.carousel.min.js','jq-owl-carousel','jquery') @themecss('/site/js/jquery/plugins/owl.carousel/2.0.0/css/owl.carousel.css')
@themejs('/site/js/jquery/plugins/owl.carousel/2.0.0/js/owl.carousel.min.js','jq-owl-carousel','jquery')
<script type="text/javascript"> <script type="text/javascript">
jQuery(document).ready(function() { jQuery(document).ready(function() {