diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index c0c1aab..1cbacfa 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + sqlite.xerial true org.sqlite.JDBC 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/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 433bfa1..84f8594 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -45,7 +45,7 @@ class MenuPlanController extends Controller "link" => "required|max:255" ]); - $menuPlans = new ExternalLink($requestMenuPlanCreate); + $menuPlans = new MenuPlan($requestMenuPlanCreate); $menuPlans->save(); return Response::detect("menuplans.store"); diff --git a/skolehjem/composer.json b/skolehjem/composer.json index c6162f5..062f5ce 100644 --- a/skolehjem/composer.json +++ b/skolehjem/composer.json @@ -16,6 +16,7 @@ "laravel/framework": "^7.0", "laravel/tinker": "^2.0", "laravel/ui": "^2.0", + "laravelcollective/html": "^6.1", "spatie/laravel-permission": "^3.13" }, "require-dev": { diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index fe82303..3ea7e2d 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -29,12 +29,12 @@
diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index c339366..3647b94 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -6,12 +6,13 @@ @endsection @section("path") - Opret Menuplan / + Opret Menuplan / @endsection @section("content")

Opret Menuplan:

-
+ + @csrf diff --git a/skolehjem/resources/views/admin/menuplans/store.blade.php b/skolehjem/resources/views/admin/menuplans/store.blade.php index 1896239..b562eab 100644 --- a/skolehjem/resources/views/admin/menuplans/store.blade.php +++ b/skolehjem/resources/views/admin/menuplans/store.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Opret Vaskemaskiner / + Opret Vaskemaskiner / @endsection @section("content") 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 691424f..3e418e3 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -16,17 +16,17 @@