Merge branch 'main' of github.com:vormkracht10/user-management

Author: mhortulanus

src/Concerns/HasBackstageManagement.php

@@ -9,13 +9,18 @@
 
 trait HasBackstageManagement
 {
+    use CanResetPassword;
     use Concerns\Conditionals\HasConditionals;
     use Concerns\Relations\HasRelations;
+
+    // Scopes
     use Concerns\Scopes\HasScopes;
 
     // Illuminate contracts:
     use Notifiable;
     use CanResetPassword;
 
+
+    // Backstage contracts:
     use HasFields;
 }

src/Resources/UserResource.php

@@ -4,8 +4,8 @@
 
 use Backstage\UserManagement\Exports\UserExporter;
 use Backstage\UserManagement\Imports\UserImporter;
-use Backstage\UserManagement\Widgets\StatsOverviewWidget;
 use Backstage\UserManagement\Resources\UserResource\Pages;
+use Backstage\UserManagement\Widgets\StatsOverviewWidget;
 use Filament\Facades\Filament;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -31,6 +31,7 @@ public static function form(Form $form): Form
             ->schema(function ($livewire) {
                 $livewire = $livewire;
 
+<<<<<<< HEAD
                 $formFields = $livewire->getFormFields();
 
                 return array_merge([
@@ -55,6 +56,18 @@ public static function form(Form $form): Form
                         ->live(debounce: 500),
                 ], $formFields);
             });
+=======
+                Forms\Components\TextInput::make('password')
+                    ->password()
+                    ->label(__('Password'))
+                    ->revealable(Filament::arePasswordsRevealable())
+                    ->rule(Password::default())
+                    ->autocomplete('new-password')
+                    ->dehydrated(fn ($state): bool => filled($state))
+                    ->dehydrateStateUsing(fn ($state): string => Hash::make($state))
+                    ->live(debounce: 500),
+            ]);
+>>>>>>> b4ca8e6041979a6d83cd9392ccaefac7790d2916
     }
 
     public static function table(Table $table): Table
@@ -119,7 +132,7 @@ public static function getPages(): array
     public static function getWidgets(): array
     {
         return [
-            StatsOverviewWidget::class
+            StatsOverviewWidget::class,
         ];
     }
 }

src/Resources/UserResource/Pages/ViewUser.php

@@ -24,7 +24,7 @@ protected function getHeaderActions(): array
         return [
             Actions\ActionGroup::make([
                 Actions\Action::make('send_verify_user_email')
-                    ->visible(fn($record) => $record->isVerified() === false)
+                    ->visible(fn ($record) => $record->isVerified() === false)
                     ->label(__('Send Verification Email'))
                     ->action(function ($record) {
                         $notification = new VerifyEmail;
@@ -43,6 +43,7 @@ protected function getHeaderActions(): array
                         $user = $this->record;
                         /**
                          * Broker
+                         *
                          * @var \Illuminate\Auth\Passwords\PasswordBroker $broker
                          */
                         $broker = app('auth.password.broker');
@@ -59,7 +60,6 @@ protected function getHeaderActions(): array
                 ->icon(false)
                 ->dropdownPlacement('bottom'),
 
-
             Actions\EditAction::make(),
         ];
     }