Add default_template as Book setting

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

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 2077f6888fbc84e9a57c42836c0958f1d844213a..c3c8d1066d75dd664cad9750a45f955905c651dc 100644 (file)
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,143 +1,130 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

-use Activity;
-use BookStack\Repos\EntityRepo;
+namespace BookStack\Http\Controllers;
+
+use BookStack\Actions\ActivityQueries;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Queries\RecentlyViewed;
+use BookStack\Entities\Queries\TopFavourites;
+use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Repos\BookshelfRepo;
+use BookStack\Entities\Tools\PageContent;
+use BookStack\Util\SimpleListOptions;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

-use Illuminate\Http\Response;
-use Views;

 
 class HomeController extends Controller
 {
 
 class HomeController extends Controller
 {

-    protected $entityRepo;
-

     /**
     /**

-     * HomeController constructor.
-     * @param EntityRepo $entityRepo
+     * Display the homepage.

      */
      */

-    public function __construct(EntityRepo $entityRepo)
+    public function index(Request $request, ActivityQueries $activities)

     {
     {

-        $this->entityRepo = $entityRepo;
-        parent::__construct();
-    }
+        $activity = $activities->latest(10);
+        $draftPages = [];

 
 

+        if ($this->isSignedIn()) {
+            $draftPages = Page::visible()
+                ->where('draft', '=', true)
+                ->where('created_by', '=', user()->id)
+                ->orderBy('updated_at', 'desc')
+                ->with('book')
+                ->take(6)
+                ->get();
+        }

 
 

-    /**
-     * Display the homepage.
-     * @return Response
-     */
-    public function index()
-    {
-        $activity = Activity::latest(10);
-        $draftPages = $this->signedIn ? $this->entityRepo->getUserDraftPages(6) : [];

         $recentFactor = count($draftPages) > 0 ? 0.5 : 1;
         $recentFactor = count($draftPages) > 0 ? 0.5 : 1;

-        $recents = $this->signedIn ? Views::getUserRecentlyViewed(12*$recentFactor, 0) : $this->entityRepo->getRecentlyCreated('book', 12*$recentFactor);
-        $recentlyUpdatedPages = $this->entityRepo->getRecentlyUpdated('page', 12);
-
-
-        $customHomepage = false;
-        $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);
-            }
-        }
+        $recents = $this->isSignedIn() ?
+            (new RecentlyViewed())->run(12 * $recentFactor, 1)
+            : Book::visible()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get();
+        $favourites = (new TopFavourites())->run(6);
+        $recentlyUpdatedPages = Page::visible()->with('book')
+            ->where('draft', false)
+            ->orderBy('updated_at', 'desc')
+            ->take($favourites->count() > 0 ? 5 : 10)
+            ->select(Page::$listAttributes)
+            ->get();

 
 

-        $view = 'home';
-        if ($bookHomepageSetting) {
-            $view = 'home-book';
-        } else if ($customHomepage) {
-            $view = 'home-custom';
+        $homepageOptions = ['default', 'books', 'bookshelves', 'page'];
+        $homepageOption = setting('app-homepage-type', 'default');
+        if (!in_array($homepageOption, $homepageOptions)) {
+            $homepageOption = 'default';

         }
 
         }
 

-        return view('common/' . $view, [
-            'activity' => $activity,
-            'recents' => $recents,
+        $commonData = [
+            'activity'             => $activity,
+            'recents'              => $recents,

             'recentlyUpdatedPages' => $recentlyUpdatedPages,
             'recentlyUpdatedPages' => $recentlyUpdatedPages,

-            'draftPages' => $draftPages,
-            'customHomepage' => $customHomepage,
-            'books' => $books,
-            'booksViewType' => $booksViewType
-        ]);
-    }
+            'draftPages'           => $draftPages,
+            'favourites'           => $favourites,
+        ];

 
 

-    /**
-     * Get a js representation of the current translations
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
-     * @throws \Exception
-     */
-    public function getTranslations()
-    {
-        $locale = app()->getLocale();
-        $cacheKey = 'GLOBAL_TRANSLATIONS_' . $locale;
-        if (cache()->has($cacheKey) && config('app.env') !== 'development') {
-            $resp = cache($cacheKey);
-        } else {
-            $translations = [
-                // Get only translations which might be used in JS
-                'common' => trans('common'),
-                'components' => trans('components'),
-                'entities' => trans('entities'),
-                'errors' => trans('errors')
-            ];
-            if ($locale !== 'en') {
-                $enTrans = [
-                    'common' => trans('common', [], 'en'),
-                    'components' => trans('components', [], 'en'),
-                    'entities' => trans('entities', [], 'en'),
-                    'errors' => trans('errors', [], 'en')
-                ];
-                $translations = array_replace_recursive($enTrans, $translations);
-            }
-            $resp = 'window.translations = ' . json_encode($translations);
-            cache()->put($cacheKey, $resp, 120);
+        // Add required list ordering & sorting for books & shelves views.
+        if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
+            $key = $homepageOption;
+            $view = setting()->getForCurrentUser($key . '_view_type');
+            $listOptions = SimpleListOptions::fromRequest($request, $key)->withSortOptions([
+                'name' => trans('common.sort_name'),
+                'created_at' => trans('common.sort_created_at'),
+                'updated_at' => trans('common.sort_updated_at'),
+            ]);
+
+            $commonData = array_merge($commonData, [
+                'view'        => $view,
+                'listOptions' => $listOptions,
+            ]);

         }
 
         }
 

-        return response($resp, 200, [
-            'Content-Type' => 'application/javascript'
-        ]);
-    }
+        if ($homepageOption === 'bookshelves') {
+            $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+            $data = array_merge($commonData, ['shelves' => $shelves]);

 
 

-    /**
-     * Get custom head HTML, Used in ajax calls to show in editor.
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function customHeadContent()
-    {
-        return view('partials/custom-head-content');
+            return view('home.shelves', $data);
+        }
+
+        if ($homepageOption === 'books') {
+            $books = app(BookRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+            $data = array_merge($commonData, ['books' => $books]);
+
+            return view('home.books', $data);
+        }
+
+        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->html = $pageContent->render(false);
+
+            return view('home.specific-page', array_merge($commonData, ['customHomepage' => $customHomepage]));
+        }
+
+        return view('home.default', $commonData);

     }
 
     /**
     }
 
     /**

-     * Show the view for /robots.txt
-     * @return $this
+     * 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');

+

         if ($allowRobots === null) {
             $allowRobots = $sitePublic;
         }
         if ($allowRobots === null) {
             $allowRobots = $sitePublic;
         }

+

         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);

     }
 }
     }
 }