vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-06-29 07:54:41 +02:00
parent c6282b77d1 b03a89463a
commit f517e53557
21 changed files with 348 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
.idea/php.xml
View File

@ -9,16 +9,12 @@
<path value="$PROJECT_DIR$/skolehjem/vendor/psr/log" />
<path value="$PROJECT_DIR$/skolehjem/vendor/psr/simple-cache" />
<path value="$PROJECT_DIR$/skolehjem/vendor/psy/psysh" />
<path value="$PROJECT_DIR$/skolehjem/vendor/filp/whoops" />
<path value="$PROJECT_DIR$/skolehjem/vendor/opis/closure" />
<path value="$PROJECT_DIR$/skolehjem/vendor/voku/portable-ascii" />
<path value="$PROJECT_DIR$/skolehjem/vendor/asm89/stack-cors" />
<path value="$PROJECT_DIR$/skolehjem/vendor/brick/math" />
<path value="$PROJECT_DIR$/skolehjem/vendor/nikic/php-parser" />
<path value="$PROJECT_DIR$/skolehjem/vendor/defuse/php-encryption" />
<path value="$PROJECT_DIR$/skolehjem/vendor/facade/flare-client-php" />
<path value="$PROJECT_DIR$/skolehjem/vendor/facade/ignition" />
<path value="$PROJECT_DIR$/skolehjem/vendor/facade/ignition-contracts" />
<path value="$PROJECT_DIR$/skolehjem/vendor/league/commonmark" />
<path value="$PROJECT_DIR$/skolehjem/vendor/league/event" />
<path value="$PROJECT_DIR$/skolehjem/vendor/league/flysystem" />
@ -27,7 +23,6 @@
<path value="$PROJECT_DIR$/skolehjem/vendor/nyholm/psr7" />
<path value="$PROJECT_DIR$/skolehjem/vendor/ramsey/collection" />
<path value="$PROJECT_DIR$/skolehjem/vendor/ramsey/uuid" />
<path value="$PROJECT_DIR$/skolehjem/vendor/scrivo/highlight.php" />
<path value="$PROJECT_DIR$/skolehjem/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/skolehjem/vendor/dnoegel/php-xdg-base-dir" />
<path value="$PROJECT_DIR$/skolehjem/vendor/egulias/email-validator" />
@ -36,18 +31,7 @@
<path value="$PROJECT_DIR$/skolehjem/vendor/laravel/framework" />
<path value="$PROJECT_DIR$/skolehjem/vendor/laravel/passport" />
<path value="$PROJECT_DIR$/skolehjem/vendor/laravel/tinker" />
<path value="$PROJECT_DIR$/skolehjem/vendor/mockery/mockery" />
<path value="$PROJECT_DIR$/skolehjem/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/skolehjem/vendor/myclabs/deep-copy" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phar-io/manifest" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phar-io/version" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpspec/prophecy" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-code-coverage" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-file-iterator" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-text-template" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-timer" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/php-token-stream" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpunit/phpunit" />
<path value="$PROJECT_DIR$/skolehjem/vendor/symfony/console" />
<path value="$PROJECT_DIR$/skolehjem/vendor/symfony/css-selector" />
<path value="$PROJECT_DIR$/skolehjem/vendor/symfony/deprecation-contracts" />
@ -75,12 +59,9 @@
<path value="$PROJECT_DIR$/skolehjem/vendor/symfony/translation" />
<path value="$PROJECT_DIR$/skolehjem/vendor/symfony/translation-contracts" />
<path value="$PROJECT_DIR$/skolehjem/vendor/symfony/var-dumper" />
<path value="$PROJECT_DIR$/skolehjem/vendor/theseer/tokenizer" />
<path value="$PROJECT_DIR$/skolehjem/vendor/doctrine/inflector" />
<path value="$PROJECT_DIR$/skolehjem/vendor/doctrine/instantiator" />
<path value="$PROJECT_DIR$/skolehjem/vendor/doctrine/lexer" />
<path value="$PROJECT_DIR$/skolehjem/vendor/firebase/php-jwt" />
<path value="$PROJECT_DIR$/skolehjem/vendor/hamcrest/hamcrest-php" />
<path value="$PROJECT_DIR$/skolehjem/vendor/lcobucci/jwt" />
<path value="$PROJECT_DIR$/skolehjem/vendor/php-http/message-factory" />
<path value="$PROJECT_DIR$/skolehjem/vendor/fideloper/proxy" />
@ -89,30 +70,12 @@
<path value="$PROJECT_DIR$/skolehjem/vendor/phpoption/phpoption" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpseclib/phpseclib" />
<path value="$PROJECT_DIR$/skolehjem/vendor/ralouphie/getallheaders" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/code-unit-reverse-lookup" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/comparator" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/diff" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/environment" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/exporter" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/global-state" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/object-enumerator" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/object-reflector" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/recursion-context" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/resource-operations" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/type" />
<path value="$PROJECT_DIR$/skolehjem/vendor/sebastian/version" />
<path value="$PROJECT_DIR$/skolehjem/vendor/webmozart/assert" />
<path value="$PROJECT_DIR$/skolehjem/vendor/fzaninotto/faker" />
<path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/skolehjem/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/skolehjem/vendor/nunomaduro/collision" />
<path value="$PROJECT_DIR$/skolehjem/vendor/swiftmailer/swiftmailer" />
<path value="$PROJECT_DIR$/skolehjem/vendor/tijsverkoyen/css-to-inline-styles" />
<path value="$PROJECT_DIR$/skolehjem/vendor/dragonmantank/cron-expression" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpdocumentor/reflection-common" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpdocumentor/reflection-docblock" />
<path value="$PROJECT_DIR$/skolehjem/vendor/phpdocumentor/type-resolver" />
<path value="$PROJECT_DIR$/skolehjem/vendor/composer" />
<path value="$PROJECT_DIR$/skolehjem/vendor/spatie/laravel-permission" />
<path value="$PROJECT_DIR$/skolehjem/vendor/laravel/ui" />

37
.idea/skolehjem-webapp.iml
View File

@ -12,22 +12,15 @@
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/defuse/php-encryption" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/dnoegel/php-xdg-base-dir" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/doctrine/inflector" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/doctrine/instantiator" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/doctrine/lexer" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/dragonmantank/cron-expression" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/egulias/email-validator" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/flare-client-php" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/ignition" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/facade/ignition-contracts" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fideloper/proxy" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/filp/whoops" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/firebase/php-jwt" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fruitcake/laravel-cors" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/fzaninotto/faker" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/guzzlehttp/guzzle" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/guzzlehttp/promises" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/guzzlehttp/psr7" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/hamcrest/hamcrest-php" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/jaybizzle/crawler-detect" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/jenssegers/agent" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/laminas/laminas-diactoros" />
@ -42,30 +35,15 @@
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/flysystem" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/league/oauth2-server" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/mobiledetect/mobiledetectlib" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/mockery/mockery" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/monolog/monolog" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/myclabs/deep-copy" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/nesbot/carbon" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/nikic/php-parser" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/nunomaduro/collision" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/nyholm/psr7" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/opis/closure" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/paragonie/random_compat" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phar-io/manifest" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phar-io/version" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/php-http/message-factory" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpdocumentor/reflection-common" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpdocumentor/reflection-docblock" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpdocumentor/type-resolver" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpoption/phpoption" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpseclib/phpseclib" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpspec/prophecy" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpunit/php-code-coverage" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpunit/php-file-iterator" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpunit/php-text-template" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpunit/php-timer" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpunit/php-token-stream" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/phpunit/phpunit" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/psr/container" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/psr/event-dispatcher" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/psr/http-factory" />
@ -76,19 +54,6 @@
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/ralouphie/getallheaders" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/ramsey/collection" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/ramsey/uuid" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/scrivo/highlight.php" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/code-unit-reverse-lookup" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/comparator" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/diff" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/environment" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/exporter" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/global-state" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/object-enumerator" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/object-reflector" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/recursion-context" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/resource-operations" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/type" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/sebastian/version" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/spatie/laravel-permission" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/swiftmailer/swiftmailer" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/console" />
@ -118,11 +83,9 @@
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/translation" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/translation-contracts" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/symfony/var-dumper" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/theseer/tokenizer" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/tijsverkoyen/css-to-inline-styles" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/vlucas/phpdotenv" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/voku/portable-ascii" />
<excludeFolder url="file://$MODULE_DIR$/skolehjem/vendor/webmozart/assert" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

10
skolehjem/app/Http/Controllers/ExternalLinkController.php
View File

@ -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);

19
skolehjem/app/Http/Controllers/MenuPlanController.php
View File

@ -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");
}
}

4
skolehjem/app/MenuPlan.php
View File

@ -6,5 +6,7 @@ use Illuminate\Database\Eloquent\Model;
class MenuPlan extends Model
{
//
protected $fillable = [
'monday', "tuesday", 'wednesday', 'thursday', "friday", "saturday", "sunday"
];
}

8
skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
View File

@ -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');
});
}

6
skolehjem/public/css/webapp.css vendored
View File

@ -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;
}
}

27
skolehjem/resources/js/app.js vendored
View File

@ -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');
};

368
skolehjem/resources/js/calendar/calendar.js vendored
View File

@ -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()) {
//
// }
// });
//
//
// // <div class="calendar-table__col">
// // <div class="calendar-table__item">
// // <span>2</span>
// // </div>
// // </div>
//
// // 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 = {

6
skolehjem/resources/sass/webapp/_default.scss vendored
View File

@ -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) {

2
skolehjem/resources/views/admin/external-links/create.blade.php
View File

@ -14,7 +14,7 @@
<form method="post" action="{{ route("external-links.store") }}">
@csrf
<label for="title">Titel:</label>
<input type="text" name="title" id="title" required>
<input type="text" name="name" id="title" required>
<label for="link">Linket:</label>
<input type="text" name="link" id="link" required>
<input type="submit" class="btn btn-dark text-white" value="Opret">

4
skolehjem/resources/views/admin/external-links/edit.blade.php
View File

@ -6,12 +6,12 @@
@endsection
@section("path")
<a href="{{ route('external-links.edit') }}" class="text-white">Rediger Link</a> /
<a href="../external-links/edit.blade.php" class="text-white">Rediger Link</a> /
@endsection
@section("content")
<h1>Rediger Link:</h1>
<form method="post" action="">
<form method="post" action="{{ route("external-links.update", ['name' => $link->name]) }}">
@csrf
<label for="title">Titel:</label>
<input type="text" name="title" id="title" required>

14
skolehjem/resources/views/admin/external-links/store.blade.php Normal file
View File

@ -0,0 +1,14 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
Link - Opret
@endsection
@section("path")
<a href="{{ route('external-links.create') }}" class="text-white">Opret External Link</a> /
@endsection
@section("content")
Link blev (ikke) oprettet.
@endsection

14
skolehjem/resources/views/admin/external-links/update.blade.php Normal file
View File

@ -0,0 +1,14 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
link - Rediger
@endsection
@section("path")
<a href="{{ route('external-links.index') }}" class="text-white">External link</a> /
@endsection
@section("content")
Din link blev (ikke) redigeret.
@endsection

28
skolehjem/resources/views/admin/menuplans/create.blade.php
View File

@ -13,20 +13,20 @@
<h1>Opret Menuplan:</h1>
<form action="{{ action('MenuPlanController@store') }}" method="post">
@csrf
<label for="mandag">Mandag:</label>
<input type="text" name="mandag" id="mandag" required>
<label for="tirsdag">Tirsdag:</label>
<input type="text" name="tirsdag" id="tirsdag" required>
<label for="onsdag">Onsdag:</label>
<input type="text" name="onsdag" id="onsdag" required>
<label for="torsdag">Torsdag:</label>
<input type="text" name="torsdag" id="torsdag" required>
<label for="fredag">Fredag:</label>
<input type="text" name="fredag" id="fredag" required>
<label for="lørdag">Lørdag:</label>
<input type="text" name="lørdag" id="lørdag" required>
<label for="søndag">Søndag:</label>
<input type="text" name="søndag" id="søndag" required>
<label for="monday">Mandag:</label>
<input type="text" name="monday" id="monday" required>
<label for="tuesday">Tirsdag:</label>
<input type="text" name="tuesday" id="tuesday" required>
<label for="wednesday">Onsdag:</label>
<input type="text" name="wednesday" id="wednesday" required>
<label for="thursday">Torsdag:</label>
<input type="text" name="thursday" id="thursday" required>
<label for="friday">Fredag:</label>
<input type="text" name="friday" id="friday" required>
<label for="saturday">Lørdag:</label>
<input type="text" name="saturday" id="saturday" required>
<label for="sunday">Søndag:</label>
<input type="text" name="sunday" id="sunday" required>
<input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
</form>

5
skolehjem/resources/views/admin/menuplans/edit.blade.php
View File

@ -6,12 +6,13 @@
@endsection
@section("path")
<a href="{{ route('menu-plans.edit') }}" class="text-white">Rediger Menuplan</a> /
<a class="text-white">Rediger Menuplan</a> /
@endsection
@section("content")
<h1>Rediger Menuplan:</h1>
<form method="post" action="">
<form method="post" action="{{ route("menu-plans.store") }}">
@csrf
<label for="mandag">Mandag:</label>
<input type="text" name="mandag" id="mandag" value="{Mandag}" required>
<label for="tirsdag">Tirsdag:</label>

18
skolehjem/resources/views/admin/menuplans/index.blade.php
View File

@ -24,15 +24,15 @@
</tr>
@foreach($menuPlans as $menuplan)
<tr>
<th>{Mandag}</th>
<th>{Tirsdag}</th>
<th>{Onsdag}</th>
<th>{Torsdag}</th>
<th>{Fredag}</th>
<th>{Lørdag}</th>
<th>{Søndag}</th>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
<td>{{$menuplan->monday}}</td>
<td>{{$menuplan->tuesday}}</td>
<td>{{$menuplan->wednesday}}</td>
<td>{{$menuplan->thursday}}</td>
<td>{{$menuplan->friday}}</td>
<td>{{$menuplan->saturday}}</td>
<td>{{$menuplan->sunday}}</td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
</tr>
@endforeach
</table>

2
skolehjem/resources/views/admin/menuplans/show.blade.php
View File

@ -6,7 +6,7 @@
@endsection
@section("path")
<a href="{{ route('menu-plans.show') }}" class="text-white">Vis Menuplan</a> /
<a href="{{ route('menu-plans.show', [ "id" => $menuplan->id ]) }}" class="text-white">Vis Menuplan</a> /
@endsection
@section("content")

36
skolehjem/resources/views/app/bookings/index.blade.php
View File

@ -10,11 +10,11 @@
<div class="col w-100 mt-auto">
<div class="calendar-container">
<div class="calendar-container__header">
<button id="month-previous" class="calendar-container__btn calendar-container__btn--left" title="Previous">
<button id="week-previous" class="calendar-container__btn calendar-container__btn--left" title="Previous">
<i class="icon ion-ios-arrow-back"></i>
</button>
<h2 id="month" class="calendar-container__title">{Måned} {År}</h2>
<button id="month-next" class="calendar-container__btn calendar-container__btn--right" title="Next">
<button id="week-next" class="calendar-container__btn calendar-container__btn--right" title="Next">
<i class="icon ion-ios-arrow-forward"></i>
</button>
</div>
@ -223,22 +223,22 @@
</div>
<div class="events-container">
<span class="events__title">Tider</span>
<ul class="events__list">
<li class="events__item">
<div class="events__item--left">
<span class="events__name">Vaskemaskine Tid</span>
<span class="events__date">{Dato}</span>
</div>
<span class="events__tag">Book</span>
</li>
<li class="events__item">
<div class="events__item--left">
<span class="events__name">Vaskemaskine Tid</span>
<span class="events__date">{Dato}</span>
</div>
<span class="events__tag">Book</span>
</li>
</ul>
<select id="events" class="events__list">
{{-- <li class="events__item">--}}
{{-- <div class="events__item--left">--}}
{{-- <span class="events__name">Vaskemaskine Tid</span>--}}
{{-- <span class="events__date">{Dato}</span>--}}
{{-- </div>--}}
{{-- <span class="events__tag">Book</span>--}}
{{-- </li>--}}
{{-- <li class="events__item">--}}
{{-- <div class="events__item--left">--}}
{{-- <span class="events__name">Vaskemaskine Tid</span>--}}
{{-- <span class="events__date">{Dato}</span>--}}
{{-- </div>--}}
{{-- <span class="events__tag">Book</span>--}}
{{-- </li>--}}
</select>
</div>
</div>
</main>

12
skolehjem/resources/views/app/layout/base.blade.php
View File

@ -16,27 +16,27 @@
</button>
</header>
<div class="d-none bg-sde-blue col" id="menu">
<a href="menu-plans">
<a href="{{ route("menu-plans.index") }}">
<img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
Menuplan
</a>
<a href="events">
<a href="{{ route("events.index") }}">
<img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter">
Aktiviteter
</a>
<a href="washing-reservations">
<a href="{{ route("washing-reservations.index") }}">
<img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Reservationer">
Reservationer
</a>
<a href="">
<a href="#">
<img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
Galleri
</a>
<a href="">
<a href="#">
<img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
Kontoret
</a>
<a href="">
<a href="#">
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
Vagttelefon
</a>

58
skolehjem/resources/views/app/washing-reservations/index.blade.php Normal file
View File

@ -0,0 +1,58 @@
@extends("app.layout.base")
@extends("app.layout.header")
@section("title")
Booking Liste
@endsection
@section("content")
<main>
<h1 class="text-center sde-blue mb-0">Booking Liste</h1>
<div class="col w-100 mt-auto">
<div class="calendar-container">
<div class="calendar-container__header">
<button id="week-previous" class="calendar-container__btn fas fa-arrow-left" title="Previous">
<i class="icon ion-ios-arrow-back"></i>
</button>
<h2 id="title" class="calendar-container__title">{Måned} {År}</h2>
<button id="week-next" class="calendar-container__btn fas fa-arrow-right" title="Next">
<i class="icon ion-ios-arrow-forward"></i>
</button>
</div>
<div class="calendar-container__body">
<div id="calendar" class="calendar-table">
<div class="calendar-table__body">
</div>
</div>
</div>
</div>
<div id="event-container" class="events-container">
<p>
Maskiner skal dynamisk opdateres alt efter om det er en fra bygning E eller en af de andre bygninger der vil vaske, da bygning E har egen vaskekælder!
</p>
{{-- <span class="events__title">Maskiner</span>--}}
{{-- <select id="washing-machines" class="events__list">--}}
{{-- </select>--}}
{{-- <span class="events__title">Tider</span>--}}
{{-- <select id="events" class="events__list">--}}
{{-- <li class="events__item">--}}
{{-- <div class="events__item--left">--}}
{{-- <span class="events__name">Vaskemaskine Tid</span>--}}
{{-- <span class="events__date">{Dato}</span>--}}
{{-- </div>--}}
{{-- <span class="events__tag">Book</span>--}}
{{-- </li>--}}
{{-- <li class="events__item">--}}
{{-- <div class="events__item--left">--}}
{{-- <span class="events__name">Vaskemaskine Tid</span>--}}
{{-- <span class="events__date">{Dato}</span>--}}
{{-- </div>--}}
{{-- <span class="events__tag">Book</span>--}}
{{-- </li>--}}
</select>
</div>
</div>
</main>
@endsection