Skip to content

Commit a969f0a

Browse files
BaspaBaspa
committed
Merge branch 'main' of github.com:vormkracht10/filament-mails
2 parents 7bbc965 + 6e83baa commit a969f0a

File tree

5 files changed

+25
-33
lines changed

5 files changed

+25
-33
lines changed

‎src/FilamentMailsPlugin.php

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

33
namespace Vormkracht10\FilamentMails;
44

5-
use Filament\Panel;
65
use Filament\Contracts\Plugin;
76
use Filament\Facades\Filament;
8-
use Filament\Support\Colors\Color;
97
use Filament\Navigation\NavigationItem;
10-
use Vormkracht10\FilamentMails\Resources\MailResource;
8+
use Filament\Panel;
9+
use Filament\Support\Colors\Color;
1110
use Vormkracht10\FilamentMails\Resources\EventResource;
12-
use Vormkracht10\FilamentMails\Widgets\BouncerateWidget;
11+
use Vormkracht10\FilamentMails\Resources\MailResource;
1312

1413
class FilamentMailsPlugin implements Plugin
1514
{
@@ -35,16 +34,16 @@ public function boot(Panel $panel): void
3534
NavigationItem::make()
3635
->group(__('Mails'))
3736
->label('Mails')
38-
->url(fn(): string => MailResource::getUrl('index'))
37+
->url(fn (): string => MailResource::getUrl('index'))
3938
->icon('heroicon-o-envelope')
40-
->isActiveWhen(fn(): bool => request()->routeIs('filament.' . $panel->getId() . '.resources.mails.*'))
39+
->isActiveWhen(fn (): bool => request()->routeIs('filament.' . $panel->getId() . '.resources.mails.*'))
4140
->childItems([
4241
NavigationItem::make()
4342
->label('Events')
44-
->url(fn(): string => EventResource::getUrl('index'))
43+
->url(fn (): string => EventResource::getUrl('index'))
4544
->icon('heroicon-o-calendar')
46-
->isActiveWhen(fn(): bool => request()->routeIs('filament.' . $panel->getId() . '.resources.events.*'))
47-
])
45+
->isActiveWhen(fn (): bool => request()->routeIs('filament.' . $panel->getId() . '.resources.events.*')),
46+
]),
4847
]);
4948
});
5049
}

‎src/Resources/EventResource.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
namespace Vormkracht10\FilamentMails\Resources;
44

5-
use Filament\Tables;
6-
use Filament\Tables\Table;
75
use Filament\Infolists\Infolist;
86
use Filament\Resources\Resource;
9-
use Filament\Resources\Pages\Page;
10-
use Vormkracht10\FilamentMails\Resources\MailResource\Pages\ListMails;
7+
use Filament\Tables;
8+
use Filament\Tables\Table;
119
use Vormkracht10\FilamentMails\Resources\EventResource\Pages\ListEvents;
1210
use Vormkracht10\Mails\Models\MailEvent;
1311

‎src/Resources/EventResource/Pages/ListEvents.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44

55
use Filament\Resources\Components\Tab;
66
use Filament\Resources\Pages\ListRecords;
7-
use Illuminate\Database\Eloquent\Builder;
8-
use Vormkracht10\FilamentMails\Models\Mail;
97
use Vormkracht10\FilamentMails\Resources\EventResource;
10-
use Vormkracht10\FilamentMails\Widgets\BouncerateWidget;
118
use Vormkracht10\Mails\Models\MailEvent;
129

1310
class ListEvents extends ListRecords

‎src/Resources/MailResource.php

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@
22

33
namespace Vormkracht10\FilamentMails\Resources;
44

5-
use Filament\Tables;
6-
use Filament\Tables\Table;
7-
use Filament\Infolists\Infolist;
8-
use Filament\Resources\Resource;
9-
use Filament\Resources\Pages\Page;
105
use Filament\Infolists\Components\Grid;
11-
use Filament\Infolists\Components\Tabs;
126
use Filament\Infolists\Components\Section;
7+
use Filament\Infolists\Components\Tabs;
138
use Filament\Infolists\Components\Tabs\Tab;
14-
use Vormkracht10\FilamentMails\Models\Mail;
159
use Filament\Infolists\Components\TextEntry;
10+
use Filament\Infolists\Infolist;
11+
use Filament\Resources\Resource;
12+
use Filament\Tables;
13+
use Filament\Tables\Table;
14+
use Vormkracht10\FilamentMails\Models\Mail;
1615
use Vormkracht10\FilamentMails\Resources\MailResource\Pages\ListMails;
17-
use Vormkracht10\FilamentMails\Resources\MailResource\Pages\ListEvents;
1816

1917
class MailResource extends Resource
2018
{
@@ -62,22 +60,22 @@ public static function infolist(Infolist $infolist): Infolist
6260
->label(__('Subject')),
6361
TextEntry::make('from')
6462
->label(__('From'))
65-
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
63+
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
6664
TextEntry::make('to')
6765
->label(__('Recipient'))
68-
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
66+
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
6967
TextEntry::make('cc')
7068
->label(__('CC'))
7169
->default('-')
72-
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
70+
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
7371
TextEntry::make('bcc')
7472
->label(__('BCC'))
7573
->default('-')
76-
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
74+
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
7775
TextEntry::make('reply_to')
7876
->default('-')
7977
->label(__('Reply To'))
80-
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
78+
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
8179
]),
8280
]),
8381
Section::make('Content')
@@ -167,7 +165,7 @@ public static function table(Table $table): Table
167165
->label(__('Status'))
168166
->sortable()
169167
->badge()
170-
->color(fn(string $state): string => match ($state) {
168+
->color(fn (string $state): string => match ($state) {
171169
'Hard Bounced' => 'danger',
172170
'Soft Bounced' => 'warning',
173171
'Complained' => 'danger',
@@ -186,7 +184,7 @@ public static function table(Table $table): Table
186184
->searchable(),
187185
Tables\Columns\TextColumn::make('to')
188186
->label(__('Recipient'))
189-
->formatStateUsing(fn($state) => self::formatEmailAddressForTable($state))
187+
->formatStateUsing(fn ($state) => self::formatEmailAddressForTable($state))
190188
->sortable()
191189
->searchable(),
192190
Tables\Columns\TextColumn::make('sent_at')

‎src/Widgets/BouncerateWidget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class BouncerateWidget extends BaseWidget
1212

1313
protected function getStats(): array
1414
{
15-
$bouncedMails = Mail::where(fn($query) => $query->softBounced()->orWhere(fn($query) => $query->hardBounced()))->count();
15+
$bouncedMails = Mail::where(fn ($query) => $query->softBounced()->orWhere(fn ($query) => $query->hardBounced()))->count();
1616
$openedMails = Mail::opened()->count();
1717
$deliveredMails = Mail::delivered()->count();
1818
$clickedMails = Mail::clicked()->count();
@@ -43,4 +43,4 @@ protected function getStats(): array
4343

4444
return $widgets;
4545
}
46-
}
46+
}

0 commit comments

Comments
 (0)