From b46b24bb83d831f7386442e5831c99833a48a8b6 Mon Sep 17 00:00:00 2001
From: Mischa Spelt <mischa.spelt@talumis.com>
Date: Mon, 7 Sep 2026 11:11:17 +0200
Subject: [PATCH] Fix JS packages

---
 docker-entrypoint.sh                    | 13 ++++++++++---
 resources/views/news.blade.php          |  4 ++--
 resources/views/radioschedule.blade.php |  6 +++---
 scripts/setup-vendor.js                 |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 18b9a265..29955b6e 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -10,9 +10,9 @@ echo "Setting up dependencies..."
 
 # Create vendor directories and fix permissions
 echo "Fixing permissions..."
-mkdir -p bootstrap/cache storage/framework storage/logs
-chown -R www-data:www-data bootstrap/cache storage/framework storage/logs
-chmod -R ug+rwX bootstrap/cache storage/framework storage/logs
+mkdir -p bootstrap/cache storage/framework storage/logs public/assets/vendor
+chown -R www-data:www-data bootstrap/cache storage/framework storage/logs public/assets/vendor
+chmod -R ug+rwX bootstrap/cache storage/framework storage/logs public/assets/vendor
 
 # Install PHP dependencies
 echo "Installing PHP packages..."
@@ -26,8 +26,15 @@ composer install \
 if grep -q "\"dependencies\"" package.json; then
     echo "Installing npm packages..."
     npm ci --omit=dev
+    node scripts/setup-vendor.js
 fi
 
+# Fix permissions
+echo "Fixing permissions..."
+chown -R www-data:www-data \
+    bootstrap/cache \
+    public/assets/vendor
+
 chmod -R ug+rwX bootstrap/cache
 
 echo "✓ Setup complete, starting Apache..."
diff --git a/resources/views/news.blade.php b/resources/views/news.blade.php
index f37791eb..7a2593b5 100644
--- a/resources/views/news.blade.php
+++ b/resources/views/news.blade.php
@@ -9,8 +9,8 @@
 @endsection
 
 @push('scripts')
-    <script type="text/javascript" src="/assets/vendor/moment/moment.min.js"></script>
-    <script type="text/javascript" src="/assets/vendor/daterangepicker/daterangepicker.min.js"></script>
+    <script type="text/javascript" src="/assets/vendor/moment/min/moment.min.js"></script>
+    <script type="text/javascript" src="/assets/vendor/daterangepicker/daterangepicker.js"></script>
     <link rel="stylesheet" type="text/css" href="/assets/vendor/daterangepicker/daterangepicker.css" />
     <style>
         .input-group-text svg {
diff --git a/resources/views/radioschedule.blade.php b/resources/views/radioschedule.blade.php
index db5054d1..d57c744e 100644
--- a/resources/views/radioschedule.blade.php
+++ b/resources/views/radioschedule.blade.php
@@ -73,12 +73,12 @@ $margin = 2;
             border: solid {{$border}}px #03A6E0;
         }
     </style>
-    <link href="/assets/vendor/air-datepicker/air-datepicker.min.css" rel="stylesheet">
+    <link href="/assets/vendor/air-datepicker/air-datepicker.css" rel="stylesheet">
 @endpush
 
 @push('scripts')
-    <script src="/assets/vendor/moment/moment.min.js"></script>
-    <script src="/assets/vendor/air-datepicker/air-datepicker.min.js"></script>
+    <script src="/assets/vendor/moment/min/moment.min.js"></script>
+    <script src="/assets/vendor/air-datepicker/air-datepicker.js"></script>
     <script type="text/javascript">
       var isMobile = window.screen.width <= 768;
       var airdatepicker = new AirDatepicker('#custom_date', {
diff --git a/scripts/setup-vendor.js b/scripts/setup-vendor.js
index d572e764..750635ea 100644
--- a/scripts/setup-vendor.js
+++ b/scripts/setup-vendor.js
@@ -13,7 +13,7 @@ const packages = {
   'moment': { folder: 'moment', subdir: '.' },
   'daterangepicker': { folder: 'daterangepicker', subdir: '' },
   'wavesurfer.js': { folder: 'wavesurfer', subdir: 'dist' },
-  'air-datepicker': { folder: 'air-datepicker', subdir: 'dist' },
+  'air-datepicker': { folder: 'air-datepicker', subdir: '' },
 };
 
 const vendorDir = path.join(__dirname, '..', 'public', 'assets', 'vendor');