diff --git a/.gitignore b/.gitignore index 9afa415..2032944 100644 --- 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 index efaf59f..18989c3 100644 --- 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 index 46c383a..0634b18 100644 --- 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 index 30829ce..678066b 100644 --- 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 deleted file mode 100644 index 56f868c..0000000 --- a/config/filament.php +++ /dev/null @@ -1,74 +0,0 @@ - [ - - // 'echo' => [ - // 'broadcaster' => 'pusher', - // 'key' => env('VITE_PUSHER_APP_KEY'), - // 'cluster' => env('VITE_PUSHER_APP_CLUSTER'), - // 'wsHost' => env('VITE_PUSHER_HOST'), - // 'wsPort' => env('VITE_PUSHER_PORT'), - // 'wssPort' => env('VITE_PUSHER_PORT'), - // 'authEndpoint' => '/api/v1/broadcasting/auth', - // 'disableStats' => true, - // 'encrypted' => true, - // ], - - ], - - /* - |-------------------------------------------------------------------------- - | Default Filesystem Disk - |-------------------------------------------------------------------------- - | - | This is the storage disk Filament will use to put media. You may use any - | of the disks defined in the `config/filesystems.php`. - | - */ - - 'default_filesystem_disk' => env('FILAMENT_FILESYSTEM_DISK', 'public'), - - /* - |-------------------------------------------------------------------------- - | Assets Path - |-------------------------------------------------------------------------- - | - | This is the directory where Filament's assets will be published to. It - | is relative to the `public` directory of your Laravel application. - | - | After changing the path, you should run `php artisan filament:assets`. - | - */ - - 'assets_path' => null, - - /* - |-------------------------------------------------------------------------- - | Livewire Loading Delay - |-------------------------------------------------------------------------- - | - | This sets the delay before loading indicators appear. - | - | Setting this to 'none' makes indicators appear immediately, which can be - | desirable for high-latency connections. Setting it to 'default' applies - | Livewire's standard 200ms delay. - | - */ - - 'livewire_loading_delay' => 'default', - -]; diff --git a/config/filesystems.php b/config/filesystems.php index 4157f10..5dcbd3a 100644 --- 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, ],