kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

Merge remote-tracking branch 'origin/#4-users-crud' into #4-users-crud

Browse Source 
# Conflicts:
#	app/Enums/FormOfEmployment.php
#	app/Models/User.php
#	resources/js/Pages/Users/Index.vue
#	routes/web.php
This commit is contained in:
Adrian Hopek
2022-01-18 07:40:57 +01:00
parent acf2eba95d df0390134c
commit 13d166ee81
18 changed files with 71 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/js/Pages/Users/Create.vue
View File

@@ -10,7 +10,7 @@
</p>
</div>
<form
class="border-t border-gray-200 px-6 divide-y"
class="border-t border-gray-200 px-6"
@submit.prevent="form.post('/users')"
>
<div class="sm:grid sm:grid-cols-3 py-4 items-center">

2
resources/js/Pages/Users/Edit.vue
View File

@@ -10,7 +10,7 @@
</p>
</div>
<form
class="border-t border-gray-200 px-6 divide-y"
class="border-t border-gray-200 px-6"
@submit.prevent="form.put(`/users/${user.id}`)"
>
<div class="sm:grid sm:grid-cols-3 py-4 items-center">

2
resources/js/Pages/Users/Index.vue
View File

@@ -76,7 +76,7 @@
<td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
<div class="flex">
<span
class="inline-flex items-center justify-center h-10 w-10 rounded-full bg-blumilk-500"
class="inline-flex items-center justify-center h-10 w-10 rounded-full"
>
<img
class="h-10 w-10 rounded-full"

2
resources/js/Shared/MainMenu.vue
View File

@@ -37,7 +37,7 @@
>
<div>
<MenuButton
class="bg-white rounded-full flex text-sm ring-2 ring-white ring-opacity-20 focus:outline-none focus:ring-opacity-100"
class="rounded-full flex text-sm ring-2 ring-white ring-opacity-20 focus:outline-none focus:ring-opacity-100"
>
<span class="sr-only">Open user menu</span>
<img