Merge pull request #614 from nasirkhan/dev

UI update and fix
nasirkhan · Sep 21, 2024 · fb22f4d · fb22f4d
2 parents c904b0e + f721d7f
commit fb22f4d
Show file tree

Hide file tree

Showing 11 changed files with 269 additions and 345 deletions.
diff --git a/Modules/Post/Models/Post.php b/Modules/Post/Models/Post.php
@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Notifications\Notifiable;
+use Modules\Post\Enums\PostStatus;
 use Modules\Post\Models\Presenters\PostPresenter;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
@@ -40,6 +41,11 @@ public function tags()
         return $this->morphToMany('Modules\Tag\Models\Tag', 'taggable');
     }
 
+    public function scopePublishedAndScheduled($query)
+    {
+        return $query->where('status', '=', PostStatus::Published->value);
+    }
+
     /**
      * Get the list of Published Articles.
      *
@@ -48,20 +54,12 @@ public function tags()
      */
     public function scopePublished($query)
     {
-        return $query->where('status', '=', '1')
-            ->where('published_at', '<=', Carbon::now());
-    }
-
-    public function scopePublishedAndScheduled($query)
-    {
-        return $query->where('status', '=', '1');
+        return $query->publishedAndScheduled()->where('published_at', '<=', Carbon::now());
     }
 
     public function scopeFeatured($query)
     {
-        return $query->where('is_featured', '=', 'Yes')
-            ->where('status', '=', '1')
-            ->where('published_at', '<=', Carbon::now());
+        return $query->publishedAndScheduled()->where('is_featured', '=', 'Yes');
     }
 
     /**
@@ -72,9 +70,7 @@ public function scopeFeatured($query)
      */
     public function scopeRecentlyPublished($query)
     {
-        return $query->where('status', '=', '1')
-            ->whereDate('published_at', '<=', Carbon::today()->toDateString())
-            ->orderBy('published_at', 'desc');
+        return $query->publishedAndScheduled()->orderBy('published_at', 'desc');
     }
 
     /**

diff --git a/Modules/Post/Resources/views/frontend/posts/index.blade.php b/Modules/Post/Resources/views/frontend/posts/index.blade.php
@@ -53,11 +53,11 @@
                             $$module_name_singular->category->slug,
                         ])" :text="$$module_name_singular->category_name" />
                     </p>
-                    <p>
+                    <div class="mt-4">
                         @foreach ($$module_name_singular->tags as $tag)
                             <x-frontend.badge :url="route('frontend.tags.show', [encode_id($tag->id), $tag->slug])" :text="$tag->name" />
                         @endforeach
-                    </p>
+                    </div>
                 </x-frontend.card>
             @endforeach
         </div>

diff --git a/app/Http/Controllers/Backend/BackendBaseController.php b/app/Http/Controllers/Backend/BackendBaseController.php
@@ -98,7 +98,7 @@ public function index_list(Request $request)
         foreach ($query_data as $row) {
             $$module_name[] = [
                 'id' => $row->id,
-                'text' => $row->name.' (Slug: '.$row->slug.')',
+                'text' => $row->name,
             ];
         }