v0.10.9 - Added pagination onto guides, washing-reservations, events and news

skolehjem/app/Http/Controllers/NewsController.php

@@ -31,7 +31,7 @@ class NewsController extends Controller
      */
     public function index(Request $request)
     {
-        $news = News::query()->paginate($request->input("limit", 20));
+        $news = News::query()->orderBy('id', 'asc')->paginate(2);
 
         return Response::detect("news.index", [ "news" => $news ]);
     }

skolehjem/app/Http/Controllers/RootController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\News;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -14,9 +15,20 @@ class RootController extends Controller
     }
 
     public function index() {
-        if(auth()->user()->can('admin.panel.show'))
-            return Response::detect("root.index");
-        else
-            return view('app.root.index');
+        $perPage = 2;
+
+        if(auth()->user()->can('admin.panel.show')) {
+            if(Response::detect("root.index")->name() == "admin.root.index")
+                return Response::detect("root.index");
+            else {
+                $news = News::query()->orderBy('id', 'asc')->paginate($perPage);
+                return Response::detect("root.index", ["news" => $news]);
+            }
+        }
+        else {
+            $news = News::query()->orderBy('id', 'asc')->paginate($perPage);
+
+            return view('app.root.index', ["news" => $news]);
+        }
     }
 }