Fixed failing test after drawio default url change

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

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 3258f43693d5600a26985caa5de675ab04c6f8a5..f38bd71dfc7ea456a9e5e46f74140035ba777c91 100644 (file)
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,23 +1,24 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

-use Activity;
+namespace BookStack\Http\Controllers;
+
+use BookStack\Actions\ActivityQueries;

 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Book;

-use BookStack\Entities\Tools\PageContent;

 use BookStack\Entities\Models\Page;
 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\Repos\BookRepo;
 use BookStack\Entities\Repos\BookshelfRepo;

-use Illuminate\Http\Response;
-use Views;
+use BookStack\Entities\Tools\PageContent;

 
 class HomeController extends Controller
 {
 
 class HomeController extends Controller
 {

-

     /**
      * Display the homepage.
      */
     /**
      * 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()) {


@@ -32,12 +33,14 @@ class HomeController extends Controller
 
         $recentFactor = count($draftPages) > 0 ? 0.5 : 1;
         $recents = $this->isSignedIn() ?
 
         $recentFactor = count($draftPages) > 0 ? 0.5 : 1;
         $recents = $this->isSignedIn() ?

-              Views::getUserRecentlyViewed(12*$recentFactor, 1)
+            (new RecentlyViewed())->run(12 * $recentFactor, 1)

             : Book::visible()->orderBy('created_at', 'desc')->take(12 * $recentFactor)->get();
             : 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')
         $recentlyUpdatedPages = Page::visible()->with('book')
             ->where('draft', false)
             ->orderBy('updated_at', 'desc')

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

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


@@ -47,29 +50,30 @@ class HomeController extends Controller
         }
 
         $commonData = [
         }
 
         $commonData = [

-            'activity' => $activity,
-            'recents' => $recents,
+            'activity'             => $activity,
+            'recents'              => $recents,

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

-            'draftPages' => $draftPages,
+            'draftPages'           => $draftPages,
+            'favourites'           => $favourites,

         ];
 
         // Add required list ordering & sorting for books & shelves views.
         if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
             $key = $homepageOption;
         ];
 
         // Add required list ordering & sorting for books & shelves views.
         if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
             $key = $homepageOption;

-            $view = setting()->getForCurrentUser($key . '_view_type', config('app.views.' . $key));
+            $view = setting()->getForCurrentUser($key . '_view_type');

             $sort = setting()->getForCurrentUser($key . '_sort', 'name');
             $order = setting()->getForCurrentUser($key . '_sort_order', 'asc');
 
             $sortOptions = [
             $sort = setting()->getForCurrentUser($key . '_sort', 'name');
             $order = setting()->getForCurrentUser($key . '_sort_order', 'asc');
 
             $sortOptions = [

-                'name' => trans('common.sort_name'),
+                'name'       => trans('common.sort_name'),

                 'created_at' => trans('common.sort_created_at'),
                 'updated_at' => trans('common.sort_updated_at'),
             ];
 
             $commonData = array_merge($commonData, [
                 'created_at' => trans('common.sort_created_at'),
                 'updated_at' => trans('common.sort_updated_at'),
             ];
 
             $commonData = array_merge($commonData, [

-                'view' => $view,
-                'sort' => $sort,
-                'order' => $order,
+                'view'        => $view,
+                'sort'        => $sort,
+                'order'       => $order,

                 'sortOptions' => $sortOptions,
             ]);
         }
                 'sortOptions' => $sortOptions,
             ]);
         }


@@ -77,41 +81,36 @@ class HomeController extends Controller
         if ($homepageOption === 'bookshelves') {
             $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['sort'], $commonData['order']);
             $data = array_merge($commonData, ['shelves' => $shelves]);
         if ($homepageOption === 'bookshelves') {
             $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') {
             $bookRepo = app(BookRepo::class);
             $books = $bookRepo->getAllPaginated(18, $commonData['sort'], $commonData['order']);
             $data = array_merge($commonData, ['books' => $books]);
         }
 
         if ($homepageOption === 'books') {
             $bookRepo = app(BookRepo::class);
             $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);
-            return view('common.home-custom', array_merge($commonData, ['customHomepage' => $customHomepage]));
-        }
+            $customHomepage->html = $pageContent->render(false);

 
 

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

 
 

-    /**
-     * 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.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');


@@ -121,14 +120,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);
     }