chore: use prebuilt image (#63)

monicahq · Feb 24, 2024 · acbed8e · acbed8e
1 parent 2f5a30e
commit acbed8e
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 87 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,16 +1,14 @@
 {
   "name": "PHP & SQLite",
-  "service": "app",
-  "workspaceFolder": "/workspace",
-  "dockerComposeFile": "docker-compose.yml",
+  "image": "ghcr.io/asbiin/devcontainers/php:8.2",
 
   // For use with PHP or Apache (e.g.php -S localhost:8080 or apache2ctl start)
   "forwardPorts": [8080],
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {}
+  },
 
   // Use 'postCreateCommand' to run commands after the container is created.
   "postCreateCommand": ".devcontainer/postCreate.sh",
   "postStartCommand": ".devcontainer/postStart.sh"
-
-  // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
-  // "remoteUser": "vscode"
 }
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh
@@ -31,7 +31,7 @@ set_apache() {
 }
 
 set_database() {
-    cp $ROOT/.env.example $ROOT/.env && echo "APP_TRUSTED_PROXIES=*" >> $ROOT/.env
+    cp $ROOT/.env.example $ROOT/.env && echo -e "APP_TRUSTED_PROXIES=*\nAPP_FORCE_URL=true" >> $ROOT/.env
     setenv "DB_CONNECTION" "sqlite"
     setenv "DB_DATABASE" "$ROOT/$DATABASE"
     touch $ROOT/$DATABASE && chgrp www-data $ROOT/$DATABASE && chmod g+w $ROOT/$DATABASE

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -5,8 +5,11 @@
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Str;
 
 class RouteServiceProvider extends ServiceProvider
 {
@@ -24,6 +27,11 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
+        if (Config::get('app.force_url')) {
+            URL::forceRootUrl(Str::of(config('app.url'))->ltrim('/'));
+            URL::forceScheme('https');
+        }
+
         RateLimiter::for('api', function (Request $request) {
             return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
         });

diff --git a/config/app.php b/config/app.php
@@ -59,6 +59,8 @@
 
     'asset_url' => env('ASSET_URL'),
 
+    'force_url' => (bool) env('APP_FORCE_URL', false),
+
     /*
     |--------------------------------------------------------------------------
     | Application Timezone

diff --git a/resources/css/app.css b/resources/css/app.css
@@ -1,3 +1,4 @@
+@import 'charts.css';
 @tailwind base;
 @tailwind components;
 @tailwind utilities;

diff --git a/resources/js/app.js b/resources/js/app.js
@@ -1,9 +1,9 @@
 import './bootstrap';
+import '../css/app.css';
 
 import Alpine from 'alpinejs';
 import Clipboard from "@ryangjchandler/alpine-clipboard";
 import htmx from 'htmx.org';
-import 'charts.css';
 
 window.Alpine = Alpine;
 window.htmx = htmx;

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -11,7 +11,7 @@
   <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>⛺</text></svg>">
 
   <!-- Scripts -->
-  @vite(['resources/css/app.css', 'resources/js/app.js'])
+  @vite('resources/js/app.js')
 </head>
 
 <body class="font-sans antialiased text-slate-900 dark:text-gray-100">

diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
@@ -10,7 +10,7 @@
   <title>{{ config('app.name', 'Laravel') }}</title>
 
   <!-- Scripts -->
-  @vite(['resources/css/app.css', 'resources/js/app.js'])
+  @vite('resources/js/app.js')
 
   {{ $jsonLdSchema ?? '' }}
 

diff --git a/resources/views/layouts/login.blade.php b/resources/views/layouts/login.blade.php
@@ -9,7 +9,7 @@
   <title>{{ config('app.name', 'Laravel') }}</title>
 
   <!-- Scripts -->
-  @vite(['resources/css/app.css', 'resources/js/app.js'])
+  @vite('resources/js/app.js')
 
   {{ $jsonLdSchema ?? '' }}
 

diff --git a/vite.config.js b/vite.config.js
@@ -10,7 +10,10 @@ export default defineConfig(({ mode }) => {
   return {
     plugins: [
       laravel({
-        input: ['resources/css/app.css', 'resources/js/app.js'],
+        input: [
+          'resources/css/app.css',
+          'resources/js/app.js'
+        ],
         refresh: true,
       }),
       basicSsl(),