vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-06-29 14:08:32 +02:00
parent b32a782b17 7fb4920354
commit 58da7e8136
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/app/Http/Controllers/StaffController.php
View File

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

2
skolehjem/app/Http/Controllers/UserController.php
View File

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

2
skolehjem/resources/views/admin/contacts/index.blade.php
View File

@ -26,7 +26,7 @@
<td>{{ $contact->email }}</td> <td>{{ $contact->email }}</td>
<td>{{ $contact->phone }}</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.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> </tr>
@endforeach @endforeach
</table> </table>

2
skolehjem/resources/views/admin/staff/edit.blade.php
View File

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

9
skolehjem/resources/views/admin/users/index.blade.php
View File

@ -26,14 +26,7 @@
<td>{{ $user->email }}</td> <td>{{ $user->email }}</td>
<td>{{ $user->phone }}</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><a href="{{ route("users.edit", [ "user" => $user->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td> <td><a href="{{ route("users.destroy", [ "user" => $user ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></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>
</tr> </tr>
@endforeach @endforeach
</table> </table>