media collections disks

code4romania · Dec 13, 2023 · 8cf4c7a · 8cf4c7a
1 parent 5d82063
commit 8cf4c7a
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 4 deletions.
diff --git a/app/Models/Article.php b/app/Models/Article.php
@@ -47,6 +47,7 @@ class Article extends Model implements HasMedia
     public function registerMediaCollections(): void
     {
         $this->addMediaCollection('preview')
+            ->useDisk(config('filesystems.default_public'))
             ->useFallbackUrl(Vite::image('placeholder.png'))
             ->singleFile()
             ->registerMediaConversions(function (Media $media) {
@@ -60,6 +61,7 @@ public function registerMediaCollections(): void
             });
 
         $this->addMediaCollection('gallery')
+            ->useDisk(config('filesystems.default_public'))
             ->useFallbackUrl(Vite::image('placeholder.png'))
             ->registerMediaConversions(function (Media $media) {
                 $this

diff --git a/app/Models/BCRProject.php b/app/Models/BCRProject.php
@@ -61,6 +61,7 @@ class BCRProject extends Model implements HasMedia
     public function registerMediaCollections(): void
     {
         $this->addMediaCollection('preview')
+            ->useDisk(config('filesystems.default_public'))
             ->useFallbackUrl(Vite::image('placeholder.png'))
             ->singleFile()
             ->registerMediaConversions(function () {
@@ -70,6 +71,7 @@ public function registerMediaCollections(): void
             });
 
         $this->addMediaCollection('gallery')
+            ->useDisk(config('filesystems.default_public'))
             ->registerMediaConversions(function () {
                 $this
                     ->addMediaConversion('preview')

diff --git a/app/Models/Badge.php b/app/Models/Badge.php
@@ -37,6 +37,7 @@ class Badge extends Model implements HasMedia
     public function registerMediaCollections(): void
     {
         $this->addMediaCollection('default')
+            ->useDisk(config('filesystems.default_public'))
             ->useFallbackUrl(Vite::asset('resources/images/badge.png'))
             ->singleFile()
             ->registerMediaConversions(function (Media $media) {

diff --git a/app/Models/Organization.php b/app/Models/Organization.php
@@ -95,6 +95,7 @@ public function donations()
     public function registerMediaCollections(): void
     {
         $this->addMediaCollection('logo')
+            ->useDisk(config('filesystems.default_public'))
             ->useFallbackUrl(Vite::image('placeholder.png'))
             ->singleFile()
             ->registerMediaConversions(function (Media $media) {
@@ -104,9 +105,11 @@ public function registerMediaCollections(): void
             });
 
         $this->addMediaCollection('statute')
+            ->useDisk(config('filesystems.default'))
             ->singleFile();
 
-        $this->addMediaCollection('statute_pending');
+        $this->addMediaCollection('statute_pending')
+            ->useDisk(config('filesystems.default'));
     }
 
     public function users(): HasMany

diff --git a/app/Models/Project.php b/app/Models/Project.php
@@ -88,6 +88,7 @@ class Project extends Model implements HasMedia
     public function registerMediaCollections(): void
     {
         $this->addMediaCollection('preview')
+            ->useDisk(config('filesystems.default_public'))
             ->useFallbackUrl(Vite::image('placeholder.png'))
             ->singleFile()
             ->registerMediaConversions(function (Media $media) {
@@ -97,6 +98,7 @@ public function registerMediaCollections(): void
             });
 
         $this->addMediaCollection('gallery')
+            ->useDisk(config('filesystems.default_public'))
             ->registerMediaConversions(function (Media $media) {
                 $this
                     ->addMediaConversion('preview')

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -22,6 +22,10 @@ public function register(): void
         $this->registerCarbonMacros();
 
         Vite::macro('image', fn (string $asset) => $this->asset("resources/images/{$asset}"));
+
+        config([
+            'filament.default_filesystem_disk' => config('filesystems.default_public'),
+        ]);
     }
 
     /**

diff --git a/config/filesystems.php b/config/filesystems.php
@@ -17,6 +17,8 @@
 
     'default' => env('FILESYSTEM_DISK', 'local'),
 
+    'default_public' => env('FILESYSTEM_DISK_PUBLIC', 'public'),
+
     /*
     |--------------------------------------------------------------------------
     | Filesystem Disks
@@ -46,7 +48,22 @@
             'throw' => false,
         ],
 
-        's3' => [
+        's3public' => [
+            'driver' => 's3',
+            'key' => env('AWS_ACCESS_KEY_ID'),
+            'secret' => env('AWS_SECRET_ACCESS_KEY'),
+            'token' => env('AWS_SESSION_TOKEN'),
+            'region' => env('AWS_DEFAULT_REGION'),
+            'bucket' => env('AWS_PUBLIC_BUCKET'),
+            'url' => env('AWS_PUBLIC_URL'),
+            'endpoint' => env('AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'throw' => false,
+            'root' => env('AWS_PUBLIC_BUCKET_ROOT'),
+            'visibility' => 'private',
+        ],
+
+        's3private' => [
             'driver' => 's3',
             'key' => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
@@ -57,8 +74,8 @@
             'endpoint' => env('AWS_ENDPOINT'),
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
             'throw' => false,
-            'root' => env('AWS_BUCKET_ROOT'),
-            'visibility' => 'public',
+            'root' => env('AWS_PUBLIC_BUCKET_ROOT'),
+            'visibility' => 'private',
         ],
 
     ],