Merge remote-tracking branch 'origin/master'

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

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -76,7 +76,7 @@ class MenuPlanController extends Controller
     public function edit($id)
     {
         $editLink = MenuPlan::find($id);
-        return Response::detect("menuplans.edit", ["menu-plans" => $editLink]);
+        return Response::detect("menuplans.edit", ["menuPlans" => $editLink]);
     }
 
     /**

skolehjem/resources/js/navmenu/menu.js

@@ -1,13 +1,3 @@
-// document.addEventListener("DOMContentLoaded", function(){
-//     // Handler when the DOM is fully loaded
-//     var path = window.location.pathname;
-//
-//     if(path === "/menuplans" || path === "/vagttelefon" || path === "/")
-//     {
-//         document.getElementById ('toggle').addEventListener ('click', toggleMenu, false);
-//     }
-// });
-//
 // function toggleMenu() {
 //     var buttonElement = document.getElementById('menuIcon');
 //
@@ -39,11 +29,21 @@
 
 function toggleMenu(menu) {
     let menuElement = document.getElementById(menu);
+    let logoElement = document.getElementById("sdeLogo");
+    let htmlElement = document.getElementsByTagName('html')[0];
+    let mainElement = document.getElementsByTagName('main')[0];
 
-    if(menuElement.classList.contains("hide"))
+    if(menuElement.classList.contains("hide")) {
         menuElement.classList.remove("hide");
-    else
+        mainElement.classList.remove("d-none");
+        htmlElement.style.backgroundColor = 'rgb(255, 255, 255)';
+        logoElement.src = '/images/logos/Logo-normal.svg';
+    } else {
         menuElement.classList.add("hide");
+        mainElement.classList.add("d-none");
+        htmlElement.style.backgroundColor = 'rgb(0, 120, 138)';
+        logoElement.src = '/images/logos/Logo-hvid.svg';
+    }
 }
 
 module.exports = {

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") }}">
+    <form method="post" action="">
-        @csrf
         <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")