Merge remote-tracking branch 'origin/master'

skolehjem/app/Http/Controllers/CalendarController.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+
+class CalendarController extends Controller
+{
+//    public function index()
+}

skolehjem/app/Http/Controllers/RootController.php

@@ -8,6 +8,6 @@ use Illuminate\Http\Response;
 class RootController extends Controller
 {
     public function index() {
-        return Response::detect("index");
+        return Response::detect("root.index");
     }
 }

skolehjem/config/detector.php

@@ -1,7 +1,10 @@
 <?php
 
 return [
+    /*
+     * The default path in the resources/views folder to use.
+     */
     "defaultPath" => "admin",
 
-    "mobilePath" => "webapp",
+    "mobilePath" => "app",
 ];

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

@@ -0,0 +1,22 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Link - Opret
+@endsection
+
+@section("path")
+    <a href="{{ route('external-links.create') }}" class="text-white">Opret Link</a> /
+@endsection
+
+@section("content")
+    <h1>Opret Link:</h1>
+    <form method="post" action="{{ route("external-links.store") }}">
+        @csrf
+        <label for="title">Titel:</label>
+        <input type="text" name="title" id="title" required>
+        <label for="link">Linket:</label>
+        <input type="text" name="link" id="link" required>
+        <input type="submit" class="btn btn-dark text-white" value="Opret">
+    </form>
+@endsection

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

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

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

@@ -0,0 +1,22 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Link - Rediger
+@endsection
+
+@section("path")
+    <a href="{{ route('external-links.edit') }}" class="text-white">Rediger Link</a> /
+@endsection
+
+@section("content")
+    <h1>Rediger Link:</h1>
+    <form method="post" action="">
+        @csrf
+        <label for="title">Titel:</label>
+        <input type="text" name="title" id="title" required>
+        <label for="link">Linket:</label>
+        <input type="text" name="link" id="link" required>
+        <input type="submit" class="btn btn-dark text-white" value="Rediger">
+    </form>
+@endsection

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

@@ -0,0 +1,33 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Link - Vis
+@endsection
+
+@section("path")
+    <a href="{{ route('external-links.index') }}" class="text-white">Vis Link</a> /
+@endsection
+
+@section("content")
+    <table class="tbl">
+        <tr>
+            <th>ID</th>
+            <th>Title</th>
+            <th>Link</th>
+            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+        </tr>
+        @foreach($links as $link)
+            <tr>
+                <th>{ID}</th>
+                <th>{Titel}</th>
+                <th>{Link}</th>
+                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
+                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
+            </tr>
+        @endforeach
+    </table>
+
+    {{ $links->links() }}
+@endsection

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

@@ -28,6 +28,24 @@
 {{--                <a href="{{ route("menu-plans.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>--}}
             </div>
         </div>
+        <div class="segment">
+            <h3 class="text-white">Booking</h3>
+            <div class="row">
+                {{--                <a href="{{ route("bookings.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Bookings</a>--}}
+            </div>
+            <div class="row">
+                {{--                <a href="{{ route('bookings.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Booking</a>--}}
+            </div>
+        </div>
+        <div class="segment">
+            <h3 class="text-white">Vaskemaskiner</h3>
+            <div class="row">
+                {{--                <a href="{{ route("washing-machines.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Bookings</a>--}}
+            </div>
+            <div class="row">
+                {{--                <a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Booking</a>--}}
+            </div>
+        </div>
     </div>
     <div class="w-85" style="background-color: #cccccc;">
         <div class="directorypath text-white">

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

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

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

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

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

@@ -0,0 +1,32 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Menuplan - Rediger
+@endsection
+
+@section("path")
+    <a href="{{ route('menuplans.edit') }}" class="text-white">Rediger Menuplan</a> /
+@endsection
+
+@section("content")
+    <h1>Rediger Menuplan:</h1>
+    <form method="post" action="">
+        <label for="mandag">Mandag:</label>
+        <input type="text" name="mandag" id="mandag" value="{Mandag}" required>
+        <label for="tirsdag">Tirsdag:</label>
+        <input type="text" name="tirsdag" id="tirsdag" value="{Tirsdag}" required>
+        <label for="onsdag">Onsdag:</label>
+        <input type="text" name="onsdag" id="onsdag" value="{Onsdag}" required>
+        <label for="torsdag">Torsdag:</label>
+        <input type="text" name="torsdag" id="torsdag" value="{Torsdag}" required>
+        <label for="fredag">Fredag:</label>
+        <input type="text" name="fredag" id="fredag" value="{Fredag}" required>
+        <label for="lørdag">Lørdag:</label>
+        <input type="text" name="lørdag" id="lørdag" value="{Lørdag}" required>
+        <label for="søndag">Søndag:</label>
+        <input type="text" name="søndag" id="søndag" value="{Søndag}" required>
+
+        <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
+    </form>
+@endsection

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

@@ -0,0 +1,43 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Menuplan - Vis
+@endsection
+
+@section("path")
+    <a href="{{ route('menuplans.index') }}" class="text-white">Vis Menuplan</a> /
+@endsection
+
+@section("content")
+    <table class="tbl">
+        <tr>
+            <th>ID</th>
+            <th>Mandag</th>
+            <th>Tirsdag</th>
+            <th>Onsdag</th>
+            <th>Torsdag</th>
+            <th>Fredag</th>
+            <th>Lørdag</th>
+            <th>Søndag</th>
+            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
+        </tr>
+        @foreach($menuplans as $menuplan)
+        <tr>
+            <th>{ID}</th>
+            <th>{Mandag}</th>
+            <th>{Tirsdag}</th>
+            <th>{Onsdag}</th>
+            <th>{Torsdag}</th>
+            <th>{Fredag}</th>
+            <th>{Lørdag}</th>
+            <th>{Søndag}</th>
+                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
+                <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
+        </tr>
+        @endforeach
+    </table>
+
+    {{ $menuplans->links() }}
+@endsection

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

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Menuplan</a> /
+    <a href="{{ route('menuplans.show') }}" class="text-white">Vis Menuplan</a> /
 @endsection
 
 @section("content")

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

@@ -6,27 +6,9 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Rediger Menuplan</a> /
+    <a href="{{ route('menuplans.edit') }}" class="text-white">Rediger Menuplan</a> /
 @endsection
 
 @section("content")
-    <h1>Rediger Menuplan:</h1>
+    Din menuplan blev (ikke) redigeret.
-    <form method="post" action="">
-        <label for="mandag">Mandag:</label>
-        <input type="text" name="mandag" id="mandag" value="{Mandag}" required>
-        <label for="tirsdag">Tirsdag:</label>
-        <input type="text" name="tirsdag" id="tirsdag" value="{Tirsdag}" required>
-        <label for="onsdag">Onsdag:</label>
-        <input type="text" name="onsdag" id="onsdag" value="{Onsdag}" required>
-        <label for="torsdag">Torsdag:</label>
-        <input type="text" name="torsdag" id="torsdag" value="{Torsdag}" required>
-        <label for="fredag">Fredag:</label>
-        <input type="text" name="fredag" id="fredag" value="{Fredag}" required>
-        <label for="lørdag">Lørdag:</label>
-        <input type="text" name="lørdag" id="lørdag" value="{Lørdag}" required>
-        <label for="søndag">Søndag:</label>
-        <input type="text" name="søndag" id="søndag" value="{Søndag}" required>
-
-        <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
-    </form>
 @endsection

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

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Fjern Bruger</a> /
+    <a href="{{ route('users.delete') }}" class="text-white">Fjern Bruger</a> /
 @endsection
 
 @section("content")

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

@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Logud</a> /
+    <a href="{{ route('users.logout') }}" class="text-white">Logud</a> /
 @endsection
 
 @section("content")

skolehjem/resources/views/admin/washing-machines/create.blade.php

@@ -2,18 +2,18 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Vaskemaskiner - Vis
+    Vaskemaskiner - Opret
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Opret Vaskemaskine</a> /
+    <a href="{{ route('washing-machines.create') }}" class="text-white">Opret Vaskemaskine</a> /
 @endsection
 
 @section("content")
-    <h1>Opret Bruger:</h1>
+    <h1>Opret Vaskemaskine:</h1>
     <form method="post" action="{{ route("washing-machines.store") }}">
         @csrf
-        <label for="name_first">Navn:</label>
+        <label for="name_first">Vaskemaskine Navn:</label>
         <input type="text" name="name" id="name" max="60" required>
         <input type="submit" class="btn btn-dark text-white" value="Opret">
     </form>

skolehjem/resources/views/admin/washing-machines/delete.blade.php

@@ -2,32 +2,12 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Vaskemaskiner - Vis
+    Vaskemaskiner - Fjern
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Vaskemaskiner</a> /
+    <a href="{{ route('washing-machines.delete') }}" class="text-white">Fjern Vaskemaskine</a> /
 @endsection
 
 @section("content")
-    <table class="tbl">
-        <tr>
-            <th>ID</th>
-            <th>Fornavn</th>
-            <th>Efternavn</th>
-            <th>Email</th>
-            <th>Tlf nr</th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
-        </tr>
-        <tr>
-            <td>{ID}</td>
-            <td>{Fornavn}</td>
-            <td>{Efternavn}</td>
-            <td>{Email}</td>
-            <td>{TLF}</td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
-        </tr>
-    </table>
 @endsection

skolehjem/resources/views/admin/washing-machines/edit.blade.php

@@ -2,32 +2,18 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Vaskemaskiner - Vis
+    Vaskemaskine - Rediger
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Vaskemaskiner</a> /
+    <a href="{{ route('washing-machines.edit', ['id' => $user->id]) }}" class="text-white">Rediger Vaskemaskiner</a> /
 @endsection
 
 @section("content")
-    <table class="tbl">
+    <form method="post" action="{{ route("washing-machines.store") }}">
-        <tr>
+        @csrf
-            <th>ID</th>
+        <label for="name_first">Vaskemaskine Navn:</label>
-            <th>Fornavn</th>
+        <input type="text" name="name" id="name" max="60" required>
-            <th>Efternavn</th>
+        <input type="submit" class="btn btn-dark text-white" value="Opret">
-            <th>Email</th>
+    </form>
-            <th>Tlf nr</th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
-        </tr>
-        <tr>
-            <td>{ID}</td>
-            <td>{Fornavn}</td>
-            <td>{Efternavn}</td>
-            <td>{Email}</td>
-            <td>{TLF}</td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
-        </tr>
-    </table>
 @endsection

skolehjem/resources/views/admin/washing-machines/index.blade.php

@@ -6,28 +6,26 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Vaskemaskiner</a> /
+    <a href="{{ route('washing-machines.index') }}" class="text-white">Vis Vaskemaskiner</a> /
 @endsection
 
 @section("content")
     <table class="tbl">
         <tr>
             <th>ID</th>
-            <th>Fornavn</th>
+            <th>Navn</th>
-            <th>Efternavn</th>
-            <th>Email</th>
-            <th>Tlf nr</th>
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
+        @foreach($machines as $machine)
         <tr>
             <td>{ID}</td>
-            <td>{Fornavn}</td>
+            <td>{Navn}</td>
-            <td>{Efternavn}</td>
-            <td>{Email}</td>
-            <td>{TLF}</td>
             <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
             <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
         </tr>
+        @endforeach
     </table>
+
+    {{ $machines->links() }}
 @endsection

skolehjem/resources/views/admin/washing-machines/show.blade.php

@@ -6,26 +6,20 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Vaskemaskiner</a> /
+    <a href="{{ route('washing-machines.index') }}" class="text-white">Vis Vaskemaskiner</a> /
 @endsection
 
 @section("content")
     <table class="tbl">
         <tr>
             <th>ID</th>
-            <th>Fornavn</th>
+            <th>Navn</th>
-            <th>Efternavn</th>
-            <th>Email</th>
-            <th>Tlf nr</th>
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         <tr>
             <td>{ID}</td>
-            <td>{Fornavn}</td>
+            <td>{Navn}</td>
-            <td>{Efternavn}</td>
-            <td>{Email}</td>
-            <td>{TLF}</td>
             <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
             <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
         </tr>

skolehjem/resources/views/admin/washing-machines/store.blade.php

@@ -2,32 +2,13 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Vaskemaskiner - Vis
+    Vaskemaskiner - Opret
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Vaskemaskiner</a> /
+    <a href="{{ route('washing-machines.create') }}" class="text-white">Opret Vaskemaskine</a> /
 @endsection
 
 @section("content")
-    <table class="tbl">
+    Vaskemaskinen blev (ikke) oprettet.
-        <tr>
-            <th>ID</th>
-            <th>Fornavn</th>
-            <th>Efternavn</th>
-            <th>Email</th>
-            <th>Tlf nr</th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
-        </tr>
-        <tr>
-            <td>{ID}</td>
-            <td>{Fornavn}</td>
-            <td>{Efternavn}</td>
-            <td>{Email}</td>
-            <td>{TLF}</td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
-        </tr>
-    </table>
 @endsection

skolehjem/resources/views/admin/washing-machines/update.blade.php

@@ -2,32 +2,13 @@
 @extends("admin.layout.header")
 
 @section("title")
-    Vaskemaskiner - Vis
+    Vaskemaskiner - Rediger
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Vis Vaskemaskiner</a> /
+    <a href="{{ route('washing-machines.create') }}" class="text-white">Rediger Vaskemaskine</a> /
 @endsection
 
 @section("content")
-    <table class="tbl">
+    Din vaskemaskine blev (ikke) redigeret.
-        <tr>
-            <th>ID</th>
-            <th>Fornavn</th>
-            <th>Efternavn</th>
-            <th>Email</th>
-            <th>Tlf nr</th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
-            <th style="width: 1px;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
-        </tr>
-        <tr>
-            <td>{ID}</td>
-            <td>{Fornavn}</td>
-            <td>{Efternavn}</td>
-            <td>{Email}</td>
-            <td>{TLF}</td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
-            <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
-        </tr>
-    </table>
 @endsection

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

@@ -1,5 +1,5 @@
-@extends("webapp.layout.base")
+@extends("app.layout.base")
-@extends("webapp.layout.header")
+@extends("app.layout.header")
 @section("title")
     Booking Liste
 @endsection

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

@@ -3,14 +3,48 @@
 <head>
     <title>@yield("title")</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+{{--    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">--}}
     <link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
 </head>
 <body>
+{{--    @yield("header")--}}
+<header class="row align-items-center">
+    <img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
+    <button class="ml-auto" onclick="toggleMenu('menu')" id="toggle">
+{{--        <img src="{{URL::asset('/images/icons/icon.svg')}}" id="menuIcon" alt="-">--}}
+        <i class="fas fa-bars"></i>
+    </button>
+</header>
+<div class="d-none bg-sde-blue col" id="menu">
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
+        Menuplan
+    </a>
+    <a href="">
+        <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>
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
+        Galleri
+    </a>
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
+        Kontoret
+    </a>
+    <a href="">
+        <img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
+        Vagttelefon
+    </a>
+</div>
 
-    @yield("content")
+@yield("content")
 
-    <script src="{{ mix("/js/app.js") }}"></script>
+<script src="{{ mix("/js/app.js") }}"></script>
-    @yield("scripts")
+@yield("scripts")
 </body>
 </html>

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

@@ -1,5 +1,5 @@
-@extends("webapp.layout.base")
+@extends("app.layout.base")
-@extends("webapp.layout.header")
+@extends("app.layout.header")
 @section("title")
     Menuplan
 @endsection

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

@@ -1,5 +1,5 @@
 {{----}}
-{{------Webapp
+{{------app
 {{----}}
 
 {{--Login--}}
@@ -10,10 +10,13 @@
 
 
 {{--Vagttelefon--}}
-{{--@extends("webapp.vagttelefon.index")--}}
+{{--@extends("app.vagttelefons.index")--}}
 
 {{--Booking Liste--}}
-{{----}}@extends("webapp.booking.index")
+{{--@extends("app.bookings.index")--}}
+
+{{--Menuplan--}}
+{{--@extends("app.menuplans.index")--}}
 
 {{----}}
 {{------Admin Panel
@@ -39,3 +42,15 @@
 
 {{--Update Menuplan--}}
 {{--@extends("admin.menuplans.update")--}}
+
+{{--Create booking--}}
+{{--@extends("admin.bookings.create")--}}
+
+{{--Read booking--}}
+{{--@extends("admin.bookings.show")--}}
+
+{{--Create washing-machine--}}
+{{--@extends("admin.washing-machines.create")--}}
+
+{{--Read washing-machine--}}
+{{--@extends("admin.washing-machines.show")--}}

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

@@ -1,4 +1,4 @@
-@extends('webapp.layout.base')
+@extends('app.layout.base')
 
 @section('content')
 @endsection

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

@@ -1,4 +1,4 @@
-@extends("webapp.layout.base")
+@extends("app.layout.base")
 
 @section("title")
     Login

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

@@ -1,4 +1,4 @@
-@extends("webapp.layout.base")
+@extends("app.layout.base")
 
 @section("title")
     Register

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

@@ -1,7 +1,7 @@
-@extends("webapp.layout.base")
+@extends("app.layout.base")
-@extends("webapp.layout.header")
+@extends("app.layout.header")
 @section("title")
-    Menuplan
+    Vagttelefon
 @endsection
 
 @section("content")

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

@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>@yield("title")</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-{{--    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">--}}
-    <link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
-</head>
-<body>
-{{--    @yield("header")--}}
-<header class="row align-items-center">
-    <img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
-    <button class="ml-auto" onclick="toggleMenu('menu')" id="toggle">
-{{--        <img src="{{URL::asset('/images/icons/icon.svg')}}" id="menuIcon" alt="-">--}}
-        <i class="fas fa-bars"></i>
-    </button>
-</header>
-<div class="d-none bg-sde-blue col" id="menu">
-    <a href="">
-        <img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
-        Menuplan
-    </a>
-    <a href="">
-        <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>
-    <a href="">
-        <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
-        Galleri
-    </a>
-    <a href="">
-        <img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
-        Kontoret
-    </a>
-    <a href="">
-        <img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
-        Vagttelefon
-    </a>
-</div>
-
-@yield("content")
-
-<script src="{{ mix("/js/app.js") }}"></script>
-@yield("scripts")
-</body>
-</html>