From 4ed33e4f99574ad74ac144ba1f5d35035f82bbb0 Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Wed, 24 Jun 2020 14:19:55 +0200
Subject: [PATCH 1/2] Edited washing-machines, app\root\index &
 admin\layout\base

---
 .../views/admin/layout/base.blade.php         |  9 ++++++
 .../admin/washing-machines/create.blade.php   |  8 ++---
 .../admin/washing-machines/delete.blade.php   | 24 ++-------------
 .../admin/washing-machines/edit.blade.php     | 30 +++++--------------
 .../admin/washing-machines/index.blade.php    | 12 ++------
 .../admin/washing-machines/show.blade.php     | 12 ++------
 .../admin/washing-machines/store.blade.php    | 25 ++--------------
 .../admin/washing-machines/update.blade.php   | 25 ++--------------
 .../resources/views/app/root/index.blade.php  |  6 ++++
 9 files changed, 41 insertions(+), 110 deletions(-)

diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php
index 64991f9..4b01fc0 100644
--- a/skolehjem/resources/views/admin/layout/base.blade.php
+++ b/skolehjem/resources/views/admin/layout/base.blade.php
@@ -37,6 +37,15 @@
                 {{--                <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">
diff --git a/skolehjem/resources/views/admin/washing-machines/create.blade.php b/skolehjem/resources/views/admin/washing-machines/create.blade.php
index e16decc..b8915bb 100644
--- a/skolehjem/resources/views/admin/washing-machines/create.blade.php
+++ b/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>
diff --git a/skolehjem/resources/views/admin/washing-machines/delete.blade.php b/skolehjem/resources/views/admin/washing-machines/delete.blade.php
index e7c4ae2..cd45215 100644
--- a/skolehjem/resources/views/admin/washing-machines/delete.blade.php
+++ b/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="" 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
diff --git a/skolehjem/resources/views/admin/washing-machines/edit.blade.php b/skolehjem/resources/views/admin/washing-machines/edit.blade.php
index e7c4ae2..ea595fc 100644
--- a/skolehjem/resources/views/admin/washing-machines/edit.blade.php
+++ b/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">
-        <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>
+    <form method="post" action="{{ route("washing-machines.store") }}">
+        @csrf
+        <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>
 @endsection
diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php
index e7c4ae2..5fa7354 100644
--- a/skolehjem/resources/views/admin/washing-machines/index.blade.php
+++ b/skolehjem/resources/views/admin/washing-machines/index.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>Efternavn</th>
-            <th>Email</th>
-            <th>Tlf nr</th>
+            <th>Navn</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>{Navn}</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>
diff --git a/skolehjem/resources/views/admin/washing-machines/show.blade.php b/skolehjem/resources/views/admin/washing-machines/show.blade.php
index e7c4ae2..5fa7354 100644
--- a/skolehjem/resources/views/admin/washing-machines/show.blade.php
+++ b/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>Efternavn</th>
-            <th>Email</th>
-            <th>Tlf nr</th>
+            <th>Navn</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>{Navn}</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>
diff --git a/skolehjem/resources/views/admin/washing-machines/store.blade.php b/skolehjem/resources/views/admin/washing-machines/store.blade.php
index e7c4ae2..d5f49ec 100644
--- a/skolehjem/resources/views/admin/washing-machines/store.blade.php
+++ b/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">
-        <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>
+    Vaskemaskinen blev (ikke) oprettet.
 @endsection
diff --git a/skolehjem/resources/views/admin/washing-machines/update.blade.php b/skolehjem/resources/views/admin/washing-machines/update.blade.php
index e7c4ae2..1428fec 100644
--- a/skolehjem/resources/views/admin/washing-machines/update.blade.php
+++ b/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">
-        <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>
+    Din vaskemaskine blev (ikke) redigeret.
 @endsection
diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php
index ce3e68e..4faa4bb 100644
--- a/skolehjem/resources/views/app/root/index.blade.php
+++ b/skolehjem/resources/views/app/root/index.blade.php
@@ -45,3 +45,9 @@
 
 {{--Read booking--}}
 {{--@extends("admin.bookings.show")--}}
+
+{{--Create washing-machine--}}
+{{--@extends("admin.washing-machines.create")--}}
+
+{{--Read washing-machine--}}
+{{--@extends("admin.washing-machines.show")--}}

From bf57ec9d99076f4b2c203c3ad53624c5fe0b63c4 Mon Sep 17 00:00:00 2001
From: Anders <anders164a@gmail.com>
Date: Thu, 25 Jun 2020 08:12:53 +0200
Subject: [PATCH 2/2] Added 2 more pages to Menuplans - Edited Href in
 Menuplans, Users & Washing-Machines

---
 .../views/admin/menuplans/create.blade.php    |  2 +-
 .../views/admin/menuplans/delete.blade.php    | 13 ++++++++
 .../views/admin/menuplans/edit.blade.php      | 32 +++++++++++++++++++
 .../views/admin/menuplans/show.blade.php      |  2 +-
 .../views/admin/menuplans/update.blade.php    | 22 ++-----------
 .../views/admin/users/delete.blade.php        |  2 +-
 .../views/admin/users/logout.blade.php        |  2 +-
 .../admin/washing-machines/delete.blade.php   |  2 +-
 8 files changed, 52 insertions(+), 25 deletions(-)
 create mode 100644 skolehjem/resources/views/admin/menuplans/delete.blade.php
 create mode 100644 skolehjem/resources/views/admin/menuplans/edit.blade.php

diff --git a/skolehjem/resources/views/admin/menuplans/create.blade.php b/skolehjem/resources/views/admin/menuplans/create.blade.php
index 3d1ddba..c339366 100644
--- a/skolehjem/resources/views/admin/menuplans/create.blade.php
+++ b/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")
diff --git a/skolehjem/resources/views/admin/menuplans/delete.blade.php b/skolehjem/resources/views/admin/menuplans/delete.blade.php
new file mode 100644
index 0000000..ca84f3d
--- /dev/null
+++ b/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
diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php
new file mode 100644
index 0000000..c8cab9a
--- /dev/null
+++ b/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
diff --git a/skolehjem/resources/views/admin/menuplans/show.blade.php b/skolehjem/resources/views/admin/menuplans/show.blade.php
index b733ab6..1a08414 100644
--- a/skolehjem/resources/views/admin/menuplans/show.blade.php
+++ b/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")
diff --git a/skolehjem/resources/views/admin/menuplans/update.blade.php b/skolehjem/resources/views/admin/menuplans/update.blade.php
index 37b19fa..ae46029 100644
--- a/skolehjem/resources/views/admin/menuplans/update.blade.php
+++ b/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>
-    <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>
+    Din menuplan blev (ikke) redigeret.
 @endsection
diff --git a/skolehjem/resources/views/admin/users/delete.blade.php b/skolehjem/resources/views/admin/users/delete.blade.php
index 78aa7cb..25cf6a1 100644
--- a/skolehjem/resources/views/admin/users/delete.blade.php
+++ b/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")
diff --git a/skolehjem/resources/views/admin/users/logout.blade.php b/skolehjem/resources/views/admin/users/logout.blade.php
index 096c00e..9a9693a 100644
--- a/skolehjem/resources/views/admin/users/logout.blade.php
+++ b/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")
diff --git a/skolehjem/resources/views/admin/washing-machines/delete.blade.php b/skolehjem/resources/views/admin/washing-machines/delete.blade.php
index cd45215..9efdfdf 100644
--- a/skolehjem/resources/views/admin/washing-machines/delete.blade.php
+++ b/skolehjem/resources/views/admin/washing-machines/delete.blade.php
@@ -6,7 +6,7 @@
 @endsection
 
 @section("path")
-    <a href="" class="text-white">Fjern Vaskemaskine</a> /
+    <a href="{{ route('washing-machines.delete') }}" class="text-white">Fjern Vaskemaskine</a> /
 @endsection
 
 @section("content")