From e6d9ddf7d8f31d9914516ca82e0324be383435d0 Mon Sep 17 00:00:00 2001 From: Anders Date: Fri, 26 Jun 2020 08:56:18 +0200 Subject: [PATCH] Fixed EventController to go to Events instead of bookings Added app->events->index page (needed backend and a foreach loop (foreach event do...)) Changed name in menu 'Vaske Booking Liste' to 'Reservationer' --- .../app/Http/Controllers/EventController.php | 14 ++++++------- .../views/app/events/index.blade.php | 21 +++++++++++++++++++ .../resources/views/app/layout/base.blade.php | 4 ++-- .../resources/views/app/root/index.blade.php | 4 +++- 4 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 skolehjem/resources/views/app/events/index.blade.php diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 35eacc3..60eb631 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -19,7 +19,7 @@ class EventController extends Controller { $events = Event::query()->paginate($request->input("limit", 20)); - return Response::detect("bookings.index", [ "events" => $events]); + return Response::detect("events.index", [ "events" => $events]); } /** @@ -29,7 +29,7 @@ class EventController extends Controller */ public function create() { - return Response::detect("bookings.create"); + return Response::detect("events.create"); } /** @@ -49,7 +49,7 @@ class EventController extends Controller $event->save(); - return Response::detect("bookings.store"); + return Response::detect("events.store"); } /** @@ -60,7 +60,7 @@ class EventController extends Controller */ public function show(Event $id) { - return Response::detect("bookings.show", [ "event" => $id ]); + return Response::detect("events.show", [ "event" => $id ]); } /** @@ -71,7 +71,7 @@ class EventController extends Controller */ public function edit(Event $id) { - return Response::detect("bookings.edit", [ "event" => $id ]); + return Response::detect("events.edit", [ "event" => $id ]); } /** @@ -91,7 +91,7 @@ class EventController extends Controller $id->update($requestBody); $id->save(); - return Response::detect("bookings.update"); + return Response::detect("events.update"); } /** @@ -105,6 +105,6 @@ class EventController extends Controller { $id->delete(); - return Response::detect("bookings.destroy"); + return Response::detect("events.destroy"); } } diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php new file mode 100644 index 0000000..e148383 --- /dev/null +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -0,0 +1,21 @@ +@extends("app.layout.base") +@extends("app.layout.header") +@section("title") + Aktiviteter +@endsection + +@section("content") +
+

Aktiviteter

+ +

{Aktivitet}

+

{Dato}

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.

+ Tilmeld + +

{Aktivitet2}

+

{Dato}

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.

+ Tilmeld +
+@endsection diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 53eb909..3e418e3 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -25,8 +25,8 @@ Aktiviteter - Vaske booking liste - Vaske booking liste + Reservationer + Reservationer Galleri diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index f428ba2..5c51df9 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -11,9 +11,11 @@ {{--Register--}} {{--@extends("app.users.register")--}} +{{--Events--}} +{{----}}@extends("app.events.index") {{--Vagttelefon--}} -{{----}}@extends("app.vagttelefons.index") +{{--@extends("app.vagttelefons.index")--}} {{--Booking Liste--}} {{--@extends("app.washing-reservations.index")--}}