Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/Http/Controllers/MenuPlanController.php
#	skolehjem/resources/views/admin/external-links/index.blade.php

skolehjem/resources/views/admin/events/delete.blade.php

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Fornavn</th>
             <th>Efternavn</th>
             <th>Email</th>
@@ -21,7 +20,6 @@
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         <tr>
-            <td>{ID}</td>
             <td>{Fornavn}</td>
             <td>{Efternavn}</td>
             <td>{Email}</td>

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

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Fornavn</th>
             <th>Efternavn</th>
             <th>Email</th>
@@ -21,7 +20,6 @@
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         <tr>
-            <td>{ID}</td>
             <td>{Fornavn}</td>
             <td>{Efternavn}</td>
             <td>{Email}</td>

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

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Event Navn</th>
             <th>Event Beskrivelse</th>
             <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
@@ -20,7 +19,6 @@
         </tr>
         @foreach($events as $event)
             <tr>
-                <td>{{ $event->id }}</td>
                 <td>{{ $event->name }}</td>
                 <td>{{ $event->description }}</td>
                 <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>

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

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Fornavn</th>
             <th>Efternavn</th>
             <th>Email</th>
@@ -21,7 +20,6 @@
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         <tr>
-            <td>{ID}</td>
             <td>{Fornavn}</td>
             <td>{Efternavn}</td>
             <td>{Email}</td>

skolehjem/resources/views/admin/events/store.blade.php

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Fornavn</th>
             <th>Efternavn</th>
             <th>Email</th>
@@ -21,7 +20,6 @@
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         <tr>
-            <td>{ID}</td>
             <td>{Fornavn}</td>
             <td>{Efternavn}</td>
             <td>{Email}</td>

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

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Fornavn</th>
             <th>Efternavn</th>
             <th>Email</th>
@@ -21,7 +20,6 @@
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         <tr>
-            <td>{ID}</td>
             <td>{Fornavn}</td>
             <td>{Efternavn}</td>
             <td>{Email}</td>

skolehjem/resources/views/admin/external-links/index.blade.php

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Title</th>
             <th>Link</th>
             <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
@@ -20,9 +19,8 @@
         </tr>
         @foreach($links as $link)
             <tr>
-                <th>{{ $link->id }}</th>
-                <th>{{$link->name}}</th>
-                <th><a href="{{$link->link}}"> {{$link->link}} </th>
+                <th>{Titel}</th>
+                <th>{Link}</th>
                 <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/layout/base.blade.php

@@ -28,25 +28,16 @@
                 <a href="{{ route("menu-plans.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
             </div>
         </div>
-        <div class="segment">
-            <h3 class="text-white">Booking</h3>
-            <div class="row">
-                <a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Bookings</a>
-            </div>
-            <div class="row">
-                <a href="{{ route('washing-reservations.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Booking</a>
-            </div>
-        </div>
         <div class="segment">
             <h3 class="text-white">Vaskemaskiner</h3>
             <div class="row">
                 <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-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
+                <a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vaske Reservationer</a>
             </div>
             <div class="row">
-                <a href="{{ route("washing-reservations.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Vaskemaskine Reservationer</a>
+                <a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
             </div>
         </div>
     </div>

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

@@ -13,20 +13,20 @@
     <h1>Opret Menuplan:</h1>
     <form action="{{ action('MenuPlanController@store') }}" method="post">
         @csrf
-        <label for="mandag">Mandag:</label>
-        <input type="text" name="mandag" id="mandag" required>
-        <label for="tirsdag">Tirsdag:</label>
-        <input type="text" name="tirsdag" id="tirsdag" required>
-        <label for="onsdag">Onsdag:</label>
-        <input type="text" name="onsdag" id="onsdag" required>
-        <label for="torsdag">Torsdag:</label>
-        <input type="text" name="torsdag" id="torsdag" required>
-        <label for="fredag">Fredag:</label>
-        <input type="text" name="fredag" id="fredag" required>
-        <label for="lørdag">Lørdag:</label>
-        <input type="text" name="lørdag" id="lørdag" required>
-        <label for="søndag">Søndag:</label>
-        <input type="text" name="søndag" id="søndag" required>
+        <label for="monday">Mandag:</label>
+        <input type="text" name="monday" id="monday" required>
+        <label for="tuesday">Tirsdag:</label>
+        <input type="text" name="tuesday" id="tuesday" required>
+        <label for="wednesday">Onsdag:</label>
+        <input type="text" name="wednesday" id="wednesday" required>
+        <label for="thursday">Torsdag:</label>
+        <input type="text" name="thursday" id="thursday" required>
+        <label for="friday">Fredag:</label>
+        <input type="text" name="friday" id="friday" required>
+        <label for="saturday">Lørdag:</label>
+        <input type="text" name="saturday" id="saturday" required>
+        <label for="sunday">Søndag:</label>
+        <input type="text" name="sunday" id="sunday" required>
 
         <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
     </form>

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

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Mandag</th>
             <th>Tirsdag</th>
             <th>Onsdag</th>
@@ -25,16 +24,15 @@
         </tr>
         @foreach($menuPlans as $menuplan)
         <tr>
-            <th>{ID}</th>
-            <th>{Mandag}</th>
-            <th>{Tirsdag}</th>
-            <th>{Onsdag}</th>
-            <th>{Torsdag}</th>
-            <th>{Fredag}</th>
-            <th>{Lørdag}</th>
-            <th>{Søndag}</th>
-                <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>
+            <td>{{$menuplan->monday}}</td>
+            <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=""><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
     </table>

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

@@ -6,13 +6,12 @@
 @endsection
 
 @section("path")
-    <a href="{{ route('menu-plans.show') }}" class="text-white">Vis Menuplan</a> /
+    <a href="{{ route('menu-plans.show', [ "id" => $menuplan->id ]) }}" class="text-white">Vis Menuplan</a> /
 @endsection
 
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Fredag</th>
             <th>Tirsdag</th>
             <th>Onsdag</th>
@@ -24,7 +23,6 @@
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         <tr>
-            <td>{ID}</td>
             <td>{Fredag}</td>
             <td>{Tirsdag}</td>
             <td>{Onsdag}</td>

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

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Fornavn</th>
             <th>Efternavn</th>
             <th>Email</th>
@@ -22,7 +21,6 @@
         </tr>
         @foreach($users as $user)
         <tr>
-                <td>{{ $user->id }}</td>
                 <td>{{ $user->name_first }}</td>
                 <td>{{ $user->name_last }}</td>
                 <td>{{ $user->email }}</td>

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

@@ -12,14 +12,12 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Navn</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>
         @foreach($machines as $machine)
         <tr>
-            <td>{ID}</td>
             <td>{Navn}</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>

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

@@ -12,13 +12,11 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Navn</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>
         <tr>
-            <td>{ID}</td>
             <td>{Navn}</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>

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

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Fornavn</th>
             <th>Efternavn</th>
             <th>Tlf nr</th>
@@ -22,7 +21,6 @@
         </tr>
         @foreach($reservations as $reservation)
         <tr>
-                <td>{ID}</td>
                 <td>{Fornavn}</td>
                 <td>{Efternavn}</td>
                 <td>{Tlf Nr}</td>

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

@@ -12,7 +12,6 @@
 @section("content")
     <table class="tbl">
         <tr>
-            <th>ID</th>
             <th>Fornavn</th>
             <th>Efternavn</th>
             <th>Telefon Nr.</th>
@@ -21,7 +20,6 @@
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         <tr>
-            <th>ID</th>
             <th>Fornavn</th>
             <th>Efternavn</th>
             <th>Telefon Nr.</th>