Merge pull request #59 from ludndev/dev/ludndev

Refactor Configuration for Filament Profile Editing and Avatar Handling

README.md

@@ -120,8 +120,8 @@ If needed you can define the disk and visibility of the avatar image. In the con
 
 ```php
 return [
-    'disk' => 's3',
-    'visibility' => 'public',
+    'disk' => env('FILESYSTEM_DISK', 'public'),
+    'visibility' => 'public', // or replace by filesystem disk visibility with fallback value
 ];
 ```
 
@@ -147,7 +147,7 @@ protected $fillable = [
     'name',
     'email',
     'password',
-    'avatar_url',
+    'avatar_url', // or column name according to config('filament-edit-profile.avatar_column', 'avatar_url')
 ];
 ```
 
@@ -162,7 +162,8 @@ class User extends Authenticatable implements HasAvatar
     // ...
     public function getFilamentAvatarUrl(): ?string
     {
-        return $this->avatar_url ? Storage::url("$this->avatar_url") : null;
+        $avatarColumn = config('filament-edit-profile.avatar_column', 'avatar_url');
+        return $this->$avatarColumn ? Storage::url("$this->$avatarColumn") : null;
     }
 }
 ```

config/filament-edit-profile.php

@@ -1,5 +1,7 @@
 <?php
 
 return [
-
+    'avatar_column' => 'avatar_url',
+    'disk' => env('FILESYSTEM_DISK', 'public'),
+    'visibility' => 'public', // or replace by filesystem disk visibility with fallback value
 ];

database/migrations/add_avatar_url_to_users_table.php.stub

@@ -12,7 +12,7 @@ return new class extends Migration
     public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
-            $table->string('avatar_url')->nullable();
+            $table->string(config('filament-edit-profile.avatar_column', 'avatar_url'))->nullable();
         });
     }
 
@@ -22,7 +22,7 @@ return new class extends Migration
     public function down(): void
     {
         Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn('avatar_url');
+            $table->dropColumn(config('filament-edit-profile.avatar_column', 'avatar_url'));
         });
     }
 };

src/Livewire/EditProfileForm.php

@@ -28,7 +28,7 @@ public function mount(): void
 
         $this->userClass = get_class($this->user);
 
-        $this->form->fill($this->user->only('avatar_url', 'name', 'email'));
+        $this->form->fill($this->user->only(config('filament-edit-profile.avatar_column', 'avatar_url'), 'name', 'email'));
     }
 
     public function form(Form $form): Form
@@ -39,7 +39,7 @@ public function form(Form $form): Form
                     ->aside()
                     ->description(__('filament-edit-profile::default.profile_information_description'))
                     ->schema([
-                        FileUpload::make('avatar_url')
+                        FileUpload::make(config('filament-edit-profile.avatar_column', 'avatar_url'))
                             ->label(__('filament-edit-profile::default.avatar'))
                             ->avatar()
                             ->imageEditor()