From 32b7b3c92594cba5e470ff8a6ef72619e520331e Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 1 Jul 2020 10:29:47 +0200 Subject: [PATCH 01/12] Test commit --- skolehjem/app/Http/Controllers/MenuPlanController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 27db7c0..7b33aaa 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -120,7 +120,7 @@ class MenuPlanController extends Controller /** * Remove the specified resource from storage. - * + * Test delete return index function. * @param int $id * @return \Illuminate\Http\RedirectResponse */ From 4e69768ae8cf498eaea7c3997807d146bf299bc5 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 1 Jul 2020 11:46:29 +0200 Subject: [PATCH 02/12] =?UTF-8?q?Lavet=20controller=20og=20et=20fors=C3=B8?= =?UTF-8?q?g=20p=C3=A5=20GUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/Http/Controllers/UserController.php | 16 ++++++++++++++++ .../resources/views/admin/users/index.blade.php | 11 +++++++++++ 2 files changed, 27 insertions(+) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 6a0ce84..1754ecb 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -253,4 +253,20 @@ 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/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index ffbbfb6..ade0686 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -12,6 +12,17 @@ @section("content")
CreateOpret Bruger + + +
+ @csrf + + +
+ + + +
From 9c17623518d4b628a5c86e06aee666a4ff0e1f8b Mon Sep 17 00:00:00 2001 From: Neerholt Date: Tue, 7 Jul 2020 19:29:21 +0200 Subject: [PATCH 03/12] Live search --- .../Http/Controllers/ContactController.php | 30 +++++++++++++++++++ .../app/Http/Controllers/UserController.php | 15 +--------- skolehjem/package-lock.json | 6 ++++ skolehjem/package.json | 1 + .../views/admin/contacts/index.blade.php | 27 +++++++++++++++++ .../views/admin/users/index.blade.php | 16 +++------- 6 files changed, 69 insertions(+), 26 deletions(-) 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.=''. + ''. + ''. + ''. + ''. + ''; + } + 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") +
CreateOpret Kontakt + +
+ @csrf + + + +
' . $user->name_first . '' . $user->name_last . '' . $user->mail . '' . $user->phone .'
@@ -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") -
+
+ + CreateOpret Bruger - -
- @csrf - - -
- - - -
@@ -41,6 +33,7 @@ @endforeach
{{ $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 @@
- {{ $users->links() }} @endsection From 2dd20ac85ae30b8b9ac2f5073b05adb6ea52840b Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 27 Jul 2020 13:07:19 +0200 Subject: [PATCH 04/12] Semi fix live search --- .idea/php.xml | 37 +++++++++++++++++++ .idea/skolehjem-webapp.iml | 37 +++++++++++++++++++ skolehjem/.env.example | 2 +- .../Http/Controllers/ContactController.php | 10 ++--- skolehjem/database/seeds/UserSeeder.php | 1 + .../views/admin/contacts/index.blade.php | 6 ++- skolehjem/routes/web.php | 2 +- 7 files changed, 87 insertions(+), 8 deletions(-) diff --git a/.idea/php.xml b/.idea/php.xml index f1a82aa..553889a 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -82,6 +82,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/skolehjem-webapp.iml b/.idea/skolehjem-webapp.iml index 0da7fb8..924e151 100644 --- a/.idea/skolehjem-webapp.iml +++ b/.idea/skolehjem-webapp.iml @@ -12,15 +12,22 @@ + + + + + + + @@ -35,15 +42,30 @@ + + + + + + + + + + + + + + + @@ -54,6 +76,19 @@ + + + + + + + + + + + + + @@ -83,9 +118,11 @@ + + diff --git a/skolehjem/.env.example b/skolehjem/.env.example index ac74863..bb147f0 100644 --- a/skolehjem/.env.example +++ b/skolehjem/.env.example @@ -6,7 +6,7 @@ APP_URL=http://localhost LOG_CHANNEL=stack -DB_CONNECTION=mysql +DB_CONNECTION=sqlite DB_HOST=127.0.0.1 DB_PORT=3306 DB_DATABASE=laravel diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 94236d4..7311c91 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -139,17 +139,17 @@ class ContactController extends Controller 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(); + $users = DB::table('users')->where('name_first', 'LIKE',$request->search.'%') + ->orWhere('name_last','LIKE', $request->search.'%') + ->orWhere('phone','LIKE', $request->search.'%') + ->orWhere('email','LIKE',$request->search. '%')->get(); if($users){ foreach ($users as $key => $user){ $output.=''. '' . $user->name_first . ''. '' . $user->name_last . ''. - '' . $user->mail . ''. + '' . $user->email . ''. '' . $user->phone .''. ''; } diff --git a/skolehjem/database/seeds/UserSeeder.php b/skolehjem/database/seeds/UserSeeder.php index 029d2d4..39325cf 100644 --- a/skolehjem/database/seeds/UserSeeder.php +++ b/skolehjem/database/seeds/UserSeeder.php @@ -28,6 +28,7 @@ class UserSeeder extends Seeder } + Log::debug("OPRET"); $user = new \App\User(); diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 2dc74dc..fb9f980 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -54,11 +54,15 @@ $value = $(this).val(); $.ajax({ type: 'get', - url: '{{URL::to('contacts')}}', + url: '{{route('contacts.search')}}', data: {'search':$value}, success:function (data) { $('tbody').html(data); console.log(data); + console.log($value) + }, + error:function (data) { + console.log(data); } }); }) diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 3cb19ff..da4b509 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -30,7 +30,7 @@ Route::get("/account/edit", "UserController@accountedit")->name("users.accounted Route::get("/account/editpass", "UserController@accounteditpass")->name("users.accounteditpass"); Route::post("/account/update", "UserController@update")->name("users.accountupdate"); Route::get("phones", "PhoneController@index")->name("phones.index"); - +Route::get("/contactsapi", "ContactController@search")->name("contacts.search"); Route::resource("contacts", "ContactController"); Route::resource("menu-plans", "MenuPlanController"); From 715b188ecd983cfa38847bc7cb629a1c497c5e1d Mon Sep 17 00:00:00 2001 From: Vedran Zelen Date: Mon, 27 Jul 2020 13:24:35 +0200 Subject: [PATCH 05/12] removed useless comment --- skolehjem/app/Http/Controllers/ContactController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 7abfc08..e649834 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -6,7 +6,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use App\Contact; use phpDocumentor\Reflection\Types\Context; -//hello + class ContactController extends Controller { public function __construct() From 42449ae0916447c6485a844f548800f4d699792a Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 27 Jul 2020 14:01:04 +0200 Subject: [PATCH 06/12] Comments Added --- skolehjem/app/Http/Controllers/UserController.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index e03049e..c027dbe 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -152,7 +152,7 @@ class UserController extends Controller // else if(Auth::user()->hasPermissionTo("user.edit")) { $user = User::find($id); - if ($request->roles != null) { + if ($request->roles != null) { //You can only edit roles on the admin site, so if there is an input roles, then update user info and edit roles /** @var User $user */ $user->update($data); $user->roles()->detach(); @@ -163,20 +163,20 @@ class UserController extends Controller } //$user->save(); - } else { - if ($request->input('password') != null) { - if ($request->input('password') != $request->input('confirmpassword')) { + } else { // Else if you're not on the admin site (user site) + if ($request->input('password') != null) { // If you're editing the password + if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back. return Response::detect("users.editpass"); - } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { + } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back. return Response::detect("users.editpass"); - } else { + } else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout. /** @var User $user */ $user->update($data); Auth::logout(); return redirect()->route("users.login"); } - } else { + } else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user. $user->update($data); } From f1fb73beec226b23618f49a4eaa45e33f0c8dbde Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 27 Jul 2020 14:03:57 +0200 Subject: [PATCH 07/12] Fix css on live search, live search now works --- .../Http/Controllers/ContactController.php | 25 ++++++++++++++++--- skolehjem/public/css/admin.css | 5 ++++ skolehjem/resources/sass/admin/nav/nav.scss | 5 ++++ .../views/admin/contacts/index.blade.php | 3 +-- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 7311c91..3c2616b 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -138,23 +138,40 @@ class ContactController extends Controller public function search(Request $request){ if($request->ajax()){ - $output = ""; - $users = DB::table('users')->where('name_first', 'LIKE',$request->search.'%') + $output = "". + "Kontakt Navn". + "Titel". + "E-mail". + "Tlf". + "\"Update\"". + "\"Delete\"". + ""; + $users = DB::table('contacts')->where('name_first', 'LIKE',$request->search.'%') ->orWhere('name_last','LIKE', $request->search.'%') ->orWhere('phone','LIKE', $request->search.'%') ->orWhere('email','LIKE',$request->search. '%')->get(); - if($users){ + if(count($users) !== 0){ foreach ($users as $key => $user){ $output.=''. '' . $user->name_first . ''. '' . $user->name_last . ''. '' . $user->email . ''. '' . $user->phone .''. + ' $user->id ]) . '">Update'. + '
$user->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. ''; } - return Response($output); + }else{ + $output.= "

Der er ingen resultater...

"; } + return Response($output); } } diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css index c1e0293..807857f 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -6628,6 +6628,11 @@ main { margin-right: 4px; } +#search { + margin-bottom: 0; + line-height: 2.3rem; +} + .directorypath { border-radius: 2px; background-color: #333333; diff --git a/skolehjem/resources/sass/admin/nav/nav.scss b/skolehjem/resources/sass/admin/nav/nav.scss index d46b2b1..5f1d02c 100644 --- a/skolehjem/resources/sass/admin/nav/nav.scss +++ b/skolehjem/resources/sass/admin/nav/nav.scss @@ -47,3 +47,8 @@ height: 1em; margin-right: 4px; } + +#search { + margin-bottom: 0; + line-height: 2.3rem; +} diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index fb9f980..1321fcf 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -58,8 +58,7 @@ data: {'search':$value}, success:function (data) { $('tbody').html(data); - console.log(data); - console.log($value) + console.log(data) }, error:function (data) { console.log(data); From b9633d36a9c2f2092e89bc5555dc9defe33f2ec1 Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 27 Jul 2020 16:03:49 +0200 Subject: [PATCH 08/12] Made Live search is done --- .../Http/Controllers/ContactController.php | 2 - .../app/Http/Controllers/EventController.php | 41 ++++++++++++++ .../Http/Controllers/MenuPlanController.php | 40 ++++++++++++++ .../app/Http/Controllers/RolesController.php | 35 ++++++++++++ .../app/Http/Controllers/UserController.php | 54 +++++++++++++++++++ .../views/admin/contacts/index.blade.php | 4 +- .../views/admin/events/index.blade.php | 27 ++++++++++ .../views/admin/menuplans/index.blade.php | 27 ++++++++++ .../views/admin/roles/index.blade.php | 30 +++++++++++ .../views/admin/users/index.blade.php | 28 ++++++++++ .../washing-reservations/index.blade.php | 6 +++ skolehjem/routes/web.php | 7 +++ 12 files changed, 296 insertions(+), 5 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 3c2616b..e24b7c8 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -168,8 +168,6 @@ class ContactController extends Controller ''. ''; } - }else{ - $output.= "

Der er ingen resultater...

"; } return Response($output); } diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 55866ba..3497ae3 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -6,6 +6,7 @@ use App\Event; use App\User; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\DB; class EventController extends Controller @@ -130,4 +131,44 @@ class EventController extends Controller $event->delete(); return redirect()->route("events.index"); } + + + public function search(Request $request){ + if($request->ajax()){ + $output = "". + "Event Navn". + "Event Beskrivelse". + "Event Dato". + "\"Update\"". + "\"Delete\"". + ""; + $events = DB::table('events')->where('name', 'LIKE',$request->search.'%') + ->orWhere('date','LIKE', $request->search.'%') + ->get(); + + if(count($events) !== 0){ + foreach ($events as $key => $event){ + $output.=''. + '' . $event->name . ''. + '' . $event->description .''. + '' . $event->date .''. + ' $event->id ]) . '">Update'. + '
$event->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. + ''; + } + } + return Response($output); + } + } + + + } + + diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 7b33aaa..279bf1c 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -6,6 +6,7 @@ use App\ExternalLink; use App\MenuPlan; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\DB; class MenuPlanController extends Controller @@ -130,4 +131,43 @@ class MenuPlanController extends Controller $menuplan->delete(); return redirect()->route("menu-plans.index"); } + + + public function search(Request $request){ + if($request->ajax()){ + $output = "". + "Uge". + "Mandag". + "Tirsdag". + "Onsdag". + "Torsdag". + "\"Update\"". + "\"Delete\"". + ""; + $menuplans = DB::table('menu_plans')->where('week', 'LIKE',$request->search.'%')->get(); + + if(count($menuplans) !== 0){ + foreach ($menuplans as $key => $menuplan){ + $output.=''. + '' . $menuplan->week . ''. + '' . $menuplan->monday . ''. + '' . $menuplan->tuesday . ''. + '' . $menuplan->wednesday .''. + '' . $menuplan->thursday .''. + ' $menuplan->id ]) . '">Update'. + '
$menuplan->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. + ''; + } + } + return Response($output); + } + } + + } diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 093cbe8..801a275 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Support\Facades\DB; use Spatie\Permission\Models\Role; class rolesController extends Controller @@ -115,4 +116,38 @@ class rolesController extends Controller $role->delete(); return redirect()->route("roles.index"); } + + + public function search(Request $request){ + if($request->ajax()){ + $output = "". + "Navn". + "Beskrivelse". + "\"Update\"". + "\"Delete\"". + ""; + $roles = DB::table('roles')->where('name', 'LIKE',$request->search.'%')->get(); + + if(count($roles) !== 0){ + foreach ($roles as $key => $role){ + $output.=''. + '' . $role->name . ''. + '' . $role->description . ''. + ' $role->id ]) . '">Update'. + '
$role->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. + ''; + } + } + return Response($output); + } + } + + + } diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 535b54b..afb8e6f 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -256,4 +256,58 @@ class UserController extends Controller } + public function search(Request $request){ + if($request->ajax()){ + $output = "". + "Fornavn". + "Efternavn". + "Email". + "Tlf nr". + "Rolle(r)". + "\"Update\"". + "\"Delete\"". + ""; + $users = DB::table('users')->where('name_first', 'LIKE',$request->search.'%') + ->orWhere('name_last','LIKE', $request->search.'%') + ->orWhere('phone','LIKE', $request->search.'%') + ->orWhere('email','LIKE',$request->search. '%')->get(); + + if(count($users) !== 0){ + foreach ($users as $key => $user){ + $roles = null; + $rolesString = null; + + foreach (User::all() as $usr) { + if($usr->id == $user->id) + $roles = $usr->roles; + } + + for($i = 0; $i < count($roles); $i++) { + if(count($roles)-1 != $i) { + $rolesString .= $roles[$i]->name.","; + }else { + $rolesString = $roles[$i]->name; + } + } + + $output.=''. + '' . $user->name_first . ''. + '' . $user->name_last . ''. + '' . $user->email . ''. + '' . $user->phone .''. + '' . $rolesString .''. + ' $user->id ]) . '">Update'. + '
$user->id ]). '" class="w-100 nostyle">'. + csrf_field(). + method_field("delete"). + + ''. + '
'. + ''. + ''; + } + } + return Response($output); + } + } } diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 1321fcf..da10d16 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -16,7 +16,7 @@
@csrf - +
@@ -50,7 +50,6 @@
CreateOpret Event + +
+ @csrf + +
+
@@ -40,4 +47,24 @@ {{ $events->links() }} + + + + @endsection diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index d63d272..83e091a 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -10,8 +10,15 @@ @endsection @section("content") +
CreateOpret Menuplan + +
+ @csrf + + +
@@ -43,4 +50,24 @@
{{ $menuPlans->links() }} + + + + + @endsection diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php index fe3e3e7..554eb3b 100644 --- a/skolehjem/resources/views/admin/roles/index.blade.php +++ b/skolehjem/resources/views/admin/roles/index.blade.php @@ -10,8 +10,16 @@ @endsection @section("content") +
CreateOpret Rolle + +
+ @csrf + +
+ +
@@ -35,4 +43,26 @@ @endforeach
+ + + + + + @endsection diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 6f9aa3a..42045a6 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -10,11 +10,17 @@ @endsection @section("content") +
CreateOpret Bruger +
+ @csrf + +
+
@@ -54,4 +60,26 @@ @endforeach
{{ $users->links() }} + + + + + + @endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index 46939c3..3fbdf89 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -12,6 +12,12 @@ @section("content")
CreateOpret Reservation + +
+ @csrf + +
+
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index da4b509..00e6079 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -31,6 +31,13 @@ Route::get("/account/editpass", "UserController@accounteditpass")->name("users.a Route::post("/account/update", "UserController@update")->name("users.accountupdate"); Route::get("phones", "PhoneController@index")->name("phones.index"); Route::get("/contactsapi", "ContactController@search")->name("contacts.search"); +Route::get("/eventsapi", "EventController@search")->name("events.search"); +Route::get("/menuplansapi", "MenuPlanController@search")->name("menu-plans.search"); +Route::get("/rolesapi", "RolesController@search")->name("roles.search"); +Route::get("/userapi", "UserController@search")->name("users.search"); + + + Route::resource("contacts", "ContactController"); Route::resource("menu-plans", "MenuPlanController"); From ca3e2689ea64f6426feeef8a95889b13f64d9b76 Mon Sep 17 00:00:00 2001 From: Anders Date: Mon, 27 Jul 2020 14:58:56 +0200 Subject: [PATCH 09/12] Frontpage fixed --- skolehjem/resources/views/app/users/index.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/skolehjem/resources/views/app/users/index.blade.php b/skolehjem/resources/views/app/users/index.blade.php index 033a81e..e38ec82 100644 --- a/skolehjem/resources/views/app/users/index.blade.php +++ b/skolehjem/resources/views/app/users/index.blade.php @@ -3,18 +3,18 @@ @section('content')
- Menu - Aktiviteter - Kalender + Menuplan + Aktiviteter + Vaskemaskine Reservationer
- + Facebook - + Youtube - + Instagram From fb65c1b9fc23a27b373427430130181de5d9e151 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 28 Jul 2020 08:18:45 +0200 Subject: [PATCH 10/12] Added UserEvent.php --- .../app/Http/Controllers/UserController.php | 2 +- skolehjem/app/UserEvent.php | 10 +++++ ...7_01_064330_create_resource_categories.php | 4 +- ..._07_28_061420_create_user_events_table.php | 37 +++++++++++++++++++ 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 skolehjem/app/UserEvent.php create mode 100644 skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 7e3be4d..7d76618 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -286,7 +286,7 @@ class UserController extends Controller "
". "". ""; - $users = DB::table('users')->where('name_first', 'LIKE',$request->search.'%') + $users = User::query()->where('name_first', 'LIKE',$request->search.'%') ->orWhere('name_last','LIKE', $request->search.'%') ->orWhere('phone','LIKE', $request->search.'%') ->orWhere('email','LIKE',$request->search. '%')->get(); diff --git a/skolehjem/app/UserEvent.php b/skolehjem/app/UserEvent.php new file mode 100644 index 0000000..3899fd5 --- /dev/null +++ b/skolehjem/app/UserEvent.php @@ -0,0 +1,10 @@ +id(); $table->string("name")->unique(); $table->text("description"); $table->string("slug")->unique(); $table->timestamps(); - }); + });*/ } /** diff --git a/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php new file mode 100644 index 0000000..e129f3c --- /dev/null +++ b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php @@ -0,0 +1,37 @@ +id(); + $table->integer("user_id")->unique(); + $table->integer("event_id")->unique(); + + $table->timestamps(); + + $table->foreign("user_id")->references("id")->on("users"); + $table->foreign("event_id")->references("id")->on("events"); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('user_events'); + } +} From b89c1509feb7f802e0cc39475621bf3b6ca14a9a Mon Sep 17 00:00:00 2001 From: Vedran Zelen Date: Tue, 28 Jul 2020 08:34:10 +0200 Subject: [PATCH 11/12] Added comments for easier understanding. --- .../migrations/2014_10_12_000000_create_users_table.php | 7 ++++++- .../2014_10_12_100000_create_password_resets_table.php | 2 ++ .../2019_08_19_000000_create_failed_jobs_table.php | 3 +++ .../2020_06_08_080402_create_permission_tables.php | 2 ++ .../2020_06_08_085447_create_washing_reservations.php | 2 ++ .../migrations/2020_06_08_090042_create_calendar_dates.php | 2 ++ .../2020_06_08_090108_create_calendar_events.php | 2 ++ .../migrations/2020_06_08_091617_create_feedbacks.php | 2 ++ .../2020_06_08_123954_create_washing_machines.php | 2 ++ .../migrations/2020_06_09_081037_alter_feedbacks.php | 2 ++ .../2020_06_09_081126_alter_washing_reservations.php | 2 ++ .../migrations/2020_06_23_070657_create_menu_plans.php | 2 ++ .../migrations/2020_06_24_064840_create_external_links.php | 2 ++ .../migrations/2020_06_29_065007_create_contact.php | 2 ++ .../migrations/2020_06_29_091545_create_events.php | 2 ++ .../migrations/2020_06_30_065154_create_albums_table.php | 2 ++ .../2020_07_01_061911_create_resource_category.php | 2 ++ .../2020_07_01_062112_create_resource_extension.php | 2 ++ .../migrations/2020_07_01_062544_create_resource.php | 2 ++ .../2020_07_01_064330_create_resource_categories.php | 2 ++ skolehjem/database/seeds/UserSeeder.php | 7 +++++-- 21 files changed, 50 insertions(+), 3 deletions(-) diff --git a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php index 9760e02..ef119d6 100644 --- a/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php +++ b/skolehjem/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,5 +1,7 @@ id(); $table->string('name_first'); @@ -34,6 +37,8 @@ class CreateUsersTable extends Migration * * @return void */ + + //if table exists, drop table. public function down() { Schema::dropIfExists('users'); diff --git a/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php b/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php index 0ee0a36..5a8c158 100644 --- a/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php +++ b/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php @@ -1,5 +1,7 @@ phone = 12345678; - + //gives all permission to the Admin. foreach (\Spatie\Permission\Models\Permission::all() as $permission) { $user->givePermissionTo($permission); } From 9a5be4e280647b75995aef70ab9005e16c2e1eb3 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 28 Jul 2020 09:23:28 +0200 Subject: [PATCH 12/12] Name fix for contact --- skolehjem/app/Http/Controllers/ContactController.php | 8 ++++---- skolehjem/resources/views/admin/contacts/index.blade.php | 1 - skolehjem/resources/views/admin/events/index.blade.php | 1 - skolehjem/resources/views/admin/layout/base.blade.php | 1 + skolehjem/resources/views/admin/roles/index.blade.php | 1 - skolehjem/resources/views/admin/users/index.blade.php | 1 - 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 443cd99..c581e55 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -146,16 +146,16 @@ class ContactController extends Controller "". "". ""; - $users = DB::table('contacts')->where('name_first', 'LIKE',$request->search.'%') - ->orWhere('name_last','LIKE', $request->search.'%') + $users = DB::table('contacts')->where('contactname', 'LIKE',$request->search.'%') + ->orWhere('title','LIKE', $request->search.'%') ->orWhere('phone','LIKE', $request->search.'%') ->orWhere('email','LIKE',$request->search. '%')->get(); if(count($users) !== 0){ foreach ($users as $key => $user){ $output.=''. - ''. - ''. + ''. + ''. ''. ''. ''. diff --git a/skolehjem/resources/views/admin/contacts/index.blade.php b/skolehjem/resources/views/admin/contacts/index.blade.php index 71335dd..3622a1b 100644 --- a/skolehjem/resources/views/admin/contacts/index.blade.php +++ b/skolehjem/resources/views/admin/contacts/index.blade.php @@ -10,7 +10,6 @@ @endsection @section("content") -
CreateOpret Kontakt diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 2ed1629..22b9f4a 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -10,7 +10,6 @@ @endsection @section("content") -
CreateOpret Event diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 36e1a71..9ba4838 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -5,6 +5,7 @@ + @yield("header") diff --git a/skolehjem/resources/views/admin/roles/index.blade.php b/skolehjem/resources/views/admin/roles/index.blade.php index 554eb3b..a032d77 100644 --- a/skolehjem/resources/views/admin/roles/index.blade.php +++ b/skolehjem/resources/views/admin/roles/index.blade.php @@ -10,7 +10,6 @@ @endsection @section("content") -
CreateOpret Rolle diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 42045a6..f790b1c 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -10,7 +10,6 @@ @endsection @section("content") -
\"Update\"\"Delete\"
\"Update\"\"Delete\"
' . $user->name_first . '' . $user->name_last . '' . $user->contactname . '' . $user->title . '' . $user->email . '' . $user->phone .' $user->id ]) . '">Update