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

 Conflicts:

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

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

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

skolehjem/app/Http/Controllers/ExternalLinkController.php

@@ -19,7 +19,7 @@ class ExternalLinkController extends Controller
     {
         $externalLink = ExternalLink::query()->paginate($request->input("limit", 20));
 
-        return Response::detect("external-links.index", [ "externalLinks" => $externalLink ]);
+        return Response::detect("external-links.index", [ "links" => $externalLink ]);
     }
 
     /**
@@ -59,7 +59,7 @@ class ExternalLinkController extends Controller
      */
     public function show($id)
     {
-        return Response::detect("external-links.show", [ "externallink" => $id]);
+        return Response::detect("external-links.show", [ "link" => $id]);
     }
 
     /**
@@ -71,7 +71,7 @@ class ExternalLinkController extends Controller
     public function edit($id)
     {
         $link = ExternalLink::find($id);
-        return Response::detect("external-links.edit", ["externallink" => $link]);
+        return Response::detect("external-links.edit", ["link" => $link]);
     }
 
     /**
@@ -84,8 +84,8 @@ class ExternalLinkController extends Controller
     public function update(Request $request, $id)
     {
         $data = $request->validate([
-            "name" => "",
+            "name" => "max:255",
-            "link" => ""
+            "link" => "max:255"
             ]);
 
         $id->update($data);

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/external-links/create.blade.php

@@ -14,7 +14,7 @@
     <form method="post" action="{{ route("external-links.store") }}">
         @csrf
         <label for="title">Titel:</label>
-        <input type="text" name="title" id="title" required>
+        <input type="text" name="name" id="title" required>
         <label for="link">Linket:</label>
         <input type="text" name="link" id="link" required>
         <input type="submit" class="btn btn-dark text-white" value="Opret">

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

@@ -6,12 +6,12 @@
 @endsection
 
 @section("path")
-    <a href="{{ route('external-links.edit') }}" class="text-white">Rediger Link</a> /
+    <a href="../external-links/edit.blade.php" class="text-white">Rediger Link</a> /
 @endsection
 
 @section("content")
     <h1>Rediger Link:</h1>
-    <form method="post" action="">
+    <form method="post" action="{{ route("external-links.edit", ['external_link' => $link]) }}">
         @csrf
         <label for="title">Titel:</label>
         <input type="text" name="title" id="title" required>

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

@@ -19,8 +19,8 @@
         </tr>
         @foreach($links as $link)
             <tr>
-                <th>{Titel}</th>
+                <th>{{$link->name}}</th>
-                <th>{Link}</th>
+                <th><a href="{{$link->link}}">{{$link->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/external-links/store.blade.php

@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Link - Opret
+@endsection
+
+@section("path")
+    <a href="{{ route('external-links.create') }}" class="text-white">Opret External Link</a> /
+@endsection
+
+@section("content")
+    Link blev (ikke) oprettet.
+@endsection

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

@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    link - Rediger
+@endsection
+
+@section("path")
+    <a href="{{ route('external-links.index') }}" class="text-white">External link</a> /
+@endsection
+
+@section("content")
+    Din link blev (ikke) redigeret.
+@endsection

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/washing-reservations/index.blade.php

@@ -2,11 +2,11 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Booking - Vis
+    Vaskemaskine 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 Vaskemaskine Reservationer</a> /
 @endsection
 
 @section("content")