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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 

 Conflicts:
	skolehjem/database/seeds/RoleSeeder.php
This commit is contained in:
Neerholt 2020-08-31 09:16:04 +02:00
parent e36ddf78f8 d8a754d398
commit 3856541790
7 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
skolehjem/database/seeds/RoleSeeder.php
View File

@ -41,6 +41,7 @@ class RoleSeeder extends Seeder
$brugerPermissions = new Collection();
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "event.list")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "link.external.list")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "contact.list")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "feedback.create")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "menuplan.list")->first());
@ -48,6 +49,12 @@ class RoleSeeder extends Seeder
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.delete")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "washing.machine.reservation.list")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "ownuser.edit")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "event.list")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "event.show")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "guides.list")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "guides.show")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "news.list")->first());
$brugerPermissions->add(\Spatie\Permission\Models\Permission::query()->where("name", "=", "news.show")->first());
//Give permissions to Bruger (id: 2)
foreach ($brugerPermissions as $permission) {

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

@ -6658,6 +6658,11 @@ main {
margin: 0.25rem 0rem;
}
.fa-arrow-right:before,
.fa-arrow-left:before {
color: black;
}
@media only screen and (max-width: 900px) {
main {
max-width: 460px;

5
skolehjem/public/css/webappdark.css vendored
View File

@ -6658,6 +6658,11 @@ main {
margin: 0.25rem 0rem;
}
.fa-arrow-right:before,
.fa-arrow-left:before {
color: black;
}
@media only screen and (max-width: 900px) {
main {
max-width: 460px;

1
skolehjem/resources/lang/dk/msg.php
View File

@ -21,6 +21,7 @@ return[
"dereringenvaskemaskiner" => "Der er ikke nogen vaskemaskiner",
"lokation" => "Lokation",
"kontakter" => "Kontakt",
"telefontid" => "Telefontider",
"navn" => "Navn",
"email"=> "E-mail",
"ring" => "Ring",

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

@ -15,6 +15,10 @@ main {
margin: 0.25rem 0rem;
}
.fa-arrow-right:before, .fa-arrow-left:before {
color: black;
}
// Mobile
@media only screen
and (max-width : 900px)

9
skolehjem/resources/views/app/washing-reservations/create.blade.php
View File

@ -421,6 +421,8 @@
//The offset from the current week
let weekOffset = 0;
var styleElem = document.head.appendChild(document.createElement("style"));
styleElem.innerHTML = "#week-previous:before {color: unset;}";
//Generate calender and set onclick function on the week changing arrows
if(document.getElementById("calendar")) {
@ -430,11 +432,18 @@
if(weekOffset > 0)
{
weekOffset--;
if(weekOffset == 0){
styleElem.innerHTML = "#week-previous:before {color: unset;}";
}
generateCalendar(weekOffset);
}
}
document.getElementById("week-next").onclick = function () {
if(weekOffset == 0)
{
styleElem.innerHTML = "#week-previous:before {color: black;}";
}
weekOffset++;
generateCalendar(weekOffset);
}