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

 Conflicts:

	skolehjem/database/seeds/RoleSeeder.php

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

skolehjem/database/seeds/RoleSeeder.php

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

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;

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;

skolehjem/resources/lang/dk/msg.php

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

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)

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