diff --git a/skolehjem/public/images/icons/trashcan-dark.svg b/skolehjem/public/images/icons/trashcan-dark.svg new file mode 100644 index 0000000..d5c6fbe --- /dev/null +++ b/skolehjem/public/images/icons/trashcan-dark.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/resources/js/app.js b/skolehjem/resources/js/app.js index c626430..8cd4e33 100644 --- a/skolehjem/resources/js/app.js +++ b/skolehjem/resources/js/app.js @@ -9,14 +9,11 @@ require('./bootstrap'); //Dependencies require('./date'); -//Webapp hamburger menu -require('./navmenu/menu'); - //Sites require('./sites/menuplan'); -//Initializer -require('./init'); +//Webapp hamburger menu +require('./navmenu/menu'); // window.Vue = require('vue'); diff --git a/skolehjem/resources/js/init.js b/skolehjem/resources/js/init.js deleted file mode 100644 index 0cbe11a..0000000 --- a/skolehjem/resources/js/init.js +++ /dev/null @@ -1,32 +0,0 @@ -document.addEventListener("DOMContentLoaded", function(){ - // Handler when the DOM is fully loaded - start(); -}); - -function start() { - var path = window.location.pathname; - - switch (path) { - //Webapp - default: - break; - case "/menuplan": - menuplan(); - break; - case "/vagttelefon": - vagttelefon(); - break; - - //Admin Panel - case "/admin": - break; - } -} - -function menuplan() { - startMenuplan(); -} - -function vagttelefon() { - startMenu(); -} diff --git a/skolehjem/resources/js/navmenu/menu.js b/skolehjem/resources/js/navmenu/menu.js index 8ebb926..3ab3947 100644 --- a/skolehjem/resources/js/navmenu/menu.js +++ b/skolehjem/resources/js/navmenu/menu.js @@ -1,6 +1,12 @@ -function startMenu() { - document.getElementById ('toggle').addEventListener ('click', toggleMenu, false); -} +document.addEventListener("DOMContentLoaded", function(){ + // Handler when the DOM is fully loaded + var path = window.location.pathname; + + if(path === "/menuplan" || path === "/vagttelefon" || path === "/") + { + document.getElementById ('toggle').addEventListener ('click', toggleMenu, false); + } +}); function toggleMenu() { var buttonElement = document.getElementById('menuIcon'); diff --git a/skolehjem/resources/js/sites/menuplan.js b/skolehjem/resources/js/sites/menuplan.js index 1995d8e..2f14dea 100644 --- a/skolehjem/resources/js/sites/menuplan.js +++ b/skolehjem/resources/js/sites/menuplan.js @@ -1,7 +1,12 @@ -function startMenuplan() { - updateWeek(); - startMenu(); -} +document.addEventListener("DOMContentLoaded", function(){ + // Handler when the DOM is fully loaded + var path = window.location.pathname; + + if(path === "/menuplan") + { + updateWeek(); + } +}); function updateWeek() { var elm = document.getElementById('week'); diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index d5bd3b4..c6841e5 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -18,9 +18,6 @@
CreateOpret Bruger
-
- DeleteFjern Bruger -
UpdateRediger Bruger
@@ -33,9 +30,6 @@
CreateOpret Menuplan
-
- DeleteFjern Menuplan -
UpdateRediger Menuplan
diff --git a/skolehjem/resources/views/admin/menuplan/delete.blade.php b/skolehjem/resources/views/admin/menuplan/delete.blade.php deleted file mode 100644 index ac5aad6..0000000 --- a/skolehjem/resources/views/admin/menuplan/delete.blade.php +++ /dev/null @@ -1,14 +0,0 @@ -@extends("admin.layout.base") -@extends("admin.layout.header") - -@section("title") - Menuplan - Delete -@endsection - -@section("path") - Fjern Menuplan / -@endsection - -@section("content") - Delete -@endsection diff --git a/skolehjem/resources/views/admin/menuplan/read.blade.php b/skolehjem/resources/views/admin/menuplan/read.blade.php index c428175..b733ab6 100644 --- a/skolehjem/resources/views/admin/menuplan/read.blade.php +++ b/skolehjem/resources/views/admin/menuplan/read.blade.php @@ -21,6 +21,7 @@ Lørdag Søndag Update + Delete {ID} @@ -32,6 +33,7 @@ {Lørdag} {Søndag} Update + Delete @endsection diff --git a/skolehjem/resources/views/admin/user/delete.blade.php b/skolehjem/resources/views/admin/user/delete.blade.php deleted file mode 100644 index 7e342a2..0000000 --- a/skolehjem/resources/views/admin/user/delete.blade.php +++ /dev/null @@ -1,14 +0,0 @@ -@extends("admin.layout.base") -@extends("admin.layout.header") - -@section("title") - User - Delete -@endsection - -@section("path") - Fjern Bruger / -@endsection - -@section("content") - Delete -@endsection diff --git a/skolehjem/resources/views/admin/user/read.blade.php b/skolehjem/resources/views/admin/user/read.blade.php index 30b2995..e00506e 100644 --- a/skolehjem/resources/views/admin/user/read.blade.php +++ b/skolehjem/resources/views/admin/user/read.blade.php @@ -18,6 +18,7 @@ Email Tlf nr Update + Delete {ID} @@ -26,6 +27,7 @@ {Email} {TLF} Update + Delete @endsection diff --git a/skolehjem/resources/views/index.blade.php b/skolehjem/resources/views/index.blade.php index fee5637..cd728b3 100644 --- a/skolehjem/resources/views/index.blade.php +++ b/skolehjem/resources/views/index.blade.php @@ -1,5 +1,5 @@ {{----}} -{{------User +{{------Webapp {{----}} {{--Login--}} @@ -8,6 +8,10 @@ {{--Register--}} {{--@extends("app.user.register")--}} + +{{--Vagttelefon--}} +{{--@extends("webapp.vagttelefon.index")--}} + {{----}} {{------Admin Panel {{----}} @@ -21,18 +25,11 @@ {{--Update User--}} {{--@extends("admin.user.update")--}} -{{--Delete User--}} -{{--@extends("admin.user.delete")--}} - - {{--Create Menuplan--}} -{{--@extends("admin.menuplan.create")--}} +{{----}}@extends("admin.menuplan.create") {{--Read Menuplan--}} {{--@extends("admin.menuplan.read")--}} {{--Update Menuplan--}} -{{----}}@extends("admin.menuplan.update") - -{{--Delete Menuplan--}} -{{--@extends("admin.menuplan.delete")--}} +{{--@extends("admin.menuplan.update")--}}