From ec8224760e650d72e7f5d984137e11b52725d071 Mon Sep 17 00:00:00 2001 From: arifal Date: Fri, 13 Jun 2025 16:10:03 +0700 Subject: [PATCH] fix handle using asset for access css --- Dockerfile | 2 +- app/Providers/AppServiceProvider.php | 16 ++++++++++++++++ deploy.sh | 4 ++++ resources/views/auth/login.blade.php | 12 ++++++------ resources/views/layouts/backapp.blade.php | 6 +++--- .../layouts/front-partials/header.blade.php | 2 +- resources/views/layouts/frontapp.blade.php | 6 +++--- .../views/layouts/partials/header.blade.php | 2 +- .../layouts/partials/headerMobile.blade.php | 2 +- .../views/layouts/partials/sidebarMenu.blade.php | 2 +- resources/views/welcome.blade.php | 14 +++++++------- 11 files changed, 44 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2fab994..c202396 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,7 @@ COPY --chown=www-data:www-data . /var/www/html RUN composer install --optimize-autoloader --no-dev --no-interaction # Install Node.js dependencies and build assets -RUN npm ci --only=production \ +RUN npm ci \ && npm run production \ && rm -rf node_modules diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 2a9c4d4..7464ec5 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -6,6 +6,7 @@ use App\Models\Menu; use Carbon\Carbon; use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\View; +use Illuminate\Support\Facades\URL; class AppServiceProvider extends ServiceProvider { @@ -36,5 +37,20 @@ class AppServiceProvider extends ServiceProvider $view->with('menus', $menus); }); + + // Force HTTPS in production if needed + if (config('app.env') === 'production') { + // Force the application URL to include port if specified + $appUrl = config('app.url'); + if ($appUrl) { + URL::forceRootUrl($appUrl); + + // Parse URL to check if it's HTTPS + $parsedUrl = parse_url($appUrl); + if (isset($parsedUrl['scheme']) && $parsedUrl['scheme'] === 'https') { + URL::forceScheme('https'); + } + } + } } } diff --git a/deploy.sh b/deploy.sh index b55edc6..a585a9d 100755 --- a/deploy.sh +++ b/deploy.sh @@ -53,5 +53,9 @@ docker-compose -f docker-compose.prod.yml logs --tail=20 echo "✅ Deployment completed!" echo "🌐 Application should be available at: http://localhost:8082" echo "" +echo "🔍 Testing asset URLs:" +echo "CSS: http://localhost:8082/assets/css/app.bundle.min.css" +echo "JS: http://localhost:8082/assets/js/app.bundle.min.js" +echo "" echo "To check logs: docker-compose -f docker-compose.prod.yml logs -f" echo "To check app logs: docker-compose -f docker-compose.prod.yml logs -f app" \ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 23641c2..7955ddb 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -90,14 +90,14 @@ - + - + - + @@ -107,12 +107,12 @@