From a61b2e3803ab28b5bca6bb0a8be605446947231c Mon Sep 17 00:00:00 2001 From: DariusIII Date: Sun, 5 Oct 2025 18:31:25 +0200 Subject: [PATCH] Remove all-js and all-css --- resources/css/app.css | 70 +++++++++++++++++++++++++ resources/js/app.js | 27 ++++++++++ resources/views/layouts/admin.blade.php | 2 - resources/views/layouts/app.blade.php | 5 +- resources/views/layouts/guest.blade.php | 2 - resources/views/layouts/main.blade.php | 3 -- webpack.mix.js | 10 +++- 7 files changed, 107 insertions(+), 12 deletions(-) diff --git a/resources/css/app.css b/resources/css/app.css index b5c61c956..a3d2be5ca 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,3 +1,73 @@ +/* Import FontAwesome */ +@import '@fortawesome/fontawesome-free/css/all.min.css'; + +/* Import other necessary libraries */ +@import 'animate.css/animate.min.css'; +@import 'datatables/media/css/jquery.dataTables.min.css'; + @tailwind base; @tailwind components; @tailwind utilities; + +/* Custom styles for proper spacing and button alignment */ +.btn { + @apply inline-flex items-center justify-center px-4 py-2 border rounded-md font-semibold text-sm transition-colors duration-150; +} + +.btn i { + @apply mr-2; +} + +.btn-primary { + @apply bg-blue-600 text-white border-blue-600 hover:bg-blue-700; +} + +.btn-secondary { + @apply bg-gray-600 text-white border-gray-600 hover:bg-gray-700; +} + +.btn-success { + @apply bg-green-600 text-white border-green-600 hover:bg-green-700; +} + +.btn-danger { + @apply bg-red-600 text-white border-red-600 hover:bg-red-700; +} + +.btn-warning { + @apply bg-yellow-500 text-white border-yellow-500 hover:bg-yellow-600; +} + +.btn-info { + @apply bg-cyan-600 text-white border-cyan-600 hover:bg-cyan-700; +} + +.btn-sm { + @apply px-3 py-1 text-xs; +} + +.btn-lg { + @apply px-6 py-3 text-base; +} + +/* Button group spacing */ +.btn-group { + @apply inline-flex space-x-2; +} + +/* Icon spacing */ +.fas, .far, .fab, .fa { + @apply inline-block; + min-width: 1em; + text-align: center; +} + +/* Table action buttons */ +.table-actions { + @apply flex items-center gap-2; +} + +.table-actions .btn { + @apply flex-shrink-0; +} + diff --git a/resources/js/app.js b/resources/js/app.js index e59d6a0ad..e1aa76900 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1 +1,28 @@ import './bootstrap'; + +// Import jQuery and make it globally available +import $ from 'jquery'; +window.$ = window.jQuery = $; + +// Import Bootstrap JS +import 'bootstrap'; + +// Import FontAwesome +import '@fortawesome/fontawesome-free/js/all.min.js'; + +// Import DataTables +import 'datatables'; + +// Import other necessary libraries +import autosize from 'autosize'; +window.autosize = autosize; + +// Initialize autosize on page load +document.addEventListener('DOMContentLoaded', function() { + // Auto-resize textareas + const textareas = document.querySelectorAll('textarea[data-autosize]'); + if (textareas.length > 0) { + autosize(textareas); + } +}); + diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index a8930ee1e..490d060b4 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -10,7 +10,6 @@ - @vite(['resources/css/app.css', 'resources/js/app.js']) @stack('styles') @@ -72,7 +71,6 @@ - @stack('scripts') diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index c1a6dee54..825656ddc 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -9,15 +9,12 @@ {{ config('app.name', 'Laravel') }} - - - - + @vite(['resources/css/app.css', 'resources/js/app.js'])
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index e0721a147..29530c4db 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -8,7 +8,6 @@ {{ config('app.name') }} - @vite(['resources/css/app.css', 'resources/js/app.js']) @stack('styles') @@ -16,7 +15,6 @@ @yield('content') - @stack('scripts') diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 3ffea84b1..bedc53427 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -11,7 +11,6 @@ - @vite(['resources/css/app.css', 'resources/js/app.js']) @stack('styles') @@ -79,8 +78,6 @@
- - @include('partials.toast-notifications') diff --git a/webpack.mix.js b/webpack.mix.js index f034c5d5b..bb5177122 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -18,7 +18,14 @@ mix .copyDirectory('node_modules/tinymce/icons/', 'public/assets/js/icons/') .copyDirectory('vendor/bhuvidya/laravel-countries/flags/', 'public/assets/images/flags/') .copy('node_modules/icheck/skins/flat/green.png', 'public/assets/css/green.png') - .copy('node_modules/icheck/skins/flat/green@2x.png', 'public/assets/css/green@2x.png') + .copy('node_modules/icheck/skins/flat/green@2x.png', 'public/assets/css/green@2x.png'); + +/* + * Legacy Smarty template assets - DISABLED + * Now using Vite with Tailwind CSS instead + * These bundled assets are no longer needed as we're using Vite for asset management + */ +/* .styles( [ 'node_modules/bootstrap/dist/css/bootstrap.min.css', @@ -66,3 +73,4 @@ mix 'resources/assets/js/functions.js' ] , 'public/assets/js/all-js.js'); +*/