Skip to content

Commit

Permalink
update webpacj and jquery
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbarzin
dbarzin committed Dec 4, 2024
1 parent d097828 commit 27776fe
Show file tree
Hide file tree
Showing 8 changed files with 139 additions and 12 deletions.
41 changes: 38 additions & 3 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"body-parser": "^1.20.1",
"bonjour-service": "^1.1.1",
"boolbase": "^1.0.0",
"bootstrap": "^5.3.3",
"brace-expansion": "^1.1.11",
"braces": "^3.0.2",
"brorand": "^1.1.0",
Expand Down Expand Up @@ -266,6 +267,7 @@
"isexe": "^2.0.0",
"isobject": "^3.0.1",
"jest-worker": "^27.5.1",
"jquery": "^3.7.1",
"js-tokens": "^4.0.0",
"jsesc": "^2.5.2",
"json-parse-even-better-errors": "^2.3.1",
Expand Down
2 changes: 1 addition & 1 deletion public/css/bootstrap.min.css.map
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions public/js/jquery.min.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/js/jquery.min.map
View file

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions public/mix-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"/js/custom-mix.js": "/js/custom-mix.js",
"/css/custom-mix.css": "/css/custom-mix.css"
"/js/jquery.min.map": "/js/jquery.min.map",
"/js/jquery.min.js": "/js/jquery.min.js",
"/css/bootstrap.min.css": "/css/bootstrap.min.css",
"/css/bootstrap.min.css.map": "/css/bootstrap.min.css.map",
"/js/bootstrap.bundle.min.js": "/js/bootstrap.bundle.min.js",
"/js/bootstrap.bundle.min.js.map": "/js/bootstrap.bundle.min.js.map"
}
9 changes: 7 additions & 2 deletions resources/views/layouts/admin.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,19 @@
<!-- <script src="//cdn.jsdelivr.net/npm/sweetalert2@11"></script> -->
<script src="/js/sweetalert2.all.min.js"></script>

<!-- JQuery -->
<!--script src="https://code.jquery.com/jquery-3.7.1.js"></script-->
<script src="{{ asset ('/js/jquery-3.7.1.js') }}"></script>
<!--script src="{{ asset ('/js/jquery-3.7.1.js') }}"></script-->
<!--script src="{{ asset ('/js/jquery-3.7.1.js') }}"></script-->
<script src="{{ asset ('/js/jquery.min.js') }}"></script>

<!-- Bootstrap -->
<!-- script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script -->
<!--script src="/js/bootstrap.bundle.min.js"></script-->
<script src="/js/bootstrap.bundle.min.js"></script>

<!-- script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"></script -->
<script src="/js/popper.min.js"></script>
<!--script src="/js/popper.min.js"></script-->
<!-- script src="https://unpkg.com/@coreui/[email protected]/dist/js/coreui.min.js"></script -->
<script src="/js/coreui.min.js"></script>
<!-- script src="//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js"></script -->
Expand Down Expand Up @@ -284,6 +288,7 @@
<script src="/js/moment.min.js"></script>
<!-- script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script-->
<script src="/js/bootstrap-datetimepicker.min.js"></script>

<!--script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.5/js/select2.full.min.js"></script-->
<script src="/js/select2.full.min.js"></script>

Expand Down
86 changes: 82 additions & 4 deletions webpack.mix.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,85 @@ const mix = require('laravel-mix');
|
*/

mix.js('resources/js/app.js', 'public/js')
.sass('resources/sass/app.scss', 'public/css');

mix.js('resources/js/app.js', 'public/js').vue();
// mix.js('resources/js/app.js', 'public/js');
// .sass('resources/sass/app.scss', 'public/css');

// mix.js('resources/js/app.js', 'public/js').vue();

// JQuery

mix.copy('node_modules/jquery/dist/jquery.min.map','public/js');
mix.copy('node_modules/jquery/dist/jquery.min.js','public/js');

// Bootstrap
mix.copy('node_modules/bootstrap/dist/css/bootstrap.min.css','public/css');
mix.copy('node_modules/bootstrap/dist/css/bootstrap.min.css.map','public/css');
mix.copy('node_modules/bootstrap/dist/js/bootstrap.bundle.min.js','public/js');
mix.copy('node_modules/bootstrap/dist/js/bootstrap.bundle.min.js.map','public/js');

/*
// bootstrap-datetimepicker
mix.copy('node_modules/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js','public/js');
// popper
mix.copy('node_modules/@popperjs/core/dist/umd/popper.min.js','public/js');
mix.copy('node_modules/@popperjs/core/dist/umd/popper.min.js.map','public/js');
// coreui
mix.copy('node_modules/@coreui/coreui/dist/css/coreui.min.css','public/css');
mix.copy('node_modules/@coreui/coreui/dist/css/coreui.min.css.map','public/css');
mix.copy('node_modules/@coreui/coreui/dist/js/coreui.min.js','public/js');
mix.copy('node_modules/@coreui/coreui/dist/js/coreui.min.js.map','public/js');
mix.copy('node_modules/@coreui/coreui/dist/js/bootstrap.bundle.min.js','public/js');
mix.copy('node_modules/@coreui/coreui/dist/js/bootstrap.bundle.min.js.map','public/js');
// Fontawesome
mix.copy('node_modules/font-awesome/css/font-awesome.min.css','public/css');
// mix.copy('node_modules/@fortawesome/fontawesome-free/css/solid.min.css','public/css');
// mix.copy('node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2','public/webfonts');
mix.copy('node_modules/font-awesome/fonts/fontawesome-webfont.woff2','public/webfonts');
// dataTables
mix.copy('node_modules/datatables.net/js/dataTables.min.js','public/js');
mix.copy('node_modules/datatables.net-select/js/dataTables.select.min.js','public/js');
mix.copy('node_modules/datatables.net-bs5/js/dataTables.bootstrap5.js','public/js');
mix.copy('node_modules/datatables.net-buttons/js/dataTables.buttons.min.js','public/js');
mix.copy('node_modules/datatables.net-searchbuilder/js/dataTables.searchBuilder.min.js','public/js');
mix.copy('node_modules/datatables.net-buttons/js/buttons.colVis.min.js','public/js');
mix.copy('node_modules/datatables.net-buttons/js/buttons.html5.min.js','public/js');
mix.copy('node_modules/datatables.net-buttons/js/buttons.print.min.js','public/js');
// JSZip
mix.copy('node_modules/jszip/dist/jszip.min.js','public/js');
// PDFMake
mix.copy('node_modules/pdfmake/build/pdfmake.min.js','public/js');
mix.copy('node_modules/pdfmake/build/pdfmake.min.js.map','public/js');
mix.copy('node_modules/pdfmake/build/vfs_fonts.js','public/js');
// select2
mix.copy('node_modules/select2/dist/js/select2.min.js','public/js');
mix.copy('node_modules/select2/dist/css/select2.min.css','public/css');
// Chartjs
mix.copy('node_modules/chartjs/chart.js','public/js');
// DropZone
mix.copy('node_modules/dropzone/dist/dropzone-min.js','public/js');
mix.copy('node_modules/dropzone/dist/dropzone-min.js.map','public/js');
mix.copy('node_modules/dropzone/dist/dropzone.css','public/css');
mix.copy('node_modules/dropzone/dist/dropzone.css.map','public/css');
// SweetAlert2
mix.copy('node_modules/sweetalert2/dist/sweetalert2.min.js','public/js');
mix.copy('node_modules/sweetalert2/dist/sweetalert2.css','public/css');
// CKEditor
mix.copy('node_modules/@ckeditor/ckeditor5-build-classic/build/ckeditor.js','public/js');
mix.copy('node_modules/@ckeditor/ckeditor5-editor-classic/theme/classiceditor.css','public/css');
// Moment
mix.copy('node_modules/moment/min/moment.min.js','public/js');
mix.copy('node_modules/moment/min/moment.min.js.map','public/js');
*/

0 comments on commit 27776fe

Please sign in to comment.