From 24e51c38b87d36c48d0c6a151c0b18124139dd2b Mon Sep 17 00:00:00 2001 From: Elisa Goloviatinski Date: Mon, 16 Dec 2024 23:57:27 +0100 Subject: [PATCH] Adjusted files for production --- .github/workflows/main.yml | 2 +- timeliner/resources/css/app.css | 2 ++ timeliner/resources/js/app.js | 4 ++-- timeliner/resources/views/layouts/app.blade.php | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 34448a9..01efcbb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: - name: installing dependencies and setup run: | cd /home/laravel/project/Timeliner/timeliner - composer install + composer install --no-dev --optimize-autoloader php artisan key:generate --force php artisan migrate --force npm install diff --git a/timeliner/resources/css/app.css b/timeliner/resources/css/app.css index af3b826..a2dc0be 100644 --- a/timeliner/resources/css/app.css +++ b/timeliner/resources/css/app.css @@ -1,5 +1,7 @@ @import './timelinestyle.css'; +@import './bootstrap-toggle.min.css'; + @tailwind base; @tailwind components; @tailwind utilities; diff --git a/timeliner/resources/js/app.js b/timeliner/resources/js/app.js index 1011fcc..630cc78 100644 --- a/timeliner/resources/js/app.js +++ b/timeliner/resources/js/app.js @@ -1,11 +1,11 @@ import './bootstrap'; import './timelinelistener'; -import '../css/timelinestyle.css'; - import './formfunctions'; import './createformfunctions'; +import './bootstrap-toggle.min.js' + import Alpine from 'alpinejs'; diff --git a/timeliner/resources/views/layouts/app.blade.php b/timeliner/resources/views/layouts/app.blade.php index 4382945..7109ed6 100644 --- a/timeliner/resources/views/layouts/app.blade.php +++ b/timeliner/resources/views/layouts/app.blade.php @@ -13,8 +13,6 @@ @vite(['resources/css/app.css', 'resources/js/app.js']) - @vite(['resources/css/bootstrap-toggle.min.css', 'resources/js/bootstrap-toggle.min.js']) -