From: Dan Brown <redacted>
Date: Sun, 20 May 2018 08:51:45 +0000 (+0100)
Subject: Merge branch 'master' into feature/615
X-Git-Tag: v0.22.0~1^2~11^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8df9dab80aa75dcc9991fb2f0c525782f3daef26?hp=-c

Merge branch 'master' into feature/615
---

8df9dab80aa75dcc9991fb2f0c525782f3daef26
diff --combined app/Http/Controllers/HomeController.php
index da61d1c64,32e0a743c..dff319506
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@@ -33,41 -33,22 +33,41 @@@ class HomeController extends Controlle
          $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor);
          $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12);
  
 -        // Custom homepage
 +
          $customHomepage = false;
 -        $homepageSetting = setting('app-homepage');
 -        if ($homepageSetting) {
 -            $id = intval(explode(':', $homepageSetting)[0]);
 -            $customHomepage = $this->entityRepo->getById('page', $id, false, true);
 -            $this->entityRepo->renderPage($customHomepage, true);
 +        $books = false;
 +        $booksViewType = false;
 +
 +        // Check book homepage
 +        $bookHomepageSetting = setting('app-book-homepage');
 +        if ($bookHomepageSetting) {
 +            $books = $this->entityRepo->getAllPaginated('book', 18);
 +            $booksViewType = setting()->getUser($this->currentUser, 'books_view_type', config('app.views.books', 'list'));
 +        } else {
 +            // Check custom homepage
 +            $homepageSetting = setting('app-homepage');
 +            if ($homepageSetting) {
 +                $id = intval(explode(':', $homepageSetting)[0]);
 +                $customHomepage = $this->entityRepo->getById('page', $id, false, true);
 +                $this->entityRepo->renderPage($customHomepage, true);
 +            }
 +        }
 +
 +        $view = 'home';
 +        if ($bookHomepageSetting) {
 +            $view = 'home-book';
 +        } else if ($customHomepage) {
 +            $view = 'home-custom';
          }
  
 -        $view = $customHomepage ? 'home-custom' : 'home';
          return view($view, [
              'activity' => $activity,
              'recents' => $recents,
              'recentlyUpdatedPages' => $recentlyUpdatedPages,
              'draftPages' => $draftPages,
 -            'customHomepage' => $customHomepage
 +            'customHomepage' => $customHomepage,
 +            'books' => $books,
 +            'booksViewType' => $booksViewType
          ]);
      }
  
@@@ -153,4 -134,12 +153,12 @@@
              ->view('robots', ['allowRobots' => $allowRobots])
              ->header('Content-Type', 'text/plain');
      }
+ 
+     /**
+      * Show the route for 404 responses.
+      */
+     public function getNotFound()
+     {
+         return response()->view('errors/404', [], 404);
+     }
  }