From 47161e2615a3e0b74e3269bc9afad1c13f45b8fd Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 25 Jun 2020 08:28:36 +0200 Subject: [PATCH 1/3] Working on calendar.js --- .../app/Http/Controllers/EventController.php | 14 +- skolehjem/resources/js/app.js | 9 + skolehjem/resources/js/calendar/calendar.js | 216 ++++++++++++++++++ skolehjem/resources/js/calendar/month.js | 31 +++ .../views/app/bookings/index.blade.php | 28 +-- .../resources/views/app/root/index.blade.php | 4 +- 6 files changed, 279 insertions(+), 23 deletions(-) create mode 100644 skolehjem/resources/js/calendar/calendar.js create mode 100644 skolehjem/resources/js/calendar/month.js diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 60eb631..35eacc3 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -19,7 +19,7 @@ class EventController extends Controller { $events = Event::query()->paginate($request->input("limit", 20)); - return Response::detect("events.index", [ "events" => $events]); + return Response::detect("bookings.index", [ "events" => $events]); } /** @@ -29,7 +29,7 @@ class EventController extends Controller */ public function create() { - return Response::detect("events.create"); + return Response::detect("bookings.create"); } /** @@ -49,7 +49,7 @@ class EventController extends Controller $event->save(); - return Response::detect("events.store"); + return Response::detect("bookings.store"); } /** @@ -60,7 +60,7 @@ class EventController extends Controller */ public function show(Event $id) { - return Response::detect("events.show", [ "event" => $id ]); + return Response::detect("bookings.show", [ "event" => $id ]); } /** @@ -71,7 +71,7 @@ class EventController extends Controller */ public function edit(Event $id) { - return Response::detect("events.edit", [ "event" => $id ]); + return Response::detect("bookings.edit", [ "event" => $id ]); } /** @@ -91,7 +91,7 @@ class EventController extends Controller $id->update($requestBody); $id->save(); - return Response::detect("events.update"); + return Response::detect("bookings.update"); } /** @@ -105,6 +105,6 @@ class EventController extends Controller { $id->delete(); - return Response::detect("events.destroy"); + return Response::detect("bookings.destroy"); } } diff --git a/skolehjem/resources/js/app.js b/skolehjem/resources/js/app.js index 8cd4e33..ee9352e 100644 --- a/skolehjem/resources/js/app.js +++ b/skolehjem/resources/js/app.js @@ -15,8 +15,17 @@ require('./sites/menuplan'); //Webapp hamburger menu require('./navmenu/menu'); +// require("./calendar/calendar"); + +import { nextMonth, previousMonth, countDays, createCalendar, months, month, currentMonth, days, calendar } from "./calendar/calendar"; + // window.Vue = require('vue'); +createCalendar(); + +document.getElementById("month-next").onclick = nextMonth; +document.getElementById("month-previous").onclick = previousMonth; + /** * The following block of code may be used to automatically register your * Vue components. It will recursively scan this directory for the Vue diff --git a/skolehjem/resources/js/calendar/calendar.js b/skolehjem/resources/js/calendar/calendar.js new file mode 100644 index 0000000..eca6d56 --- /dev/null +++ b/skolehjem/resources/js/calendar/calendar.js @@ -0,0 +1,216 @@ +// class Calendar { +// constructor() { +// +// } +// +// nextMonth() { +// +// } +// +// previousMonth() { +// +// } +// +// addEvent() { +// +// } +// +// removeEvent() { +// +// } +// } + +const calendar = document.getElementById("calendar"); +const days = [ + "Mandag", + "Tirsdag", + "Onsdag", + "Torsdag", + "Fredag", + "Lørdag", + "Søndag" +]; + +const months = [ + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December", +] + +const month = document.getElementById("month"); + +const year = 2020; + +let currentMonth = 0; + +let firstDay = (new Date(year, month)).getDay(); + +function createCalendar() { + + calendar.innerHTML = ""; + + // HEADER + let header = document.createElement("div"); + header.classList.add("calendar-table__header", "calendar-table__row"); + + days.forEach((value) =>{ + let head = document.createElement("div"); + head.classList.add("calendar-table__col"); + + head.innerText = value; + + header.appendChild(head); + }); + + calendar.appendChild(header); + + + // BODY + + let date = new Date(Date.now()); + + months.forEach((value, index) => { + if(index === date.getMonth()) { + + } + }); + + +//
+//
+// 2 +//
+//
+ + // let intDay = 1; + // for(let columns = 0; columns < 5; columns++) + // { + // let row = document.createElement("div"); + // row.classList.add("calendar-table__row"); + // + // for (let i = 0; i < 7; i++) + // { + // let day = document.createElement("div"); + // day.classList.add("calendar-table__col", "calendar-table__item"); + // day.innerText = intDay; + // // let + // + // row.appendChild(day); + // + // intDay++; + // } + // calendar.appendChild(row); + // } + drawMonth(6); +} + +function drawMonth(monthId) { + + + let dateObject = new Date() + + let date = 1; + for(let columns = 0; columns < 6; columns++) + { + let row = document.createElement("div"); + row.classList.add("calendar-table__row"); + + for (let i = 0; i < 7; i++) + { + if(columns === 0 && i < firstDay) { + let day = document.createElement("div"); + day.classList.add("calendar-table__col", "calendar-table__item"); + // day.innerText = date; + + row.appendChild(day); + } + else if(date > countDays(year, 6)) { + break; + } + + else { + let day = document.createElement("div"); + day.classList.add("calendar-table__col", "calendar-table__item"); + day.innerText = date; + + row.appendChild(day); + date++; + } + + // let day = document.createElement("div"); + // day.classList.add("calendar-table__col", "calendar-table__item"); + // day.innerText = date; + // // let + // + // row.appendChild(day); + // + // date++; + } + calendar.appendChild(row); + } +} + +function nextMonth() { + currentMonth++; + + if(currentMonth > 11) + currentMonth = 0; + + months.forEach((value, index) => { + if(index === currentMonth) + month.innerText = value; + }); + + drawMonth(currentMonth); +} + +function previousMonth() { + currentMonth--; + + if(currentMonth < 0) + currentMonth = 11; + + months.forEach((value, index) => { + if(index === currentMonth) + month.innerText = value; + }); + + drawMonth(currentMonth); +} + + +function countDays(year, month) { + return 32 - new Date(year, month, 32).getDate(); +} + +// Monday +// Tuesday +// Wednesday +// Thursday +// Friday +// Saturday +// Sunday +// +// mon tue wed thu fri sat sun + + +module.exports = { + createCalendar, + countDays, + nextMonth, + previousMonth, + calendar, + days, + months, + currentMonth, + month, +}; diff --git a/skolehjem/resources/js/calendar/month.js b/skolehjem/resources/js/calendar/month.js new file mode 100644 index 0000000..c271448 --- /dev/null +++ b/skolehjem/resources/js/calendar/month.js @@ -0,0 +1,31 @@ +class Month { + constructor(year, monthOffsetNormalized) { + this.year = year; + this.normalizedOffset = monthOffsetNormalized; + } + + init() { + this.firstDay = (new Date(this.year, month - 1)).getDay(); + + + } + + draw(render) { + this.clearRender(render); + + + } + + clearRender(render) { + let renderElement = document.getElementById(render); + renderElement.innerHTML = ""; + } + + createDay() { + + } + + countDays() { + return 32 - new Date(this.year, this.normalizedOffset - 1, 32).getDate(); + } +} diff --git a/skolehjem/resources/views/app/bookings/index.blade.php b/skolehjem/resources/views/app/bookings/index.blade.php index 42b11be..a56e30a 100644 --- a/skolehjem/resources/views/app/bookings/index.blade.php +++ b/skolehjem/resources/views/app/bookings/index.blade.php @@ -10,26 +10,26 @@
- -

{Måned} {År}

-
-
-
-
-
Man
-
Tir
-
Ons
-
Tor
-
Fre
-
Lør
-
Søn
-
+
+
+{{--
--}} +
Mon
+
Tue
+
Wed
+
Thu
+
Fri
+
Sat
+
Sun
+{{--
--}}
diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index ce3e68e..02016ec 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -13,7 +13,7 @@ {{--@extends("app.vagttelefons.index")--}} {{--Booking Liste--}} -{{--@extends("app.bookings.index")--}} +@extends("app.bookings.index") {{----}} {{------Admin Panel @@ -35,7 +35,7 @@ {{--@extends("admin.menuplans.create")--}} {{--Read Menuplan--}} -{{----}}@extends("admin.menuplans.show") +{{--@extends("admin.menuplans.show")--}} {{--Update Menuplan--}} {{--@extends("admin.menuplans.update")--}} From 3f9eaa7f8d9f10798171c0b158707f994427be66 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 25 Jun 2020 13:20:47 +0200 Subject: [PATCH 2/3] Working on calendar.js again --- skolehjem/package-lock.json | 5 + skolehjem/package.json | 3 + skolehjem/resources/js/app.js | 14 +- skolehjem/resources/js/calendar/calendar.js | 394 +++++++++++--------- 4 files changed, 233 insertions(+), 183 deletions(-) diff --git a/skolehjem/package-lock.json b/skolehjem/package-lock.json index 5431d05..f84361c 100644 --- a/skolehjem/package-lock.json +++ b/skolehjem/package-lock.json @@ -5704,6 +5704,11 @@ "minimist": "^1.2.5" } }, + "moment": { + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz", + "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", diff --git a/skolehjem/package.json b/skolehjem/package.json index 52cbde8..5126d1c 100644 --- a/skolehjem/package.json +++ b/skolehjem/package.json @@ -18,5 +18,8 @@ "sass": "^1.20.1", "sass-loader": "^8.0.0", "vue-template-compiler": "^2.6.11" + }, + "dependencies": { + "moment": "^2.27.0" } } diff --git a/skolehjem/resources/js/app.js b/skolehjem/resources/js/app.js index ee9352e..f479e32 100644 --- a/skolehjem/resources/js/app.js +++ b/skolehjem/resources/js/app.js @@ -7,6 +7,8 @@ require('./bootstrap'); //Dependencies +require("moment"); + require('./date'); //Sites @@ -17,14 +19,16 @@ require('./navmenu/menu'); // require("./calendar/calendar"); -import { nextMonth, previousMonth, countDays, createCalendar, months, month, currentMonth, days, calendar } from "./calendar/calendar"; +// import { nextMonth, previousMonth, countDays, createCalendar, months, month, currentMonth, days, calendar } from "./calendar/calendar"; // window.Vue = require('vue'); -createCalendar(); +import { generateCalendar } from "./calendar/calendar"; -document.getElementById("month-next").onclick = nextMonth; -document.getElementById("month-previous").onclick = previousMonth; +// createCalendar(); +// +// document.getElementById("month-next").onclick = nextMonth; +// document.getElementById("month-previous").onclick = previousMonth; /** * The following block of code may be used to automatically register your @@ -48,3 +52,5 @@ document.getElementById("month-previous").onclick = previousMonth; // const app = new Vue({ // el: '#app', // }); + +generateCalendar(); diff --git a/skolehjem/resources/js/calendar/calendar.js b/skolehjem/resources/js/calendar/calendar.js index eca6d56..356982f 100644 --- a/skolehjem/resources/js/calendar/calendar.js +++ b/skolehjem/resources/js/calendar/calendar.js @@ -20,7 +20,11 @@ // } // } +const moment = require("moment"); + const calendar = document.getElementById("calendar"); +const title = document.getElementById("month"); + const days = [ "Mandag", "Tirsdag", @@ -30,187 +34,219 @@ const days = [ "Lørdag", "Søndag" ]; - -const months = [ - "January", - "February", - "March", - "April", - "May", - "June", - "July", - "August", - "September", - "October", - "November", - "December", -] - -const month = document.getElementById("month"); - -const year = 2020; - -let currentMonth = 0; - -let firstDay = (new Date(year, month)).getDay(); - -function createCalendar() { - - calendar.innerHTML = ""; - - // HEADER - let header = document.createElement("div"); - header.classList.add("calendar-table__header", "calendar-table__row"); - - days.forEach((value) =>{ - let head = document.createElement("div"); - head.classList.add("calendar-table__col"); - - head.innerText = value; - - header.appendChild(head); - }); - - calendar.appendChild(header); - - - // BODY - - let date = new Date(Date.now()); - - months.forEach((value, index) => { - if(index === date.getMonth()) { - - } - }); - - -//
-//
-// 2 -//
-//
- - // let intDay = 1; - // for(let columns = 0; columns < 5; columns++) - // { - // let row = document.createElement("div"); - // row.classList.add("calendar-table__row"); - // - // for (let i = 0; i < 7; i++) - // { - // let day = document.createElement("div"); - // day.classList.add("calendar-table__col", "calendar-table__item"); - // day.innerText = intDay; - // // let - // - // row.appendChild(day); - // - // intDay++; - // } - // calendar.appendChild(row); - // } - drawMonth(6); -} - -function drawMonth(monthId) { - - - let dateObject = new Date() - - let date = 1; - for(let columns = 0; columns < 6; columns++) - { - let row = document.createElement("div"); - row.classList.add("calendar-table__row"); - - for (let i = 0; i < 7; i++) - { - if(columns === 0 && i < firstDay) { - let day = document.createElement("div"); - day.classList.add("calendar-table__col", "calendar-table__item"); - // day.innerText = date; - - row.appendChild(day); - } - else if(date > countDays(year, 6)) { - break; - } - - else { - let day = document.createElement("div"); - day.classList.add("calendar-table__col", "calendar-table__item"); - day.innerText = date; - - row.appendChild(day); - date++; - } - - // let day = document.createElement("div"); - // day.classList.add("calendar-table__col", "calendar-table__item"); - // day.innerText = date; - // // let - // - // row.appendChild(day); - // - // date++; - } - calendar.appendChild(row); - } -} - -function nextMonth() { - currentMonth++; - - if(currentMonth > 11) - currentMonth = 0; - - months.forEach((value, index) => { - if(index === currentMonth) - month.innerText = value; - }); - - drawMonth(currentMonth); -} - -function previousMonth() { - currentMonth--; - - if(currentMonth < 0) - currentMonth = 11; - - months.forEach((value, index) => { - if(index === currentMonth) - month.innerText = value; - }); - - drawMonth(currentMonth); -} - - -function countDays(year, month) { - return 32 - new Date(year, month, 32).getDate(); -} - -// Monday -// Tuesday -// Wednesday -// Thursday -// Friday -// Saturday -// Sunday // -// mon tue wed thu fri sat sun +// const months = [ +// "January", +// "February", +// "March", +// "April", +// "May", +// "June", +// "July", +// "August", +// "September", +// "October", +// "November", +// "December", +// ] +// const month = document.getElementById("month"); +// +// const year = 2020; +// +// let currentMonth = 0; +// +// let firstDay = (new Date(year, month)).getDay(); +// +// function createCalendar() { +// +// calendar.innerHTML = ""; +// +// // HEADER +// let header = document.createElement("div"); +// header.classList.add("calendar-table__header", "calendar-table__row"); +// +// days.forEach((value) =>{ +// let head = document.createElement("div"); +// head.classList.add("calendar-table__col"); +// +// head.innerText = value; +// +// header.appendChild(head); +// }); +// +// calendar.appendChild(header); +// +// +// // BODY +// +// let date = new Date(Date.now()); +// +// months.forEach((value, index) => { +// if(index === date.getMonth()) { +// +// } +// }); +// +// +// //
+// //
+// // 2 +// //
+// //
+// +// // let intDay = 1; +// // for(let columns = 0; columns < 5; columns++) +// // { +// // let row = document.createElement("div"); +// // row.classList.add("calendar-table__row"); +// // +// // for (let i = 0; i < 7; i++) +// // { +// // let day = document.createElement("div"); +// // day.classList.add("calendar-table__col", "calendar-table__item"); +// // day.innerText = intDay; +// // // let +// // +// // row.appendChild(day); +// // +// // intDay++; +// // } +// // calendar.appendChild(row); +// // } +// drawMonth(6); +// } +// +// function drawMonth(monthId) { +// +// +// let dateObject = new Date() +// +// let date = 1; +// for(let columns = 0; columns < 6; columns++) +// { +// let row = document.createElement("div"); +// row.classList.add("calendar-table__row"); +// +// for (let i = 0; i < 7; i++) +// { +// if(columns === 0 && i < firstDay) { +// let day = document.createElement("div"); +// day.classList.add("calendar-table__col", "calendar-table__item"); +// // day.innerText = date; +// +// row.appendChild(day); +// } +// else if(date > countDays(year, 6)) { +// break; +// } +// +// else { +// let day = document.createElement("div"); +// day.classList.add("calendar-table__col", "calendar-table__item"); +// day.innerText = date; +// +// row.appendChild(day); +// date++; +// } +// +// // let day = document.createElement("div"); +// // day.classList.add("calendar-table__col", "calendar-table__item"); +// // day.innerText = date; +// // // let +// // +// // row.appendChild(day); +// // +// // date++; +// } +// calendar.appendChild(row); +// } +// } +// +// function nextMonth() { +// currentMonth++; +// +// if(currentMonth > 11) +// currentMonth = 0; +// +// months.forEach((value, index) => { +// if(index === currentMonth) +// month.innerText = value; +// }); +// +// drawMonth(currentMonth); +// } +// +// function previousMonth() { +// currentMonth--; +// +// if(currentMonth < 0) +// currentMonth = 11; +// +// months.forEach((value, index) => { +// if(index === currentMonth) +// month.innerText = value; +// }); +// +// drawMonth(currentMonth); +// } +// +// +// function countDays(year, month) { +// return 32 - new Date(year, month, 32).getDate(); +// } +// +// // Monday +// // Tuesday +// // Wednesday +// // Thursday +// // Friday +// // Saturday +// // Sunday +// // +// // mon tue wed thu fri sat sun +// +// +// module.exports = { +// createCalendar, +// countDays, +// nextMonth, +// previousMonth, +// calendar, +// days, +// months, +// currentMonth, +// month, +// }; + + + +calendar.innerHTML = ""; +// +// cal.forEach(value => { +// let elem = document.createElement("div"); +// elem.innerText = value; +// console.log(value); +// calendar.appendChild(elem); +// }); +// +// title.innerText = moment().format("DD/MM/YYYY"); + +function generateCalendar() { + const startWeek = moment().startOf("month").week(); + const endWeek = moment().endOf("month").week(); + + let cal = []; + for (let week = startWeek; week < endWeek; week++) { + cal.push({ + week : week, + days : Array(7).fill(0).map((n, i) => moment().week(week).startOf("week").clone().add(n + i, "day")) + }); + } + + +} module.exports = { - createCalendar, - countDays, - nextMonth, - previousMonth, - calendar, - days, - months, - currentMonth, - month, + generateCalendar }; From 7f083860f1bb0379c88ab10b9818d86edebd474c Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Thu, 25 Jun 2020 14:52:04 +0200 Subject: [PATCH 3/3] Fixes --- .../views/admin/events/index.blade.php | 4 ++-- .../views/admin/external-links/index.blade.php | 4 ++-- .../resources/views/admin/layout/base.blade.php | 3 +++ .../views/admin/menuplans/index.blade.php | 4 ++-- .../resources/views/admin/users/index.blade.php | 4 ++-- .../admin/washing-machines/index.blade.php | 4 ++-- .../admin/washing-reservations/index.blade.php | 4 ++-- .../resources/views/app/contact/index.blade.php | 17 +++++++++++++++++ .../resources/views/app/root/index.blade.php | 5 ++++- 9 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 skolehjem/resources/views/app/contact/index.blade.php diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 43f8e58..a3fb7fa 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -15,8 +15,8 @@ ID Event Navn Event Beskrivelse - Update - Delete + Update + Delete @foreach($events as $event) diff --git a/skolehjem/resources/views/admin/external-links/index.blade.php b/skolehjem/resources/views/admin/external-links/index.blade.php index 8a2c341..b30db93 100644 --- a/skolehjem/resources/views/admin/external-links/index.blade.php +++ b/skolehjem/resources/views/admin/external-links/index.blade.php @@ -15,8 +15,8 @@ ID Title Link - Update - Delete + Update + Delete @foreach($links as $link) diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 7ed0dfa..fe82303 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -45,6 +45,9 @@
CreateOpret Vaskemaskine
+
+ ReadVis Vaskemaskine Reservationer +
diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index 998d82b..6e78a07 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -20,8 +20,8 @@ Fredag Lørdag Søndag - Update - Delete + Update + Delete @foreach($menuplans as $menuplan) diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index efa7f8b..9d98713 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -17,8 +17,8 @@ Efternavn Email Tlf nr - Update - Delete + Update + Delete @foreach($users as $user) diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php index 2013ae3..4c1e3f5 100644 --- a/skolehjem/resources/views/admin/washing-machines/index.blade.php +++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php @@ -14,8 +14,8 @@ ID Navn - Update - Delete + Update + Delete @foreach($machines as $machine) diff --git a/skolehjem/resources/views/admin/washing-reservations/index.blade.php b/skolehjem/resources/views/admin/washing-reservations/index.blade.php index c298261..1e2684d 100644 --- a/skolehjem/resources/views/admin/washing-reservations/index.blade.php +++ b/skolehjem/resources/views/admin/washing-reservations/index.blade.php @@ -17,8 +17,8 @@ Efternavn Tlf nr Vaskemaskine - Update - Delete + Update + Delete @foreach($reservations as $reservation) diff --git a/skolehjem/resources/views/app/contact/index.blade.php b/skolehjem/resources/views/app/contact/index.blade.php new file mode 100644 index 0000000..bb157b3 --- /dev/null +++ b/skolehjem/resources/views/app/contact/index.blade.php @@ -0,0 +1,17 @@ +@extends("app.layout.base") +@extends("app.layout.header") +@section("title") + Kontakt +@endsection + +@section("content") +
+

Kontakt

+

Email: x@x.x

+ +45 xx xx xx xx + Tilkald x +

Email: x@x.x

+ +45 xx xx xx xx + Tilkald x +
+@endsection diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index e1d118b..5987779 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -3,7 +3,7 @@ {{----}} {{--Index--}} -{{----}}@extends("app.users.index") +{{--@extends("app.users.index")--}} {{--Login--}} {{--@extends("app.users.login")--}} @@ -21,6 +21,9 @@ {{--Menuplan--}} {{--@extends("app.menuplans.index")--}} +{{--Contact--}} +{{----}}@extends("app.contact.index") + {{----}} {{------Admin Panel {{----}}