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

skolehjem/resources/js/app.js

@@ -3,11 +3,18 @@
  * includes Vue and other libraries. It is a great starting point when
  * building robust, powerful web applications using Vue and Laravel.
  */
-
+//Bootstrap
 require('./bootstrap');
-require('./navmenu/menu');
+
+//Dependencies
 require('./date');
 
+//Sites
+require('./sites/menuplan');
+
+//Webapp hamburger menu
+require('./navmenu/menu');
+
 // window.Vue = require('vue');
 
 /**

skolehjem/resources/js/navmenu/menu.js

@@ -1,11 +1,12 @@
 document.addEventListener("DOMContentLoaded", function(){
     // Handler when the DOM is fully loaded
-    start();
-});
+    var path = window.location.pathname;
 
-function start() {
-    document.getElementById ('toggle').addEventListener ('click', toggleMenu, false);
-}
+    if(path === "/menuplan" || path === "/vagttelefon" || path === "/")
+    {
+        document.getElementById ('toggle').addEventListener ('click', toggleMenu, false);
+    }
+});
 
 function toggleMenu() {
     var buttonElement = document.getElementById('menuIcon');

skolehjem/resources/js/sites/menuplan.js

@@ -1,11 +1,12 @@
 document.addEventListener("DOMContentLoaded", function(){
     // Handler when the DOM is fully loaded
-    start();
-});
+    var path = window.location.pathname;
 
-function start() {
-    updateWeek();
-}
+    if(path === "/menuplan")
+    {
+        updateWeek();
+    }
+});
 
 function updateWeek() {
     var elm = document.getElementById('week');

skolehjem/resources/sass/_forms.scss

@@ -1,54 +0,0 @@
-/* Mobile */
-@media only screen
-and (max-width : 900px)
-{
-    form {
-        max-width: 100%;
-        padding: 0 .45rem 0 .45rem;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-    }
-
-    input[type="email"], input[type="password"] {
-        border: none;
-        border-bottom: white solid 2px;
-        background-color: transparent;
-        font-size: 1rem;
-        color: rgba(255,255,255,1);
-        line-height: 2rem;
-        margin-bottom: 1rem;
-    }
-
-    .btn {
-        border: 0;
-        border-radius: 4px;
-        padding: .75rem;
-        cursor: pointer;
-        font-weight: 700;
-        font-size: 1.05rem;
-        background-color: white;
-        color: $sde-black-80;
-        margin-bottom: .5rem;
-    }
-
-    .btn-dark {
-        color: white;
-        background-color: $sde-black-80;
-    }
-
-    .btn-sde-blue {
-        color: white;
-        background-color: $sde-blue;
-    }
-
-    .btn-disabled {
-        color: white;
-        background-color: $sde-black-20;
-    }
-
-    .form-inline {
-        display: inline-flex;
-    }
-
-}

skolehjem/resources/sass/_sizes.scss

@@ -1,23 +0,0 @@
-.w-100 {
-    width: 100%;
-}
-
-.w-75 {
-    width: 75%;
-}
-
-.w-50 {
-    width: 50%;
-}
-
-.w-25 {
-    width: 25%;
-}
-
-.min-height-100 {
-    min-height: 100%;
-}
-
-.bg-sde-blue {
-    background-color: $sde-blue;
-}

skolehjem/resources/sass/admin/admin.scss

@@ -0,0 +1,21 @@
+// App
+@import '../app/app';
+
+//
+// Admin
+//
+
+// Header
+@import 'header/header';
+
+// Nav
+@import 'nav/nav';
+
+// Directory Path
+@import 'nav/directory';
+
+// Content
+@import 'content/content';
+
+// Tables
+@import "content/table";

skolehjem/resources/sass/admin/content/content.scss

@@ -0,0 +1,8 @@
+.content {
+    border-radius: 2px;
+    background-color: #ffffff;
+    width: calc(96% - 2rem);
+    min-height: calc(100% - 40.8px - 8rem);
+    padding: 1rem;
+    margin: 2rem auto;
+}

skolehjem/resources/sass/admin/content/table.scss

@@ -0,0 +1,31 @@
+.tbl {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+.tbl td, .tbl th {
+    border: 1px solid #ddd;
+    padding: 8px;
+}
+
+.tbl tr:nth-child(even){background-color: rgba(0, 0, 0, 0.1);}
+
+.tbl tr:hover {background-color: #ddd;}
+
+.tbl th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    background-color: #00788a;
+    color: white;
+}
+
+.tbl > tbody > tr > td > a {
+    width: 100%;
+    display: flex;
+}
+
+.tbl > tbody > tr > td > a > img {
+    width: 1em;
+    margin: auto;
+}

skolehjem/resources/sass/admin/header/header.scss

@@ -0,0 +1,14 @@
+header {
+    height: 4.5rem;
+}
+
+.brand {
+    width: calc(15% - 2rem);
+    padding: 0 1rem 0 1rem;
+    min-width: calc(194px - 2rem);
+}
+
+main {
+    min-height: calc(100% - 4.5rem);
+    background-color: #333333;
+}

skolehjem/resources/sass/admin/nav/directory.scss

@@ -0,0 +1,11 @@
+.directorypath {
+    border-radius: 2px;
+    background-color: #333333;
+    width: calc(96% - 2rem);
+    padding: .5rem 1rem .5rem 1rem;
+
+    margin-top: 2rem;
+    margin-bottom: 2rem;
+    margin-left: auto;
+    margin-right: auto;
+}

skolehjem/resources/sass/admin/nav/nav.scss

@@ -0,0 +1,37 @@
+.nav {
+    width: 15%;
+    height: 100%;
+    min-width: 194px;
+}
+
+.segment {
+    margin-bottom: 1.25rem;
+}
+
+.segment > h3 {
+    margin-left: -1rem;
+    margin-top: 0;
+    width: calc(100% + 2rem);
+    background-color: rgba(0,0,0, 0.2);
+    text-align: center;
+}
+
+.segment > div {
+    padding: 0 1.25rem 0 1.25rem;
+    width: calc(100% - 2.5rem);
+    align-items: center;
+    margin-bottom: .5rem;
+}
+
+.segment > div:hover {
+    background-color: rgba(0,0,0,0.2);
+}
+
+.segment > div > a > img {
+    height: 1em;
+    padding-right: 8px;
+}
+
+.segment > div > a {
+
+}

skolehjem/resources/sass/app/app.scss

@@ -18,26 +18,20 @@
 // Variables
 @import 'variables';
 
-// Defaults
-@import "default";
-
 // Forms
-@import "forms";
+@import "forms/forms";
 
 // Displays
-@import "displays";
+@import "general/displays";
 
 // Texts
-@import "texts";
+@import "general/texts";
 
 // Margins
-@import "margins";
+@import "general/margins";
 
 // Sizes
-@import "sizes";
+@import "general/sizes";
 
 // Checkboxes
-@import "checkboxes";
-
-// Bootstrap
-//@import '~bootstrap/scss/bootstrap';
+@import "forms/checkboxes";

skolehjem/resources/sass/app/forms/_forms.scss

@@ -0,0 +1,57 @@
+form {
+    max-width: 100%;
+    padding: 0 .45rem 0 .45rem;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+.btn {
+    border: 0;
+    border-radius: 4px;
+    padding: .5rem;
+    cursor: pointer;
+    font-weight: 700;
+    font-size: 1.05rem;
+    background-color: white;
+    color: $sde-black-80;
+    margin-bottom: .5rem;
+}
+
+.btn-dark {
+    color: white;
+    background-color: $sde-black-80;
+}
+
+.btn-sde-blue {
+    color: white;
+    background-color: $sde-blue;
+}
+
+.btn-disabled {
+    color: white;
+    background-color: $sde-black-20;
+}
+
+.form-inline {
+    display: inline-flex;
+}
+
+input{
+    border: grey solid 2px;
+    border-radius: 4px;
+    background-color: transparent;
+    font-size: 1rem;
+    line-height: 2rem;
+    margin-bottom: 1rem;
+}
+
+input.appinput {
+    border: none;
+    border-bottom: white solid 2px;
+    background-color: transparent;
+    font-size: 1rem;
+    color: rgba(255,255,255,1);
+    line-height: 2rem;
+    margin-bottom: 1rem;
+}

skolehjem/resources/sass/app/general/_displays.scss

@@ -19,3 +19,11 @@
     display: flex;
     flex-direction: column;
 }
+
+.cursor-normal {
+    cursor: default;
+}
+
+.cursor-pointer {
+    cursor: pointer;
+}

skolehjem/resources/sass/app/general/_margins.scss

@@ -34,6 +34,22 @@
     margin-top: 0;
 }
 
+.ml-1 {
+    margin-left: .75rem;
+}
+
+.mr-1 {
+    margin-right: .75rem;
+}
+
+.mb-1 {
+    margin-bottom: .75rem;
+}
+
+.mt-1 {
+    margin-top: .75rem;
+}
+
 .ml-2 {
     margin-left: 3rem;
 }

skolehjem/resources/sass/app/general/_sizes.scss

@@ -0,0 +1,59 @@
+* {
+    font-family: $font-family-sans-serif;
+}
+
+html, body {
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    height: 100%;
+}
+
+::placeholder {
+    opacity: 1;
+}
+
+a {
+    color: #000000;
+    text-decoration: none;
+}
+
+.w-100 {
+    width: 100%;
+}
+
+.w-85 {
+    width: 85%;
+}
+
+.w-75 {
+    width: 75%;
+}
+
+.w-50 {
+    width: 50%;
+}
+
+.w-25 {
+    width: 25%;
+}
+
+.w-15 {
+    width: 15%;
+}
+
+.h-100 {
+    height: 100%;
+}
+
+.h-90 {
+    height: 90%;
+}
+
+.h-10 {
+    height: 10%;
+}
+
+.bg-sde-blue {
+    background-color: $sde-blue;
+}

skolehjem/resources/sass/webapp/_default.scss

@@ -1,23 +1,12 @@
-* {
-    font-family: $font-family-sans-serif;
+main {
+    max-width: 900px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: auto;
+    padding: 0 1.25rem 0 1.25rem;
 }
 
-html, body {
-    width: 100%;
-    margin: 0;
-    height: 100%;
-}
-
-::placeholder {
-    opacity: 1;
-}
-
-a {
-    color: #000000;
-    text-decoration: none;
-}
-
-
 // Mobile
 @media only screen
 and (max-width : 900px)
@@ -67,7 +56,7 @@ and (max-width : 900px)
     }
 
     span {
-        font-size: 5vw;
+        font-size: 12px;
     }
 
     p {

skolehjem/resources/sass/webapp/webapp.scss

@@ -0,0 +1,9 @@
+// App
+@import '../app/app';
+
+//
+// Webapp
+//
+
+// Defaults
+@import "default";

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

@@ -0,0 +1,10 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Home - Admin Panel
+@endsection
+
+@section("content")
+
+@endsection

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

@@ -0,0 +1,51 @@
+<!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/admin.css") }}">
+</head>
+<body>
+@yield("header")
+<main class="row">
+    <div class="col nav" style="background-color: #333333;">
+        <div class="segment">
+            <h3 class="text-white">Brugere</h3>
+            <div class="row">
+                <a href="" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Brugere</a>
+            </div>
+            <div class="row">
+                <a href="" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Bruger</a>
+            </div>
+            <div class="row">
+                <a href="" class="text-white"><img src="{{ asset('/images/icons/pencil.svg') }}" alt="Update">Rediger Bruger</a>
+            </div>
+        </div>
+        <div class="segment">
+            <h3 class="text-white">Menuplan</h3>
+            <div class="row">
+                <a href="" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Menuplan</a>
+            </div>
+            <div class="row">
+                <a href="" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
+            </div>
+            <div class="row">
+                <a href="" class="text-white"><img src="{{ asset('/images/icons/pencil.svg') }}" alt="Update">Rediger Menuplan</a>
+            </div>
+        </div>
+    </div>
+    <div class="w-85" style="background-color: #cccccc;">
+        <div class="directorypath text-white">
+            <a href="" class="text-white">Home</a> / @yield("path")
+        </div>
+        <div class="content">
+            @yield("content")
+        </div>
+    </div>
+</main>
+
+<script src="{{ mix("/js/app.js") }}"></script>
+@yield("scripts")
+</body>
+</html>

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

@@ -0,0 +1,7 @@
+@section("header")
+    <header class="row align-items-center" style="background-color: #00788a;">
+        <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="h-100 brand" alt="Syddansk Erhvervsskole">
+        <a href="" class="btn btn-dark text-white m-0 ml-auto">User: Admin</a>
+        <a href="" class="btn btn-dark text-white m-0 ml-1 mr-1">Log ud</a>
+    </header>
+@endsection

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

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

skolehjem/resources/views/admin/menuplan/read.blade.php

@@ -0,0 +1,39 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Menuplan - Read
+@endsection
+
+@section("path")
+    <a href="" class="text-white">Vis Menuplan</a> /
+@endsection
+
+@section("content")
+    <table class="tbl">
+        <tr>
+            <th>ID</th>
+            <th>Fredag</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>
+        <tr>
+            <td>{ID}</td>
+            <td>{Fredag}</td>
+            <td>{Tirsdag}</td>
+            <td>{Onsdag}</td>
+            <td>{Torsdag}</td>
+            <td>{Fredag}</td>
+            <td>{Lørdag}</td>
+            <td>{Søndag}</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/menuplan/update.blade.php

@@ -0,0 +1,32 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Menuplan - Rediger
+@endsection
+
+@section("path")
+    <a href="" 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/user/create.blade.php

@@ -0,0 +1,29 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Bruger - Opret
+@endsection
+
+@section("path")
+    <a href="" class="text-white">Opret Bruger</a> /
+@endsection
+
+@section("content")
+    <h1>Opret Bruger:</h1>
+    <form method="post" action="">
+        <label for="name_first">Fornavn:</label>
+            <input type="text" name="name_first" id="name_first" required>
+        <label for="name_last">Efternavn:</label>
+            <input type="text" name="name_last" id="name_last" required>
+        <label for="email">Email:</label>
+            <input type="email" name="email" id="email" required>
+        <label for="password1">Password:</label>
+            <input type="password" name="password" id="password1" required>
+        <label for="password2">Confirm Password:</label>
+            <input type="password" id="password2" required>
+        <label for="tel">Telefon nr:</label>
+            <input type="tel" name="phone" id="tel" required>
+        <input type="submit" class="btn btn-dark text-white" value="Opret">
+    </form>
+@endsection

skolehjem/resources/views/admin/user/read.blade.php

@@ -0,0 +1,33 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    User - Read
+@endsection
+
+@section("path")
+    <a href="" class="text-white">Vis Brugere</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/user/update.blade.php

@@ -0,0 +1,29 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Bruger - Rediger
+@endsection
+
+@section("path")
+    <a href="" class="text-white">Rediger Bruger</a> /
+@endsection
+
+@section("content")
+    <h1>Rediger Bruger:</h1>
+    <form method="post" action="">
+        <label for="name_first">Fornavn:</label>
+        <input type="text" name="name_first" id="name_first" value="{Fornavn}" required>
+        <label for="name_last">Efternavn:</label>
+        <input type="text" name="name_last" id="name_last" value="{Efternavn}" required>
+        <label for="email">Email:</label>
+        <input type="email" name="email" id="email" value="{Email}" required>
+        <label for="password1">Password:</label>
+        <input type="password" name="password" id="password1" value="{Password}" required>
+        <label for="password2">Confirm Password:</label>
+        <input type="password" id="password2" value="{Password}" required>
+        <label for="tel">Telefon nr:</label>
+        <input type="tel" name="phone" id="tel" value="{Telefon}" required>
+        <input type="submit" class="btn btn-dark text-white" value="Rediger">
+    </form>
+@endsection

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

@@ -0,0 +1,15 @@
+<!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 style="background-color: #00788a;">
+    @yield("content")
+
+    <script src="{{ mix("/js/app.js") }}"></script>
+    @yield("scripts")
+</body>
+</html>

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

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

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

@@ -1,17 +1,17 @@
-@extends("layout.base")
+@extends("app.layout.base")
 
 @section("title")
     Login
 @endsection
 
 @section("content")
-    <main>
+    <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">
-            <input type="email" name="email" placeholder="Email" required>
-            <input type="password" name="password" placeholder="Password" required>
+            <input class="appinput" type="email" name="email" placeholder="Email" required>
+            <input class="appinput" type="password" name="password" placeholder="Password" required>
             <label class="toggle">
                 <input class="toggle__input" type="checkbox" name="rememberpassword">
                 <span class="toggle__label">

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

@@ -1,18 +1,18 @@
-@extends("layout.base")
+@extends("app.layout.base")
 
 @section("title")
     Register
 @endsection
 
 @section("content")
-    <main>
+    <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" onsubmit="return validateRegisterForm(this)" >
-            <input type="email" name="email" placeholder="Email">
-            <input type="password" name="password" placeholder="Password">
-            <input type="password" name="confirmpassword" placeholder="Confirm password">
+            <input class="appinput" type="email" name="email" placeholder="Email">
+            <input class="appinput" type="password" name="password" placeholder="Password">
+            <input class="appinput" type="password" name="confirmpassword" placeholder="Confirm password">
             <input class="btn btn-dark" type="submit" value="Sign up">
             <button class="btn" onclick="window.location='';">Sign in</button>
         </form>

skolehjem/resources/views/index.blade.php

@@ -1,7 +1,35 @@
-@extends("layout.base")
+{{----}}
+{{------Webapp
+{{----}}
+
+{{--Login--}}
+{{--@extends("app.user.login")--}}
+
+{{--Register--}}
+{{--@extends("app.user.register")--}}
 
 
+{{--Vagttelefon--}}
+{{--@extends("webapp.vagttelefon.index")--}}
 
-@section("content")
-    Hej
-@endsection
+{{----}}
+{{------Admin Panel
+{{----}}
+
+{{--Create User--}}
+{{--@extends("admin.user.create")--}}
+
+{{--Read User--}}
+{{--@extends("admin.user.read")--}}
+
+{{--Update User--}}
+{{--@extends("admin.user.update")--}}
+
+{{--Create Menuplan--}}
+{{----}}@extends("admin.menuplan.create")
+
+{{--Read Menuplan--}}
+{{--@extends("admin.menuplan.read")--}}
+
+{{--Update Menuplan--}}
+{{--@extends("admin.menuplan.update")--}}

skolehjem/resources/views/user/index.blade.php

@@ -1,9 +0,0 @@
-@extends('layout.base')
-
-@section('content')
-
-    <ul>
-
-    </ul>
-
-@endsection

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

@@ -4,7 +4,7 @@
     <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/app.css") }}">
+    <link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
 </head>
 <body>
     @yield("header")

skolehjem/resources/views/webapp/menuplan/index.blade.php

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

skolehjem/resources/views/webapp/vagttelefon/index.blade.php

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