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

skolehjem/composer.json

@@ -43,6 +43,9 @@
         "classmap": [
             "database/seeds",
             "database/factories"
+        ],
+        "files": [
+            "app/Helpers.php"
         ]
     },
     "autoload-dev": {

skolehjem/resources/views/app/events/index.blade.php

@@ -44,7 +44,7 @@
                             <p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
                         </div>
                         <div class="container">
-                            {!! $event->description !!}
+                            {!! \App\Helpers::closetags(substr($event->description, 0, 300) )!!}
                             <input type="hidden" name="event_id" value="{{ $event->id }}">
                             {!! session()->get('error#' . $event->id) !!}
                             {!! session()->get('signup#' . $event->id) !!}

skolehjem/resources/views/app/guides/index.blade.php

@@ -41,7 +41,7 @@
                         <h3>{{ $guide->name}}</h3>
                     </div>
                     <div class="container">
-                        {!! substr($guide->guide_articles, 0, 300) !!}
+                        {!! \App\Helpers::closetags(substr($guide->guide_articles, 0, 300)) !!}
                         <a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="{{route("guides.show", ["guide" => $guide->id ])}}">Læs mere</a>
                     </div>
                 </div>