From 679de4872dabb9ad4de889028f67c941b4d42644 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Mon, 3 Aug 2020 13:14:58 +0200
Subject: [PATCH 1/3] fixed

---
 skolehjem/app/Http/Controllers/UserController.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 33ebb3f..62db770 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -38,7 +38,8 @@ class UserController extends Controller
      */
     public function index(Request $request)
     {
-        $users = User::query()->paginate($request->query("page", 20));
+        //$users = User::query()->paginate($request->query("page", 20));
+        $users = User::query()->orderBy('id', 'desc')->paginate(20);
 
         return Response::detect("users.index", [ "users" => $users ]);
     }
@@ -379,14 +380,6 @@ class UserController extends Controller
             }
 
 
-
-                            //Dont delete
-                        /*elseif ($request->isCheck === "rolle")
-                        $users = User::query()->where('rolle', 'LIKE',$request->search.'%');*/
-
-
-
-
             if(count($users) !== 0){
                 foreach ($users as $key => $user){
 

From e2847e9959f19c6893339ebd9f071e2cc78bf891 Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Mon, 3 Aug 2020 13:21:47 +0200
Subject: [PATCH 2/3] Fixed PageNation

---
 skolehjem/app/Http/Controllers/UserController.php     | 6 +++---
 skolehjem/resources/views/admin/users/index.blade.php | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 62db770..3e817a2 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -39,7 +39,7 @@ class UserController extends Controller
     public function index(Request $request)
     {
         //$users = User::query()->paginate($request->query("page", 20));
-        $users = User::query()->orderBy('id', 'desc')->paginate(20);
+        $users = User::query()->orderBy('id', 'asc')->paginate(20);
 
         return Response::detect("users.index", [ "users" => $users ]);
     }
@@ -321,7 +321,7 @@ class UserController extends Controller
                     foreach ($roles as $role) {
                         if($user->hasRole($role)) {
                             array_push($users, $user);
-                            break 2;
+                            break 1;
                         }
                     }
                 }
@@ -348,7 +348,7 @@ class UserController extends Controller
                     foreach ($roles as $role) {
                         if($user->hasRole($role)) {
                             array_push($users, $user);
-                            break 2;
+                            break 1;
                         }
                     }
                 }
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index 703106e..76f7a53 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -70,13 +70,16 @@
     {{ $users->links() }}
 
         <script>
+            var url = new URL(window.location.href);
+            var page = url.searchParams.get("page");
+
             $('#search').on('keyup', function () {
                 $value = $(this).val();
                 $checkboxValue = $( "input:checked" ).val();
                 $.ajax({
                     type: 'get',
                     url: '{{route('users.search')}}',
-                    data: {'search':$value, 'isCheck': $checkboxValue},
+                    data: {'search':$value, 'isCheck': $checkboxValue, 'page': page },
                     success:function (data) {
                         console.log($checkboxValue);
                         $('tbody').html(data);

From 01f9502653a74942b368f7e6a839d147da43e83a Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Mon, 3 Aug 2020 13:44:53 +0200
Subject: [PATCH 3/3] Removes - Console.log in feedback(s)

---
 skolehjem/resources/views/admin/feedbacks/index.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/skolehjem/resources/views/admin/feedbacks/index.blade.php b/skolehjem/resources/views/admin/feedbacks/index.blade.php
index 3ec8442..ec85be1 100644
--- a/skolehjem/resources/views/admin/feedbacks/index.blade.php
+++ b/skolehjem/resources/views/admin/feedbacks/index.blade.php
@@ -47,7 +47,6 @@
                 url: '{{route('feedbacks.search')}}',
                 data: {'option':$value},
                 success:function (data) {
-                    console.log($value);
                     $('tbody').html(data);
                 },
                 error:function (data) {