feat: merge update admin into badge

Author: StevyMarlino

.github/actions/setup/action.yml

@@ -21,7 +21,7 @@ runs:
       shell: sh
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
     - name: Cache dependencies
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}

.github/workflows/update-changelog.yml

@@ -7,6 +7,8 @@ on:
 jobs:
   update:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     steps:
       - name: Checkout code

.gitignore

@@ -21,6 +21,8 @@ composer.phar
 /public/hot
 /public/storage
 /public/media
+public/css/
+public/js/
 /public/**/*.xml
 /storage/*.key
 /storage/framework/cache

app/Actions/Article/CreateArticleAction.php

@@ -6,6 +6,7 @@
 
 use App\Data\ArticleData;
 use App\Models\Article;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;
 
@@ -27,15 +28,19 @@ public function execute(ArticleData $articleData): Article
             );
         }
 
+        /** @var User $user */
+        $user = Auth::user();
+
         // @phpstan-ignore-next-line
         return Article::query()->create([
             'title' => $articleData->title,
             'slug' => $articleData->slug,
             'body' => $articleData->body,
             'published_at' => $articleData->published_at,
             'submitted_at' => $articleData->submitted_at,
+            'approved_at' => $articleData->approved_at,
             'canonical_url' => $articleData->canonical_url,
-            'user_id' => Auth::id(),
+            'user_id' => $user->id,
         ]);
     }
 }

app/Data/ArticleData.php

@@ -18,5 +18,6 @@ public function __construct(
         public ?Carbon $published_at = null,
         public ?Carbon $submitted_at = null,
         public ?Carbon $declined_at = null,
+        public ?Carbon $approved_at = null,
     ) {}
 }

app/Filament/Resources/ArticleResource.php

@@ -102,7 +102,6 @@ public static function table(Table $table): Table
 
                         return '';
                     })
-                    ->searchable()
                     ->sortable(),
             ])
             ->actions([

app/Livewire/Components/Slideovers/ArticleForm.php

@@ -10,13 +10,13 @@
 use App\Exceptions\UnverifiedUserException;
 use App\Livewire\Traits\WithAuthenticatedUser;
 use App\Models\Article;
-use Carbon\Carbon;
 use Filament\Forms;
 use Filament\Forms\Concerns\InteractsWithForms;
 use Filament\Forms\Contracts\HasForms;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
@@ -91,7 +91,7 @@ public function form(Form $form): Form
                                     ->helperText(__('pages/article.draft_help')),
                                 Forms\Components\DatePicker::make('published_at')
                                     ->label(__('pages/article.form.published_at'))
-                                    ->minDate(now())
+                                    ->closeOnDateSelection()
                                     ->prefixIcon('untitledui-calendar-date')
                                     ->native(false)
                                     ->visible(fn (Forms\Get $get): bool => $get('is_draft') === false)
@@ -110,7 +110,7 @@ public function form(Form $form): Form
                             ->relationship(
                                 name: 'tags',
                                 titleAttribute: 'name',
-                                modifyQueryUsing: fn ($query) => $query->whereJsonContains('concerns', 'post')
+                                modifyQueryUsing: fn (Builder $query): Builder => $query->whereJsonContains('concerns', 'post')
                             )
                             ->preload()
                             ->required()
@@ -173,10 +173,8 @@ public function save(): void
         $state = $this->form->getState();
 
         $publishedFields = [
-            'published_at' => data_get($state, 'published_at')
-                ? new Carbon(data_get($state, 'published_at'))
-                : null,
-            'submitted_at' => data_get($state, 'is_draft') ? null : now(),
+            'published_at' => data_get($state, 'published_at') ?? null,
+            'submitted_at' => data_get($state, 'is_draft') ?? null,
         ];
 
         if ($this->article?->id) {

app/Models/Article.php

@@ -31,21 +31,21 @@
  * @property bool $show_toc
  * @property bool $is_pinned
  * @property int $is_sponsored
- * @property string | null $canonical_url
- * @property string | null $reason
- * @property int | null $tweet_id
+ * @property string|null $canonical_url
+ * @property string|null $reason
+ * @property int|null $tweet_id
  * @property int $user_id
- * @property string | null $locale
+ * @property string|null $locale
  * @property-read User $user
- * @property Carbon | null $published_at
- * @property Carbon | null $submitted_at
- * @property Carbon | null $approved_at
- * @property Carbon | null $shared_at
- * @property Carbon | null $declined_at
- * @property Carbon | null $sponsored_at
- * @property Carbon $created_at
- * @property Carbon $updated_at
- * @property \Illuminate\Database\Eloquent\Collection | Tag[] $tags
+ * @property-read \Illuminate\Support\Carbon|null $published_at
+ * @property-read \Illuminate\Support\Carbon|null $submitted_at
+ * @property-read \Illuminate\Support\Carbon|null $approved_at
+ * @property-read \Illuminate\Support\Carbon|null $shared_at
+ * @property-read \Illuminate\Support\Carbon|null $declined_at
+ * @property-read \Illuminate\Support\Carbon|null $sponsored_at
+ * @property-read \Illuminate\Support\Carbon $created_at
+ * @property-read \Illuminate\Support\Carbon $updated_at
+ * @property \Illuminate\Database\Eloquent\Collection<int, Tag> $tags
  */
 final class Article extends Model implements HasMedia, ReactableInterface, Sitemapable, Viewable
 {

app/Providers/Filament/AdminPanelProvider.php

@@ -4,28 +4,23 @@
 
 namespace App\Providers\Filament;
 
-use App\Filament\Resources\ArticleResource\Widgets\ArticleStatsOverview;
-use App\Filament\Resources\ArticleResource\Widgets\MostLikedPostsChart;
-use App\Filament\Resources\ArticleResource\Widgets\MostViewedPostsChart;
-use App\Filament\Resources\UserResource\Widgets\UserActivityWidget;
-use App\Filament\Resources\UserResource\Widgets\UserChartWidget;
-use App\Filament\Resources\UserResource\Widgets\UserStatsOverview;
+use App\Filament\Resources\ArticleResource\Widgets as ArticleWidgets;
+use App\Filament\Resources\UserResource\Widgets;
 use Filament\Http\Middleware\Authenticate;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Pages;
 use Filament\Panel;
 use Filament\PanelProvider;
 use Filament\SpatieLaravelTranslatablePlugin;
-use Filament\Support\Colors\Color;
 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\Support\Facades\Blade;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
+use Vormkracht10\FilamentMails\Facades\FilamentMails;
 use Vormkracht10\FilamentMails\FilamentMailsPlugin;
 
 final class AdminPanelProvider extends PanelProvider
@@ -38,38 +33,34 @@ public function panel(Panel $panel): Panel
             ->path('cp')
             ->login()
             ->colors([
-                'primary' => Color::Green,
+                'primary' => '#099170',
             ])
             ->sidebarWidth('18.75rem')
+            ->sidebarCollapsibleOnDesktop()
             ->viteTheme('resources/css/filament/admin/theme.css')
             ->brandLogo(fn () => view('filament.brand'))
             ->favicon(asset('images/favicons/favicon-32x32.png'))
+            ->spa()
             ->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
             ->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
             ->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
             ->pages([
                 Pages\Dashboard::class,
             ])
             ->widgets([
-                UserStatsOverview::class,
-                UserChartWidget::class,
-                UserActivityWidget::class,
-                ArticleStatsOverview::class,
-                MostLikedPostsChart::class,
-                MostViewedPostsChart::class,
+                Widgets\UserStatsOverview::class,
+                Widgets\UserChartWidget::class,
+                Widgets\UserActivityWidget::class,
+                ArticleWidgets\ArticleStatsOverview::class,
+                ArticleWidgets\MostLikedPostsChart::class,
+                ArticleWidgets\MostViewedPostsChart::class,
             ])
             ->plugins([
                 SpatieLaravelTranslatablePlugin::make()
                     ->defaultLocales(['fr', 'en']),
                 FilamentMailsPlugin::make(),
             ])
-            ->renderHook(
-                'body.start',
-                fn (): string => Blade::render('@livewire(\'livewire-ui-modal\')'),
-            )
-            ->databaseNotifications()
-            ->databaseNotificationsPolling('3600s')
-            ->spa()
+            ->routes(fn () => FilamentMails::routes())
             ->middleware([
                 EncryptCookies::class,
                 AddQueuedCookiesToResponse::class,

composer.json

@@ -8,7 +8,7 @@
   ],
   "license": "MIT",
   "require": {
-    "php": "^8.2",
+    "php": "^8.3",
     "ext-fileinfo": "*",
     "ext-json": "*",
     "archtechx/laravel-seo": "^0.10",
@@ -37,9 +37,8 @@
     "laravelcm/gamify": "*",
     "laravelcm/laravel-subscriptions": "^1.3",
     "laravelcm/livewire-slide-overs": "^1.0",
-    "livewire/livewire": "^3.5",
     "livewire/volt": "^1.6",
-    "mckenziearts/blade-untitledui-icons": "^1.3",
+    "mckenziearts/blade-untitledui-icons": "^1.4",
     "notchpay/notchpay-php": "^1.6",
     "ramsey/uuid": "^4.7.4",
     "sentry/sentry-laravel": "^4.10",
@@ -65,10 +64,10 @@
     "laravel/pint": "^1.18",
     "mockery/mockery": "^1.6.2",
     "nunomaduro/collision": "^8.1",
-    "pestphp/pest": "^2.32",
-    "pestphp/pest-plugin-laravel": "^2.1",
-    "pestphp/pest-plugin-livewire": "^2.1",
-    "phpunit/phpunit": "^10.0",
+    "pestphp/pest": "^3.8",
+    "pestphp/pest-plugin-laravel": "^3.0",
+    "pestphp/pest-plugin-livewire": "^3.0",
+    "phpunit/phpunit": "^11.0",
     "spatie/laravel-ignition": "^2.0",
     "spatie/test-time": "^1.3.2"
   },
@@ -90,11 +89,11 @@
   "scripts": {
     "post-autoload-dump": [
       "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-      "@php artisan package:discover --ansi"
+      "@php artisan package:discover --ansi",
+      "@php artisan filament:upgrade"
     ],
     "post-update-cmd": [
-      "Illuminate\\Foundation\\ComposerScripts::postUpdate",
-      "@php artisan filament:upgrade"
+      "Illuminate\\Foundation\\ComposerScripts::postUpdate"
     ],
     "post-root-package-install": [
       "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""