Merge remote-tracking branch 'origin/master'

# Conflicts:
#	skolehjem/app/MenuPlan.php

skolehjem/resources/views/admin/contacts/create.blade.php

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Opret Kontakt</a> /
+    <a href="{{ route('contacts.create') }}" class="text-white">Opret Kontakt</a> /
 @endsection
 
 @section("content")

skolehjem/resources/views/admin/contacts/delete.blade.php

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Slet Kontakt</a> /
+    <a href="{{ route('contacts.destroy') }}" class="text-white">Slet Kontakt</a> /
 @endsection
 
 @section("content")

skolehjem/resources/views/admin/contacts/index.blade.php

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Kontakter</a> /
+    <a href="{{ route('contacts.index', [ 'contacts' => $contacts ]) }}" class="text-white">Vis Kontakter</a> /
 @endsection
 
 @section("content")

skolehjem/resources/views/admin/contacts/show.blade.php

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Slet Kontakt</a> /
+    <a href="{{ route('contacts.destroy') }}" class="text-white">Slet Kontakt</a> /
 @endsection
 
 @section("content")

skolehjem/resources/views/admin/contacts/store.blade.php

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Opbevar Kontakt</a> /
+    <a href="{{ route('contacts.store') }}" class="text-white">Opbevar Kontakt</a> /
 @endsection
 
 @section("content")

skolehjem/resources/views/admin/events/edit.blade.php

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Events</a> /
+    <a href="{{route("events.edit", ["event" => $event])}}" class="text-white">Vis Events</a> /
 @endsection
 
 @section("content")
@@ -14,10 +14,13 @@
     <form method="post" action="{{route("events.update", ["event" => $event])}}">
         @csrf
         @method("PUT")
-        <label for="title">Titel:</label>
-        <input value="{{$event->name}}" type="text" name="title" id="title" required>
-        <label for="link">Linket:</label>
-        <input value="{{$event->description}}" type="text" name="link" id="link" required>
+        <label for="event_title">Event Titel:</label>
+        <input value="{{$event->name}}" type="text" name="name" id="event_title" required>
+        <label for="description">Beskrivelse</label>
+        <input value="{{$event->description}}" type="text" name="description" id="description" required>
+        <label for="date">Beskrivelse</label>
+        <input value="{{$event->date}}" type="date" name="date" id="date" required>
+
         <input type="submit" class="btn btn-dark text-white" value="Rediger">
     </form>
 @endsection

skolehjem/resources/views/admin/external-links/index.blade.php

@@ -19,8 +19,8 @@
         </tr>
         @foreach($links as $link)
             <tr>
-                <th>{{$link->name}}</th>
-                <th><a href="{{$link->link}}">{{$link->link}}</th>
+                <td>{{$link->name}}</td>
+                <td><a href="{{$link->link}}">{{$link->link}}</td>
                 <td><a href="{{ route("external-links.edit", [ "external_link" => $link ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
                 <td><form method="post" action="{{ route("external-links.destroy", [ "external_link" => $link ]) }}" class="w-100 nostyle">
                         @csrf

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

@@ -19,6 +19,15 @@
                 <a href="{{ route('users.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Bruger</a>
             </div>
         </div>
+        <div class="segment">
+            <h3 class="text-white">Roller</h3>
+            <div class="row">
+                <a href="{{ route("roles.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Roller</a>
+            </div>
+            <div class="row">
+                <a href="{{ route('roles.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Rolle</a>
+            </div>
+        </div>
         <div class="segment">
             <h3 class="text-white">Menuplan</h3>
             <div class="row">
@@ -49,22 +58,31 @@
                 <a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
             </div>
         </div>
+        <div class="segment">
+            <h3 class="text-white">Eksterne Links</h3>
+            <div class="row">
+                <a href="{{ route("external-links.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Links</a>
+            </div>
+            <div class="row">
+                <a href="{{ route('external-links.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Link</a>
+            </div>
+        </div>
+{{--        <div class="segment">--}}
+{{--            <h3 class="text-white">Personale</h3>--}}
+{{--            <div class="row">--}}
+{{--                <a href="{{ route('staff.index') }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Personale</a>--}}
+{{--            </div>--}}
+{{--            <div class="row">--}}
+{{--                <a href="{{ route('staff.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Personal</a>--}}
+{{--            </div>--}}
+{{--        </div>--}}
         <div class="segment">
             <h3 class="text-white">Kontakter</h3>
             <div class="row">
                 <a href="{{ route("contacts.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Kontakter</a>
             </div>
             <div class="row">
-                <a href="{{ route("contacts.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
-            </div>
-        </div>
-        <div class="segment">
-            <h3 class="text-white">Personale</h3>
-            <div class="row">
-                <a href="{{ route('staff.index') }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Personale</a>
-            </div>
-            <div class="row">
-                <a href="{{ route('staff.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Personal</a>
+                <a href="{{ route('contacts.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
             </div>
         </div>
         <div class="segment">

skolehjem/resources/views/admin/roles/create.blade.php

@@ -0,0 +1,22 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Rolle - Opret
+@endsection
+
+@section("path")
+    <a href="{{ route('roles.create') }}" class="text-white">Opret Rolle</a> /
+@endsection
+
+@section("content")
+    <h1>Opret Rolle:</h1>
+    <form method="post" action="{{ route("roles.store") }}">
+        @csrf
+        <label for="name">Navn:</label>
+            <input type="text" name="name" id="name" placeholder="Admin" required>
+        <label for="name">Beskrivelse:</label>
+            <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" required>
+        <input type="submit" class="btn btn-dark text-white" value="Opret">
+    </form>
+@endsection

skolehjem/resources/views/admin/roles/delete.blade.php

@@ -0,0 +1,13 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Rolle - Fjern
+@endsection
+
+@section("path")
+    <a href="{{ route('roles.delete') }}" class="text-white">Fjern Rolle</a> /
+@endsection
+
+@section("content")
+@endsection

skolehjem/resources/views/admin/roles/edit.blade.php

@@ -0,0 +1,23 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Rolle - Rediger
+@endsection
+
+@section("path")
+    <a href="{{ route('roles.edit', ['role' => $role]) }}" class="text-white">Rediger Rolle</a> /
+@endsection
+
+@section("content")
+    <h1>Rediger Rolle:</h1>
+    <form method="post" action="{{ route("roles.update", ['role' => $role]) }}">
+        @csrf
+        @method("put")
+        <label for="name">Navn:</label>
+            <input type="text" name="name" id="name" placeholder="Admin" value="{{ $role->name }}" required>
+        <label for="name">Beskrivelse:</label>
+            <input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ $role->description }}" required>
+        <input type="submit" class="btn btn-dark text-white" value="Rediger">
+    </form>
+@endsection

skolehjem/resources/views/admin/roles/index.blade.php

@@ -0,0 +1,35 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Rolle - Vis
+@endsection
+
+@section("path")
+    <a href="{{ route('roles.index') }}" class="text-white">Vis Roller</a> /
+@endsection
+
+@section("content")
+    <table class="tbl">
+        <tr>
+            <th>Navn</th>
+            <th>Beskrivelse</th>
+            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+        </tr>
+        @foreach($roles as $role)
+            <tr>
+                <td>{{ $role->name }}</td>
+                <td>{{ $role->description }}</td>
+                <td><a href="{{ route("roles.edit", [ "role" => $role->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
+                <td><form method="post" action="{{ route("roles.destroy", [ "role" => $role ]) }}" class="w-100 nostyle">
+                        @csrf
+                        @method("delete")
+
+                        <button class="w-100 nostyle" type="submit"><img class="w-100 cursor-pointer" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
+                    </form>
+                </td>
+            </tr>
+        @endforeach
+    </table>
+@endsection

skolehjem/resources/views/admin/roles/show.blade.php

@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Rolle - Vis
+@endsection
+
+@section("path")
+    <a href="{{ route('rolle.index') }}" class="text-white">Vis Brugere</a> /
+@endsection
+
+@section("content")
+    show.blade.php
+@endsection

skolehjem/resources/views/admin/roles/store.blade.php

@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Rolle - Opret
+@endsection
+
+@section("path")
+    <a href="{{ route('roles.create') }}" class="text-white">Opret Roller</a> /
+@endsection
+
+@section("content")
+    Rollen blev (ikke) oprettet.
+@endsection

skolehjem/resources/views/admin/roles/update.blade.php

@@ -0,0 +1,14 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Rolle - Rediger
+@endsection
+
+@section("path")
+    <a href="{{ route('roles.edit', ['role' => $role]) }}" class="text-white">Rediger Rolle</a> /
+@endsection
+
+@section("content")
+    Din rolle blev (ikke) redigeret.
+@endsection

skolehjem/resources/views/admin/users/create.blade.php

@@ -27,9 +27,10 @@
             <input type="tel" name="phone" id="tel" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
         <label for="role">Rolle:</label>
         <select name="role" id="role" class="mb-2" required>
-            <option value="admin">Admin</option>
-            <option value="staff">Personale</option>
-            <option value="resident">Beboer</option>
+            <option disabled selected value> -- Vælg en Rolle -- </option>
+            @foreach($roles as $role)
+                <option value="{{ $role->name }}">{{ $role->name }}</option>
+            @endforeach
         </select>
         <input type="submit" class="btn btn-dark text-white" value="Opret">
     </form>

skolehjem/resources/views/admin/users/edit.blade.php

@@ -28,9 +28,10 @@
             <input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required>
         <label for="role">Rolle:</label>
             <select name="role" id="role" class="mb-2" required>
-                <option value="admin">Admin</option>
-                <option value="staff">Personale</option>
-                <option value="resident">Beboer</option>
+                <option disabled selected value> -- Vælg en Rolle -- </option>
+                @foreach($roles as $role)
+                    <option value="{{ $role->name }}">{{ $role->name }}</option>
+                @endforeach
             </select>
         <input type="submit" class="btn btn-dark text-white" value="Rediger">
     </form>

skolehjem/resources/views/admin/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/admin/users/login.blade.php

@@ -1,4 +1,4 @@
-@extends("app.layout.base")
+@extends("user.layout.base")
 
 @section("title")
     Login
@@ -9,7 +9,7 @@
         <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>
@@ -20,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