Merge branch 'basic-pwa-support' of https://github.com/GamerClassN7/BookStack into...

[bookstack] / app / App / HomeController.php

diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index d971247df738fecda62d3ef862a3b833bcd48106..d0b326c8a82b099da169c6ae9a21a7f8d3ed673c 100644 (file)
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@ -78,14 +78,14 @@ class HomeController extends Controller
         }
         
         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);
@@ -148,8 +148,12 @@ class HomeController extends Controller
     public function manifest()
     {   
         $manifest =  config('manifest');
-        
-        $manifest["background_color"] = setting('app-color');
+
+        if (setting()->getForCurrentUser('dark-mode-enabled')){
+            $manifest["background_color"] = setting('app-color-dark');
+        }else{
+            $manifest["background_color"] = setting('app-color');
+        }
 
         return response()->json($manifest);
     }