Adjusted/improved some color setting wording

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

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index c2ee826c3bd04dcdd640859b66f5e3d794b31cff..c3c8d1066d75dd664cad9750a45f955905c651dc 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,15 +10,17 @@ 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 BookStack\Util\SimpleListOptions;
+use Illuminate\Http\Request;

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

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

     {
     {

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

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


@@ -39,7 +41,7 @@ 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();
 
             ->select(Page::$listAttributes)
             ->get();
 


@@ -61,65 +63,50 @@ class HomeController extends Controller
         if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
             $key = $homepageOption;
             $view = setting()->getForCurrentUser($key . '_view_type');
         if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
             $key = $homepageOption;
             $view = setting()->getForCurrentUser($key . '_view_type');

-            $sort = setting()->getForCurrentUser($key . '_sort', 'name');
-            $order = setting()->getForCurrentUser($key . '_sort_order', 'asc');
-
-            $sortOptions = [
-                'name'       => trans('common.sort_name'),
+            $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'),
                 'created_at' => trans('common.sort_created_at'),
                 'updated_at' => trans('common.sort_updated_at'),

-            ];
+            ]);

 
             $commonData = array_merge($commonData, [
                 'view'        => $view,
 
             $commonData = array_merge($commonData, [
                 'view'        => $view,

-                'sort'        => $sort,
-                'order'       => $order,
-                'sortOptions' => $sortOptions,
+                'listOptions' => $listOptions,

             ]);
         }
 
         if ($homepageOption === 'bookshelves') {
             ]);
         }
 
         if ($homepageOption === 'bookshelves') {

-            $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['sort'], $commonData['order']);
+            $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());

             $data = array_merge($commonData, ['shelves' => $shelves]);
 
             $data = array_merge($commonData, ['shelves' => $shelves]);
 

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

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

-            $bookRepo = app(BookRepo::class);
-            $books = $bookRepo->getAllPaginated(18, $commonData['sort'], $commonData['order']);
+            $books = app(BookRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());

             $data = array_merge($commonData, ['books' => $books]);
 
             $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);
-    }
-
-    /**
-     * 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');
+        return view('home.default', $commonData);

     }
 
     /**
      * 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 +116,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);
     }