From 42e3ece4aa5bce702c55e4004eaeef4e226c4653 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 09:03:24 +0200 Subject: [PATCH 1/2] Updated Contact --- .../views/app/contact/index.blade.php | 43 ++++++++++++++++--- .../resources/views/app/root/index.blade.php | 4 +- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/skolehjem/resources/views/app/contact/index.blade.php b/skolehjem/resources/views/app/contact/index.blade.php index bb157b3..daa8c1a 100644 --- a/skolehjem/resources/views/app/contact/index.blade.php +++ b/skolehjem/resources/views/app/contact/index.blade.php @@ -7,11 +7,42 @@ @section("content")

Kontakt

-

Email: x@x.x

- +45 xx xx xx xx - Tilkald x -

Email: x@x.x

- +45 xx xx xx xx - Tilkald x +

Navn: Claus Trasbo

+

Email: ctr@sde.dk

+

Forstander for Erhvervskollegiet

+ +45 40 88 65 15 og +45 63 12 65 15 + Ring + +

Navn: Birgitte True

+

Email: bit@sde.dk

+

Telefontid:

+

Mandag-Torsdag kl. 8.00-15.00

+

Fredag kl. 8.00-12.00

+ +45 63 12 67 15 + Ring + +

Navn: Thomas Thomsen

+

Email: thth@sde.dk

+

Kollegieassistent

+ +45 24 62 94 50 + Ring + +

Navn: Anja Holm Brix

+

Email: ahb@sde.dk

+

Kollegieassistent

+ +45 24 62 94 50 + Ring + +

Navn: Britta Overgaard Brink Olsen

+

Email: brio@sde.dk

+

Kollegieassistent

+ +45 24 62 94 50 + Ring + +

Navn: Jesper Sandberg

+

Email: jesa@sde.dk

+

Kollegieassistent

+ +45 24 62 94 50 + Ring
@endsection diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index 5c51df9..a2a2422 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -12,7 +12,7 @@ {{--@extends("app.users.register")--}} {{--Events--}} -{{----}}@extends("app.events.index") +{{--@extends("app.events.index")--}} {{--Vagttelefon--}} {{--@extends("app.vagttelefons.index")--}} @@ -24,7 +24,7 @@ {{--@extends("app.menuplans.index")--}} {{--Contact--}} -{{--@extends("app.contact.index")--}} +{{----}}@extends("app.contact.index") {{----}} {{------Admin Panel From c1877cd1803d7e95e623d9e52823956a2d115f44 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 29 Jun 2020 09:08:49 +0200 Subject: [PATCH 2/2] DO NOT TOUCH MENUPLAN-STUFF!!! --- .../Http/Controllers/MenuPlanController.php | 2 +- .../app/Http/Controllers/UserController.php | 63 ++++++++++--------- .../views/admin/users/edit.blade.php | 4 +- .../views/admin/users/index.blade.php | 9 ++- 4 files changed, 46 insertions(+), 32 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 9a7944a..d737725 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -89,7 +89,7 @@ class MenuPlanController extends Controller public function update(Request $request, $id) { $data = $request->all(); - + //FORCED UPDATE $menuplan = MenuPlan::find($id); $menuplan->update($data); diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 9016f0f..5880e1d 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -117,35 +117,42 @@ class UserController extends Controller */ public function update(Request $request, $id) { - $data = $request->validate([ - "name_first" => "max:255", - "name_last" => "max:255", - "email" => "email|unique:users", - "password" => "max:60", - "phone" => "unique:users", - ]); + $data = $request->all(); + +// $data = $request->validate([ +// "name_first" => "max:255", +// "name_last" => "max:255", +// "email" => "email|unique:users", +// "password" => "max:60", +// "phone" => "unique:users", +// ]); // Validates if the user is updating itself or another user. - if($id === Auth::id()) { - $user = Auth::user(); - - $user->update($data); - - $user->save(); - } - - //TODO: Implement when security's ready!!! -// else if(Auth::user()->hasPermissionTo("user.edit")) { -// $user = User::find($id); +// if($id === Auth::id()) { +// $user = Auth::user(); // -// /** @var User $user */ // $user->update($data); // // $user->save(); +// return Response::detect("users.edit", [ +// "user" => $user +// ]); // } - return Response::detect("users.edit", [ - "user" => $user + //TODO: Implement when security's ready!!! +// else if(Auth::user()->hasPermissionTo("user.edit")) { + $user = User::find($id); + + /** @var User $user */ + $user->update($data); + + $user->save(); +// } + + $users = User::query()->paginate(20); + + return Response::detect("users.index", [ + "users" => $users ]); } @@ -157,17 +164,17 @@ class UserController extends Controller */ public function destroy($id) { - if($id === Auth::id()) { - $user = Auth::user(); - $user->delete(); - } - else if(Auth::user()->hasPermissionTo("user.delete")) { +// if($id === Auth::id()) { +// $user = Auth::user(); +// $user->delete(); +// } +// else if(Auth::user()->hasPermissionTo("user.delete")) { $user = User::find($id); $user->delete(); - } +// } - return view("users.delete"); + return redirect()->route("users.index"); } /*******************************************/ diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index d9c1206..8cbe6ad 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -6,12 +6,12 @@ @endsection @section("path") - Rediger Bruger / + Rediger Bruger / @endsection @section("content")

Rediger Bruger:

-
$user]) }}"> + $user]) }}"> @csrf @method("put") diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index f2de90f..00448d7 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -26,7 +26,14 @@ {{ $user->email }} {{ $user->phone }} $user->id ]) }}">Update - Delete + + $user ]) }}" class="w-100"> + @csrf + @method("delete") + + +
+ @endforeach