fix articles

code4romania · Oct 24, 2023 · e446dd9 · e446dd9
1 parent 59ded3b
commit e446dd9
Show file tree

Hide file tree

Showing 10 changed files with 509 additions and 535 deletions.
diff --git a/app/Filament/Resources/Articles/ArticleResource.php b/app/Filament/Resources/Articles/ArticleResource.php
@@ -50,6 +50,10 @@ public static function getPluralModelLabel(): string
     {
         return __('article.label.plural');
     }
+    protected static function getNavigationBadge(): ?string
+    {
+        return (string) Article::count();
+    }
 
     public static function form(Form $form): Form
     {
@@ -98,7 +102,7 @@ public static function form(Form $form): Form
                             ->schema([
                                 SpatieMediaLibraryFileUpload::make('cover')
                                     ->label(__('article.cover_image'))
-                                    ->collection('cover')
+                                    ->collection('preview')
                                     ->required()
                                     ->image()
                                     ->maxFiles(1),
@@ -107,12 +111,12 @@ public static function form(Form $form): Form
                         Card::make()
                             ->schema([
                                 SpatieMediaLibraryFileUpload::make('gallery')
-                                    ->label(__('article.gallery'))
                                     ->collection('gallery')
+                                    ->label(__('article.gallery'))
                                     ->image()
-                                    ->multiple()
                                     ->enableReordering()
-                                    ->columnSpanFull(),
+                                    ->multiple()
+                                    ->maxFiles(20),
                             ]),
                     ]),
 
@@ -139,6 +143,12 @@ public static function table(Table $table): Table
     {
         return $table
             ->columns([
+                TextColumn::make('id')
+                    ->formatStateUsing(function (Article $record) {
+                        return sprintf('#%d', $record->id);
+                    })
+                    ->label(__('volunteer.column.id'))
+                    ->sortable(),
                 TextColumn::make('title')
                     ->label(__('article.title'))
                     ->searchable(),
@@ -161,18 +171,12 @@ public static function table(Table $table): Table
             ->actions([
                 Tables\Actions\EditAction::make(),
             ])
-            ->filtersLayout(Layout::AboveContent)
+            ->defaultSort('id', 'desc')
             ->bulkActions([
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
 
-    public static function getRelations(): array
-    {
-        return [
-            //
-        ];
-    }
 
     public static function getPages(): array
     {

diff --git a/app/Filament/Resources/Articles/CategoryResource.php b/app/Filament/Resources/Articles/CategoryResource.php
@@ -41,6 +41,11 @@ public static function getPluralModelLabel(): string
         return __('article.category.label.plural');
     }
 
+    protected static function getNavigationBadge(): ?string
+    {
+        return (string) ArticleCategory::count();
+    }
+
     public static function form(Form $form): Form
     {
         return $form

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
@@ -20,9 +20,16 @@ public function index(Request $request): Response
             'categories' => $this->getArticleCategories(),
             'collection' => ArticleCardResource::collection(
                 Article::query()
+                    ->orderByDesc('id')
                     ->wherePublished()
                     ->paginate(5)
             ),
+            'topArticles' => ArticleCardResource::collection(
+                Article::query()
+                    ->wherePublished()
+                    ->inRandomOrder()
+                    ->limit(3)
+                    ->get())
         ]);
     }
 
@@ -35,6 +42,7 @@ public function category(ArticleCategory $category, Request $request): Response
                 Article::query()
                     ->whereBelongsTo($category, 'category')
                     ->wherePublished()
+                    ->orderByDesc('id')
                     ->paginate(5)
             ),
         ]);
@@ -44,13 +52,13 @@ public function show(Article $article): Response
     {
         return Inertia::render('Public/Articles/Show', [
             'resource' => ArticleResource::make($article),
-            'related' => [], /*  Article::query()
+            'related' =>  ArticleCardResource::collection(Article::query()
                 ->wherePublished()
-                ->whereBelongsTo('category', $article->category)
+                ->whereBelongsTo($article->category, 'category')
                 ->whereNot('id', $article->id)
                 ->inRandomOrder()
                 ->limit(3)
-                ->get(), */
+                ->get()),
         ]);
     }
 }
diff --git a/app/Http/Resources/Articles/ArticleResource.php b/app/Http/Resources/Articles/ArticleResource.php
@@ -24,8 +24,16 @@ public function toArray(Request $request): array
             'content' => $this->content,
             'author' => $this->author,
             'category' => $this->category?->name,
-            'cover' => $this->getFirstMediaUrl('cover', 'large'),
+            'cover' => $this->getFirstMediaUrl('preview', 'large'),
             'gallery' => $this->getMedia('gallery')->map(fn (Media $media) => $media->getUrl('large')),
+            'swipe_gallery' => $this->getMedia('gallery')->map(function ($media) {
+                return [
+                    'src' => $media->getFullUrl('large'),
+                    'thumbnail' => $media->getFullUrl('thumb'),
+                    'w' => 1200,
+                    'h' => 600,
+                ];
+            })->toArray(),
         ];
     }
 }
diff --git a/app/Models/Article.php b/app/Models/Article.php
@@ -46,7 +46,7 @@ class Article extends Model implements HasMedia
 
     public function registerMediaCollections(): void
     {
-        $this->addMediaCollection('cover')
+        $this->addMediaCollection('preview')
             ->useFallbackUrl(Vite::image('placeholder.png'))
             ->singleFile()
             ->registerMediaConversions(function (Media $media) {
@@ -63,7 +63,6 @@ public function registerMediaCollections(): void
 
         $this->addMediaCollection('gallery')
             ->useFallbackUrl(Vite::image('placeholder.png'))
-            ->singleFile()
             ->registerMediaConversions(function (Media $media) {
                 $this
                     ->addMediaConversion('thumb')

diff --git a/app/Models/BCRProject.php b/app/Models/BCRProject.php
@@ -46,8 +46,8 @@ class BCRProject extends Model implements HasMedia
         'is_national' => 'boolean',
     ];
 
-    protected $with =[
-        'county','category'
+    protected $with = [
+        'county', 'category',
     ];
 
     public function registerMediaCollections(): void