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

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

@@ -40,6 +40,12 @@
                 <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">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>
     </div>
     <div class="w-85" style="background-color: #cccccc;">
         <div class="directorypath text-white">

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

@@ -14,17 +14,17 @@
     <form method="post" action="{{ route("users.store") }}">
         @csrf
         <label for="name_first">Fornavn:</label>
-            <input type="text" name="name_first" id="name_first" required>
+            <input type="text" name="name_first" id="name_first" placeholder="Fornavn" required>
         <label for="name_last">Efternavn:</label>
-            <input type="text" name="name_last" id="name_last" required>
+            <input type="text" name="name_last" id="name_last" placeholder="Efternavn" required>
         <label for="email">Email:</label>
-            <input type="email" name="email" id="email" required>
+            <input type="email" name="email" id="email" placeholder="x@y.z" 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>
+            <input type="password" name="password" placeholder="Password" id="password1" required>
+        <label for="password2">Bekræft Password:</label>
+            <input type="password" id="password2" placeholder="Bekræft Password" required>
         <label for="tel">Telefon nr:</label>
-            <input type="tel" name="phone" id="tel" required>
+            <input type="tel" name="phone" id="tel" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
         <input type="submit" class="btn btn-dark text-white" value="Opret">
     </form>
 @endsection

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

@@ -32,7 +32,7 @@
         <img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
         Galleri
     </a>
-    <a href="#">
+    <a href="{{ route("contacts.index") }}">
         <img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
         Kontoret
     </a>
@@ -40,6 +40,10 @@
         <img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
         Vagttelefon
     </a>
+    <a href="#">
+        <img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
+        Konto
+    </a>
 </div>
 
 @yield("content")

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

@@ -21,10 +21,10 @@
 {{--@extends("app.washing-reservations.index")--}}
 
 {{--Menuplan--}}
-{{--@extends("app.menuplans.index")--}}
+{{----}}@extends("app.menuplans.index")
 
 {{--Contact--}}
-{{----}}@extends("app.contact.index")
+{{--@extends("app.contact.index")--}}
 
 {{----}}
 {{------Admin Panel

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

@@ -1,21 +1,23 @@
 @extends('app.layout.base')
 
 @section('content')
-    <div class="d-flex col block-container mt-2">
-        <a href="" class="block text-center mb-1">Menu</a>
-        <a href="" class="block text-center mb-1">Aktiviteter</a>
-        <a href="" class="block text-center mb-1">Kalender</a>
-    </div>
-    <div class="links row">
-        <a href="" class="link">
-            <img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
-        </a>
-        <a href="" class="link">
-            <img src="{{ URL::asset('/images/icons/yt.png') }}" class="h-100" alt="Youtube">
-        </a>
-        <a href="" class="link">
-            <img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
-        </a>
+    <main>
+        <div class="d-flex col block-container mt-2">
+            <a href="" class="block text-center mb-1">Menu</a>
+            <a href="" class="block text-center mb-1">Aktiviteter</a>
+            <a href="" class="block text-center mb-1">Kalender</a>
+        </div>
+        <div class="links row">
+            <a href="" class="link">
+                <img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
+            </a>
+            <a href="" class="link">
+                <img src="{{ URL::asset('/images/icons/yt.png') }}" class="h-100" alt="Youtube">
+            </a>
+            <a href="" class="link">
+                <img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
+            </a>
 
-    </div>
+        </div>
+    </main>
 @endsection