separate the published_at from the page and posts scope

lara-zeus · Mar 5, 2024 · 26a0ab1 · 26a0ab1
1 parent 019a5cf
commit 26a0ab1
Show file tree

Hide file tree

Showing 9 changed files with 175 additions and 158 deletions.
diff --git a/.github/workflows/run-tests.yml b/.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:

diff --git a/composer.lock b/composer.lock
diff --git a/src/Classes/RenderNavItem.php b/src/Classes/RenderNavItem.php
@@ -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 . '"

diff --git a/src/Filament/Resources/PageResource.php b/src/Filament/Resources/PageResource.php
@@ -218,7 +218,7 @@ public static function getNavigationLabel(): string
 
     public static function getNavigationBadge(): ?string
     {
-        return (string) static::getEloquentQuery()->page()->count();
+        return (string) SkyPlugin::get()->getModel('Post')::page()->count();
     }
 
     public static function getActions(): array

diff --git a/src/Filament/Resources/PostResource.php b/src/Filament/Resources/PostResource.php
@@ -260,7 +260,7 @@ public static function getNavigationLabel(): string
 
     public static function getNavigationBadge(): ?string
     {
-        return (string) static::getEloquentQuery()->posts()->count();
+        return (string) SkyPlugin::get()->getModel('Post')::posts()->count();
     }
 
     public static function getActions(): array

diff --git a/src/Livewire/Page.php b/src/Livewire/Page.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

diff --git a/src/Livewire/Posts.php b/src/Livewire/Posts.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')

diff --git a/src/Models/PostScope.php b/src/Models/PostScope.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');
     }
 
     /**

diff --git a/src/SkyServiceProvider.php b/src/SkyServiceProvider.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'