diff --git a/app/Http/Controllers/Fo/NewsController.php b/app/Http/Controllers/Fo/NewsController.php index acec46b..b0c6ffe 100644 --- a/app/Http/Controllers/Fo/NewsController.php +++ b/app/Http/Controllers/Fo/NewsController.php @@ -17,12 +17,17 @@ class NewsController extends Controller */ public function index(): \Illuminate\Contracts\View\View { + /** @var \App\Models\StaticPage $staticPageModel */ $staticPageModel = StaticPage::query() ->where('type', StaticPageType::news) ->firstOrFail(); - $rangeModelList = Range::query()->limit(3)->inRandomOrder()->get(); - $newsModelList = News::query()->get(); + /** @var \App\Models\Range $rangeModelList */ + $rangeModelList = Range::query()->limit(3)->inRandomOrder()->get(); + + /** @var \App\Models\News $newsModelList */ + $newsModelList = News::query()->where('published', true)->orderby('publish_at', 'ASC')->get(); + return view('fo.pages.news.index', compact( 'staticPageModel', 'newsModelList', diff --git a/resources/views/bo/pages/news/index-list.blade.php b/resources/views/bo/pages/news/index-list.blade.php index 5ecf39c..9b67d91 100644 --- a/resources/views/bo/pages/news/index-list.blade.php +++ b/resources/views/bo/pages/news/index-list.blade.php @@ -13,7 +13,7 @@
@foreach ($newsModels as $newsModel)