Updated minimum php version from 7.3 to 7.4

[bookstack] / app / Http / Controllers / HomeController.php

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 4a71b56b9c1d44b41820ccd66242406181a3ac2d..9e66a064077d94749bdf99a2c0e8a9eecdd45bf2 100644 (file)
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -2,7 +2,7 @@
 
 namespace BookStack\Http\Controllers;
 
 
 namespace BookStack\Http\Controllers;
 

-use Activity;
+use BookStack\Actions\ActivityQueries;

 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\RecentlyViewed;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Queries\RecentlyViewed;


@@ -10,16 +10,15 @@ use BookStack\Entities\Queries\TopFavourites;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;
 use BookStack\Entities\Tools\PageContent;

-use Views;

 
 class HomeController extends Controller
 {
     /**
      * Display the homepage.
      */
 
 class HomeController extends Controller
 {
     /**
      * Display the homepage.
      */

-    public function index()
+    public function index(ActivityQueries $activities)

     {
     {

-        $activity = Activity::latest(10);
+        $activity = $activities->latest(10);

         $draftPages = [];
 
         if ($this->isSignedIn()) {
         $draftPages = [];
 
         if ($this->isSignedIn()) {


@@ -40,7 +39,8 @@ class HomeController extends Controller
         $recentlyUpdatedPages = Page::visible()->with('book')
             ->where('draft', false)
             ->orderBy('updated_at', 'desc')
         $recentlyUpdatedPages = Page::visible()->with('book')
             ->where('draft', false)
             ->orderBy('updated_at', 'desc')

-            ->take($favourites->count() > 0 ? 6 : 12)
+            ->take($favourites->count() > 0 ? 5 : 10)
+            ->select(Page::$listAttributes)

             ->get();
 
         $homepageOptions = ['default', 'books', 'bookshelves', 'page'];
             ->get();
 
         $homepageOptions = ['default', 'books', 'bookshelves', 'page'];


@@ -82,7 +82,7 @@ class HomeController extends Controller
             $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['sort'], $commonData['order']);
             $data = array_merge($commonData, ['shelves' => $shelves]);
 
             $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['sort'], $commonData['order']);
             $data = array_merge($commonData, ['shelves' => $shelves]);
 

-            return view('common.home-shelves', $data);
+            return view('home.shelves', $data);

         }
 
         if ($homepageOption === 'books') {
         }
 
         if ($homepageOption === 'books') {


@@ -90,36 +90,35 @@ class HomeController extends Controller
             $books = $bookRepo->getAllPaginated(18, $commonData['sort'], $commonData['order']);
             $data = array_merge($commonData, ['books' => $books]);
 
             $books = $bookRepo->getAllPaginated(18, $commonData['sort'], $commonData['order']);
             $data = array_merge($commonData, ['books' => $books]);
 

-            return view('common.home-book', $data);
+            return view('home.books', $data);

         }
 
         if ($homepageOption === 'page') {
             $homepageSetting = setting('app-homepage', '0:');
             $id = intval(explode(':', $homepageSetting)[0]);
         }
 
         if ($homepageOption === 'page') {
             $homepageSetting = setting('app-homepage', '0:');
             $id = intval(explode(':', $homepageSetting)[0]);

+            /** @var Page $customHomepage */

             $customHomepage = Page::query()->where('draft', '=', false)->findOrFail($id);
             $pageContent = new PageContent($customHomepage);
             $customHomepage = Page::query()->where('draft', '=', false)->findOrFail($id);
             $pageContent = new PageContent($customHomepage);

-            $customHomepage->html = $pageContent->render(true);
+            $customHomepage->html = $pageContent->render(false);

 
 

-            return view('common.home-custom', array_merge($commonData, ['customHomepage' => $customHomepage]));
+            return view('home.specific-page', array_merge($commonData, ['customHomepage' => $customHomepage]));

         }
 
         }
 

-        return view('common.home', $commonData);
+        return view('home.default', $commonData);

     }
 
     /**
      * Get custom head HTML, Used in ajax calls to show in editor.
     }
 
     /**
      * Get custom head HTML, Used in ajax calls to show in editor.

-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

      */
     public function customHeadContent()
     {
      */
     public function customHeadContent()
     {

-        return view('partials.custom-head');
+        return view('common.custom-head');

     }
 
     /**
      * Show the view for /robots.txt.
      */
     }
 
     /**
      * Show the view for /robots.txt.
      */

-    public function getRobots()
+    public function robots()

     {
         $sitePublic = setting('app-public', false);
         $allowRobots = config('app.allow_robots');
     {
         $sitePublic = setting('app-public', false);
         $allowRobots = config('app.allow_robots');


@@ -129,14 +128,14 @@ class HomeController extends Controller
         }
 
         return response()
         }
 
         return response()

-            ->view('common.robots', ['allowRobots' => $allowRobots])
+            ->view('misc.robots', ['allowRobots' => $allowRobots])

             ->header('Content-Type', 'text/plain');
     }
 
     /**
      * Show the route for 404 responses.
      */
             ->header('Content-Type', 'text/plain');
     }
 
     /**
      * Show the route for 404 responses.
      */

-    public function getNotFound()
+    public function notFound()

     {
         return response()->view('errors.404', [], 404);
     }
     {
         return response()->view('errors.404', [], 404);
     }