Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/resources/views/admin/washing-reservations/index.blade.php

skolehjem/resources/views/admin/layout/base.blade.php

@@ -34,7 +34,7 @@
                 <a href="{{ route("washing-machines.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Vaskemaskiner</a>
             </div>
             <div class="row">
-                <a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vaske Reservationer</a>
+                <a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Vaskemaskine Reservationer</a>
             </div>
             <div class="row">
                 <a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>

skolehjem/resources/views/admin/menuplans/edit.blade.php

@@ -6,13 +6,12 @@
 @endsection
 
 @section("path")
-    <a class="text-white">Rediger Menuplan</a> /
+    <a href="{{ route('menu-plans.edit') }}" class="text-white">Rediger Menuplan</a> /
 @endsection
 
 @section("content")
     <h1>Rediger Menuplan:</h1>
-    <form method="post" action="{{ route("menu-plans.store") }}">
-        @csrf
+    <form method="post" action="">
         <label for="mandag">Mandag:</label>
         <input type="text" name="mandag" id="mandag" value="{Mandag}" required>
         <label for="tirsdag">Tirsdag:</label>

skolehjem/resources/views/admin/menuplans/index.blade.php

@@ -31,7 +31,7 @@
             <td>{{$menuplan->friday}}</td>
             <td>{{$menuplan->saturday}}</td>
             <td>{{$menuplan->sunday}}</td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
+            <td><a href="{{route('menu-plans.edit', $menuplan->id)}}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
             <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
         </tr>
         @endforeach

skolehjem/resources/views/admin/menuplans/update.blade.php

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="{{ route('menuplans.edit') }}" class="text-white">Rediger Menuplan</a> /
+    <a href="{{ route('menu-plans.edit') }}" class="text-white">Rediger Menuplan</a> /
 @endsection
 
 @section("content")

skolehjem/resources/views/admin/washing-reservations/index.blade.php

@@ -2,11 +2,11 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Vaske Reservationer - Vis
+    Vaskemaskine Reservationer - Vis
 @endsection
 
 @section("path")
-    <a href="{{ route('washing-reservations.index') }}" class="text-white">Vis Vaske Reservationer</a> /
+    <a href="{{ route('washing-reservations.index') }}" class="text-white">Vis Vaskemaskine Reservationer</a> /
 @endsection
 
 @section("content")