Merge remote-tracking branch 'origin/master'

skolehjem/app/Http/Controllers/StaffController.php

@@ -60,7 +60,7 @@ class StaffController extends Controller
             "name_last" => "required|max:255",
             "email" => "required|email|unique:staff",
             "password" => "required|max:60",
-            "phone" => "required|unique:staff",
+            "phone" => "required|unique:staff"
 
         ]);
 

skolehjem/app/Http/Controllers/UserController.php

@@ -75,7 +75,7 @@ class UserController extends Controller
 
         Log::debug("SAVED USER");
 
-        return view("users.store");
+        return Response::detect("users.store");
     }
 
     /**

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

@@ -26,7 +26,7 @@
                 <td>{{ $contact->email }}</td>
                 <td>{{ $contact->phone }}</td>
                 <td><a href="{{ route("contacts.edit", [ "contact" => $contact ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
-                <td><a href="{{ route("contacts.delete", [ "contact" => $contact ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
+                <td><a href="{{ route("contacts.destroy½", [ "contact" => $contact ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
             </tr>
         @endforeach
     </table>

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

@@ -19,7 +19,7 @@
         <label for="name_last">Efternavn:</label>
         <input type="text" name="name_last" id="name_last" value="{{ $staff->name_last }}" required>
         <label for="email">Email:</label>
-        <input type="email" name="email" id="email" value="{{ $staff->name_email }}" required>
+        <input type="email" name="email" id="email" value="{{ $staff->email }}" required>
         <label for="password1">Password:</label>
         <input type="password" name="password" id="password1" value="" required>
         <label for="password2">Confirm Password:</label>

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

@@ -26,14 +26,7 @@
                 <td>{{ $user->email }}</td>
                 <td>{{ $user->phone }}</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>
-                    <form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}" class="w-100">
-                        @csrf
-                        @method("delete")
-
-                        <button type="submit"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
-                    </form>
-                </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>
         @endforeach
     </table>