Skip to content

Commit

Permalink
Merge branch 'main' of github.com:vormkracht10/filament-mails
Browse files Browse the repository at this point in the history
  • Loading branch information
Baspa committed Aug 30, 2024
2 parents a6eef70 + 362dcd8 commit 81e8203
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config/mails.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php

// config for Vormkracht10/FilamentMails
return [];
return [];
4 changes: 2 additions & 2 deletions src/FilamentMailsPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Vormkracht10\FilamentMails;

use Filament\Panel;
use Filament\Contracts\Plugin;
use Filament\Panel;
use Vormkracht10\FilamentMails\Resources\MailResource;

class FilamentMailsPlugin implements Plugin
Expand Down Expand Up @@ -38,4 +38,4 @@ public static function get(): static

return $plugin;
}
}
}
5 changes: 2 additions & 3 deletions src/Resources/MailResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace Vormkracht10\FilamentMails\Resources;

use Filament\Forms;
use Filament\Tables;
use Filament\Forms\Form;
use Filament\Tables\Table;
use Filament\Infolists\Infolist;
Expand All @@ -21,6 +19,7 @@
use Vormkracht10\FilamentMails\Models\Mail;
use Filament\Infolists\Components\TextEntry;
use Vormkracht10\FilamentMails\Resources\MailResource\Pages\ListMails;
use Vormkracht10\Mails\Models\Mail;

Check failure on line 22 in src/Resources/MailResource.php

View workflow job for this annotation

GitHub Actions / P8.2 - L10.* - prefer-lowest - ubuntu-latest

Cannot use Vormkracht10\Mails\Models\Mail as Mail because the name is already in use

Check failure on line 22 in src/Resources/MailResource.php

View workflow job for this annotation

GitHub Actions / P8.2 - L10.* - prefer-stable - ubuntu-latest

Cannot use Vormkracht10\Mails\Models\Mail as Mail because the name is already in use

class MailResource extends Resource
{
Expand All @@ -30,7 +29,7 @@ class MailResource extends Resource

protected static ?string $recordTitleAttribute = 'subject';

protected static bool $isScopedToTenant = false;
protected static bool $isScopedToTenant = false;

public static function getNavigationLabel(): string
{
Expand Down
1 change: 0 additions & 1 deletion src/Resources/MailResource/Pages/ListMails.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

class ListMails extends ListRecords
{

protected static string $resource = MailResource::class;

public function getTitle(): string
Expand Down

0 comments on commit 81e8203

Please sign in to comment.