diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php
index e649834..94236d4 100644
--- a/skolehjem/app/Http/Controllers/ContactController.php
+++ b/skolehjem/app/Http/Controllers/ContactController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Contact;
+use Illuminate\Support\Facades\DB;
use phpDocumentor\Reflection\Types\Context;
class ContactController extends Controller
@@ -132,4 +133,33 @@ class ContactController extends Controller
$contact->delete();
return redirect()->route("contacts.index");
}
+
+
+
+ public function search(Request $request){
+ if($request->ajax()){
+ $output = "";
+ $users = DB::table('users')->where('name_first', 'LIKE','%'.$request->search.'%')
+ ->orWhere('name_last','LIKE', '%'. $request->search.'%')
+ ->orWhere('phone','LIKE', '%' . $request->search.'%')
+ ->orWhere('mail','LIKE','%'.$request->serach. '%')->get();
+
+ if($users){
+ foreach ($users as $key => $user){
+ $output.='
'.
+ '' . $user->name_first . ' | '.
+ '' . $user->name_last . ' | '.
+ '' . $user->mail . ' | '.
+ '' . $user->phone .' | '.
+ '
';
+ }
+ return Response($output);
+ }
+ }
+ }
+
+
+
+
+
}
diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 1754ecb..535b54b 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\User;
use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Spatie\Permission\Models\Role;
@@ -254,19 +255,5 @@ class UserController extends Controller
return Response::detect("users.editpass");
}
- public function liveSearch(Request $request){
- if($request->ajax()){
- $output="";
- $results=DB::table('users')->where('name_first','LIKE','%'.$request->search."%")->get();
-
- if(!$results){
- echo "idk kev";
- }else{
- return Response($output);
- }
- }
- }
-
-
}
diff --git a/skolehjem/package-lock.json b/skolehjem/package-lock.json
index f84361c..89c5c1a 100644
--- a/skolehjem/package-lock.json
+++ b/skolehjem/package-lock.json
@@ -5070,6 +5070,12 @@
}
}
},
+ "jquery": {
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+ "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==",
+ "dev": true
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
diff --git a/skolehjem/package.json b/skolehjem/package.json
index 5126d1c..6fd5e74 100644
--- a/skolehjem/package.json
+++ b/skolehjem/package.json
@@ -12,6 +12,7 @@
"devDependencies": {
"axios": "^0.19",
"cross-env": "^7.0",
+ "jquery": "^3.5.1",
"laravel-mix": "^5.0.1",
"lodash": "^4.17.13",
"resolve-url-loader": "^2.3.1",
diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php
index f180b26..2dc74dc 100644
--- a/skolehjem/resources/views/admin/contacts/index.blade.php
+++ b/skolehjem/resources/views/admin/contacts/index.blade.php
@@ -10,8 +10,16 @@
@endsection
@section("content")
+
@@ -39,4 +47,23 @@
@endforeach
+
+
+
+
+
@endsection
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index ade0686..6f9aa3a 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -10,19 +10,11 @@
@endsection
@section("content")
-
+
@@ -41,6 +33,7 @@
{{ $user->email }} |
{{ $user->phone }} |
+
@for($i = 0; $i < count($user->roles); $i++)
@if(count($user->roles)-1 != $i)
{{$user->roles[$i]->name}},
@@ -60,6 +53,5 @@
|
@endforeach
-
{{ $users->links() }}
@endsection