#48 - deployment (#68)

* #48 - postgreSQL db

* #43 - vacation summary for employee (#66)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* #5 - bump dependencies

* #43 - wip

* #43 - add composer script

* #43 - fix

* #43 - fix

* #43 - wip

* #43 - ecs fix

* #43 - cr fix

* #43 - cr fix

* #43 - fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>

* #48 - redis stuff

* #48 - user avatars using ui-avatars.com

* #48 - fix

* #48 - fix

* Apply suggestions from code review

Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl>

* #48 - cr fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Marcin Tracz <marcin.tracz@blumilk.pl>
This commit is contained in:
Adrian Hopek
2022-03-04 14:47:45 +01:00
committed by GitHub
parent 3d9726039c
commit af6f747aa2
26 changed files with 315 additions and 329 deletions

View File

@@ -13,6 +13,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Rackbeat\UIAvatars\HasAvatar;
use Toby\Domain\Enums\EmploymentForm;
use Toby\Domain\Enums\Role;
@@ -35,6 +36,7 @@ class User extends Authenticatable
use HasFactory;
use Notifiable;
use SoftDeletes;
use HasAvatar;
protected $guarded = [];
@@ -75,16 +77,18 @@ class User extends Authenticatable
}
return $query
->where("first_name", "LIKE", "%{$text}%")
->orWhere("last_name", "LIKE", "%{$text}%")
->orWhere("email", "LIKE", "%{$text}%");
->where("first_name", "ILIKE", $text)
->orWhere("last_name", "ILIKE", $text)
->orWhere("email", "ILIKE", $text);
}
public function saveAvatar(string $path): void
public function getAvatar(): string
{
$this->avatar = $path;
$colors = config("colors");
$this->save();
return $this->getAvatarGenerator()
->backgroundColor($colors[strlen($this->fullname) % count($colors)])
->image();
}
public function getFullNameAttribute(): string
@@ -97,6 +101,11 @@ class User extends Authenticatable
return $this->role === $role;
}
protected function getAvatarNameKey(): string
{
return "fullName";
}
protected static function newFactory(): UserFactory
{
return UserFactory::new();