Prefix bucket public path so we don't break stuff

flowan · Feb 2, 2024 · 0bb2546 · 0bb2546
1 parent fc4ad76
commit 0bb2546
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,9 @@
 /.phpunit.cache
 /node_modules
+/public/build
+/public/hot
+/public/storage
+/public/bucket
 /storage/*.key
 /vendor
 .env
@@ -16,8 +20,3 @@ yarn-error.log
 /.vscode
 /build
 .phpactor.json
-
-/public
-!/public/favicon.ico
-!/public/index.php
-!/public/robots.txt
diff --git a/app/Console/Commands/CreateBucket.php b/app/Console/Commands/CreateBucket.php
@@ -57,7 +57,7 @@ public function handle()
         if ($visibility === 'public') {
             $this->laravel->make('files')->link(
                 bucket_path($bucket),
-                public_path($bucket)
+                public_path('bucket/'.$bucket)
             );
         }
 

diff --git a/app/Console/Commands/Install.php b/app/Console/Commands/Install.php
@@ -41,7 +41,7 @@ public function handle()
 
         $this->laravel->make('files')->link(
             bucket_path($bucket),
-            public_path($bucket)
+            public_path('bucket/'.$bucket)
         );
 
         $this->info('Application installed');

diff --git a/app/Helpers/functions.php b/app/Helpers/functions.php
@@ -10,7 +10,7 @@ function bucket_relative_path(string $bucket = 'public', ?string $filePath = nul
         ->trim('/')
         ->toString();
 
-    return $bucket.($filePath ? '/'.$filePath : '');
+    return 'bucket/'.$bucket.($filePath ? '/'.$filePath : '');
 }
 
 function bucket_path(string $bucket = 'public', ?string $filePath = null): string

diff --git a/config/filament.php b/config/filament.php
diff --git a/config/filesystems.php b/config/filesystems.php
@@ -32,7 +32,7 @@
 
         'local' => [
             'driver' => 'local',
-            'root' => env('STORAGE_PATH', storage_path('app/bucket')),
+            'root' => env('STORAGE_PATH', storage_path('app')),
             'throw' => false,
         ],