tenant admin startseite schicker gestaltet und super-admin und tenant admin (filament) aufgesplittet.

Es gibt nun task collections und vordefinierte tasks für alle. Onboarding verfeinert und webseite-carousel gefixt (logging später entfernen!)
2025-10-14 15:17:52 +02:00
parent 64a5411fb9
commit 1a4bdb1fe1
92 changed files with 6027 additions and 515 deletions
--- a/app/Filament/Resources/EventResource.php
+++ b/app/Filament/Resources/EventResource.php
@@ -3,45 +3,46 @@
 namespace App\Filament\Resources;

 use App\Filament\Resources\EventResource\Pages;
-use App\Support\JoinTokenLayoutRegistry;
+use App\Filament\Resources\EventResource\RelationManagers\EventPackagesRelationManager;
 use App\Models\Event;
-use App\Models\Tenant;
 use App\Models\EventType;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
+use App\Models\Tenant;
+use App\Support\JoinTokenLayoutRegistry;
+use BackedEnum;
 use Filament\Actions;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Schemas\Schema;
-use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\DatePicker;
-use Filament\Forms\Components\Toggle;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Toggle;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Table;
 use UnitEnum;
-use BackedEnum;
-
-use App\Filament\Resources\EventResource\RelationManagers\EventPackagesRelationManager;

 class EventResource extends Resource
 {
    protected static ?string $model = Event::class;
+
    protected static BackedEnum|string|null $navigationIcon = 'heroicon-o-calendar';
+
    protected static UnitEnum|string|null $navigationGroup = null;

+    protected static ?int $navigationSort = 20;
+
    public static function getNavigationGroup(): UnitEnum|string|null
    {
        return __('admin.nav.platform');
    }
-    protected static ?int $navigationSort = 20;

    public static function form(Schema $form): Schema
    {
        return $form->schema([
            Select::make('tenant_id')
                ->label(__('admin.events.fields.tenant'))
-                ->options(Tenant::all()->pluck('name', 'id'))
+                ->options(Tenant::query()->pluck('name', 'id'))
                ->searchable()
                ->required(),
            TextInput::make('name')
@@ -58,11 +59,11 @@ class EventResource extends Resource
                ->required(),
            Select::make('event_type_id')
                ->label(__('admin.events.fields.type'))
-                ->options(EventType::all()->pluck('name', 'id'))
+                ->options(EventType::query()->pluck('name', 'id'))
                ->searchable(),
            Select::make('package_id')
                ->label(__('admin.events.fields.package'))
-                ->options(\App\Models\Package::where('type', 'endcustomer')->pluck('name', 'id'))
+                ->options(\App\Models\Package::query()->where('type', 'endcustomer')->pluck('name', 'id'))
                ->searchable()
                ->preload()
                ->required(),
@@ -85,7 +86,7 @@ class EventResource extends Resource
        return $table
            ->columns([
                Tables\Columns\TextColumn::make('id')->sortable(),
-                Tables\Columns\TextColumn::make('tenant_id')->label(__('admin.events.table.tenant'))->sortable(),
+                Tables\Columns\TextColumn::make('tenant.name')->label(__('admin.events.table.tenant'))->searchable(),
                Tables\Columns\TextColumn::make('name')->limit(30),
                Tables\Columns\TextColumn::make('slug')->searchable(),
                Tables\Columns\TextColumn::make('date')->date(),
@@ -106,9 +107,9 @@ class EventResource extends Resource
                Tables\Columns\TextColumn::make('primary_join_token')
                    ->label(__('admin.events.table.join'))
                    ->getStateUsing(function ($record) {
-                        $token = $record->joinTokens()->orderByDesc('created_at')->first();
+                        $token = $record->joinTokens()->latest()->first();

-                        return $token ? url('/e/'.$token->token) : __('admin.events.table.no_join_tokens');
+                        return $token ? url('/e/' . $token->token) : __('admin.events.table.no_join_tokens');
                    })
                    ->description(function ($record) {
                        $total = $record->joinTokens()->count();
@@ -127,7 +128,7 @@ class EventResource extends Resource
                Actions\Action::make('toggle')
                    ->label(__('admin.events.actions.toggle_active'))
                    ->icon('heroicon-o-power')
-                    ->action(fn($record) => $record->update(['is_active' => !$record->is_active])),
+                    ->action(fn ($record) => $record->update(['is_active' => ! $record->is_active])),
                Actions\Action::make('join_tokens')
                    ->label(__('admin.events.actions.join_link_qr'))
                    ->icon('heroicon-o-qr-code')
@@ -152,7 +153,7 @@ class EventResource extends Resource
                                    'id' => $token->id,
                                    'label' => $token->label,
                                    'token' => $token->token,
-                                    'url' => url('/e/'.$token->token),
+                                    'url' => url('/e/' . $token->token),
                                    'usage_limit' => $token->usage_limit,
                                    'usage_count' => $token->usage_count,
                                    'expires_at' => optional($token->expires_at)->toIso8601String(),
@@ -178,19 +179,20 @@ class EventResource extends Resource
            ]);
    }

-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListEvents::route('/'),
-            'view' => Pages\ViewEvent::route('/{record}'),
-            'edit' => Pages\EditEvent::route('/{record}/edit'),
-        ];
-    }
-
    public static function getRelations(): array
    {
        return [
            EventPackagesRelationManager::class,
        ];
    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListEvents::route('/'),
+            'create' => Pages\CreateEvent::route('/create'),
+            'view' => Pages\ViewEvent::route('/{record}'),
+            'edit' => Pages\EditEvent::route('/{record}/edit'),
+        ];
+    }
 }
--- a/app/Filament/Resources/EventResource/Pages/CreateEvent.php
+++ b/app/Filament/Resources/EventResource/Pages/CreateEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Resources\EventResource\Pages;
+
+use App\Filament\Resources\EventResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateEvent extends CreateRecord
+{
+    protected static string $resource = EventResource::class;
+}
--- a/app/Filament/Resources/EventResource/RelationManagers/EventPackagesRelationManager.php
+++ b/app/Filament/Resources/EventResource/RelationManagers/EventPackagesRelationManager.php
@@ -2,26 +2,24 @@

 namespace App\Filament\Resources\EventResource\RelationManagers;

-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Filament\Actions\CreateAction;
-use Filament\Actions\EditAction;
-use Filament\Actions\DeleteAction;
+use App\Models\EventPackage;
 use Filament\Actions\BulkActionGroup;
+use Filament\Actions\CreateAction;
+use Filament\Actions\DeleteAction;
 use Filament\Actions\DeleteBulkAction;
+use Filament\Actions\EditAction;
+use Filament\Forms;
+use Filament\Forms\Components\DateTimePicker;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use App\Models\EventPackage;
-use Filament\Actions\Action;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\DateTimePicker;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Schemas\Schema;

 class EventPackagesRelationManager extends RelationManager
 {
@@ -30,29 +28,32 @@ class EventPackagesRelationManager extends RelationManager
    public function form(Schema $schema): Schema
    {
        return $schema->schema([
-                Select::make('package_id')
-                    ->label('Package')
-                    ->relationship('package', 'name')
-                    ->searchable()
-                    ->preload()
-                    ->required(),
-                TextInput::make('purchased_price')
-                    ->label('Kaufpreis')
-                    ->prefix('€')
-                    ->numeric()
-                    ->step(0.01)
-                    ->required(),
-                TextInput::make('used_photos')
-                    ->label('Verwendete Fotos')
-                    ->numeric()
-                    ->default(0)
-                    ->readOnly(),
-                TextInput::make('used_guests')
-                    ->label('Verwendete Gäste')
-                    ->numeric()
-                    ->default(0)
-                    ->readOnly(),
-            ]);
+            Select::make('package_id')
+                ->label('Package')
+                ->relationship('package', 'name')
+                ->searchable()
+                ->preload()
+                ->required(),
+            TextInput::make('purchased_price')
+                ->label('Kaufpreis')
+                ->prefix('€')
+                ->numeric()
+                ->step(0.01)
+                ->required(),
+            TextInput::make('used_photos')
+                ->label('Verwendete Fotos')
+                ->numeric()
+                ->default(0)
+                ->readOnly(),
+            TextInput::make('used_guests')
+                ->label('Verwendete Gäste')
+                ->numeric()
+                ->default(0)
+                ->readOnly(),
+            DateTimePicker::make('expires_at')
+                ->label('Ablauf')
+                ->required(),
+        ]);
    }

    public function table(Table $table): Table
@@ -90,9 +91,7 @@ class EventPackagesRelationManager extends RelationManager
                    ->money('EUR')
                    ->sortable(),
            ])
-            ->filters([
-                //
-            ])
+            ->filters([])
            ->headerActions([
                CreateAction::make(),
            ])
@@ -121,9 +120,8 @@ class EventPackagesRelationManager extends RelationManager
        return __('admin.events.relation_managers.event_packages.title');
    }

-    public function getTableQuery(): Builder | Relation
+    public function getTableQuery(): Builder|Relation
    {
-        return parent::getTableQuery()
-            ->with('package');
+        return parent::getTableQuery()->with('package');
    }
-}
+}
--- a/app/Filament/Resources/PhotoResource.php
+++ b/app/Filament/Resources/PhotoResource.php
@@ -3,46 +3,47 @@
 namespace App\Filament\Resources;

 use App\Filament\Resources\PhotoResource\Pages;
-use App\Models\Photo;
 use App\Models\Event;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
+use App\Models\Photo;
+use BackedEnum;
 use Filament\Actions;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Schemas\Schema;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Toggle;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\KeyValue;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\Toggle;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Table;
 use UnitEnum;
-use BackedEnum;

 class PhotoResource extends Resource
 {
    protected static ?string $model = Photo::class;
+
    protected static BackedEnum|string|null $navigationIcon = 'heroicon-o-photo';
+
    protected static UnitEnum|string|null $navigationGroup = null;

+    protected static ?int $navigationSort = 30;
+
    public static function getNavigationGroup(): UnitEnum|string|null
    {
        return __('admin.nav.content');
    }
-    protected static ?int $navigationSort = 30;

    public static function form(Schema $form): Schema
    {
        return $form->schema([
            Select::make('event_id')
                ->label(__('admin.photos.fields.event'))
-                ->options(Event::all()->pluck('name', 'id'))
+                ->options(Event::query()->orderBy('name')->pluck('name', 'id'))
                ->searchable()
                ->required(),
            FileUpload::make('file_path')
                ->label(__('admin.photos.fields.photo'))
-                ->image() // enable FilePond image preview
+                ->image()
                ->disk('public')
                ->directory('photos')
                ->visibility('public')
@@ -61,9 +62,14 @@ class PhotoResource extends Resource
    {
        return $table
            ->columns([
-                Tables\Columns\ImageColumn::make('file_path')->label(__('admin.photos.table.photo'))->disk('public')->visibility('public'),
+                Tables\Columns\ImageColumn::make('file_path')
+                    ->label(__('admin.photos.table.photo'))
+                    ->disk('public')
+                    ->visibility('public'),
                Tables\Columns\TextColumn::make('id')->sortable(),
-                Tables\Columns\TextColumn::make('event_id')->label(__('admin.photos.table.event')),
+                Tables\Columns\TextColumn::make('event.name')
+                    ->label(__('admin.photos.table.event'))
+                    ->searchable(),
                Tables\Columns\TextColumn::make('likes_count')->label(__('admin.photos.table.likes')),
                Tables\Columns\IconColumn::make('is_featured')->boolean(),
                Tables\Columns\TextColumn::make('created_at')->since(),
@@ -73,13 +79,13 @@ class PhotoResource extends Resource
                Actions\EditAction::make(),
                Actions\Action::make('feature')
                    ->label(__('admin.photos.actions.feature'))
-                    ->visible(fn($record) => !$record->is_featured)
-                    ->action(fn($record) => $record->update(['is_featured' => true]))
+                    ->visible(fn (Photo $record) => ! $record->is_featured)
+                    ->action(fn (Photo $record) => $record->update(['is_featured' => true]))
                    ->icon('heroicon-o-star'),
                Actions\Action::make('unfeature')
                    ->label(__('admin.photos.actions.unfeature'))
-                    ->visible(fn($record) => $record->is_featured)
-                    ->action(fn($record) => $record->update(['is_featured' => false]))
+                    ->visible(fn (Photo $record) => $record->is_featured)
+                    ->action(fn (Photo $record) => $record->update(['is_featured' => false]))
                    ->icon('heroicon-o-star'),
                Actions\DeleteAction::make(),
            ])
@@ -87,11 +93,11 @@ class PhotoResource extends Resource
                Actions\BulkAction::make('feature')
                    ->label(__('admin.photos.actions.feature_selected'))
                    ->icon('heroicon-o-star')
-                    ->action(fn($records) => $records->each->update(['is_featured' => true])),
+                    ->action(fn ($records) => $records->each->update(['is_featured' => true])),
                Actions\BulkAction::make('unfeature')
                    ->label(__('admin.photos.actions.unfeature_selected'))
                    ->icon('heroicon-o-star')
-                    ->action(fn($records) => $records->each->update(['is_featured' => false])),
+                    ->action(fn ($records) => $records->each->update(['is_featured' => false])),
                Actions\DeleteBulkAction::make(),
            ]);
    }
--- a/app/Filament/Resources/TenantPackageResource.php
+++ b/app/Filament/Resources/TenantPackageResource.php
@@ -4,28 +4,25 @@ namespace App\Filament\Resources;

 use App\Filament\Resources\TenantPackageResource\Pages;
 use App\Models\TenantPackage;
-use Filament\Schemas\Schema;
-use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Toggle;
-use Filament\Icons\Icon;
-use Filament\Resources\Resource;
-use Filament\Tables;
+use BackedEnum;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\BulkActionGroup;
 use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
+use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
+use Filament\Forms\Components\DateTimePicker;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\Toggle;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Tables;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Support\Facades\Auth;
 use UnitEnum;
-use BackedEnum;

 class TenantPackageResource extends Resource
 {
@@ -33,31 +30,23 @@ class TenantPackageResource extends Resource

    protected static BackedEnum|string|null $navigationIcon = 'heroicon-o-shopping-bag';

-    protected static ?string $navigationLabel = 'Packages';
-
    protected static ?string $slug = 'tenant-packages';

    public static function form(Schema $form): Schema
    {
        return $form
            ->schema([
-                Section::make('Package Details')
-                    ->schema([
-                        Select::make('package_id')
-                            ->relationship('package', 'name')
-                            ->required()
-                            ->searchable(),
-                        Select::make('tenant_id')
-                            ->relationship('tenant', 'name')
-                            ->required()
-                            ->default(fn () => Auth::user()->tenant_id)
-                            ->disabled(),
-                        DateTimePicker::make('expires_at')
-                            ->required(),
-                        Toggle::make('is_active')
-                            ->default(true),
-                    ])
-                    ->columns(1),
+                Select::make('tenant_id')
+                    ->relationship('tenant', 'name')
+                    ->required()
+                    ->searchable(),
+                Select::make('package_id')
+                    ->relationship('package', 'name')
+                    ->required()
+                    ->searchable(),
+                DateTimePicker::make('purchased_at'),
+                DateTimePicker::make('expires_at'),
+                Toggle::make('active')->default(true),
            ]);
    }

@@ -65,26 +54,13 @@ class TenantPackageResource extends Resource
    {
        return $table
            ->columns([
-                TextColumn::make('package.name')
-                    ->searchable()
-                    ->sortable(),
-                TextColumn::make('tenant.name')
-                    ->badge()
-                    ->color('success'),
-                TextColumn::make('expires_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-                IconColumn::make('is_active')
-                    ->boolean(),
-                TextColumn::make('created_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-            ])
-            ->filters([
-                //
+                TextColumn::make('tenant.name')->searchable()->sortable(),
+                TextColumn::make('package.name')->badge()->color('success'),
+                TextColumn::make('purchased_at')->dateTime()->sortable(),
+                TextColumn::make('expires_at')->dateTime()->sortable(),
+                IconColumn::make('active')->boolean(),
            ])
+            ->filters([])
            ->actions([
                ActionGroup::make([
                    ViewAction::make(),
@@ -96,15 +72,12 @@ class TenantPackageResource extends Resource
                BulkActionGroup::make([
                    DeleteBulkAction::make(),
                ]),
-            ])
-            ->modifyQueryUsing(fn (Builder $query) => $query->where('tenant_id', Auth::user()->tenant_id));
+            ]);
    }

    public static function getRelations(): array
    {
-        return [
-            //
-        ];
+        return [];
    }

    public static function getPages(): array
@@ -116,4 +89,4 @@ class TenantPackageResource extends Resource
            'edit' => Pages\EditTenantPackage::route('/{record}/edit'),
        ];
    }
-}
+}
--- a/app/Filament/Resources/TenantPackageResource/Pages/CreateTenantPackage.php
+++ b/app/Filament/Resources/TenantPackageResource/Pages/CreateTenantPackage.php
@@ -3,23 +3,9 @@
 namespace App\Filament\Resources\TenantPackageResource\Pages;

 use App\Filament\Resources\TenantPackageResource;
-use Filament\Actions;
 use Filament\Resources\Pages\CreateRecord;
-use Illuminate\Support\Facades\Auth;

 class CreateTenantPackage extends CreateRecord
 {
    protected static string $resource = TenantPackageResource::class;
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        $data['tenant_id'] = Auth::user()->tenant_id;
-
-        return $data;
-    }
-
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-}
+}
--- a/app/Filament/Resources/TenantPackageResource/Pages/EditTenantPackage.php
+++ b/app/Filament/Resources/TenantPackageResource/Pages/EditTenantPackage.php
@@ -17,9 +17,4 @@ class EditTenantPackage extends EditRecord
            Actions\DeleteAction::make(),
        ];
    }
-
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-}
+}
--- a/app/Filament/Resources/TenantPackageResource/Pages/ListTenantPackages.php
+++ b/app/Filament/Resources/TenantPackageResource/Pages/ListTenantPackages.php
@@ -5,8 +5,6 @@ namespace App\Filament\Resources\TenantPackageResource\Pages;
 use App\Filament\Resources\TenantPackageResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Auth;

 class ListTenantPackages extends ListRecords
 {
@@ -18,9 +16,4 @@ class ListTenantPackages extends ListRecords
            Actions\CreateAction::make(),
        ];
    }
-
-    protected function getTableQuery(): Builder
-    {
-        return parent::getTableQuery()->where('tenant_id', Auth::user()->tenant_id);
-    }
-}
+}
--- a/app/Filament/Resources/TenantPackageResource/Pages/ViewTenantPackage.php
+++ b/app/Filament/Resources/TenantPackageResource/Pages/ViewTenantPackage.php
@@ -17,4 +17,4 @@ class ViewTenantPackage extends ViewRecord
            Actions\DeleteAction::make(),
        ];
    }
-}
+}
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -4,36 +4,30 @@ namespace App\Filament\Resources;

 use App\Filament\Resources\UserResource\Pages;
 use App\Models\User;
-use Filament\Schemas\Schema;
-use Filament\Forms\Form;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Textarea;
-use Filament\Icons\Icon;
-use Filament\Resources\Resource;
-use Filament\Tables;
+use BackedEnum;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\BulkActionGroup;
 use Filament\Actions\DeleteBulkAction;
 use Filament\Actions\EditAction;
 use Filament\Actions\ViewAction;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Textarea;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Tables;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Request;
-use BackedEnum;
+use UnitEnum;
+
 class UserResource extends Resource
 {
    protected static ?string $model = User::class;

    protected static BackedEnum|string|null $navigationIcon = 'heroicon-o-user-circle';

-    protected static ?string $navigationLabel = 'Users';
-
    protected static ?string $slug = 'users';

    public static function form(Schema $form): Schema
@@ -76,8 +70,7 @@ class UserResource extends Resource
                            ->required(fn (string $operation): bool => $operation === 'create')
                            ->dehydrated(false),
                    ])
-                    ->columns(1)
-                    ->visible(fn (): bool => Auth::user()?->id === Request::route('record')),
+                    ->columns(1),
            ]);
    }

@@ -85,22 +78,18 @@ class UserResource extends Resource
    {
        return $table
            ->columns([
-                TextColumn::make('fullName')
-                    ->searchable(),
-                TextColumn::make('email')
-                    ->searchable(),
-                TextColumn::make('username')
-                    ->searchable(),
-                TextColumn::make('phone'),
+                TextColumn::make('fullName')->sortable()->searchable(),
+                TextColumn::make('email')->searchable(),
+                TextColumn::make('username')->searchable(),
                TextColumn::make('tenant.name')
-                    ->label('Tenant'),
-                TextColumn::make('email_verified_at')
-                    ->dateTime()
-                    ->sortable(),
-            ])
-            ->filters([
-                //
+                    ->label(__('admin.common.tenant'))
+                    ->badge(),
+                TextColumn::make('phone'),
+                IconColumn::make('email_verified_at')
+                    ->label(__('admin.users.fields.verified'))
+                    ->boolean(),
            ])
+            ->filters([])
            ->actions([
                ActionGroup::make([
                    ViewAction::make(),
@@ -111,23 +100,20 @@ class UserResource extends Resource
                BulkActionGroup::make([
                    DeleteBulkAction::make(),
                ]),
-            ])
-            ->modifyQueryUsing(fn (Builder $query) => $query->where('tenant_id', Auth::user()->tenant_id));
+            ]);
    }

    public static function getRelations(): array
    {
-        return [
-            //
-        ];
+        return [];
    }

    public static function getPages(): array
    {
        return [
            'index' => Pages\ListUsers::route('/'),
+            'create' => Pages\CreateUser::route('/create'),
            'edit' => Pages\EditUser::route('/{record}/edit'),
        ];
    }
 }
-
--- a/app/Filament/Resources/UserResource/Pages/CreateUser.php
+++ b/app/Filament/Resources/UserResource/Pages/CreateUser.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Filament\Resources\UserResource\Pages;
+
+use App\Filament\Resources\UserResource;
+use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Support\Facades\Hash;
+
+class CreateUser extends CreateRecord
+{
+    protected static string $resource = UserResource::class;
+
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        if (isset($data['password'])) {
+            $data['password'] = Hash::make($data['password']);
+        }
+
+        return $data;
+    }
+}
--- a/app/Filament/Resources/UserResource/Pages/EditUser.php
+++ b/app/Filament/Resources/UserResource/Pages/EditUser.php
@@ -26,9 +26,4 @@ class EditUser extends EditRecord

        return $data;
    }
-
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-}
+}
--- a/app/Filament/Resources/UserResource/Pages/ListUsers.php
+++ b/app/Filament/Resources/UserResource/Pages/ListUsers.php
@@ -5,8 +5,6 @@ namespace App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables;
-use Filament\Tables\Table;

 class ListUsers extends ListRecords
 {
@@ -18,11 +16,4 @@ class ListUsers extends ListRecords
            Actions\CreateAction::make(),
        ];
    }
-
-    public function table(Table $table): Table
-    {
-        return $table
-            ->recordClasses(fn (User $record) => $record->id === auth()->id() ? 'border-2 border-blue-500' : '')
-            ->poll('30s');
-    }
-}
+}