Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion app/Filament/Resources/Users/UserResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,29 @@
use Filament\Resources\Resource;
use Filament\Schemas\Schema;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Model;

class UserResource extends Resource
{
protected static ?string $model = User::class;

protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-users';

protected static ?string $recordTitleAttribute = 'full_name';
protected static ?string $recordTitleAttribute = 'email';

public static function getGloballySearchableAttributes(): array
{
return ['email', 'first_name', 'last_name', 'roles.name'];
}

public static function getGlobalSearchResultDetails(Model $record): array
{
return [
'Name' => $record->fullName,
'Roles' => $record->roles->pluck('name')->join(', '),
'Verified' => $record->hasVerifiedEmail() ? 'Yes' : 'No',
];
}

public static function form(Schema $schema): Schema
{
Expand Down
4 changes: 2 additions & 2 deletions app/Filament/Widgets/UserStats.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ protected function getStats(): array
{
return [
Stat::make('Users', User::query()->count()),
Stat::make('New users (last 7 days)', User::query()->where('created_at', '>=', \now()->subDays(7))->count()),
Stat::make('New users (last 30 days)', User::query()->where('created_at', '>=', \now()->subDays(30))->count()),
Stat::make('New users (last 7 days)', User::query()->where('created_at', '>=', now()->subDays(7))->count()),
Stat::make('New users (last 30 days)', User::query()->where('created_at', '>=', now()->subDays(30))->count()),
];
}
}
2 changes: 1 addition & 1 deletion app/Http/Controllers/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ public function store(LoginStoreRequest $request)
return redirect()->to($request->validated('redirect'));
}

return redirect()->intended(\route('home'));
return redirect()->intended(route('home'));
}
}
3 changes: 2 additions & 1 deletion app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use Filament\Models\Contracts\HasName;
use Filament\Panel;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Attributes\Scope;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory;
Expand Down Expand Up @@ -56,7 +57,7 @@ protected function allPermissions(): Attribute
);
}

#[\Illuminate\Database\Eloquent\Attributes\Scope]
#[Scope]
protected function hasRoles(Builder $query, array $roles): void
{
$query->whereHas('roles', fn (Builder $query) => $query->whereIn('name', $roles));
Expand Down
14 changes: 0 additions & 14 deletions app/Policies/PermissionPolicy.php

This file was deleted.

14 changes: 0 additions & 14 deletions app/Policies/RolePolicy.php

This file was deleted.

17 changes: 0 additions & 17 deletions app/Providers/AuthServiceProvider.php

This file was deleted.

2 changes: 2 additions & 0 deletions app/Providers/Filament/AdminPanelProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public function panel(Panel $panel): Panel
->id('admin')
->path('admin')
->topbar(false)
->globalSearchKeyBindings(['command+k', 'ctrl+k'])
->globalSearchFieldKeyBindingSuffix()
->viteTheme('resources/css/filament/admin/theme.css')
->colors([
'primary' => '#1e293b',
Expand Down
1 change: 0 additions & 1 deletion bootstrap/providers.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@

return [
App\Providers\AppServiceProvider::class,
App\Providers\AuthServiceProvider::class,
App\Providers\Filament\AdminPanelProvider::class,
];