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/public/css/admin.css b/skolehjem/public/css/admin.css index a12765f..a7bd23d 100644 --- a/skolehjem/public/css/admin.css +++ b/skolehjem/public/css/admin.css @@ -307,6 +307,34 @@ a { background-color: #00788a; } +.block-container { + padding: 0 8px; +} + +.block { + color: white; + padding: 1em 2em; + border-radius: 4px; + background-color: #00788a; +} + +.links { + position: absolute; + width: 100%; + bottom: 8px; + height: 2rem; + justify-content: center; +} + +.link { + height: 2rem; + display: inline-flex; + align-items: center; + align-content: center; + align-self: center; + margin-left: 8px; +} + .toggle { --uiToggleSize: var(--toggleSize, 20px); --uiToggleIndent: var(--toggleIndent, .4em); diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index bf976dd..ab22e31 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -307,6 +307,34 @@ a { background-color: #00788a; } +.block-container { + padding: 0 8px; +} + +.block { + color: white; + padding: 1em 2em; + border-radius: 4px; + background-color: #00788a; +} + +.links { + position: absolute; + width: 100%; + bottom: 8px; + height: 2rem; + justify-content: center; +} + +.link { + height: 2rem; + display: inline-flex; + align-items: center; + align-content: center; + align-self: center; + margin-left: 8px; +} + .toggle { --uiToggleSize: var(--toggleSize, 20px); --uiToggleIndent: var(--toggleIndent, .4em); diff --git a/skolehjem/public/images/icons/facebook-icon.png b/skolehjem/public/images/icons/facebook-icon.png new file mode 100644 index 0000000..a3a6cdd Binary files /dev/null and b/skolehjem/public/images/icons/facebook-icon.png differ diff --git a/skolehjem/public/images/icons/instagram.png b/skolehjem/public/images/icons/instagram.png new file mode 100644 index 0000000..4be2809 Binary files /dev/null and b/skolehjem/public/images/icons/instagram.png differ diff --git a/skolehjem/public/images/icons/yt.png b/skolehjem/public/images/icons/yt.png new file mode 100644 index 0000000..b01ee11 Binary files /dev/null and b/skolehjem/public/images/icons/yt.png differ diff --git a/skolehjem/resources/sass/app/general/_sizes.scss b/skolehjem/resources/sass/app/general/_sizes.scss index 40dbfa0..a28ff4e 100644 --- a/skolehjem/resources/sass/app/general/_sizes.scss +++ b/skolehjem/resources/sass/app/general/_sizes.scss @@ -57,3 +57,31 @@ a { .bg-sde-blue { background-color: $sde-blue; } + +.block-container { + padding: 0 8px; +} + +.block { + color: white; + padding: 1em 2em; + border-radius: 4px; + background-color: $sde-blue; +} + +.links{ + position: absolute; + width: 100%; + bottom: 8px; + height: 2rem; + justify-content: center; +} + +.link{ + height: 2rem; + display: inline-flex; + align-items: center; + align-content: center; + align-self: center; + margin-left: 8px; +} diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 43f8e58..a3fb7fa 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -15,8 +15,8 @@ ID Event Navn Event Beskrivelse - Update - Delete + Update + Delete @foreach($events as $event) diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php index 8a2c341..b30db93 100644 --- a/skolehjem/resources/views/admin/external-links/index.blade.php +++ b/skolehjem/resources/views/admin/external-links/index.blade.php @@ -15,8 +15,8 @@ ID Title Link - Update - Delete + Update + Delete @foreach($links as $link) diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 39e978b..fe82303 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
@@ -45,6 +45,9 @@
CreateOpret Vaskemaskine
+
+ ReadVis Vaskemaskine Reservationer +
diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index 998d82b..6e78a07 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -20,8 +20,8 @@ Fredag Lørdag Søndag - Update - Delete + Update + Delete @foreach($menuplans as $menuplan) 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/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index efa7f8b..9d98713 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -17,8 +17,8 @@ Efternavn Email Tlf nr - Update - Delete + Update + Delete @foreach($users as $user) diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php index 2013ae3..4c1e3f5 100644 --- a/skolehjem/resources/views/admin/washing-machines/index.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php @@ -14,8 +14,8 @@ ID Navn - Update - Delete + Update + Delete @foreach($machines as $machine) diff --git a/skolehjem/resources/views/admin/washing-reservations/create.blade.php b/skolehjem/resources/views/admin/washing-reservations/create.blade.php new file mode 100644 index 0000000..5460e31 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/create.blade.php @@ -0,0 +1,27 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Opret +@endsection + +@section("path") + Opret Booking / +@endsection + +@section("content") +

Opret Booking:

+
+ @csrf + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/delete.blade.php b/skolehjem/resources/views/admin/washing-reservations/delete.blade.php new file mode 100644 index 0000000..faf2283 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/delete.blade.php @@ -0,0 +1,13 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Fjern +@endsection + +@section("path") + Fjern Booking / +@endsection + +@section("content") +@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/edit.blade.php b/skolehjem/resources/views/admin/washing-reservations/edit.blade.php new file mode 100644 index 0000000..036dbf0 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/edit.blade.php @@ -0,0 +1,28 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Rediger +@endsection + +@section("path") + Rediger Booking / +@endsection + +@section("content") +

Rediger Booking:

+
+ @csrf + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php new file mode 100644 index 0000000..1e2684d --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -0,0 +1,37 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Vis +@endsection + +@section("path") + Vis Booking / +@endsection + +@section("content") + + + + + + + + + + + @foreach($reservations as $reservation) + + + + + + + + + + @endforeach +
IDFornavnEfternavnTlf nrVaskemaskineUpdateDelete
{ID}{Fornavn}{Efternavn}{Tlf Nr}{Vaskemaskine Nr.}UpdateDelete
+ + {{ $reservations->links() }} +@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/show.blade.php b/skolehjem/resources/views/admin/washing-reservations/show.blade.php new file mode 100644 index 0000000..6dea5a8 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/show.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Vis +@endsection + +@section("path") + Vis Booking / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnTelefon Nr.VaskemaskineUpdateDelete
IDFornavnEfternavnTelefon Nr.VaskemaskineUpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/store.blade.php b/skolehjem/resources/views/admin/washing-reservations/store.blade.php new file mode 100644 index 0000000..616c3e8 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/store.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Opret +@endsection + +@section("path") + Opret Booking / +@endsection + +@section("content") + Booking blev (ikke) oprettet. +@endsection diff --git a/skolehjem/resources/views/admin/washing-reservations/update.blade.php b/skolehjem/resources/views/admin/washing-reservations/update.blade.php new file mode 100644 index 0000000..9dd8408 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-reservations/update.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Booking - Rediger +@endsection + +@section("path") + Rediger Booking / +@endsection + +@section("content") + Din booking blev (ikke) redigeret. +@endsection diff --git a/skolehjem/resources/views/app/contact/index.blade.php b/skolehjem/resources/views/app/contact/index.blade.php new file mode 100644 index 0000000..bb157b3 --- /dev/null +++ b/skolehjem/resources/views/app/contact/index.blade.php @@ -0,0 +1,17 @@ +@extends("app.layout.base") +@extends("app.layout.header") +@section("title") + Kontakt +@endsection + +@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 +
+@endsection diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index 94f99ab..5987779 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -2,6 +2,9 @@ {{------app {{----}} +{{--Index--}} +{{--@extends("app.users.index")--}} + {{--Login--}} {{--@extends("app.users.login")--}} @@ -13,17 +16,20 @@ {{--@extends("app.vagttelefons.index")--}} {{--Booking Liste--}} -@extends("app.bookings.index") +{{--@extends("app.washing-reservations.index")--}} {{--Menuplan--}} {{--@extends("app.menuplans.index")--}} +{{--Contact--}} +{{----}}@extends("app.contact.index") + {{----}} {{------Admin Panel {{----}} {{--Index--}} -{{----}}@extends("admin.index") +{{--@extends("admin.index")--}} {{--Create User--}} {{--@extends("admin.users.create")--}} @@ -44,10 +50,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/users/index.blade.php b/skolehjem/resources/views/app/users/index.blade.php index 2f2ba6c..60543b6 100644 --- a/skolehjem/resources/views/app/users/index.blade.php +++ b/skolehjem/resources/views/app/users/index.blade.php @@ -1,4 +1,21 @@ @extends('app.layout.base') @section('content') +
+ Menu + Aktiviteter + Kalender +
+ @endsection 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");