Merge branch 'BookStackApp:development' into basic-pwa-support

diff --cc app/App/HomeController.php
index d971247df738fecda62d3ef862a3b833bcd48106,24b7c3ed819eacb1e0f7dbe04638446dfdf69197..927fdfc1d22d13cc88339bf37cd7729f60edf2e0
--- 1/app/App/HomeController.php
--- 2/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@@ -76,21 -76,21 +76,21 @@@ class HomeController extends Controlle
                  'listOptions' => $listOptions,
              ]);
          }
 -
 +        
          if ($homepageOption === 'bookshelves') {
-             $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+             $shelves = app()->make(BookshelfRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
              $data = array_merge($commonData, ['shelves' => $shelves]);
 -
 +            
              return view('home.shelves', $data);
          }
 -
 +        
          if ($homepageOption === 'books') {
-             $books = app(BookRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
+             $books = app()->make(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]);

diff --cc resources/views/layouts/base.blade.php
Simple merge

diff --cc routes/web.php
Simple merge