diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php index af6218b..56ee195 100644 --- a/skolehjem/app/Http/Controllers/ExternalLinkController.php +++ b/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" => "", - "link" => "" + "name" => "max:255", + "link" => "max:255" ]); $id->update($data); diff --git a/skolehjem/resources/js/navmenu/menu.js b/skolehjem/resources/js/navmenu/menu.js index 08393c8..9a3e8d9 100644 --- a/skolehjem/resources/js/navmenu/menu.js +++ b/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 = { diff --git a/skolehjem/resources/views/admin/external-links/create.blade.php b/skolehjem/resources/views/admin/external-links/create.blade.php index 0863aa1..318a6a6 100644 --- a/skolehjem/resources/views/admin/external-links/create.blade.php +++ b/skolehjem/resources/views/admin/external-links/create.blade.php @@ -14,7 +14,7 @@
@csrf - + diff --git a/skolehjem/resources/views/admin/external-links/edit.blade.php b/skolehjem/resources/views/admin/external-links/edit.blade.php index 8350aad..b789270 100644 --- a/skolehjem/resources/views/admin/external-links/edit.blade.php +++ b/skolehjem/resources/views/admin/external-links/edit.blade.php @@ -6,12 +6,12 @@ @endsection @section("path") - Rediger Link / + Rediger Link / @endsection @section("content")

Rediger Link:

- + $link]) }}"> @csrf diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php index 1e692f3..5cff797 100644 --- a/skolehjem/resources/views/admin/external-links/index.blade.php +++ b/skolehjem/resources/views/admin/external-links/index.blade.php @@ -19,8 +19,8 @@ @foreach($links as $link) - {Titel} - {Link} + {{$link->name}} + {{$link->link}} Update Delete diff --git a/skolehjem/resources/views/admin/external-links/store.blade.php b/skolehjem/resources/views/admin/external-links/store.blade.php new file mode 100644 index 0000000..efdc62b --- /dev/null +++ b/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") + Opret External Link / +@endsection + +@section("content") + Link blev (ikke) oprettet. +@endsection diff --git a/skolehjem/resources/views/admin/external-links/update.blade.php b/skolehjem/resources/views/admin/external-links/update.blade.php new file mode 100644 index 0000000..abd2dfe --- /dev/null +++ b/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") + External link / +@endsection + +@section("content") + Din link blev (ikke) redigeret. +@endsection diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index b7564de..67cf268 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -34,7 +34,7 @@ ReadVis Vaskemaskiner
- ReadVaske Reservationer + ReadVis Vaskemaskine Reservationer
CreateOpret Vaskemaskine diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index 251ea53..2d204c0 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/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") - Vis Booking / + Vis Vaskemaskine Reservationer / @endsection @section("content")