From: JonatanRek <redacted>
Date: Fri, 22 Sep 2023 08:49:53 +0000 (+0200)
Subject: Merge branch 'basic-pwa-support' of https://github.com/GamerClassN7/BookStack into... 
X-Git-Tag: v23.10~1^2~19^2~8
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/6e19a8a4bb8c37c641d82e506ed53598495d950b?hp=-c

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

6e19a8a4bb8c37c641d82e506ed53598495d950b
diff --combined app/App/HomeController.php
index a2bb151de,927fdfc1d..d0b326c8a
--- a/app/App/HomeController.php
+++ b/app/App/HomeController.php
@@@ -78,14 -78,14 +78,14 @@@ class HomeController extends Controlle
          }
          
          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,12 -148,8 +148,12 @@@
      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);
      }