From c803d1229910821b721c84ef93a1a7079b48b438 Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 30 Jun 2020 08:03:42 +0200
Subject: [PATCH] Frontend support for role selection in user create, read and
 update.

---
 skolehjem/public/css/admin.css                 |  3 ++-
 skolehjem/public/css/webapp.css                |  3 ++-
 skolehjem/resources/sass/app/forms/_forms.scss |  2 +-
 .../views/admin/users/create.blade.php         |  6 ++++++
 .../resources/views/admin/users/edit.blade.php | 18 ++++++++++++------
 .../views/admin/users/index.blade.php          |  6 ++++--
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css
index 01da997..366494f 100644
--- a/skolehjem/public/css/admin.css
+++ b/skolehjem/public/css/admin.css
@@ -57,7 +57,8 @@ form {
   display: inline-flex;
 }
 
-input {
+input,
+select {
   border: grey solid 2px;
   border-radius: 4px;
   background-color: transparent;
diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css
index c953bde..9ce5e9d 100644
--- a/skolehjem/public/css/webapp.css
+++ b/skolehjem/public/css/webapp.css
@@ -57,7 +57,8 @@ form {
   display: inline-flex;
 }
 
-input {
+input,
+select {
   border: grey solid 2px;
   border-radius: 4px;
   background-color: transparent;
diff --git a/skolehjem/resources/sass/app/forms/_forms.scss b/skolehjem/resources/sass/app/forms/_forms.scss
index 0cc3185..15a89a7 100644
--- a/skolehjem/resources/sass/app/forms/_forms.scss
+++ b/skolehjem/resources/sass/app/forms/_forms.scss
@@ -37,7 +37,7 @@ form {
     display: inline-flex;
 }
 
-input{
+input, select{
     border: grey solid 2px;
     border-radius: 4px;
     background-color: transparent;
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index 427d2cd..8ebac49 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -25,6 +25,12 @@
             <input type="password" id="password2" placeholder="Bekræft Password" required>
         <label for="tel">Telefon nr:</label>
             <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>
+        </select>
         <input type="submit" class="btn btn-dark text-white" value="Opret">
     </form>
 @endsection
diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php
index 8cbe6ad..502e8cd 100644
--- a/skolehjem/resources/views/admin/users/edit.blade.php
+++ b/skolehjem/resources/views/admin/users/edit.blade.php
@@ -15,17 +15,23 @@
         @csrf
         @method("put")
         <label for="name_first">Fornavn:</label>
-        <input type="text" name="name_first" id="name_first" value="{{ $user->name_first }}" required>
+            <input type="text" name="name_first" id="name_first" value="{{ $user->name_first }}" required>
         <label for="name_last">Efternavn:</label>
-        <input type="text" name="name_last" id="name_last" value="{{ $user->name_last }}" required>
+            <input type="text" name="name_last" id="name_last" value="{{ $user->name_last }}" required>
         <label for="email">Email:</label>
-        <input type="email" name="email" id="email" value="{{ $user->name_email }}" required>
+            <input type="email" name="email" id="email" value="{{ $user->name_email }}" required>
         <label for="password1">Password:</label>
-        <input type="password" name="password" id="password1" value="" required>
+            <input type="password" name="password" id="password1" value="" required>
         <label for="password2">Confirm Password:</label>
-        <input type="password" id="password2" value="" required>
+            <input type="password" id="password2" value="" required>
         <label for="tel">Telefon nr:</label>
-        <input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required>
+            <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>
+            </select>
         <input type="submit" class="btn btn-dark text-white" value="Rediger">
     </form>
 @endsection
diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php
index a6e15d1..7aae5c8 100644
--- a/skolehjem/resources/views/admin/users/index.blade.php
+++ b/skolehjem/resources/views/admin/users/index.blade.php
@@ -16,18 +16,20 @@
             <th>Efternavn</th>
             <th>Email</th>
             <th>Tlf nr</th>
+            <th>Rolle</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($users as $user)
-        <tr>
+            <tr>
                 <td>{{ $user->name_first }}</td>
                 <td>{{ $user->name_last }}</td>
                 <td>{{ $user->email }}</td>
                 <td>{{ $user->phone }}</td>
+                <td>{{ $user->roles }}</td>
                 <td><a href="{{ route("users.edit", [ "user" => $user->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
                 <td><a href="{{ route("users.destroy", [ "user" => $user ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
-        </tr>
+            </tr>
         @endforeach
     </table>