diff --git a/skolehjem/app/Booking.php b/skolehjem/app/Booking.php deleted file mode 100644 index 663e86c..0000000 --- a/skolehjem/app/Booking.php +++ /dev/null @@ -1,10 +0,0 @@ -paginate($request->input("limit", 20)); - - return Response::detect("bookings.index", [ "bookings" => $booking]); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - return Response::detect("bookings.create"); - } - - /** - * Store a newly created resource in storage. - * - * @param \Illuminate\Http\Request $request - * @return \Illuminate\Http\Response - */ - public function store(Request $request) - { - $requestBooking = $request->validate([ - "name_first" => "required|max:255", - "name_last" => "required|max:255", - "phone" => "required|unique:users", - "machine_choice" => "required|max:255", - ]); - - $booking = new Booking($requestBooking); - $booking->save(); - - return Response::detect("bookings.store"); - } - - /** - * Display the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function show($id) - { - return Response::detect("bookings.show", [ "bookings" => $id]); - } - - /** - * Show the form for editing the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function edit($id) - { - return Response::detect("bookings.show", [ "bookings" => $id]); - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response - */ - public function update(Request $request, $id) - { - // - } - - /** - * Remove the specified resource from storage. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function destroy($id) - { - // - } -} diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 6679e7d..34acf20 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -19,7 +19,7 @@ class WashingReservationController extends Controller { $reservations = WashingReservation::query()->paginate($request->query("page", 1)); - return Response::detect("washing-reservation.index"); + return Response::detect("washing-reservations.index", [ "reservations" => $reservations]); } /** @@ -29,7 +29,7 @@ class WashingReservationController extends Controller */ public function create() { - return Response::detect("washing-reservation.create"); + return Response::detect("washing-reservations.create"); } /** @@ -47,7 +47,7 @@ class WashingReservationController extends Controller $machineReservation = new WashingReservation($data); $machineReservation->save(); - return Response::detect("washing-reservation.store"); + return Response::detect("washing-reservations.store"); } /** @@ -60,7 +60,7 @@ class WashingReservationController extends Controller { $machineReservation = WashingReservation::find($id); - return Response::detect("washing-reservation.show", [ + return Response::detect("washing-reservations.show", [ "machineReservation" => $machineReservation ]); } @@ -73,7 +73,7 @@ class WashingReservationController extends Controller */ public function edit($id) { - return Response::detect("washing-reservation.edit"); + return Response::detect("washing-reservations.edit"); } /** @@ -95,7 +95,7 @@ class WashingReservationController extends Controller $machineReservation->save(); - return Response::detect("washing-reservation.edit", [ + return Response::detect("washing-reservations.edit", [ "washingReservation" => $machineReservation ]); } @@ -111,6 +111,6 @@ class WashingReservationController extends Controller $machineReservation = WashingReservation::find($id); $machineReservation->delete(); - return Response::detect("washing-reservation.delete"); + return Response::detect("washing-reservations.delete"); } } diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 39e978b..7ed0dfa 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -31,10 +31,10 @@

Booking

- ReadVis Bookings + ReadVis Bookings
- CreateOpret Booking + CreateOpret Booking
diff --git a/skolehjem/resources/views/admin/root/index.blade.php b/skolehjem/resources/views/admin/root/index.blade.php index 4738b86..2682a95 100644 --- a/skolehjem/resources/views/admin/root/index.blade.php +++ b/skolehjem/resources/views/admin/root/index.blade.php @@ -13,7 +13,7 @@ {{--@extends("app.vagttelefons.index")--}} {{--Booking Liste--}} -{{--@extends("app.bookings.index")--}} +{{--@extends("app.washing-reservations.index")--}} {{--Menuplan--}} {{--@extends("app.menuplans.index")--}} @@ -44,10 +44,10 @@ {{--@extends("admin.menuplans.update")--}} {{--Create booking--}} -{{--@extends("admin.bookings.create")--}} +{{--@extends("admin.washing-reservations.create")--}} {{--Read booking--}} -{{--@extends("admin.bookings.show")--}} +{{--@extends("admin.washing-reservations.show")--}} {{--Create washing-machine--}} {{--@extends("admin.washing-machines.create")--}} diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index 4738b86..2682a95 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -13,7 +13,7 @@ {{--@extends("app.vagttelefons.index")--}} {{--Booking Liste--}} -{{--@extends("app.bookings.index")--}} +{{--@extends("app.washing-reservations.index")--}} {{--Menuplan--}} {{--@extends("app.menuplans.index")--}} @@ -44,10 +44,10 @@ {{--@extends("admin.menuplans.update")--}} {{--Create booking--}} -{{--@extends("admin.bookings.create")--}} +{{--@extends("admin.washing-reservations.create")--}} {{--Read booking--}} -{{--@extends("admin.bookings.show")--}} +{{--@extends("admin.washing-reservations.show")--}} {{--Create washing-machine--}} {{--@extends("admin.washing-machines.create")--}} diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 7863c02..cacec32 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -32,4 +32,3 @@ Route::resource("washing-machines", "WashingMachineController"); Route::resource("washing-reservations", "WashingReservationController"); Route::resource("feedbacks", "FeedbackController"); Route::resource("external-links", "ExternalLinkController"); -Route::resource("bookings", "BookingController");