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

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

@@ -7,11 +7,15 @@
 @section("content")
     <main>
         <h1 class="text-center sde-blue mb-0">Aktiviteter</h1>
-    @foreach($events as $event)
-            <h3 class="sde-blue bold text-center mb-0">{{$event->name}}</h3>
-            <p class="text-center mt-0">{{$event->date}}</p>
-            <p>{{$event->description}}</p>
-            <a class="btn text-center btn-sde-blue btn-disabled" id="tilmeld">Tilmeld</a>
-    @endforeach
+        @if(!$events->isEmpty())
+            @foreach($events as $event)
+                    <h3 class="sde-blue bold text-center mb-0">{{$event->name}}</h3>
+                    <p class="text-center mt-0">{{$event->date}}</p>
+                    <p class="text-center">{{$event->description}}</p>
+                    <a class="btn text-center btn-sde-blue" id="tilmeld">Tilmeld</a>
+            @endforeach
+        @else
+            <p class="text-center">Der er ingen aktiviteter!</p>
+        @endif
     </main>
 @endsection

skolehjem/resources/views/app/layout/base.blade.php

@@ -37,7 +37,7 @@
 {{--        <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">--}}
 {{--        Galleri--}}
 {{--    </a>--}}
-    <a href="#">
+    <a href="{{ route("contacts.index") }}">
         <img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
         Kontoret
     </a>