From 1519b6fab9c56b7ecd60d2e1558e5caade2e47b4 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 07:48:58 +0200 Subject: [PATCH 1/5] Fixes --- skolehjem/resources/views/admin/layout/base.blade.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index fe82303..1766df1 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -31,10 +31,10 @@

Booking

- ReadVis Bookings + ReadVis Vaskemaskine Reservationer
- CreateOpret Booking + CreateOpret Vaskemaskine Reservation
@@ -45,9 +45,6 @@
CreateOpret Vaskemaskine
-
- ReadVis Vaskemaskine Reservationer -
From 7d13933ea7027869cfe0545e2487da5835711c76 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 08:02:42 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Fix=20route=20link=20til=20edit=20p=C3=A5?= =?UTF-8?q?=20menuplan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skolehjem/app/Http/Controllers/MenuPlanController.php | 2 +- skolehjem/resources/views/admin/menuplans/edit.blade.php | 5 ++--- skolehjem/resources/views/admin/menuplans/index.blade.php | 2 +- skolehjem/resources/views/admin/menuplans/update.blade.php | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 4a5e0a9..3df1610 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/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]); } /** diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index 09607b8..7295eae 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -6,13 +6,12 @@ @endsection @section("path") - Rediger Menuplan / + Rediger Menuplan / @endsection @section("content")

Rediger Menuplan:

-
- @csrf + diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index 52c5e54..f3932a6 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -31,7 +31,7 @@ {{$menuplan->friday}} {{$menuplan->saturday}} {{$menuplan->sunday}} - Update + Update Delete @endforeach diff --git a/skolehjem/resources/views/admin/menuplans/update.blade.php b/skolehjem/resources/views/admin/menuplans/update.blade.php index ae46029..4feacbf 100644 --- a/skolehjem/resources/views/admin/menuplans/update.blade.php +++ b/skolehjem/resources/views/admin/menuplans/update.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Rediger Menuplan / + Rediger Menuplan / @endsection @section("content") From 0ba866ec2952abd20f9eb5cf78739972f797603b Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 08:13:53 +0200 Subject: [PATCH 3/5] Fixes --- skolehjem/resources/js/navmenu/menu.js | 24 +++++++++---------- .../views/admin/layout/base.blade.php | 2 +- .../washing-reservations/index.blade.php | 4 ++-- .../resources/views/app/layout/base.blade.php | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) 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/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") diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 49543f6..0b5e47a 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -36,7 +36,7 @@ Kontoret Kontoret - + Vagttelefon Vagttelefon From b790d2cf65412fdec0caa5926694f35e2d46551f Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 08:15:11 +0200 Subject: [PATCH 4/5] Fixes --- skolehjem/resources/views/app/layout/base.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 0b5e47a..49543f6 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -36,7 +36,7 @@ Kontoret Kontoret - + Vagttelefon Vagttelefon From b1ae0f0964ecbf0c08e75ae5d9babf3b6a61f3f3 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 08:22:07 +0200 Subject: [PATCH 5/5] Fix edit siden --- skolehjem/app/Http/Controllers/MenuPlanController.php | 4 ++-- skolehjem/resources/views/admin/menuplans/edit.blade.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 3df1610..89d2370 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -75,8 +75,8 @@ class MenuPlanController extends Controller */ public function edit($id) { - $editLink = MenuPlan::find($id); - return Response::detect("menuplans.edit", ["menuPlans" => $editLink]); + $menuplan = MenuPlan::find($id); + return Response::detect("menuplans.edit", ["menuplan" => $menuplan]); } /** diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index 7295eae..3a2b051 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Rediger Menuplan / + $menuplan]) }}" class="text-white">Rediger Menuplan / @endsection @section("content")