Merge branch 'main' into #134-fill-users-data-for-resume

# Conflicts:
#	.eslintrc.js
#	composer.lock
#	package-lock.json
#	package.json

app/Infrastructure/Http/Resources/HolidayResource.php

@@ -16,7 +16,7 @@ class HolidayResource extends JsonResource
             "id" => $this->id,
             "name" => $this->name,
             "date" => $this->date->toDateString(),
-            "isPast" => $this->date->isPast(),
+            "isPast" => $this->date->endOfDay()->isPast(),
             "displayDate" => $this->date->toDisplayString(),
             "dayOfWeek" => $this->date->dayName,
         ];

app/Infrastructure/Http/Resources/UserFormDataResource.php

@@ -21,6 +21,8 @@ class UserFormDataResource extends JsonResource
             "position" => $this->profile->position,
             "employmentForm" => $this->profile->employment_form,
             "employmentDate" => $this->profile->employment_date->toDateString(),
+            "birthday" => $this->profile->birthday?->toDateString(),
+            "slackId" => $this->profile->slack_id,
         ];
     }
 }