Merge pull request #195 from mallardduck/fix-post-page-count

Fix page/post count bug

Author: atmonshi

.github/workflows/run-tests.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.1]
+        php: [8.2]
         laravel: [10.*]
         stability: [prefer-stable]
         include:

composer.lock

@@ -11,7 +11,7 @@ public static function render(array $item, string $class = ''): string
         $color = 'border-b border-b-secondary-500 text-secondary-500';
 
         if ($item['type'] === 'page-link' || $item['type'] === 'page_link') {
-            $page = SkyPlugin::get()->getModel('Post')::page()->find($item['data']['page_id']) ?? '';
+            $page = SkyPlugin::get()->getModel('Post')::page()->whereDate('published_at', '<=', now())->find($item['data']['page_id']) ?? '';
             $activeClass = (request()->routeIs('page', $page)) ? $color : 'border-transparent';
 
             return '<a class="' . $class . ' ' . $activeClass . '"

src/Classes/RenderNavItem.php

@@ -216,6 +216,11 @@ public static function getNavigationLabel(): string
         return __('Pages');
     }
 
+    public static function getNavigationBadge(): ?string
+    {
+        return (string) SkyPlugin::get()->getModel('Post')::page()->count();
+    }
+
     public static function getActions(): array
     {
         $action = [

src/Filament/Resources/PageResource.php

@@ -258,6 +258,11 @@ public static function getNavigationLabel(): string
         return __('Posts');
     }
 
+    public static function getNavigationBadge(): ?string
+    {
+        return (string) SkyPlugin::get()->getModel('Post')::posts()->count();
+    }
+
     public static function getActions(): array
     {
         $action = [

src/Filament/Resources/PostResource.php

@@ -11,7 +11,11 @@ class Page extends Component
 
     public function mount(string $slug): void
     {
-        $this->page = config('zeus-sky.models.Post')::where('slug', $slug)->page()->firstOrFail();
+        $this->page = config('zeus-sky.models.Post')::query()
+            ->page()
+            ->where('slug', $slug)
+            ->whereDate('published_at', '<=', now())
+            ->firstOrFail();
     }
 
     public function render(): View

src/Livewire/Page.php

@@ -22,7 +22,9 @@ public function render(): View
             ->orderBy('published_at', 'desc')
             ->get();
 
-        $pages = config('zeus-sky.models.Post')::page()
+        $pages = config('zeus-sky.models.Post')::query()
+            ->page()
+            ->whereDate('published_at', '<=', now())
             ->search($search)
             ->with(['tags', 'author', 'media'])
             ->forCategory($category)
@@ -33,8 +35,10 @@ public function render(): View
         $pages = $this->highlightSearchResults($pages, $search);
         $posts = $this->highlightSearchResults($posts, $search);
 
-        $recent = config('zeus-sky.models.Post')::posts()
+        $recent = config('zeus-sky.models.Post')::query()
+            ->posts()
             ->published()
+            ->whereDate('published_at', '<=', now())
             ->with(['tags', 'author', 'media'])
             ->limit(config('zeus-sky.recentPostsLimit'))
             ->orderBy('published_at', 'desc')

src/Livewire/Posts.php

@@ -52,17 +52,15 @@ public function scopeRelated(Builder $query, Post $post): Builder
      */
     public function scopePage(Builder $query): Builder
     {
-        return $query->where('post_type', 'page')
-            ->whereDate('published_at', '<=', now());
+        return $query->where('post_type', 'page');
     }
 
     /**
      * @param  Builder<Post>  $query
      */
     public function scopePosts(Builder $query): Builder
     {
-        return $query->where('post_type', 'post')
-            ->whereDate('published_at', '<=', now());
+        return $query->where('post_type', 'post');
     }
 
     /**

src/Models/PostScope.php

@@ -90,7 +90,10 @@ private function bootFilamentNavigation(): void
                             ->label(__('Select Page'))
                             ->searchable()
                             ->options(function () {
-                                return SkyPlugin::get()->getModel('Post')::page()->pluck('title', 'id');
+                                return SkyPlugin::get()->getModel('Post')::query()
+                                    ->page()
+                                    ->whereDate('published_at', '<=', now())
+                                    ->pluck('title', 'id');
                             }),
                     ],
                     'page_link'