Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/MenuPlan.php

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

@@ -16,6 +16,10 @@
     </button>
 </header>
 <div class="d-none bg-sde-blue col" id="menu">
+    <a href="{{ route("root.index") }}">
+        Home
+    </a>
+
     <a href="{{ route("menu-plans.index") }}">
         <img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
         Menuplan
@@ -28,15 +32,16 @@
         <img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Reservationer">
         Reservationer
     </a>
+{{--  MÅ IKKE SLETTES!!!!  --}}
+{{--    <a href="#">--}}
+{{--        <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">--}}
+{{--        Galleri--}}
+{{--    </a>--}}
     <a href="#">
-        <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
-        Galleri
-    </a>
-    <a href="{{ route("contacts.index") }}">
         <img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
         Kontoret
     </a>
-    <a href="#">
+    <a href="{{ route("phones.index") }}">
         <img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
         Vagttelefon
     </a>

skolehjem/resources/views/app/users/forgot.blade.php

@@ -0,0 +1,18 @@
+@extends("user.layout.base")
+
+@section("title")
+    Login
+@endsection
+
+@section("content")
+    <main style="background-color: #00788a; height: 100%;">
+        <div class="brand">
+            <img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
+        </div>
+        <form action="" method="post">
+            @csrf
+            <input class="appinput" type="email" name="email" placeholder="Email" required>
+            <input class="btn btn-dark" type="submit" value="Send reset mail">
+        </form>
+    </main>
+@endsection

skolehjem/resources/views/app/users/login.blade.php

@@ -1,4 +1,4 @@
-@extends("app.layout.base")
+@extends("user.layout.base")
 
 @section("title")
     Login
@@ -9,7 +9,8 @@
         <div class="brand">
             <img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
         </div>
-        <form action="" method="post">
+        <form action="{{ route("users.login") }}" method="post">
+            @csrf
             <input class="appinput" type="email" name="email" placeholder="Email" required>
             <input class="appinput" type="password" name="password" placeholder="Password" required>
             <label class="toggle">
@@ -19,8 +20,7 @@
                 </span>
             </label>
             <input class="btn btn-dark" type="submit" value="Sign in">
-            <button class="btn" onclick="window.location = '';">Sign up</button>
         </form>
-        <a class="text-white text-center" href="">Forgot password?</a>
+        <a class="text-white text-center" href="{{ route('users.show-forgot') }}">Forgot password?</a>
     </main>
 @endsection