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

# 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
18 changed files with 71 additions and 29 deletions

View File

@@ -18,7 +18,7 @@ use Toby\Enums\FormOfEmployment;
* @property string $email
* @property string $avatar
* @property FormOfEmployment $employment_form
* @property Carbon $empoyment_date
* @property Carbon $employment_date
*/
class User extends Authenticatable
{
@@ -26,8 +26,6 @@ class User extends Authenticatable
use Notifiable;
use SoftDeletes;
protected $perPage = 10;
protected $fillable = [
"name",
"email",
@@ -47,7 +45,7 @@ class User extends Authenticatable
public function scopeSearch(Builder $query, ?string $text): Builder
{
if ($text == null) {
if ($text === null) {
return $query;
}