Skip to content

Commit

Permalink
Fix styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Baspa authored and github-actions[bot] committed Aug 30, 2024
1 parent 81e8203 commit 2fcac9e
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 31 deletions.
2 changes: 1 addition & 1 deletion src/Models/Mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ public function getStatusAttribute(): string
return 'Pending';
}
}
}
}
36 changes: 14 additions & 22 deletions src/Resources/MailResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,15 @@

namespace Vormkracht10\FilamentMails\Resources;

use Filament\Forms\Form;
use Filament\Tables\Table;
use Filament\Infolists\Infolist;
use Filament\Resources\Resource;
use Filament\Infolists\Components\Grid;
use Filament\Infolists\Components\Tabs;
use Filament\Tables\Actions\EditAction;
use Filament\Tables\Actions\ViewAction;
use Filament\Tables\Actions\ActionGroup;
use Filament\Forms\Components\FileUpload;
use Filament\Tables\Actions\DeleteAction;
use Illuminate\Database\Eloquent\Builder;
use Filament\Infolists\Components\Section;
use Filament\Infolists\Components\Tabs;
use Filament\Infolists\Components\Tabs\Tab;
use Vormkracht10\FilamentMails\Models\Mail;
use Filament\Infolists\Components\TextEntry;
use Filament\Infolists\Infolist;
use Filament\Resources\Resource;
use Filament\Tables\Table;
use Vormkracht10\FilamentMails\Models\Mail;
use Vormkracht10\FilamentMails\Resources\MailResource\Pages\ListMails;
use Vormkracht10\Mails\Models\Mail;

Expand Down Expand Up @@ -75,22 +68,22 @@ public static function infolist(Infolist $infolist): Infolist
->label(__('Subject')),
TextEntry::make('from')
->label(__('From'))
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
TextEntry::make('to')
->label(__('Recipient'))
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
TextEntry::make('cc')
->label(__('CC'))
->default('-')
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
TextEntry::make('bcc')
->label(__('BCC'))
->default('-')
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
TextEntry::make('reply_to')
->default('-')
->label(__('Reply To'))
->formatStateUsing(fn($state) => self::formatEmailAddress($state)),
->formatStateUsing(fn ($state) => self::formatEmailAddress($state)),
]),
]),
Section::make('Content')
Expand Down Expand Up @@ -182,7 +175,7 @@ public static function table(Table $table): Table
->label(__('Status'))
->sortable()
->badge()
->color(fn(string $state): string => match ($state) {
->color(fn (string $state): string => match ($state) {
'Hard Bounced' => 'danger',
'Soft Bounced' => 'warning',
'Complained' => 'danger',
Expand All @@ -201,7 +194,7 @@ public static function table(Table $table): Table
->searchable(),
Tables\Columns\TextColumn::make('to')
->label(__('Recipient'))
->formatStateUsing(fn($state) => self::formatEmailAddress($state))
->formatStateUsing(fn ($state) => self::formatEmailAddress($state))
->sortable()
->searchable(),
Tables\Columns\TextColumn::make('sent_at')
Expand Down Expand Up @@ -234,7 +227,6 @@ public static function getPages(): array
];
}


private static function formatEmailAddress($state): string
{
if (empty($state)) {
Expand All @@ -243,12 +235,12 @@ private static function formatEmailAddress($state): string

$data = json_decode($state, true);

if (!is_array($data)) {
if (! is_array($data)) {
return (string) $state; // Return the original state if it's not valid JSON
}

return implode(', ', array_map(function ($email, $name) {
return $name === null ? $email : "$name <$email>";
}, array_keys($data), $data));
}
}
}
16 changes: 8 additions & 8 deletions src/Resources/MailResource/Pages/ListMails.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Vormkracht10\FilamentMails\Resources\MailResource\Pages;

use Filament\Resources\Pages\ListRecords;
use Vormkracht10\FilamentMails\Resources\MailResource;
use Filament\Resources\Components\Tab;
use Filament\Resources\Pages\ListRecords;
use Illuminate\Database\Eloquent\Builder;
use Vormkracht10\FilamentMails\Models\Mail;
use Vormkracht10\FilamentMails\Resources\MailResource;

class ListMails extends ListRecords
{
Expand All @@ -33,17 +33,17 @@ public function getTabs(): array
->label(__('Sent'))
->icon('heroicon-o-paper-airplane')
->badge(Mail::sent()->count())
->modifyQueryUsing(fn(Builder $query) => $query->sent()),
->modifyQueryUsing(fn (Builder $query) => $query->sent()),
'delivered' => Tab::make()
->label(__('Delivered'))
->icon('heroicon-o-check-circle')
->badge(Mail::delivered()->count())
->modifyQueryUsing(fn(Builder $query) => $query->delivered()),
->modifyQueryUsing(fn (Builder $query) => $query->delivered()),
'bounced' => Tab::make()
->label(__('Bounced'))
->icon('heroicon-o-x-circle')
->badge(fn() => Mail::softBounced()->count() + Mail::hardBounced()->count())
->modifyQueryUsing(fn(Builder $query) => $query->where(function ($query) {
->badge(fn () => Mail::softBounced()->count() + Mail::hardBounced()->count())
->modifyQueryUsing(fn (Builder $query) => $query->where(function ($query) {
$query->softBounced()->orWhere(function ($query) {
$query->hardBounced();
});
Expand All @@ -52,7 +52,7 @@ public function getTabs(): array
->label(__('Unsent'))
->icon('heroicon-o-x-circle')
->badge(Mail::unsent()->count())
->modifyQueryUsing(fn(Builder $query) => $query->unsent()),
->modifyQueryUsing(fn (Builder $query) => $query->unsent()),
];
}
}
}

0 comments on commit 2fcac9e

Please sign in to comment.