Merge pull request #67 from lara-zeus/fixes-updates

fixes and updates

database/factories/DepartmentFactory.php

@@ -5,19 +5,13 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use LaraZeus\Wind\WindPlugin;
 
-class DepartmentFactory extends Factory /* @phpstan-ignore-line */
+class DepartmentFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     */
     public function getModel(): string
     {
         return WindPlugin::get()->getDepartmentModel();
     }
 
-    /**
-     * Define the model's default state.
-     */
     public function definition(): array
     {
         return [

database/factories/LetterFactory.php

@@ -3,27 +3,22 @@
 namespace Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LaraZeus\Wind\Models\Department;
 use LaraZeus\Wind\WindPlugin;
 
-class LetterFactory extends Factory /* @phpstan-ignore-line */
+class LetterFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     */
     public function getModel(): string
     {
         return WindPlugin::get()->getDepartmentModel();
     }
 
-    /**
-     * Define the model's default state.
-     */
     public function definition(): array
     {
         return [
             'name' => $this->faker->name,
             'email' => $this->faker->email,
-            'department_id' => WindPlugin::get()->getDepartmentModel()::factory(),
+            'department_id' => Department::factory(),
             'title' => $this->faker->words(3, true),
             'message' => $this->faker->words(5, true),
             'status' => 'NEW',

phpstan.neon.dist

@@ -5,10 +5,9 @@ parameters:
     level: 6
     paths:
         - src
-        - config
         - database
-        - tests
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
     checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false

resources/views/themes/zeus/wind/contact-form.blade.php

@@ -4,11 +4,6 @@
     </x-slot>
 
     <x-slot name="breadcrumbs">
-        <li class="flex items-center">
-            <a href="{{ url('/') }}">{{ __('Home') }}</a>
-            @svg('iconpark-rightsmall-o','fill-current w-4 h-4 mx-3 rtl:rotate-180')
-        </li>
-
         <li class="flex items-center">
             {{ __('Contact us') }}
         </li>

routes/web.php

@@ -1,10 +1,10 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use LaraZeus\Wind\Http\Livewire\ContactsForm;
+use LaraZeus\Wind\Livewire\ContactsForm;
 use LaraZeus\Wind\WindPlugin;
 
-if (app('filament')->hasPlugin('zeus-wind')) {
+if (! defined('__PHPSTAN_RUNNING__') && app('filament')->hasPlugin('zeus-wind')) {
     Route::middleware(WindPlugin::get()->getMiddleware())
         ->prefix(WindPlugin::get()->getWindPrefix())
         ->get('{departmentSlug?}', ContactsForm::class)

src/Commands/PublishCommand.php

@@ -31,9 +31,6 @@ public function handle()
         $this->callSilent('vendor:publish', ['--tag' => 'zeus-wind-migrations', '--force' => (bool) $this->option('force')]);
         $this->callSilent('vendor:publish', ['--tag' => 'zeus-wind-translations', '--force' => (bool) $this->option('force')]);
 
-        $this->callSilent('vendor:publish', ['--tag' => 'zeus-wind-seeder', '--force' => (bool) $this->option('force')]);
-        $this->callSilent('vendor:publish', ['--tag' => 'zeus-wind-factories', '--force' => (bool) $this->option('force')]);
-
         // publish Zeus files
         $this->callSilent('vendor:publish', ['--tag' => 'zeus-config', '--force' => (bool) $this->option('force')]);
         $this->callSilent('vendor:publish', ['--tag' => 'zeus-views', '--force' => (bool) $this->option('force')]);

src/Events/LetterSent.php

@@ -2,6 +2,7 @@
 
 namespace LaraZeus\Wind\Events;
 
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
@@ -28,10 +29,8 @@ public function __construct(Letter $letter)
 
     /**
      * Get the channels the event should broadcast on.
-     *
-     * @return \Illuminate\Broadcasting\Channel|array
      */
-    public function broadcastOn()
+    public function broadcastOn(): Channel | PrivateChannel | array
     {
         return new PrivateChannel('zeus-wind');
     }

src/Events/ReplySent.php

@@ -2,6 +2,7 @@
 
 namespace LaraZeus\Wind\Events;
 
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
@@ -28,10 +29,8 @@ public function __construct(Letter $letter)
 
     /**
      * Get the channels the event should broadcast on.
-     *
-     * @return \Illuminate\Broadcasting\Channel|array
      */
-    public function broadcastOn()
+    public function broadcastOn(): Channel | PrivateChannel | array
     {
         return new PrivateChannel('zeus-wind');
     }

src/Filament/Resources/LetterResource.php

@@ -25,7 +25,6 @@
 use Filament\Tables\Filters\TrashedFilter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
 use LaraZeus\Wind\Filament\Resources\LetterResource\Pages;
 use LaraZeus\Wind\Models\Letter;
@@ -185,7 +184,7 @@ public static function table(Table $table): Table
                     ]),
                 ]),
             ])
-            ->recordClasses(fn (Model $record) => match ($record->status) {
+            ->recordClasses(fn (Letter $record) => match ($record->status) {
                 'NEW' => 'border-s-2 border-danger-600 dark:border-danger-300',
                 'REPLIED' => 'border-s-2 border-gray-600 dark:border-gray-300',
                 'READ' => 'border-s-2 border-success-600 dark:border-success-300',

src/Filament/Resources/LetterResource/Pages/EditLetter.php

@@ -3,6 +3,7 @@
 namespace LaraZeus\Wind\Filament\Resources\LetterResource\Pages;
 
 use Filament\Resources\Pages\EditRecord;
+use LaraZeus\Wind\Events\ReplySent;
 use LaraZeus\Wind\Filament\Resources\LetterResource;
 use LaraZeus\Wind\WindPlugin;
 
@@ -17,7 +18,7 @@ public function mount(int | string $record): void
     {
         parent::mount($record);
 
-        if ($this->record->reply_message !== null && strtoupper($this->record->status) === WindPlugin::get()->getDefaultStatus()) {
+        if ($this->record->reply_message === null && strtoupper($this->record->status) === WindPlugin::get()->getDefaultStatus()) {
             $this->record->update(['status' => 'READ']);
         }
     }
@@ -26,6 +27,7 @@ protected function afterSave(): void
     {
         if ($this->record->reply_message !== null) {
             $this->record->update(['status' => 'REPLIED']);
+            ReplySent::dispatch($this->record);
         }
     }
 }

src/Http/Livewire/ContactsForm.php → src/Livewire/ContactsForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace LaraZeus\Wind\Http\Livewire;
+namespace LaraZeus\Wind\Livewire;
 
 use Filament\Forms;
 use Filament\Forms\Components\Grid;

src/Models/Department.php

@@ -29,9 +29,7 @@ class Department extends Model
     use SoftDeletes;
     use HasFactory;
 
-    protected $fillable = [
-        'name', 'is_active', 'user_id', 'ordering', 'desc', 'options', 'logo', 'start_date', 'end_date', 'slug',
-    ];
+    protected $guarded = [];
 
     protected $casts = [
         'start_date' => 'datetime',
@@ -71,6 +69,6 @@ public function image(): ?string
 
     public function scopeDepartments(Builder $query): void
     {
-        $query->whereIsActive(true)->orderBy('ordering');
+        $query->where('is-active', true)->orderBy('ordering');
     }
 }

src/Models/Letter.php

@@ -24,9 +24,7 @@ class Letter extends Model
     use SoftDeletes;
     use HasFactory;
 
-    protected $fillable = [
-        'name', 'email', 'department_id', 'title', 'message', 'status', 'reply_message', 'reply_title',
-    ];
+    protected $guarded = [];
 
     protected static function newFactory(): LetterFactory
     {

src/WindPlugin.php

@@ -7,7 +7,7 @@
 use LaraZeus\Wind\Filament\Resources\DepartmentResource;
 use LaraZeus\Wind\Filament\Resources\LetterResource;
 
-class WindPlugin implements Plugin
+final class WindPlugin implements Plugin
 {
     use Configuration;
 
@@ -32,12 +32,13 @@ public function register(Panel $panel): void
 
     public static function make(): static
     {
-        return app(static::class);
+        return new self();
     }
 
-    public static function get(): Plugin | \Filament\FilamentManager
+    public static function get(): static
     {
-        return filament(app(static::class)->getId());
+        // @phpstan-ignore-next-line
+        return filament('zeus-wind');
     }
 
     public function boot(Panel $panel): void

src/WindServiceProvider.php

@@ -4,8 +4,7 @@
 
 use LaraZeus\Core\CoreServiceProvider;
 use LaraZeus\Wind\Commands\PublishCommand;
-use LaraZeus\Wind\Http\Livewire\Contacts;
-use LaraZeus\Wind\Http\Livewire\ContactsForm;
+use LaraZeus\Wind\Livewire\ContactsForm;
 use Livewire\Livewire;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
@@ -18,7 +17,6 @@ public function packageBooted(): void
     {
         CoreServiceProvider::setThemePath('wind');
 
-        Livewire::component('contact', Contacts::class);
         Livewire::component('contact-form', ContactsForm::class);
 
         if ($this->app->runningInConsole()) {

tests/AdminPanelProvider.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace LaraZeus\Wind\Tests;
+
+use Filament\Http\Middleware\Authenticate;
+use Filament\Http\Middleware\DisableBladeIconComponents;
+use Filament\Http\Middleware\DispatchServingFilamentEvent;
+use Filament\Panel;
+use Filament\PanelProvider;
+use Filament\SpatieLaravelTranslatablePlugin;
+use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
+use Illuminate\Cookie\Middleware\EncryptCookies;
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
+use Illuminate\Routing\Middleware\SubstituteBindings;
+use Illuminate\Session\Middleware\AuthenticateSession;
+use Illuminate\Session\Middleware\StartSession;
+use Illuminate\View\Middleware\ShareErrorsFromSession;
+use LaraZeus\Wind\WindPlugin;
+
+class AdminPanelProvider extends PanelProvider
+{
+    public function panel(Panel $panel): Panel
+    {
+        return $panel
+            ->default()
+            ->id('admin')
+            ->login()
+            ->plugins([
+                WindPlugin::make(),
+                SpatieLaravelTranslatablePlugin::make()
+                    ->defaultLocales(['en']),
+            ])
+            ->registration()
+            ->passwordReset()
+            ->emailVerification()
+            ->middleware([
+                EncryptCookies::class,
+                AddQueuedCookiesToResponse::class,
+                StartSession::class,
+                AuthenticateSession::class,
+                ShareErrorsFromSession::class,
+                VerifyCsrfToken::class,
+                SubstituteBindings::class,
+                DisableBladeIconComponents::class,
+                DispatchServingFilamentEvent::class,
+            ])
+            ->authMiddleware([
+                Authenticate::class,
+            ]);
+    }
+}

tests/TestCase.php

@@ -2,11 +2,25 @@
 
 namespace LaraZeus\Wind\Tests;
 
+use ArchTech\SEO\SEOServiceProvider;
+use BladeUI\Heroicons\BladeHeroiconsServiceProvider;
+use BladeUI\Icons\BladeIconsServiceProvider;
+use Codeat3\BladeIconpark\BladeIconparkServiceProvider;
+use Filament\Actions\ActionsServiceProvider;
 use Filament\FilamentServiceProvider;
+use Filament\Forms\FormsServiceProvider;
+use Filament\Infolists\InfolistsServiceProvider;
+use Filament\Notifications\NotificationsServiceProvider;
+use Filament\SpatieLaravelTranslatablePluginServiceProvider;
+use Filament\Support\SupportServiceProvider;
+use Filament\Tables\TablesServiceProvider;
+use Filament\Widgets\WidgetsServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use LaraZeus\Core\CoreServiceProvider;
 use LaraZeus\Wind\WindServiceProvider;
 use Livewire\LivewireServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
+use RyanChandler\BladeCaptureDirective\BladeCaptureDirectiveServiceProvider;
 
 class TestCase extends Orchestra
 {
@@ -22,9 +36,24 @@ protected function setUp(): void
     protected function getPackageProviders($app)
     {
         return [
-            LivewireServiceProvider::class,
+            ActionsServiceProvider::class,
+            BladeCaptureDirectiveServiceProvider::class,
+            BladeHeroiconsServiceProvider::class,
+            BladeIconsServiceProvider::class,
             FilamentServiceProvider::class,
+            FormsServiceProvider::class,
+            InfolistsServiceProvider::class,
+            LivewireServiceProvider::class,
+            NotificationsServiceProvider::class,
+            SpatieLaravelTranslatablePluginServiceProvider::class,
+            SupportServiceProvider::class,
+            TablesServiceProvider::class,
+            WidgetsServiceProvider::class,
+            AdminPanelProvider::class,
+            CoreServiceProvider::class,
             WindServiceProvider::class,
+            SEOServiceProvider::class,
+            BladeIconparkServiceProvider::class,
         ];
     }