Skip to content

Commit cfab67f

Browse files
committed
Merge branch 'filament' of https://github.com/AllanKoder/ComputerScienceResources.com into filament
2 parents 616ed1a + 81b6e7c commit cfab67f

7 files changed

Lines changed: 9 additions & 21 deletions

File tree

app/Actions/Fortify/UpdateUserProfileInformation.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
namespace App\Actions\Fortify;
44

55
use App\Models\User;
6-
use Illuminate\Contracts\Auth\MustVerifyEmail;
76
use Illuminate\Support\Facades\Validator;
8-
use Illuminate\Validation\Rule;
97
use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
108

119
class UpdateUserProfileInformation implements UpdatesUserProfileInformation

app/Filament/Admin/Resources/ComputerScienceResource.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,14 @@
33
namespace App\Filament\Admin\Resources;
44

55
use App\Filament\Admin\Resources\ComputerScienceResource\Pages;
6-
use App\Filament\Admin\Resources\ComputerScienceResource\RelationManagers;
76
use App\Filament\Admin\Resources\UserResource\RelationManagers\UserRelationManager;
8-
use App\Models\ComputerScience;
97
use App\Models\ComputerScienceResource as ModelsComputerScienceResource;
10-
use Filament\Forms;
11-
use Filament\Forms\Form;
128
use Filament\Resources\Resource;
139
use Filament\Tables;
1410
use Filament\Tables\Columns\TextColumn;
1511
use Filament\Tables\Filters\SelectFilter;
1612
use Filament\Tables\Table;
1713
use Illuminate\Database\Eloquent\Builder;
18-
use Illuminate\Database\Eloquent\SoftDeletingScope;
1914

2015
class ComputerScienceResource extends Resource
2116
{
@@ -58,7 +53,7 @@ public static function table(Table $table): Table
5853
->filters([
5954
SelectFilter::make('user')
6055
->relationship('user', 'name')
61-
->searchable()
56+
->searchable(),
6257
])
6358
->actions([
6459
Tables\Actions\EditAction::make(),
@@ -84,6 +79,7 @@ public static function getPages(): array
8479
'edit' => Pages\EditComputerScience::route('/{record}/edit'),
8580
];
8681
}
82+
8783
public static function canCreate(): bool
8884
{
8985
return false;

app/Filament/Admin/Resources/UserResource.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,10 @@
33
namespace App\Filament\Admin\Resources;
44

55
use App\Filament\Admin\Resources\UserResource\Pages;
6-
use App\Filament\Admin\Resources\UserResource\RelationManagers;
76
use App\Models\User;
8-
use Filament\Forms;
9-
use Filament\Forms\Form;
107
use Filament\Resources\Resource;
118
use Filament\Tables;
129
use Filament\Tables\Table;
13-
use Illuminate\Database\Eloquent\Builder;
14-
use Illuminate\Database\Eloquent\SoftDeletingScope;
1510

1611
class UserResource extends Resource
1712
{

app/Filament/Admin/Resources/UserResource/RelationManagers/UserRelationManager.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
use Filament\Resources\RelationManagers\RelationManager;
88
use Filament\Tables;
99
use Filament\Tables\Table;
10-
use Illuminate\Database\Eloquent\Builder;
11-
use Illuminate\Database\Eloquent\SoftDeletingScope;
1210

1311
class UserRelationManager extends RelationManager
1412
{

app/Http/Middleware/GuestOrVerified.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class GuestOrVerified
1010
{
1111
public function handle(Request $request, Closure $next)
1212
{
13-
if (Auth::check() && !Auth::user()->hasVerifiedEmail()) {
13+
if (Auth::check() && ! Auth::user()->hasVerifiedEmail()) {
1414
return redirect()->route('verification.notice');
1515
}
1616

app/Models/User.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
namespace App\Models;
44

55
use App\Traits\HasCustomProfilePhoto;
6+
use Filament\Models\Contracts\FilamentUser;
7+
use Filament\Panel;
8+
use Illuminate\Contracts\Auth\MustVerifyEmail;
69
use Illuminate\Database\Eloquent\Casts\Attribute;
710
use Illuminate\Database\Eloquent\Factories\HasFactory;
811
use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -12,9 +15,6 @@
1215
use Laravel\Fortify\TwoFactorAuthenticatable;
1316
use Laravel\Jetstream\HasProfilePhoto;
1417
use Laravel\Sanctum\HasApiTokens;
15-
use Illuminate\Contracts\Auth\MustVerifyEmail;
16-
use Filament\Models\Contracts\FilamentUser;
17-
use Filament\Panel;
1818

1919
class User extends Authenticatable implements FilamentUser, MustVerifyEmail
2020
{
@@ -85,6 +85,7 @@ protected function profilePhotoUrl(): Attribute
8585
public function canAccessPanel(Panel $panel): bool
8686
{
8787
return true;
88+
8889
return str_ends_with($this->email, '@computerscienceresources.com') && $this->hasVerifiedEmail();
8990
}
9091
}

app/Providers/Filament/AdminPanelProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace App\Providers\Filament;
44

5+
use App\Filament\Admin\Resources\ComputerScienceResource\Widgets\ResourcesTrendChart;
6+
use App\Filament\Admin\Resources\UserResource\Widgets\UsersTrendChart;
57
use Filament\Http\Middleware\Authenticate;
68
use Filament\Http\Middleware\AuthenticateSession;
79
use Filament\Http\Middleware\DisableBladeIconComponents;
@@ -17,8 +19,6 @@
1719
use Illuminate\Routing\Middleware\SubstituteBindings;
1820
use Illuminate\Session\Middleware\StartSession;
1921
use Illuminate\View\Middleware\ShareErrorsFromSession;
20-
use App\Filament\Admin\Resources\ComputerScienceResource\Widgets\ResourcesTrendChart;
21-
use App\Filament\Admin\Resources\UserResource\Widgets\UsersTrendChart;
2222

2323
class AdminPanelProvider extends PanelProvider
2424
{

0 commit comments

Comments
 (0)