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

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

@@ -0,0 +1,21 @@
+@extends("app.layout.base")
+@extends("app.layout.header")
+@section("title")
+    Aktiviteter
+@endsection
+
+@section("content")
+    <main>
+        <h1 class="text-center sde-blue mb-0">Aktiviteter</h1>
+
+        <h3 class="sde-blue bold text-center mb-0">{Aktivitet}</h3>
+        <p class="text-center mt-0">{Dato}</p>
+        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
+        <a class="btn text-center btn-sde-blue btn-disabled" id="tilmeld">Tilmeld</a>
+
+        <h3 class="sde-blue bold text-center mb-0">{Aktivitet2}</h3>
+        <p class="text-center mt-0">{Dato}</p>
+        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
+        <a class="btn text-center btn-sde-blue btn-disabled" id="tilmeld">Tilmeld</a>
+    </main>
+@endsection

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

@@ -16,17 +16,17 @@
     </button>
 </header>
 <div class="d-none bg-sde-blue col" id="menu">
-    <a href="">
+    <a href="menu-plans">
         <img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
         Menuplan
     </a>
-    <a href="">
+    <a href="events">
         <img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter">
         Aktiviteter
     </a>
-    <a href="">
-        <img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Vaske booking liste">
-        Vaske booking liste
+    <a href="washing-reservations">
+        <img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Reservationer">
+        Reservationer
     </a>
     <a href="">
         <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">

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

@@ -11,9 +11,11 @@
 {{--Register--}}
 {{--@extends("app.users.register")--}}
 
+{{--Events--}}
+{{----}}@extends("app.events.index")
 
 {{--Vagttelefon--}}
-{{----}}@extends("app.vagttelefons.index")
+{{--@extends("app.vagttelefons.index")--}}
 
 {{--Booking Liste--}}
 {{--@extends("app.washing-reservations.index")--}}
@@ -22,7 +24,7 @@
 {{--@extends("app.menuplans.index")--}}
 
 {{--Contact--}}
-{{----}}@extends("app.contact.index")
+{{--@extends("app.contact.index")--}}
 
 {{----}}
 {{------Admin Panel