updates

vormkracht10 · Feb 25, 2025 · 61b9070 · 61b9070
1 parent 0aaf007
commit 61b9070
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 70 deletions.
diff --git a/composer.json b/composer.json
@@ -39,8 +39,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Vormkracht10\\FilamentMails\\": "src/",
-            "Vormkracht10\\FilamentMails\\Database\\Factories\\": "database/factories/"
+            "Vormkracht10\\FilamentMails\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
diff --git a/database/migrations/create_mails_table.php.stub b/database/migrations/create_mails_table.php.stub
diff --git a/src/FilamentMailsServiceProvider.php b/src/FilamentMailsServiceProvider.php
@@ -44,10 +44,6 @@ public function configurePackage(Package $package): void
             $package->hasConfigFile();
         }
 
-        if (file_exists($package->basePath('/../database/migrations'))) {
-            $package->hasMigrations($this->getMigrations());
-        }
-
         if (file_exists($package->basePath('/../resources/lang'))) {
             $package->hasTranslations();
             $this->loadJsonTranslationsFrom($package->basePath('/../resources/lang'));

diff --git a/src/Resources/EventResource/Pages/ListEvents.php b/src/Resources/EventResource/Pages/ListEvents.php
@@ -39,34 +39,28 @@ public function getTabs(): array
             'delivered' => Tab::make()
                 ->label(__('Delivered'))
                 ->badgeColor('success')
-                ->icon('heroicon-o-check-circle')
+                ->icon('heroicon-o-inbox-arrow-down')
                 ->badge(MailEvent::where('type', EventType::DELIVERED)->count())
                 ->modifyQueryUsing(fn (Builder $query) => $query->where('type', EventType::DELIVERED)),
 
-            'clicked' => Tab::make()
-                ->label(__('Clicked'))
-                ->badgeColor('clicked')
-                ->icon('heroicon-o-cursor-arrow-rays')
-                ->badge(MailEvent::where('type', EventType::CLICKED)->count())
-                ->modifyQueryUsing(fn (Builder $query) => $query->where('type', EventType::CLICKED)),
-
             'opened' => Tab::make()
                 ->label(__('Opened'))
                 ->badgeColor('info')
                 ->icon('heroicon-o-envelope-open')
                 ->badge(MailEvent::where('type', EventType::OPENED)->count())
                 ->modifyQueryUsing(fn (Builder $query) => $query->where('type', EventType::OPENED)),
 
-            'soft_bounce' => Tab::make()
-                ->label(__('Soft Bounced'))
-                ->icon('heroicon-o-x-circle')
-                ->badge(MailEvent::where('type', EventType::SOFT_BOUNCED)->count())
-                ->modifyQueryUsing(fn (Builder $query) => $query->where('type', EventType::SOFT_BOUNCED)),
+            'clicked' => Tab::make()
+                ->label(__('Clicked'))
+                ->badgeColor('clicked')
+                ->icon('heroicon-o-cursor-arrow-rays')
+                ->badge(MailEvent::where('type', EventType::CLICKED)->count())
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('type', EventType::CLICKED)),
 
             'bounced' => Tab::make()
                 ->label(__('Bounced'))
                 ->badgeColor('danger')
-                ->icon('heroicon-o-x-circle')
+                ->icon('heroicon-o-arrow-path-rounded-square')
                 ->badge(fn () => MailEvent::where('type', EventType::SOFT_BOUNCED)->count() + MailEvent::where('type', EventType::HARD_BOUNCED)->count())
                 ->modifyQueryUsing(fn (Builder $query) => $query->where(function ($query) {
                     $query->where('type', EventType::SOFT_BOUNCED)
@@ -76,7 +70,7 @@ public function getTabs(): array
             'complained' => Tab::make()
                 ->label(__('Complained'))
                 ->badgeColor('warning')
-                ->icon('heroicon-o-exclamation-circle')
+                ->icon('heroicon-o-face-frown')
                 ->badge(MailEvent::where('type', EventType::COMPLAINED)->count())
                 ->modifyQueryUsing(fn (Builder $query) => $query->where('type', EventType::COMPLAINED)),
         ];

diff --git a/src/Resources/MailResource/Pages/ListMails.php b/src/Resources/MailResource/Pages/ListMails.php
@@ -37,13 +37,13 @@ public function getTabs(): array
             'all' => Tab::make()
                 ->label(__('All'))
                 ->badgeColor('primary')
-                ->icon('heroicon-o-inbox')
+                ->icon('heroicon-o-inbox-stack')
                 ->badge($class::count()),
 
             'unsent' => Tab::make()
                 ->label(__('Unsent'))
                 ->badgeColor('gray')
-                ->icon('heroicon-o-x-circle')
+                ->icon('heroicon-o-inbox')
                 ->badge($class::unsent()->count())
                 ->modifyQueryUsing(function (Builder $query) use ($class): Builder {
                     return $class->unsent();
@@ -61,7 +61,7 @@ public function getTabs(): array
             'delivered' => Tab::make()
                 ->label(__('Delivered'))
                 ->badgeColor('success')
-                ->icon('heroicon-o-check-circle')
+                ->icon('heroicon-o-inbox-arrow-down')
                 ->badge($class::delivered()->count())
                 ->modifyQueryUsing(function (Builder $query) use ($class): Builder {
                     return $class->delivered();
@@ -70,7 +70,7 @@ public function getTabs(): array
             'opened' => Tab::make()
                 ->label(__('Opened'))
                 ->badgeColor('info')
-                ->icon('heroicon-o-eye')
+                ->icon('heroicon-o-envelope-open')
                 ->badge($class::opened()->count())
                 ->modifyQueryUsing(function (Builder $query) use ($class): Builder {
                     return $class->opened();
@@ -88,7 +88,7 @@ public function getTabs(): array
             'bounced' => Tab::make()
                 ->label(__('Bounced'))
                 ->badgeColor('danger')
-                ->icon('heroicon-o-x-circle')
+                ->icon('heroicon-o-arrow-path-rounded-square')
                 ->badge(fn () => $class::softBounced()->count() + $class::hardBounced()->count())
                 ->modifyQueryUsing(function (Builder $query) use ($class): Builder {
                     return $query->where(function (Builder $subQuery) use ($class) {
@@ -100,7 +100,7 @@ public function getTabs(): array
             'complained' => Tab::make()
                 ->label(__('Complained'))
                 ->badgeColor('gray')
-                ->icon('heroicon-o-x-circle')
+                ->icon('heroicon-o-face-frown')
                 ->badge($class::complained()->count())
                 ->modifyQueryUsing(function (Builder $query) use ($class): Builder {
                     return $class->complained();

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -51,10 +51,5 @@ protected function getPackageProviders($app)
     public function getEnvironmentSetUp($app)
     {
         config()->set('database.default', 'testing');
-
-        /*
-        $migration = include __DIR__.'/../database/migrations/create_filament-mails_table.php.stub';
-        $migration->up();
-        */
     }
 }