From 08362b24cb436243cfb1ab1443a175d5029c3f40 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 31 Aug 2020 08:16:26 +0200 Subject: [PATCH] v0.10.15q - Various fixes --- skolehjem/app/Http/Controllers/NewsController.php | 2 +- skolehjem/database/seeds/RoleSeeder.php | 7 ++++++- skolehjem/public/css/webapp.css | 5 +++++ skolehjem/public/css/webappdark.css | 5 +++++ skolehjem/resources/sass/webapp/_default.scss | 4 ++++ .../views/app/washing-reservations/create.blade.php | 9 +++++++++ 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/skolehjem/app/Http/Controllers/NewsController.php b/skolehjem/app/Http/Controllers/NewsController.php index d303ad6..bb315de 100644 --- a/skolehjem/app/Http/Controllers/NewsController.php +++ b/skolehjem/app/Http/Controllers/NewsController.php @@ -15,7 +15,7 @@ class NewsController extends Controller public function __construct() { $this->middleware([ "auth" ]); - $this->middleware(["lang"]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:news.list" ])->only("index"); $this->middleware([ "check.auth:news.show" ])->only("show"); diff --git a/skolehjem/database/seeds/RoleSeeder.php b/skolehjem/database/seeds/RoleSeeder.php index f369303..003d912 100644 --- a/skolehjem/database/seeds/RoleSeeder.php +++ b/skolehjem/database/seeds/RoleSeeder.php @@ -40,7 +40,6 @@ class RoleSeeder extends Seeder //Bruger Permissions $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()); @@ -49,6 +48,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) { diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css index 4c76564..490eef5 100644 --- a/skolehjem/public/css/webapp.css +++ b/skolehjem/public/css/webapp.css @@ -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; diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css index 05e4ec5..d0abb18 100644 --- a/skolehjem/public/css/webappdark.css +++ b/skolehjem/public/css/webappdark.css @@ -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; diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss index efccd02..8d6da6a 100644 --- a/skolehjem/resources/sass/webapp/_default.scss +++ b/skolehjem/resources/sass/webapp/_default.scss @@ -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) diff --git a/skolehjem/resources/views/app/washing-reservations/create.blade.php b/skolehjem/resources/views/app/washing-reservations/create.blade.php index b91a4ce..170f2dd 100644 --- a/skolehjem/resources/views/app/washing-reservations/create.blade.php +++ b/skolehjem/resources/views/app/washing-reservations/create.blade.php @@ -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); }