Merge branch 'vacation-request-ui-polishing' into #22-vacation-calendar

app/Domain/VacationDaysCalculator.php

@@ -16,7 +16,7 @@ class VacationDaysCalculator
         $period = CarbonPeriod::create($from, $to);
         $holidays = $yearPeriod->holidays()->pluck("date");
 
-        $validDays = collect();
+        $validDays = new Collection();
 
         foreach ($period as $day) {
             if ($this->passes($day, $holidays)) {

database/factories/VacationFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;

database/migrations/2022_02_07_133018_create_vacations_table.php

@@ -11,7 +11,7 @@ use Toby\Eloquent\Models\VacationRequest;
 return new class() extends Migration {
     public function up(): void
     {
-        Schema::create("vacations", function (Blueprint $table) {
+        Schema::create("vacations", function (Blueprint $table): void {
             $table->id();
             $table->foreignIdFor(User::class)->constrained()->cascadeOnDelete();
             $table->foreignIdFor(VacationRequest::class)->constrained()->cascadeOnDelete();

database/seeders/DatabaseSeeder.php

@@ -80,17 +80,17 @@ class DatabaseSeeder extends Seeder
                 ->sequence(fn() => [
                     "year_period_id" => $yearPeriods->random()->id,
                 ])
-                ->afterCreating(function (VacationRequest $vacationRequest) {
+                ->afterCreating(function (VacationRequest $vacationRequest): void {
                     $days = app(VacationDaysCalculator::class)->calculateDays(
                         $vacationRequest->yearPeriod,
                         $vacationRequest->from,
-                        $vacationRequest->to
+                        $vacationRequest->to,
                     );
 
                     foreach ($days as $day) {
                         $vacationRequest->vacations()->create([
                             "date" => $day,
-                            "user_id" => $vacationRequest->user->id
+                            "user_id" => $vacationRequest->user->id,
                         ]);
                     }
                 })

resources/js/Pages/Holidays/Index.vue

@@ -144,7 +144,7 @@ import { DotsVerticalIcon, PencilIcon, TrashIcon } from '@heroicons/vue/solid'
 import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
 
 export default {
-  name: 'HolidayINdex',
+  name: 'HolidayIndex',
   components: {
     DotsVerticalIcon,
     PencilIcon,

resources/js/Pages/VacationRequest/Show.vue

@@ -54,9 +54,18 @@
               <dt class="text-sm font-medium text-gray-500">
                 Komentarz
               </dt>
-              <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+              <dd
+                v-if="request.comment != null"
+                class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"
+              >
                 {{ request.comment }}
               </dd>
+              <dd
+                v-else
+                class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"
+              >
+                -
+              </dd>
             </div>
             <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
               <dt class="text-sm font-medium text-gray-500">
@@ -236,13 +245,17 @@
                     </span>
                   </div>
                   <div class="min-w-0 flex-1 pt-1.5 flex justify-between space-x-4">
-                    <div>
-                      <p class="text-sm text-gray-500">
+                    <div class="flex flex-col items-start">
+                      <div class="text-sm font-medium text-gray-700">
                         {{ status.name }}
-                      </p>
                       </div>
-                    <div class="text-right text-sm whitespace-nowrap text-gray-500">
-                      <time>4 lutego 2022</time>
+                        <div class="text-right text-sm whitespace-nowrap font-medium text-gray-400">
+                            Jan Kowalski
+                        </div>
+                    </div>
+                      <div class="text-right text-sm whitespace-nowrap text-gray-500 flex flex-col">
+                          <time>29.10.2022</time>
+                          <time>09:04</time>
                       </div>
                   </div>
                 </div>