diff --git a/.idea/php.xml b/.idea/php.xml index ea2c04b..f1a82aa 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -9,16 +9,12 @@ - - - - @@ -27,7 +23,6 @@ - @@ -36,18 +31,7 @@ - - - - - - - - - - - @@ -75,12 +59,9 @@ - - - @@ -89,30 +70,12 @@ - - - - - - - - - - - - - - - - - - diff --git a/.idea/skolehjem-webapp.iml b/.idea/skolehjem-webapp.iml index 924e151..0da7fb8 100644 --- a/.idea/skolehjem-webapp.iml +++ b/.idea/skolehjem-webapp.iml @@ -12,22 +12,15 @@ - - - - - - - @@ -42,30 +35,15 @@ - - - - - - - - - - - - - - - @@ -76,19 +54,6 @@ - - - - - - - - - - - - - @@ -118,11 +83,9 @@ - - 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/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 84f8594..4a5e0a9 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -41,8 +41,13 @@ class MenuPlanController extends Controller public function store(Request $request) { $requestMenuPlanCreate = $request->validate([ - "name" => "required|max:255", - "link" => "required|max:255" + "monday" => "required|max:255", + "tuesday" => "required|max:255", + "wednesday" => "required|max:255", + "thursday" => "required|max:255", + "friday" => "required|max:255", + "saturday" => "required|max:255", + "sunday" => "required|max:255" ]); $menuPlans = new MenuPlan($requestMenuPlanCreate); @@ -57,9 +62,9 @@ class MenuPlanController extends Controller * @param int $id * @return \Illuminate\Http\Response */ - public function show($id) + public function show(MenuPlan $id) { - return Response::detect("menu-plan.show", [ "menu-plans" => $id]); + return Response::detect("menuplans.show", [ "menuplan" => $id]); } /** @@ -71,7 +76,7 @@ class MenuPlanController extends Controller public function edit($id) { $editLink = MenuPlan::find($id); - return Response::detect("menu-plans.edit", ["menu-plans" => $editLink]); + return Response::detect("menuplans.edit", ["menu-plans" => $editLink]); } /** @@ -91,7 +96,7 @@ class MenuPlanController extends Controller $id->update($data); $id->save(); - return Response::detect("menu-plans.update"); + return Response::detect("menuplans.update"); } /** @@ -103,6 +108,6 @@ class MenuPlanController extends Controller public function destroy($id) { $id->delete(); - return Response::detect("menu-plans.destroy"); + return Response::detect("menuplans.destroy"); } } diff --git a/skolehjem/app/MenuPlan.php b/skolehjem/app/MenuPlan.php index a449ec1..cce1492 100644 --- a/skolehjem/app/MenuPlan.php +++ b/skolehjem/app/MenuPlan.php @@ -6,5 +6,7 @@ use Illuminate\Database\Eloquent\Model; class MenuPlan extends Model { - // + protected $fillable = [ + 'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday" + ]; } diff --git a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php index 0b194f6..9506908 100644 --- a/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php +++ b/skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php @@ -15,7 +15,15 @@ class CreateMenuPlans extends Migration { Schema::create('menu_plans', function (Blueprint $table) { $table->id(); + $table->string('monday', 255); + $table->string('tuesday', 255); + $table->string('wednesday', 255); + $table->string('thursday', 255); + $table->string('friday', 255); + $table->string('saturday', 255); + $table->string('sunday', 255); $table->timestamps(); + //$table->text('description'); }); } diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index a39e0c1..e9ec7da 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -6737,11 +6737,11 @@ main { color: #99A4AE; font-size: 12px; font-weight: 700; - padding: 12px 3px; + padding: 6px 3px; text-align: center; text-transform: uppercase; width: 40px; - height: 38px; + height: 18px; } @media (min-width: 360px) { @@ -6765,7 +6765,7 @@ main { @media (min-width: 360px) { .calendar-table__body .calendar-table__col { width: 46px; - height: 48px; + height: 24px; } } diff --git a/skolehjem/resources/js/app.js b/skolehjem/resources/js/app.js index 3b72321..4dd2dd9 100644 --- a/skolehjem/resources/js/app.js +++ b/skolehjem/resources/js/app.js @@ -7,7 +7,7 @@ require('./bootstrap'); //Dependencies -require("moment"); +const moment = require("moment"); require('./date'); @@ -23,7 +23,7 @@ import { toggleMenu } from './navmenu/menu'; // window.Vue = require('vue'); -//import { generateCalendar } from "./calendar/calendar"; +import { generateCalendar } from "./calendar/calendar"; // createCalendar(); // @@ -53,8 +53,23 @@ import { toggleMenu } from './navmenu/menu'; // el: '#app', // }); -//generateCalendar(); +let weekOffset = 0; -document.getElementById("toggle").onclick = function () { - toggleMenu('menu'); -}; +if(document.getElementById("calendar")) { + generateCalendar(); + + document.getElementById("week-previous").onclick = function () { + weekOffset--; + generateCalendar(weekOffset); + } + + document.getElementById("week-next").onclick = function () { + weekOffset++; + generateCalendar(weekOffset); + } +} + +if(document.getElementById("toggle")) + document.getElementById("toggle").onclick = function () { + toggleMenu('menu'); + }; diff --git a/skolehjem/resources/js/calendar/calendar.js b/skolehjem/resources/js/calendar/calendar.js index 356982f..b7faff0 100644 --- a/skolehjem/resources/js/calendar/calendar.js +++ b/skolehjem/resources/js/calendar/calendar.js @@ -22,229 +22,167 @@ const moment = require("moment"); -const calendar = document.getElementById("calendar"); -const title = document.getElementById("month"); - -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, -// }; +// const calendar = document.getElementById("calendar"); +// const title = document.getElementById("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"); +// calendar.innerHTML = ""; -function generateCalendar() { - const startWeek = moment().startOf("month").week(); - const endWeek = moment().endOf("month").week(); +function generateCalendar(weekOffset = 0) { + const week = (moment().week() + weekOffset); - 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")) - }); + document.getElementById("title").innerText = week; + + let weekDays = Array.apply(null, Array(7)).map((value, index) => { + return moment(index, "e").locale("da").startOf("week").weekday(index).format("ddd"); + }); + // weekDays.push(weekDays.shift()); + + // console.log(week); + // console.log(weekDays); + + const calendar = document.getElementById("calendar"); + + let header = document.createElement("div"); + header.classList.add("calendar-table__header", "calendar-table__row"); + + let calendarBody = document.createElement("div"); + calendarBody.classList.add("calendar-table__body"); + + let calendarRow = document.createElement("div"); + calendarRow.classList.add("calendar-table__row") + + weekDays.forEach(function (weekDay) { + let headerDay = document.createElement("div"); + headerDay.classList.add("calendar-table__col"); + + headerDay.innerText = weekDay; + + header.appendChild(headerDay); + + + let date = moment().locale("da").day(weekDay).week(week); + + // onDateSelect(date); + + let dayHolder = document.createElement("div"); + dayHolder.classList.add("calendar-table__col"); + + let day = document.createElement("div"); + day.classList.add("calendar-table__item"); + day.innerText = date.date(); + + dayHolder.appendChild(day); + + dayHolder.onclick = function() { + onDateSelect(date); + } + + calendarRow.appendChild(dayHolder); + }); + + calendarBody.appendChild(calendarRow); + + calendar.innerHTML = ""; + + calendar.appendChild(header); + calendar.appendChild(calendarBody); +} + +function onDateSelect(date) { + let events; + let machinez; + + let container = document.getElementById("event-container"); + + + if(document.getElementById("washing-machines") != undefined) + machinez = document.getElementById("washing-machines"); + else { + let span = document.createElement("span"); + span.classList.add("events__title"); + span.innerText = "Maskiner"; + + let select = document.createElement("select"); + select.classList.add("events__title"); + select.id = "washing-machines"; + + container.appendChild(span); + container.appendChild(select); + + machinez = document.getElementById("washing-machines"); + } + if(document.getElementById("events") != undefined) + events = document.getElementById("events"); + else { + let span = document.createElement("span"); + span.classList.add("events__title"); + span.innerText = "Tider"; + + let select = document.createElement("select"); + select.classList.add("events__title"); + select.id = "events"; + + container.appendChild(span); + container.appendChild(select); + + events = document.getElementById("events"); + } + + // events.innerHTML = ""; + + const machines = [ + "Maskine 1", + "Maskine 2" + ] + + for (let i = 0; i < machines.length; i++) { + let option = document.createElement("option"); + option.text = machines[i]; + + machinez.appendChild(option); } + for (let hour = 8; hour <= 20; hour++) { + + let option = document.createElement("option"); + option.text = prependZero(hour); + + events.appendChild(option); + + // let item = document.createElement("li"); + // item.classList.add("events__item"); + // + // let itemData = document.createElement("div"); + // + // let head = document.createElement("span"); + // head.classList.add("events__name"); + // head.innerText = "Vaskemaskine Tid"; + // + // let dat = document.createElement("span"); + // dat.classList.add("events__date"); + // dat.innerText = "Klokken " + prependZero(hour); + // + // itemData.appendChild(head); + // itemData.appendChild(dat); + // item.appendChild(itemData); + // + // let button = document.createElement("span"); + // button.classList.add("events__tag"); + // button.innerText = "Book"; + // + // item.appendChild(button); + // + // events.appendChild(item); + } +} + +function prependZero(value) { + if(value < 10) + return "0" + value; + return value; } module.exports = { diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss index 8c38155..02677db 100644 --- a/skolehjem/resources/sass/webapp/_default.scss +++ b/skolehjem/resources/sass/webapp/_default.scss @@ -285,11 +285,11 @@ $primary-color: $blue; color: $gray; font-size: $sm-font-size; font-weight: $font-weight--bold; - padding: 12px 3px; + padding: 6px 3px; text-align: center; text-transform: uppercase; width: 40px; - height: 38px; + height: 18px; @include mq(360) { width: 46px; @@ -309,7 +309,7 @@ $primary-color: $blue; @include mq(360) { width: 46px; - height: 48px; + height: 24px; } @include mq(410) { 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..ae2f856 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->name]) }}"> @csrf 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/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php index 3647b94..fab76ef 100644 --- a/skolehjem/resources/views/admin/menuplans/create.blade.php +++ b/skolehjem/resources/views/admin/menuplans/create.blade.php @@ -13,20 +13,20 @@

Opret Menuplan:

@csrf - - - - - - - - - - - - - - + + + + + + + + + + + + + +
diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index 7295eae..09607b8 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -6,12 +6,13 @@ @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 13f36c4..52c5e54 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -24,15 +24,15 @@ @foreach($menuPlans as $menuplan) - {Mandag} - {Tirsdag} - {Onsdag} - {Torsdag} - {Fredag} - {Lørdag} - {Søndag} - Update - Delete + {{$menuplan->monday}} + {{$menuplan->tuesday}} + {{$menuplan->wednesday}} + {{$menuplan->thursday}} + {{$menuplan->friday}} + {{$menuplan->saturday}} + {{$menuplan->sunday}} + Update + Delete @endforeach diff --git a/skolehjem/resources/views/admin/menuplans/show.blade.php b/skolehjem/resources/views/admin/menuplans/show.blade.php index 1154e24..5a8b198 100644 --- a/skolehjem/resources/views/admin/menuplans/show.blade.php +++ b/skolehjem/resources/views/admin/menuplans/show.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Vis Menuplan / + $menuplan->id ]) }}" class="text-white">Vis Menuplan / @endsection @section("content") diff --git a/skolehjem/resources/views/app/bookings/index.blade.php b/skolehjem/resources/views/app/bookings/index.blade.php index a56e30a..b9202f6 100644 --- a/skolehjem/resources/views/app/bookings/index.blade.php +++ b/skolehjem/resources/views/app/bookings/index.blade.php @@ -10,11 +10,11 @@
-

{Måned} {År}

-
@@ -223,22 +223,22 @@
Tider -
    -
  • -
    - Vaskemaskine Tid - {Dato} -
    - Book -
    • -
  • -
    - Vaskemaskine Tid - {Dato} -
    - Book -
    • -
+
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 3e418e3..49543f6 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -16,27 +16,27 @@