Moox User init w-i-p (#381)

Co-authored-by: adrolli <[email protected]>

config/filament-shield.php

@@ -4,7 +4,7 @@
     'shield_resource' => [
         'should_register_navigation' => true,
         'slug' => 'user/roles',
-        'navigation_sort' => 10,
+        'navigation_sort' => 702,
         'navigation_badge' => true,
         'navigation_group' => true,
         'is_globally_searchable' => false,

database/migrations/2024_03_04_235738_update_user_table.php

@@ -0,0 +1,64 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            // name and email are part of Laravel's default
+            if (! Schema::hasColumn('users', 'slug')) {
+                $table->string('slug')->after('name');
+            }
+            if (! Schema::hasColumn('users', 'gender')) {
+                $table->enum('gender', ['male', 'female', 'other'])->after('slug');
+            }
+            if (! Schema::hasColumn('users', 'title')) {
+                $table->string('title')->nullable()->after('gender');
+            }
+            if (! Schema::hasColumn('users', 'first_name')) {
+                $table->string('first_name')->after('title');
+            }
+            if (! Schema::hasColumn('users', 'last_name')) {
+                $table->string('last_name')->after('first_name');
+            }
+            if (! Schema::hasColumn('users', 'website')) {
+                $table->string('website')->nullable()->after('email');
+            }
+            if (! Schema::hasColumn('users', 'description')) {
+                $table->text('description')->nullable()->after('website');
+            }
+            // `email_verified_at`, `password`, and `remember_token` are part of Laravel's default
+            if (! Schema::hasColumn('users', 'two_factor_secret')) {
+                $table->text('two_factor_secret')->nullable()->after('remember_token');
+            }
+            if (! Schema::hasColumn('users', 'two_factor_recovery_codes')) {
+                $table->text('two_factor_recovery_codes')->nullable()->after('two_factor_secret');
+            }
+            if (! Schema::hasColumn('users', 'two_factor_confirmed_at')) {
+                $table->timestamp('two_factor_confirmed_at')->nullable()->after('two_factor_recovery_codes');
+            }
+            // Skipping `current_team_id` as it's from Jetstream
+            if (! Schema::hasColumn('users', 'avatar_url')) {
+                $table->string('avatar_url', 2048)->nullable()->after('two_factor_confirmed_at');
+            }
+            if (! Schema::hasColumn('users', 'profile_photo_path')) {
+                $table->string('profile_photo_path')->nullable()->after('avatar_url');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Sorry, it's the user table
+    }
+};

packages/builder/src/Resources/BuilderResource.php

@@ -19,7 +19,7 @@ class BuilderResource extends Resource
 {
     protected static ?string $model = Builder::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-play';
+    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
 
     public static function form(Form $form): Form
     {

packages/user/config/user.php

@@ -1,20 +1,5 @@
 <?php
 
 return [
-    'resources' => [
-        'user' => [
-            'enabled' => true,
-            'label' => 'User',
-            'plural_label' => 'Users',
-            'navigation_group' => 'User Group',
-            'navigation_icon' => 'heroicon-o-play',
-            'navigation_sort' => 1,
-            'navigation_count_badge' => true,
-            'resource' => Moox\User\Resources\UserResource::class,
-        ],
-    ],
-    'pruning' => [
-        'enabled' => true,
-        'retention_days' => 7,
-    ],
+    // not used
 ];

packages/user/database/migrations/update_user_table.php.stub

@@ -0,0 +1,63 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            // name and email are part of Laravel's default
+            if (!Schema::hasColumn('users', 'slug')) {
+                $table->string('slug')->after('name');
+            }
+            if (!Schema::hasColumn('users', 'gender')) {
+                $table->enum('gender', ['unknown', 'male', 'female', 'other'])->after('slug')->default('unknown');
+            }
+            if (!Schema::hasColumn('users', 'title')) {
+                $table->string('title')->nullable()->after('gender');
+            }
+            if (!Schema::hasColumn('users', 'first_name')) {
+                $table->string('first_name')->after('title');
+            }
+            if (!Schema::hasColumn('users', 'last_name')) {
+                $table->string('last_name')->after('first_name');
+            }
+            if (!Schema::hasColumn('users', 'website')) {
+                $table->string('website')->nullable()->after('email');
+            }
+            if (!Schema::hasColumn('users', 'description')) {
+                $table->text('description')->nullable()->after('website');
+            }
+            // `email_verified_at`, `password`, and `remember_token` are part of Laravel's default
+            if (!Schema::hasColumn('users', 'two_factor_secret')) {
+                $table->text('two_factor_secret')->nullable()->after('remember_token');
+            }
+            if (!Schema::hasColumn('users', 'two_factor_recovery_codes')) {
+                $table->text('two_factor_recovery_codes')->nullable()->after('two_factor_secret');
+            }
+            if (!Schema::hasColumn('users', 'two_factor_confirmed_at')) {
+                $table->timestamp('two_factor_confirmed_at')->nullable()->after('two_factor_recovery_codes');
+            }
+            // Skipping `current_team_id` as it's from Jetstream
+            if (!Schema::hasColumn('users', 'avatar_url')) {
+                $table->string('avatar_url', 2048)->nullable()->after('two_factor_confirmed_at');
+            }
+            if (!Schema::hasColumn('users', 'profile_photo_path')) {
+                $table->string('profile_photo_path')->nullable()->after('avatar_url');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // Sorry, it's the user table
+    }
+};

packages/user/resources/lang/en/translations.php

@@ -1,10 +1,12 @@
 <?php
 
 return [
+    'single' => 'User',
+    'plural' => 'Users',
     'breadcrumb' => 'User',
     'title' => 'User',
     'navigation_label' => 'User',
-    'navigation_group' => 'User Group',
+    'navigation_group' => 'User',
     'totalone' => 'User One',
     'totaltwo' => 'User Two',
     'totalthree' => 'User Three',

packages/user/src/Commands/InstallCommand.php

@@ -80,10 +80,12 @@ public function publish_configuration(): void
     public function publish_migrations(): void
     {
         if (Schema::hasTable('user')) {
-            warning('The user table already exists. The migrations will not be published.');
-        } elseif (confirm('Do you wish to publish the migrations?', true)) {
-            info('Publishing User Migrations...');
-            $this->callSilent('vendor:publish', ['--tag' => 'user-migrations']);
+            warning('The user table already exists. The migrations add fields required by Moox User.');
+
+            if (confirm('Do you wish to publish the migrations?', true)) {
+                info('Publishing User Migrations...');
+                $this->callSilent('vendor:publish', ['--tag' => 'user-migrations']);
+            }
         }
     }
 

packages/user/src/Models/User.php

@@ -2,22 +2,42 @@
 
 namespace Moox\User\Models;
 
-use Illuminate\Database\Eloquent\Model;
+use App\Models\User as BaseUser;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Notifications\Notifiable;
+use Jeffgreco13\FilamentBreezy\Traits\TwoFactorAuthenticatable;
+use Spatie\Permission\Traits\HasRoles;
 
-class User extends Model
+class User extends BaseUser
 {
-    protected $table = 'user';
+    use HasFactory, HasRoles, Notifiable, SoftDeletes, TwoFactorAuthenticatable;
 
     protected $fillable = [
         'name',
-        'started_at',
-        'finished_at',
-        'failed',
+        'slug',
+        'gender',
+        'title',
+        'first_name',
+        'last_name',
+        'email',
+        'website',
+        'description',
+        'password',
+        'profile_photo_path',
+    ];
+
+    protected $searchableFields = ['*'];
+
+    protected $hidden = [
+        'password',
+        'remember_token',
+        'two_factor_secret',
+        'two_factor_recovery_codes',
     ];
 
     protected $casts = [
-        'failed' => 'bool',
-        'started_at' => 'datetime',
-        'finished_at' => 'datetime',
+        'email_verified_at' => 'datetime',
+        'two_factor_confirmed_at' => 'datetime',
     ];
 }