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

[bookstack] / app / App / HomeController.php

diff --git a/app/App/HomeController.php b/app/App/HomeController.php
index 2c57da3c129412fdcc682d9ffbec22cb1adca970..927fdfc1d22d13cc88339bf37cd7729f60edf2e0 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);
@@ -147,61 +147,10 @@ class HomeController extends Controller
     */
     public function manifest()
     {   
-        $manifest = [
-            "name" => config('app.name' | 'BookStack'), 
-            "short_name" => "bookstack", 
-            "start_url" => "/", 
-            "scope" => "/", 
-            "display" => "standalone", 
-            "background_color" => "#fff", 
-            "description" => config('app.name' | 'BookStack'), 
-            "categories" => [
-                "productivity", 
-                "lifestyle" 
-            ], 
-            "launch_handler" => [
-                "client_mode" => "focus-existing" 
-            ], 
-            "orientation" => "portrait", 
-            "icons" => [
-                [
-                    "src" => "/icon-64.png", 
-                    "sizes" => "64x64", 
-                    "type" => "image/png" 
-                ], 
-                [
-                    "src" => "/icon-32.png", 
-                    "sizes" => "32x32", 
-                    "type" => "image/png" 
-                ], 
-                [
-                    "src" => "/icon-128.png", 
-                    "sizes" => "128x128", 
-                    "type" => "image/png" 
-                ], 
-                [
-                    "src" => "icon-180.png", 
-                    "sizes" => "180x180", 
-                    "type" => "image/png" 
-                ], 
-                [
-                    "src" => "icon.png", 
-                    "sizes" => "256x256", 
-                    "type" => "image/png" 
-                ], 
-                [
-                    "src" => "icon.ico", 
-                    "sizes" => "48x48", 
-                    "type" => "image/vnd.microsoft.icon" 
-                ], 
-                [
-                    "src" => "favicon.ico", 
-                    "sizes" => "48x48", 
-                    "type" => "image/vnd.microsoft.icon" 
-                ],
-            ],
-        ]; 
+        $manifest =  config('manifest');
         
+        $manifest["background_color"] = setting('app-color');
+
         return response()->json($manifest);
     }
 }