cleaning up some data

app/Filament/Resources/UserResource.php

@@ -2,17 +2,19 @@
 
 namespace App\Filament\Resources;
 
-use App\Filament\Resources\UserResource\Pages;
-use App\Filament\Resources\UserResource\RelationManagers;
-use Wave\User;
+use App\Models\User;
 use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
 use Filament\Tables;
+use Filament\Forms\Get;
+use Filament\Forms\Set;
+use Filament\Forms\Form;
 use Filament\Tables\Table;
+use Filament\Resources\Resource;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Database\Eloquent\Builder;
+use App\Filament\Resources\UserResource\Pages;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
+use App\Filament\Resources\UserResource\RelationManagers;
 
 class UserResource extends Resource
 {
@@ -26,46 +28,38 @@ public static function form(Form $form): Form
     {
         return $form
             ->schema([
-                Forms\Components\TextInput::make('role_id')
-                    ->numeric()
-                    ->required()
-                    ->rule('exists:roles,id'),
                 Forms\Components\TextInput::make('name')
                     ->required()
                     ->maxLength(191),
+                Forms\Components\TextInput::make('username')
+                    ->required()
+                    ->maxLength(191),
                 Forms\Components\TextInput::make('email')
                     ->email()
                     ->required()
                     ->maxLength(191),
-                Forms\Components\TextInput::make('avatar')
-                    ->required()
-                    ->maxLength(191)
-                    ->default('users/default.png'),
+                Forms\Components\FileUpload::make('avatar')
+                    ->image(),
                 Forms\Components\DateTimePicker::make('email_verified_at'),
                 Forms\Components\TextInput::make('password')
                     ->password()
                     ->dehydrateStateUsing(fn ($state) => Hash::make($state))
-                    ->required(fn (string $context): bool => $context === 'create')
-                    ->maxLength(191),
-                Forms\Components\Textarea::make('settings')
-                    ->columnSpanFull(),
-                Forms\Components\TextInput::make('username')
-                    ->required()
-                    ->maxLength(191),
-                Forms\Components\TextInput::make('stripe_id')
-                    ->maxLength(191),
-                Forms\Components\TextInput::make('card_brand')
-                    ->maxLength(191),
-                Forms\Components\TextInput::make('card_last_four')
-                    ->maxLength(191),
+                    ->dehydrated(fn ($state) => filled($state))
+                    ->required(fn (string $context): bool => $context === 'create'),
+                Forms\Components\Select::make('roles')
+                    ->multiple()
+                    ->relationship('roles', 'name')
+                    ->preload()
+                    ->searchable()
+                    ->required(),
                 Forms\Components\DateTimePicker::make('trial_ends_at'),
                 Forms\Components\TextInput::make('verification_code')
                     ->maxLength(191),
-                Forms\Components\TextInput::make('verified')
-                    ->numeric(),
+                Forms\Components\Toggle::make('verified')
             ]);
     }
 
+
     public static function table(Table $table): Table
     {
         return $table

app/Models/User.php

@@ -22,6 +22,7 @@ class User extends WaveUser
         'name',
         'email',
         'username',
+        'avatar',
         'password',
         'role_id',
         'verification_code',

database/seeders/UsersTableSeeder.php

@@ -28,12 +28,8 @@ public function run()
                 'avatar' => 'users/default.png',
                 'password' => '$2y$10$L8MjmjVVOCbyLHbp7pq/9.1ZEEa5AqE67ZXLd2M4.res05a3Rz/G2',
                 'remember_token' => '4oXDVo48Lm1pc4j7NkWI9cMO4hv5OIEJFMrqjSCKQsIwWMGRFYDvNpdioBfo',
-                'settings' => NULL,
                 'created_at' => '2017-11-21 16:07:22',
                 'updated_at' => '2018-09-22 23:34:02',
-                'stripe_id' => NULL,
-                'card_brand' => NULL,
-                'card_last_four' => NULL,
                 'trial_ends_at' => NULL,
                 'verification_code' => NULL,
                 'verified' => 1,

resources/themes/anchor/pages/settings/profile.blade.php

@@ -1,6 +1,6 @@
 <?php
 
-    use function Laravel\Folio\{name};
+    use function Laravel\Folio\{middleware, name};
     use Filament\Forms\Concerns\InteractsWithForms;
     use Filament\Forms\Contracts\HasForms;
     use Filament\Forms\Form;
@@ -9,6 +9,7 @@
 	use Wave\Traits\HasDynamicFields;
     use Wave\ApiKey;
     
+	middleware('auth');
     name('settings.profile');
 
 	new class extends Component implements HasForms
@@ -164,7 +165,7 @@ private function saveFormFields($state){
 		"
 		class="relative w-full">
 			<form wire:submit="save" class="w-full">
-				<div class="relative flex flex-col lg:px-10 mt-5">
+				<div class="relative flex flex-col mt-5 lg:px-10">
 					<div class="relative flex-shrink-0 w-32 h-32 cursor-pointer group">
 						<img id="preview" src="{{ auth()->user()->avatar() . '?' . time() }}" class="w-32 h-32 rounded-full">
 

routes/web.php

@@ -15,4 +15,8 @@
 use Wave\Facades\Wave;
 
 // Wave routes
-Wave::routes();
+Wave::routes();
+
+Route::get('role', function(){
+    dd(\App\Models\User::find(2)->roles);
+});

storage/dump.sql

@@ -1110,7 +1110,7 @@ CREATE TABLE `users` (
 LOCK TABLES `users` WRITE;
 /*!40000 ALTER TABLE `users` DISABLE KEYS */;
 
-INSERT INTO `users` (`id`, `role_id`, `name`, `email`, `username`, `avatar`, `password`, `remember_token`, `settings`, `created_at`, `updated_at`, `stripe_id`, `card_brand`, `card_last_four`, `trial_ends_at`, `verification_code`, `verified`)
+INSERT INTO `users` (`id`, `role_id`, `name`, `email`, `username`, `avatar`, `password`, `remember_token`, `settings`, `created_at`, `updated_at`, `trial_ends_at`, `verification_code`, `verified`)
 VALUES
 	(1,1,'Tony Lea','tnylea@gmail.com','tnylea','users/default.png','$2y$10$NTj4nKIuYQpkiGuyAP8Kl.3vsX2TiiF/b7I3ELoF4mxkINxpvAI/a','pBCFKLJ0KAuikvH3Jl4l7iRbnyItD7QLSwgpnku83ydezT9ATd0d9j7fwkq0',NULL,'2017-11-21 16:07:22','2018-08-26 20:18:24',NULL,NULL,NULL,NULL,NULL,1),
 	(9,2,'John Doe','johndoe@gmail.com','johndoe','users/default.png','$2y$10$3VqIf6CSwroI2kz7aqMXx.2MXa.ERlRWZ/vJ1dKPaB5aF1lbhefGm','06HEVc3NqyMs0rpUra4XAh2SLf5id691aKdv8d2dYNEHVVdAZAZiydF6zSCx',NULL,'2018-06-22 21:32:49','2018-06-22 21:32:49',NULL,NULL,NULL,NULL,NULL,1),

theme.json

@@ -1,3 +1,3 @@
 {
-    "name": "anchor"
+    "name": "cove"
 }

wave/database/migrations/2024_03_29_225419_create_users_table.php

@@ -19,12 +19,8 @@ public function up(): void
             $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
             $table->string('remember_token', 100)->nullable();
-            $table->text('settings')->nullable();
             $table->timestamps();
             $table->string('username')->unique();
-            $table->string('stripe_id')->nullable();
-            $table->string('card_brand')->nullable();
-            $table->string('card_last_four')->nullable();
             $table->dateTime('trial_ends_at')->nullable();
             $table->string('verification_code')->nullable();
             $table->tinyInteger('verified')->nullable();

wave/src/User.php

@@ -32,6 +32,7 @@ class User extends AuthUser implements JWTSubject, HasAvatar, FilamentUser
         'name',
         'email',
         'username',
+        'avatar',
         'password',
         'role_id',
         'verification_code',