Skip to content

Commit 195ed51

Browse files
committed
wip
1 parent 6218ffc commit 195ed51

25 files changed

Lines changed: 1588 additions & 1416 deletions

app/Filament/Resources/FailedJobResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static function form(Form $form): Form
5050
TextInput::make('queue')->disabled(),
5151

5252
// make text a little bit smaller because often a complete Stack Trace is shown:
53-
TextArea::make('exception')->disabled()->columnSpan(4)->extraInputAttributes(['style' => 'font-size: 80%;']),
53+
Textarea::make('exception')->disabled()->columnSpan(4)->extraInputAttributes(['style' => 'font-size: 80%;']),
5454
PrettyJsonField::make('payload')->disabled()->columnSpan(4),
5555
])->columns(4);
5656
}

app/Filament/Resources/OrganizationInvitationResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static function form(Form $form): Form
3939
->required(),
4040
Select::make('role')
4141
->options(Role::class),
42-
Forms\Components\Select::make('organization_id')
42+
Select::make('organization_id')
4343
->label('Organization')
4444
->relationship(name: 'organization', titleAttribute: 'name')
4545
->searchable(['name'])

app/Filament/Resources/OrganizationResource.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static function form(Form $form): Form
5555
->label('Is personal?')
5656
->hiddenOn(['create'])
5757
->required(),
58-
Forms\Components\Select::make('user_id')
58+
Select::make('user_id')
5959
->label('Owner')
6060
->relationship(name: 'owner', titleAttribute: 'email')
6161
->searchable(['name', 'email'])
@@ -76,7 +76,7 @@ public static function form(Form $form): Form
7676
Select::make('time_format')
7777
->options(TimeFormat::toSelectArray())
7878
->required(),
79-
Forms\Components\Select::make('currency')
79+
Select::make('currency')
8080
->label('Currency')
8181
->options(function (): array {
8282
$currencies = ISOCurrencyProvider::getInstance()->getAvailableCurrencies();
@@ -114,22 +114,22 @@ public static function table(Table $table): Table
114114
{
115115
return $table
116116
->columns([
117-
Tables\Columns\TextColumn::make('name')
117+
TextColumn::make('name')
118118
->searchable()
119119
->sortable(),
120120
Tables\Columns\IconColumn::make('personal_team')
121121
->boolean()
122122
->label('Is personal?')
123123
->sortable(),
124-
Tables\Columns\TextColumn::make('owner.email')
124+
TextColumn::make('owner.email')
125125
->sortable(),
126-
Tables\Columns\TextColumn::make('currency'),
126+
TextColumn::make('currency'),
127127
TextColumn::make('billable_rate')
128128
->money(fn (Organization $resource) => $resource->currency, divideBy: 100),
129-
Tables\Columns\TextColumn::make('created_at')
129+
TextColumn::make('created_at')
130130
->dateTime()
131131
->sortable(),
132-
Tables\Columns\TextColumn::make('updated_at')
132+
TextColumn::make('updated_at')
133133
->dateTime()
134134
->sortable()
135135
->toggleable(isToggledHiddenByDefault: true),
@@ -223,7 +223,7 @@ public static function table(Table $table): Table
223223

224224
return $select;
225225
}),
226-
Forms\Components\Select::make('timezone')
226+
Select::make('timezone')
227227
->label('Timezone')
228228
->options(fn (): array => app(TimezoneService::class)->getSelectOptions())
229229
->searchable()

app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ public function table(Table $table): Table
4949
return $table
5050
->recordTitleAttribute('name')
5151
->columns([
52-
Tables\Columns\TextColumn::make('name'),
53-
Tables\Columns\TextColumn::make('role'),
52+
TextColumn::make('name'),
53+
TextColumn::make('role'),
5454
TextColumn::make('billable_rate')
5555
->money($organization->currency, divideBy: 100),
5656
])
5757
->headerActions([
58-
Tables\Actions\AttachAction::make()
58+
AttachAction::make()
5959
->recordTitle(fn (User $record): string => "{$record->name} ({$record->email})")
6060
->form(fn (AttachAction $action): array => [
6161
$action->getRecordSelect(),

app/Filament/Resources/ReportResource.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ public static function form(Form $form): Form
6363
return $record->getRawOriginal('properties');
6464
})
6565
->disabled(),
66-
Forms\Components\DateTimePicker::make('created_at')
66+
DateTimePicker::make('created_at')
6767
->label('Created At')
6868
->hiddenOn(['create'])
6969
->disabled(),
70-
Forms\Components\DateTimePicker::make('updated_at')
70+
DateTimePicker::make('updated_at')
7171
->label('Updated At')
7272
->hiddenOn(['create'])
7373
->disabled(),
@@ -78,10 +78,10 @@ public static function table(Table $table): Table
7878
{
7979
return $table
8080
->columns([
81-
Tables\Columns\TextColumn::make('name')
81+
TextColumn::make('name')
8282
->searchable()
8383
->sortable(),
84-
Tables\Columns\TextColumn::make('description')
84+
TextColumn::make('description')
8585
->searchable()
8686
->sortable(),
8787
ToggleColumn::make('is_public')
@@ -90,10 +90,10 @@ public static function table(Table $table): Table
9090
TextColumn::make('organization.name')
9191
->searchable()
9292
->sortable(),
93-
Tables\Columns\TextColumn::make('created_at')
93+
TextColumn::make('created_at')
9494
->dateTime()
9595
->sortable(),
96-
Tables\Columns\TextColumn::make('updated_at')
96+
TextColumn::make('updated_at')
9797
->dateTime()
9898
->sortable()
9999
->toggleable(isToggledHiddenByDefault: true),

app/Filament/Resources/TimeEntryResource.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ public static function table(Table $table): Table
9393
($record->end?->toDateTimeString('minute') ?? '...').')';
9494
})
9595
->label('Time'),
96-
Tables\Columns\TextColumn::make('organization.name')
96+
TextColumn::make('organization.name')
9797
->sortable(),
98-
Tables\Columns\TextColumn::make('created_at')
98+
TextColumn::make('created_at')
9999
->sortable(),
100-
Tables\Columns\TextColumn::make('updated_at')
100+
TextColumn::make('updated_at')
101101
->sortable(),
102102
])
103103
->filters([

app/Filament/Resources/UserResource.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ public static function form(Form $form): Form
4747
return $form
4848
->columns(1)
4949
->schema([
50-
Forms\Components\TextInput::make('id')
50+
TextInput::make('id')
5151
->label('ID')
5252
->disabled()
5353
->visibleOn(['update', 'show'])
5454
->readOnly()
5555
->maxLength(255),
56-
Forms\Components\TextInput::make('name')
56+
TextInput::make('name')
5757
->label('Name')
5858
->required()
5959
->maxLength(255),
60-
Forms\Components\TextInput::make('email')
60+
TextInput::make('email')
6161
->label('Email')
6262
->required()
6363
->rules($record?->is_placeholder ? [] : [

app/Http/Controllers/Api/V1/TimeEntryController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
class TimeEntryController extends Controller
6060
{
61-
private function assertNoOverlap(Organization $organization, Member $member, \Illuminate\Support\Carbon $start, ?\Illuminate\Support\Carbon $end, ?TimeEntry $exclude = null): void
61+
private function assertNoOverlap(Organization $organization, Member $member, Carbon $start, ?Carbon $end, ?TimeEntry $exclude = null): void
6262
{
6363
if (! $organization->prevent_overlapping_time_entries) {
6464
return;

app/Http/Kernel.php

Lines changed: 58 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,37 @@
44

55
namespace App\Http;
66

7+
use App\Http\Middleware\Authenticate;
78
use App\Http\Middleware\CheckOrganizationBlocked;
9+
use App\Http\Middleware\EncryptCookies;
10+
use App\Http\Middleware\EnsureEmailIsVerified;
11+
use App\Http\Middleware\ForceHttps;
812
use App\Http\Middleware\ForceJsonResponse;
13+
use App\Http\Middleware\HandleInertiaRequests;
14+
use App\Http\Middleware\PreventRequestsDuringMaintenance;
15+
use App\Http\Middleware\RedirectIfAuthenticated;
16+
use App\Http\Middleware\ShareInertiaData;
17+
use App\Http\Middleware\TrimStrings;
18+
use App\Http\Middleware\TrustProxies;
19+
use App\Http\Middleware\ValidateSignature;
20+
use App\Http\Middleware\VerifyCsrfToken;
21+
use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
22+
use Illuminate\Auth\Middleware\Authorize;
23+
use Illuminate\Auth\Middleware\RequirePassword;
24+
use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
925
use Illuminate\Foundation\Http\Kernel as HttpKernel;
26+
use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
27+
use Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests;
28+
use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
29+
use Illuminate\Http\Middleware\AddLinkHeadersForPreloadedAssets;
30+
use Illuminate\Http\Middleware\HandleCors;
31+
use Illuminate\Http\Middleware\SetCacheHeaders;
32+
use Illuminate\Routing\Middleware\SubstituteBindings;
33+
use Illuminate\Routing\Middleware\ThrottleRequests;
34+
use Illuminate\Session\Middleware\AuthenticateSession;
35+
use Illuminate\Session\Middleware\StartSession;
36+
use Illuminate\View\Middleware\ShareErrorsFromSession;
37+
use Laravel\Passport\Http\Middleware\CreateFreshApiToken;
1038

1139
class Kernel extends HttpKernel
1240
{
@@ -18,13 +46,13 @@ class Kernel extends HttpKernel
1846
* @var array<int, class-string|string>
1947
*/
2048
protected $middleware = [
21-
\App\Http\Middleware\ForceHttps::class,
22-
\App\Http\Middleware\TrustProxies::class,
23-
\Illuminate\Http\Middleware\HandleCors::class,
24-
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
25-
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
26-
\App\Http\Middleware\TrimStrings::class,
27-
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
49+
ForceHttps::class,
50+
TrustProxies::class,
51+
HandleCors::class,
52+
PreventRequestsDuringMaintenance::class,
53+
ValidatePostSize::class,
54+
TrimStrings::class,
55+
ConvertEmptyStringsToNull::class,
2856
];
2957

3058
/**
@@ -34,21 +62,21 @@ class Kernel extends HttpKernel
3462
*/
3563
protected $middlewareGroups = [
3664
'web' => [
37-
\App\Http\Middleware\EncryptCookies::class,
38-
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
39-
\Illuminate\Session\Middleware\StartSession::class,
40-
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
41-
\App\Http\Middleware\VerifyCsrfToken::class,
42-
\Illuminate\Routing\Middleware\SubstituteBindings::class,
43-
\App\Http\Middleware\HandleInertiaRequests::class,
44-
\App\Http\Middleware\ShareInertiaData::class,
45-
\Illuminate\Http\Middleware\AddLinkHeadersForPreloadedAssets::class,
46-
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
65+
EncryptCookies::class,
66+
AddQueuedCookiesToResponse::class,
67+
StartSession::class,
68+
ShareErrorsFromSession::class,
69+
VerifyCsrfToken::class,
70+
SubstituteBindings::class,
71+
HandleInertiaRequests::class,
72+
ShareInertiaData::class,
73+
AddLinkHeadersForPreloadedAssets::class,
74+
CreateFreshApiToken::class,
4775
],
4876

4977
'api' => [
50-
\Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
51-
\Illuminate\Routing\Middleware\SubstituteBindings::class,
78+
ThrottleRequests::class.':api',
79+
SubstituteBindings::class,
5280
ForceJsonResponse::class,
5381
],
5482

@@ -64,17 +92,17 @@ class Kernel extends HttpKernel
6492
* @var array<string, class-string|string>
6593
*/
6694
protected $middlewareAliases = [
67-
'auth' => \App\Http\Middleware\Authenticate::class,
68-
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
69-
'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
70-
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
71-
'can' => \Illuminate\Auth\Middleware\Authorize::class,
72-
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
73-
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
74-
'precognitive' => \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class,
75-
'signed' => \App\Http\Middleware\ValidateSignature::class,
76-
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
77-
'verified' => \App\Http\Middleware\EnsureEmailIsVerified::class,
95+
'auth' => Authenticate::class,
96+
'auth.basic' => AuthenticateWithBasicAuth::class,
97+
'auth.session' => AuthenticateSession::class,
98+
'cache.headers' => SetCacheHeaders::class,
99+
'can' => Authorize::class,
100+
'guest' => RedirectIfAuthenticated::class,
101+
'password.confirm' => RequirePassword::class,
102+
'precognitive' => HandlePrecognitiveRequests::class,
103+
'signed' => ValidateSignature::class,
104+
'throttle' => ThrottleRequests::class,
105+
'verified' => EnsureEmailIsVerified::class,
78106
'check-organization-blocked' => CheckOrganizationBlocked::class,
79107
];
80108
}

app/Http/Middleware/ForceHttps.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ForceHttps
1414
/**
1515
* Handle an incoming request.
1616
*
17-
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
17+
* @param Closure(Request): (Response) $next
1818
*/
1919
public function handle(Request $request, Closure $next, string ...$guards): Response
2020
{

0 commit comments

Comments
 (0)