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

Merge branch 'main' into #62-vacation-request-list-for-approvers

Browse Source 
# Conflicts:
#	app/Eloquent/Helpers/UserAvatarGenerator.php
#	composer.lock
#	database/factories/VacationRequestActivityFactory.php
#	database/seeders/DatabaseSeeder.php
#	database/seeders/DemoSeeder.php
This commit is contained in:
Adrian Hopek
2022-03-07 10:53:35 +01:00
parent fdafb76461 af6f747aa2
commit 3a1b9862c1
25 changed files with 196 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Infrastructure/Http/Resources/UserResource.php
View File

@@ -18,7 +18,7 @@ class UserResource extends JsonResource
"email" => $this->email,
"role" => $this->role->label(),
"position" => $this->position,
"avatar" => asset($this->avatar),
"avatar" => $this->getAvatar(),
"deleted" => $this->trashed(),
"employmentForm" => $this->employment_form->label(),
"employmentDate" => $this->employment_date->toDisplayString(),