From 1d08ddbf582b448424579900f15956f435c43672 Mon Sep 17 00:00:00 2001 From: Anders Date: Thu, 25 Jun 2020 15:11:59 +0200 Subject: [PATCH] Fixed mistakes --- skolehjem/resources/js/app.js | 10 +++++--- skolehjem/resources/js/sites/menuplan.js | 3 ++- .../resources/views/app/layout/base.blade.php | 2 +- .../views/app/vagttelefons/index.blade.php | 23 ------------------- 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/skolehjem/resources/js/app.js b/skolehjem/resources/js/app.js index f479e32..3b72321 100644 --- a/skolehjem/resources/js/app.js +++ b/skolehjem/resources/js/app.js @@ -15,7 +15,7 @@ require('./date'); require('./sites/menuplan'); //Webapp hamburger menu -require('./navmenu/menu'); +import { toggleMenu } from './navmenu/menu'; // require("./calendar/calendar"); @@ -23,7 +23,7 @@ require('./navmenu/menu'); // window.Vue = require('vue'); -import { generateCalendar } from "./calendar/calendar"; +//import { generateCalendar } from "./calendar/calendar"; // createCalendar(); // @@ -53,4 +53,8 @@ import { generateCalendar } from "./calendar/calendar"; // el: '#app', // }); -generateCalendar(); +//generateCalendar(); + +document.getElementById("toggle").onclick = function () { + toggleMenu('menu'); +}; diff --git a/skolehjem/resources/js/sites/menuplan.js b/skolehjem/resources/js/sites/menuplan.js index 52b23fb..55641df 100644 --- a/skolehjem/resources/js/sites/menuplan.js +++ b/skolehjem/resources/js/sites/menuplan.js @@ -1,4 +1,4 @@ -document.addEventListener("DOMContentLoaded", function(){ +/*document.addEventListener("DOMContentLoaded", function(){ // Handler when the DOM is fully loaded var path = window.location.pathname; @@ -14,3 +14,4 @@ function updateWeek() { elm.innerHTML = "Uge " + date.getWeek(); } +*/ diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 99ee86d..691424f 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -10,7 +10,7 @@ {{-- @yield("header")--}}
- diff --git a/skolehjem/resources/views/app/vagttelefons/index.blade.php b/skolehjem/resources/views/app/vagttelefons/index.blade.php index b4b0a7d..bbd4eb3 100644 --- a/skolehjem/resources/views/app/vagttelefons/index.blade.php +++ b/skolehjem/resources/views/app/vagttelefons/index.blade.php @@ -21,28 +21,5 @@ @endsection @section("scripts") - @endsection