Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

 Conflicts:

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

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

@@ -21,12 +21,6 @@
         <input type="text" name="wednesday" id="wednesday" placeholder="Pandekager" required>
         <label for="thursday">Torsdag:</label>
         <input type="text" name="thursday" id="thursday" placeholder="Bøf med løg" required>
-        <label for="friday">Fredag:</label>
-        <input type="text" name="friday" id="friday" placeholder="Tarteletter" required>
-        <label for="saturday">Lørdag:</label>
-        <input type="text" name="saturday" id="saturday" placeholder="Boller i karry" required>
-        <label for="sunday">Søndag:</label>
-        <input type="text" name="sunday" id="sunday" placeholder="Lasagne" required>
 
         <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
     </form>

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

@@ -22,12 +22,6 @@
         <input type="text" name="wednesday" id="onsdag" value="{{ $menuplan->wednesday }}" required>
         <label for="torsdag">Torsdag:</label>
         <input type="text" name="thursday" id="torsdag" value="{{ $menuplan->thursday }}" required>
-        <label for="fredag">Fredag:</label>
-        <input type="text" name="friday" id="fredag" value="{{ $menuplan->friday }}" required>
-        <label for="lørdag">Lørdag:</label>
-        <input type="text" name="saturday" id="lørdag" value="{{ $menuplan->saturday }}" required>
-        <label for="søndag">Søndag:</label>
-        <input type="text" name="sunday" id="søndag" value="{{ $menuplan->sunday }}" required>
 
         <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
     </form>

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

@@ -16,9 +16,6 @@
             <th>Tirsdag</th>
             <th>Onsdag</th>
             <th>Torsdag</th>
-            <th>Fredag</th>
-            <th>Lørdag</th>
-            <th>Søndag</th>
             <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
@@ -28,9 +25,6 @@
             <td>{{$menuplan->tuesday}}</td>
             <td>{{$menuplan->wednesday}}</td>
             <td>{{$menuplan->thursday}}</td>
-            <td>{{$menuplan->friday}}</td>
-            <td>{{$menuplan->saturday}}</td>
-            <td>{{$menuplan->sunday}}</td>
             <td><a href="{{ route("menu-plans.edit", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
             <td>
                 <form method="post" action="{{ route("menu-plans.destroy", [ "menu_plan" => $menuplan ]) }}" class="w-100">

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

@@ -16,9 +16,6 @@
             <th>Tirsdag</th>
             <th>Onsdag</th>
             <th>Torsdag</th>
-            <th>Fredag</th>
-            <th>Lørdag</th>
-            <th>Søndag</th>
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
@@ -27,9 +24,6 @@
             <td>{Tirsdag}</td>
             <td>{Onsdag}</td>
             <td>{Torsdag}</td>
-            <td>{Fredag}</td>
-            <td>{Lørdag}</td>
-            <td>{Søndag}</td>
             <td><a href=""><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>

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

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

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

@@ -2,11 +2,11 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Booking - Fjern
+    Vaske Reservationer - Fjern
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Fjern Booking</a> /
+    <a href="" class="text-white">Fjern Vaske Reservationer</a> /
 @endsection
 
 @section("content")

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

@@ -2,11 +2,11 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Booking - Rediger
+    Vaske Reservationer - Rediger
 @endsection
 
 @section("path")
-    <a href="{{ route('washing-reservations.edit', ['id' => $reservations->id]) }}" class="text-white">Rediger Booking</a> /
+    <a href="{{ route('washing-reservations.edit', ['id' => $reservations->id]) }}" class="text-white">Rediger Vaske Reservationer</a> /
 @endsection
 
 @section("content")

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

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

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

@@ -2,13 +2,13 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Booking - Opret
+    Vaske Reservationer - Opret
 @endsection
 
 @section("path")
-    <a href="{{ route('washing-reservations.create') }}" class="text-white">Opret Booking</a> /
+    <a href="{{ route('washing-reservations.create') }}" class="text-white">Opret Vaske Reservationer</a> /
 @endsection
 
 @section("content")
-    Booking blev (ikke) oprettet.
+    Vaske Reservationer blev (ikke) oprettet.
 @endsection

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

@@ -2,13 +2,13 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Booking - Rediger
+    Vaske Reservationer - Rediger
 @endsection
 
 @section("path")
-    <a href="{{ route('washing-reservations.edit') }}" class="text-white">Rediger Booking</a> /
+    <a href="{{ route('washing-reservations.edit') }}" class="text-white">Rediger Vaske Reservationer</a> /
 @endsection
 
 @section("content")
-    Din booking blev (ikke) redigeret.
+    Din Vaske Reservationer blev (ikke) redigeret.
 @endsection