finish with week? #VC

app/Eloquent/Models/Resume.php

@@ -31,7 +31,6 @@ class Resume extends Model
         "technologies" => AsCollection::class,
         "projects" => AsCollection::class,
     ];
-    protected $perPage = 50;
 
     public function user(): BelongsTo
     {

app/Eloquent/Models/User.php

@@ -46,7 +46,6 @@ class User extends Authenticatable implements NotifiableInterface
     protected $with = [
         "profile",
     ];
-    protected $perPage = 50;
 
     public function profile(): HasOne
     {

app/Eloquent/Models/VacationRequest.php

@@ -49,7 +49,6 @@ class VacationRequest extends Model
         "to" => "date",
         "event_ids" => AsCollection::class,
     ];
-    protected $perPage = 50;
 
     public function user(): BelongsTo
     {

app/Infrastructure/Http/Controllers/DashboardController.php

@@ -12,11 +12,8 @@ use Toby\Domain\UserVacationStatsRetriever;
 use Toby\Domain\VacationRequestStatesRetriever;
 use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
-use Toby\Eloquent\Models\Holiday;
-use Toby\Eloquent\Models\Vacation;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Infrastructure\Http\Resources\HolidayResource;
-use Toby\Infrastructure\Http\Resources\SimpleVacationRequestResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;
 use Toby\Infrastructure\Http\Resources\VacationResource;
 
@@ -57,22 +54,6 @@ class DashboardController extends Controller
             ->limit(3)
             ->get();
 
-        $allHolidays = $yearPeriod->holidays;
-
-        $approvedVacations = $request->user()
-            ->vacations()
-            ->with("vacationRequest.vacations")
-            ->whereBelongsTo($yearPeriod)
-            ->approved()
-            ->get();
-
-        $pendingVacations = $request->user()
-            ->vacations()
-            ->with("vacationRequest.vacations")
-            ->whereBelongsTo($yearPeriod)
-            ->pending()
-            ->get();
-
         $limit = $vacationStatsRetriever->getVacationDaysLimit($user, $yearPeriod);
         $used = $vacationStatsRetriever->getUsedVacationDays($user, $yearPeriod);
         $pending = $vacationStatsRetriever->getPendingVacationDays($user, $yearPeriod);
@@ -85,19 +66,6 @@ class DashboardController extends Controller
             "remoteDays" => VacationResource::collection($remoteDays),
             "vacationRequests" => VacationRequestResource::collection($vacationRequests),
             "holidays" => HolidayResource::collection($holidays),
-            "allHolidays" => $allHolidays->mapWithKeys(
-                fn(Holiday $holiday): array => [$holiday->date->toDateString() => $holiday->name],
-            ),
-            "approvedVacations" => $approvedVacations->mapWithKeys(
-                fn(Vacation $vacation): array => [
-                    $vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest),
-                ],
-            ),
-            "pendingVacations" => $pendingVacations->mapWithKeys(
-                fn(Vacation $vacation): array => [
-                    $vacation->date->toDateString() => new SimpleVacationRequestResource($vacation->vacationRequest),
-                ],
-            ),
             "stats" => [
                 "limit" => $limit,
                 "remaining" => $remaining,

resources/js/Pages/Dashboard.vue

@@ -3,11 +3,11 @@
   <div class="grid grid-cols-1 gap-4 items-start xl:grid-cols-3 xl:gap-8">
     <div class="grid grid-cols-1 gap-4 xl:col-span-2">
       <Welcome :user="auth.user" />
-      <VacationCalendar
+      <VacationCalendar />
-        :holidays="allHolidays"
+      <VacationStats :stats="stats" />
-        :approved-vacations="approvedVacations"
+    </div>
-        :pending-vacations="pendingVacations"
+    <div class="grid grid-cols-1 gap-4">
-      />
+      <VacationCalendar />
       <PendingVacationRequests
         v-if="can.listAllVacationRequests"
         :requests="vacationRequests.data"
@@ -16,9 +16,6 @@
         v-else
         :requests="vacationRequests.data"
       />
-    </div>
-    <div class="grid grid-cols-1 gap-4">
-      <VacationStats :stats="stats" />
       <AbsenceList
         v-if="years.current.year === years.selected.year && absences.data.length"
         :absences="absences.data"
@@ -54,8 +51,5 @@ defineProps({
   can: Object,
   stats: Object,
   years: Object,
-  allHolidays: Object,
-  approvedVacations: Object,
-  pendingVacations: Object,
 })
 </script>

resources/js/Pages/Holidays/Index.vue

@@ -17,7 +17,7 @@
       </div>
     </div>
     <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
         <table class="min-w-full divide-y divide-gray-200">
           <thead class="bg-gray-50">
             <tr>

resources/js/Pages/Keys.vue

@@ -19,7 +19,7 @@
       </div>
     </div>
     <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
         <table class="min-w-full divide-y divide-gray-200">
           <thead class="bg-gray-50">
             <tr>

resources/js/Pages/MonthlyUsage.vue

@@ -9,7 +9,7 @@
       </div>
     </div>
     <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-x-auto xl:overflow-x-visible">
         <table class="min-w-full divide-y divide-gray-200">
           <thead class="bg-gray-50">
             <tr>

resources/js/Pages/Resumes/Index.vue

@@ -15,7 +15,7 @@
       </div>
     </div>
     <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
         <table class="min-w-full divide-y divide-gray-200">
           <thead class="bg-gray-50">
             <tr>

resources/js/Pages/Technologies.vue

@@ -18,7 +18,7 @@
       </div>
     </div>
     <div class="border-t border-gray-200">
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
         <table class="min-w-full divide-y divide-gray-200">
           <thead class="bg-gray-50">
             <tr>

resources/js/Pages/Users/Index.vue

@@ -30,7 +30,7 @@
           >
         </div>
       </div>
-      <div class="overflow-x-auto">
+      <div class="overflow-auto xl:overflow-visible">
         <table class="min-w-full divide-y divide-gray-200">
           <thead class="bg-gray-50">
             <tr>

resources/js/Pages/VacationLimits.vue

@@ -10,13 +10,13 @@
     </div>
     <div class="border-t border-gray-200">
       <form @submit.prevent="submitVacationDays">
-        <div class="overflow-x-auto">
+        <div class="overflow-auto xl:overflow-visible">
           <table class="min-w-full border-b divide-y divide-gray-200">
             <thead class="bg-gray-50">
               <tr>
                 <th
                   scope="col"
-                  class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap bg-gray-50 sticky -left-1"
+                  class="py-3 px-4 text-xs font-semibold tracking-wider text-left text-gray-500 uppercase whitespace-nowrap"
                 >
                   Imię i nazwisko
                 </th>
@@ -52,8 +52,8 @@
                 :key="item.id"
                 class="hover:bg-blumilk-25"
               >
-                <td class="p-4 text-sm text-gray-500 whitespace-nowrap bg-white sticky -left-1 z-10">
+                <td class="p-4 text-sm text-gray-500 whitespace-nowrap">
-                  <div class="flex justify-start items-center">
+                  <div class="flex">
                     <span class="inline-flex justify-center items-center w-10 h-10 rounded-full">
                       <img
                         class="w-10 h-10 rounded-full"
@@ -61,16 +61,10 @@
                       >
                     </span>
                     <div class="ml-3">
-                      <p class="flex items-start flex-col-reverse md:flex-row">
+                      <p class="text-sm font-medium text-gray-900 break-all">
-                        <span
+                        {{ item.user.name }}
-                          v-for="split in item.user.name.split(' ', 2)"
-                          :key="split"
-                          class="first:text-xs md:first:text-sm font-medium text-gray-900 truncate first:mr-1"
-                        >
-                          {{ split }}
-                        </span>
                       </p>
-                      <p class="hidden md:block text-sm text-gray-500 break-all">
+                      <p class="text-sm text-gray-500 break-all">
                         {{ item.user.email }}
                       </p>
                     </div>

resources/js/Pages/VacationRequest/Create.vue

@@ -297,8 +297,8 @@
               <button
                 type="submit"
                 class="inline-flex justify-center py-2 px-4 text-sm font-medium text-white bg-blumilk-600 rounded-md border border-transparent focus:outline-none focus:ring-2 focus:ring-blumilk-500 focus:ring-offset-2 shadow-sm"
-                :class="[form.processing || !isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
+                :class="[form.processing || !form.isDirty ? 'disabled:opacity-60' : 'hover:bg-blumilk-700']"
-                :disabled="form.processing || !isDirty"
+                :disabled="form.processing || !form.isDirty"
               >
                 Zapisz
               </button>
@@ -359,13 +359,6 @@ const form = useForm({
   flowSkipped: false,
 })
 
-let isDirty = ref(false)
-
-watch(form, formData => {
-  const { from, to } = formData.data()
-  isDirty.value = formData.isDirty || from !== null || to !== null
-}, { immediate: true, deep: true })
-
 refreshEstimatedDays(form.from, form.to)
 
 const estimatedDays = ref([])

resources/js/Pages/VacationRequest/Index.vue

@@ -88,7 +88,7 @@
         </Listbox>
       </div>
     </div>
-    <div class="overflow-x-auto">
+    <div class="overflow-auto xl:overflow-visible">
       <table class="min-w-full divide-y divide-gray-200">
         <thead class="bg-gray-50">
           <tr>

resources/js/Pages/VacationRequest/IndexForApprovers.vue

@@ -53,7 +53,7 @@
               leave-to-class="opacity-0"
             >
               <ListboxOptions
-                class="overflow-x-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
+                class="overflow-auto absolute z-10 py-1 mt-1 w-full max-w-lg max-h-60 text-base bg-white rounded-md focus:outline-none ring-1 ring-black ring-opacity-5 shadow-lg sm:text-sm"
               >
                 <ListboxOption
                   v-slot="{ active }"
@@ -237,7 +237,7 @@
         </Listbox>
       </div>
     </div>
-    <div class="overflow-x-auto">
+    <div class="overflow-auto xl:overflow-visible">
       <table class="min-w-full divide-y divide-gray-200">
         <thead class="bg-gray-50">
           <tr>

resources/js/Shared/Widgets/Calendar/DayComponent.vue

@@ -1,104 +0,0 @@
-<template>
-  <div
-    :class="[ (day.isVacation || day.isPendingVacation) && `border-b-2 border-dashed ${getVacationBorder(day)}` ]"
-  >
-    <Popper
-      v-if="day.isHoliday"
-      as="div"
-      open-delay="200"
-      hover
-      offset-distance="0"
-      @mouseover.passive="onMouseover"
-      @mouseleave="onMouseleave"
-    >
-      <time
-        :datetime="day.date"
-        :class="[ day.isToday && 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white', 'text-red-600' ]"
-      >
-        {{ day.dayNumber }}
-      </time>
-      <template #content>
-        <div class="py-2 px-6 text-sm font-semibold text-left text-gray-700 bg-white rounded-lg border border-gray-400">
-          {{ getHolidayDescription(day) }}
-        </div>
-      </template>
-    </Popper>
-    <Popper
-      v-else-if="day.isPendingVacation"
-      as="div"
-      open-delay="200"
-      hover
-      offset-distance="0"
-      @mouseover.passive="onMouseover"
-      @mouseleave="onMouseleave"
-    >
-      <time
-        :datetime="day.date"
-        :class="[ day.isToday && 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white' ]"
-      >
-        {{ day.dayNumber }}
-      </time>
-      <template #content>
-        <VacationPopup :vacation="getVacationInfo(day)" />
-      </template>
-    </Popper>
-    <div
-      v-else-if="day.isWeekend"
-    >
-      <time
-        :datetime="day.date"
-        :class="{ 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white': day.isToday }"
-      >
-        {{ day.dayNumber }}
-      </time>
-    </div>
-    <InertiaLink
-      v-else
-      href="/vacation/requests/create"
-      :data="{ 'from_date': day.date }"
-      @mouseover.passive="onMouseover"
-      @mouseleave="onMouseleave"
-    >
-      <time
-        :datetime="day.date"
-        :class="{ 'flex h-6 w-6 items-center justify-center rounded-full bg-blumilk-500 font-semibold text-white': day.isToday }"
-      >
-        {{ day.dayNumber }}
-      </time>
-    </InertiaLink>
-  </div>
-</template>
-
-<script setup>
-import Popper from 'vue3-popper'
-import { defineProps, ref } from 'vue'
-import VacationPopup from '@/Shared/VacationPopup'
-
-defineProps({
-  day: {
-    type: Object,
-    required: true,
-  },
-  getHolidayDescription: {
-    type: Function,
-  },
-  getVacationBorder: {
-    type: Function,
-  },
-  getVacationInfo: {
-    type: Function,
-  },
-})
-
-const isActive = ref(false)
-
-function onMouseover() {
-  if (!isActive.value)
-    isActive.value = true
-}
-
-function onMouseleave() {
-  if (isActive.value)
-    isActive.value = false
-}
-</script>

resources/js/Shared/Widgets/VacationCalendar.vue

@@ -10,7 +10,6 @@
             v-if="calendarState.isPrevious"
             type="button"
             class="flex items-center justify-center rounded-l-md border border-r-0 border-gray-300 bg-white py-2 pl-3 pr-4 text-gray-400 hover:text-gray-500 focus:relative md:w-9 md:px-2 md:hover:bg-gray-50"
-            :class="{ 'rounded-r-md border-r md:rounded-r-none md:border-r-0': !calendarState.isNext }"
             @click="toLast"
           >
             <span class="sr-only">Poprzedni {{ calendarState.viewMode.details.shortcut }}</span>
@@ -25,17 +24,13 @@
             :class="{ 'rounded-l-md border border-r-0': !calendarState.isPrevious, 'rounded-r-md border border-l-0': !calendarState.isNext }"
             @click="goToToday"
           >
-            Dzisiaj
+            Dziś
           </button>
-          <span
+          <span class="relative -mx-px h-5 w-px bg-gray-300 md:hidden" />
-            class="relative -mx-px h-5 w-px bg-gray-300 md:hidden z-10"
-            :class="{ 'hidden': !calendarState.isPrevious || !calendarState.isNext }"
-          />
           <button
             v-if="calendarState.isNext"
             type="button"
             class="flex items-center justify-center rounded-r-md border border-l-0 border-gray-300 bg-white py-2 pl-4 pr-3 text-gray-400 hover:text-gray-500 focus:relative md:w-9 md:px-2 md:hover:bg-gray-50"
-            :class="{ 'rounded-l-md border-l md:rounded-l-none md:border-l-0': !calendarState.isPrevious }"
             @click="toNext"
           >
             <span class="sr-only">Następny {{ calendarState.viewMode.details.shortcut }}</span>
@@ -54,8 +49,7 @@
           type="button"
           class="flex items-center rounded-md border border-gray-300 bg-white py-2 pl-3 pr-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50"
         >
-          <span class="md:hidden">{{ calendarState.viewMode.details.shortcut }}</span>
+          {{ calendarState.viewMode.details.name }}
-          <span class="hidden md:inline-block">{{ calendarState.viewMode.details.name }}</span>
           <ChevronDownIcon
             class="ml-2 h-5 w-5 text-gray-400"
             aria-hidden="true"
@@ -126,16 +120,19 @@
           class="w-full grid grid-cols-7 gap-px"
           :class="{ 'grid-rows-1': calendarState.viewMode.isWeek }"
         >
-          <DayComponent
+          <div
             v-for="(day, index) in days"
             :key="index"
-            :day="day"
+            class="flex flex-col"
-            class="flex flex-col relative py-2 px-3"
+            :class="[day.isCurrentMonth ? 'bg-white' : 'bg-gray-50 text-gray-500', calendarState.viewMode.isWeek && index !== 0 && (index % 5 === 0 || index % 6 === 0) ? 'bg-red-100' : undefined, calendarState.viewMode.isWeek ? 'day' : 'month-day', 'relative py-2 px-3']"
-            :class="[day.isCurrentMonth ? 'bg-white' : 'bg-gray-50 text-gray-500', { 'hover:bg-blumilk-25': day.isCurrentMonth && !day.isWeekend }, { 'day': calendarState.viewMode.isWeek }, { 'bg-red-100': day.isCurrentMonth && day.isWeekend }, { 'bg-red-50': !day.isCurrentMonth && day.isWeekend }, { 'text-red-800': day.isWeekend }]"
+          >
-            :get-holiday-description="getHolidayDescription"
+            <time
-            :get-vacation-border="getVacationBorder"
+              :datetime="day.date"
-            :get-vacation-info="getVacationInfo"
+              :class="day.isToday ? 'flex h-6 w-6 items-center justify-center rounded-full bg-indigo-600 font-semibold text-white' : undefined"
-          />
+            >
+              {{ day.date.split('-').pop().replace(/^0/, '') }}
+            </time>
+          </div>
         </div>
       </div>
     </div>
@@ -147,30 +144,18 @@ import { CheckIcon, ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon } from '@
 import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/vue'
 import { ref, watch, computed, reactive } from 'vue'
 import { DateTime } from 'luxon'
-import useVacationTypeInfo from '@/Composables/vacationTypeInfo'
 import useCurrentYearPeriodInfo from '@/Composables/yearPeriodInfo'
 import { useMonthInfo } from '@/Composables/monthInfo'
 import { viewModes, find as findViewMode } from '@/Shared/Widgets/Calendar/ViewModeOptions'
-import DayComponent from '@/Shared/Widgets/Calendar/DayComponent'
-
-const props = defineProps({
-  holidays: Object,
-  approvedVacations: Object,
-  pendingVacations: Object,
-})
 
 let days = ref([])
-
+const months = useMonthInfo().getMonths()
 function getCurrentDate() {
   const { year, month, weekNumber } = DateTime.now()
   return { year, month, week: weekNumber }
 }
-const currentDate = getCurrentDate()
-
-const months = useMonthInfo().getMonths()
-const { findType } = useVacationTypeInfo()
 const selectedYear = useCurrentYearPeriodInfo().year.value
-const weeksInYear = DateTime.fromObject({ year: selectedYear, month: 12, day: 31 }).weekNumber
+const currentDate = getCurrentDate()
 
 const calendar = {
   viewMode: ref('week'),
@@ -190,11 +175,11 @@ const calendarState = reactive({
   monthName: computed(() => months[calendar.currents.month - 1]?.name),
   isActualYear: computed(() => calendar.currents.year === DateTime.now().year),
   isPrevious: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 1 : calendar.currents.week > 0),
-  isNext: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 12 : calendar.currents.week < weeksInYear),
+  isNext: computed(() => calendarState.viewMode.isMonth ? calendar.currents.month !== 12 : calendar.currents.week < DateTime.fromObject({ year: selectedYear, month: 12, day: 31 }).weekNumber),
 })
 
 const customCalendar = {
-  loadCalendar() {
+  generateCalendar() {
     const date = DateTime.fromObject({
       year: calendar.currents.year,
       month: calendarState.viewMode.isMonth ? calendar.currents.month : 1,
@@ -236,38 +221,33 @@ const customCalendar = {
     return days
   },
   prepareDay(day) {
-    const isCurrentMonth = isInCurrentMonth(day)
     return {
       date: day.toISODate(),
       dayNumber: day.day,
-      isCurrentMonth: isCurrentMonth,
+      isCurrentMonth: isInCurrentMonth(day),
       isToday: isToday(day),
-      isWeekend: isWeekend(day),
-      isHoliday: isHoliday(day),
-      isVacation: isCurrentMonth && isVacation(day),
-      isPendingVacation: isCurrentMonth && isPendingVacation(day),
     }
   },
 }
 
 watch([calendar.viewMode, calendar.currents], () => {
-  customCalendar.loadCalendar()
+  customCalendar.generateCalendar()
 })
 
-customCalendar.loadCalendar()
+customCalendar.generateCalendar()
 
 function toLast() {
   if (calendar.viewMode.value === 'week')
     minusWeek()
   else
-    minusMonth()
+    addMonths(-1)
 }
 
 function toNext() {
-  if (calendar.viewMode.value === 'week')
+  if (calendar.viewMode.value === 'week') {
     addWeek()
-  else
+  } else
-    addMonth()
+    addMonths()
 }
 
 function resetCalendar(config = {}) {
@@ -276,7 +256,7 @@ function resetCalendar(config = {}) {
 
   calendar.currents.year = isUndefined(config.year) ? selectedYear : config.month
   calendar.currents.month = calendarState.isActualYear || !isUndefined(config.year) ? currentMonth : 1
-  calendar.currents.week = calendarState.isActualYear || !isUndefined(config.week) ? currentWeek : 0
+  calendar.currents.week = calendarState.isActualYear || !isUndefined(config.year) ? currentWeek : 1
 }
 
 function isUndefined(value) {
@@ -295,10 +275,15 @@ function addWeek(minus = false) {
 
   const startWeekDay = date.startOf('week'), endWeekDay = date.endOf('week')
   nextMonth = howMany > 0 ? startWeekDay.month : endWeekDay.month
-  if (howMany < 0 && endWeekDay.day === endWeekDay.daysInMonth)
+  if (howMany < 0 && endWeekDay.day === endWeekDay.daysInMonth) {
+    console.log('pre', endWeekDay.day, endWeekDay.daysInMonth)
     calendar.currents.week--
-  else if (howMany > 0 && startWeekDay.day === 1)
+  } else if (howMany > 0 && startWeekDay.day === 1) {
+    console.log('next', endWeekDay.day, endWeekDay.daysInMonth)
     calendar.currents.week++
+  } else {
+    console.log('else', endWeekDay.day, endWeekDay.daysInMonth)
+  }
 
   if (nextMonth !== calendar.currents.month) {
     calendar.currents.month = calendar.currents.week > 1 ? nextMonth : 1
@@ -313,12 +298,8 @@ function minusWeek() {
   addWeek(true)
 }
 
-function addMonth(minus = false) {
+function addMonths(howMany = 1) {
-  calendar.currents.month += minus ? -1 : 1
+  calendar.currents.month += howMany
-}
-
-function minusMonth() {
-  addMonth(true)
 }
 
 function goToToday() {
@@ -327,7 +308,7 @@ function goToToday() {
 
 function updateViewMode(type) {
   if (type === 'month')
-    resetCalendar({ week: 0 })
+    resetCalendar({ week: 1 })
   else
     resetCalendar()
   calendar.viewMode.value = type
@@ -337,37 +318,9 @@ function isInCurrentMonth(date) {
   return calendar.currents.month === date.month
 }
 
-function isWeekend(date) {
-  return date.weekday === 6 || date.weekday === 7
-}
-
 function isToday(date) {
   return date.toISODate() === DateTime.local().toISODate()
 }
-
-function isHoliday(date) {
-  return props.holidays[date.toISODate()] !== undefined
-}
-
-function getHolidayDescription(day) {
-  return props.holidays[day.date]
-}
-
-function isVacation(date) {
-  return props.approvedVacations[date.toISODate()] !== undefined
-}
-
-function isPendingVacation(date) {
-  return props.pendingVacations[date.toISODate()] !== undefined
-}
-
-function getVacationBorder(day) {
-  return findType(getVacationInfo(day).type)?.border
-}
-
-function getVacationInfo(day) {
-  return day.isVacation ? props.approvedVacations[day.date] : props.pendingVacations[day.date]
-}
 </script>
 
 <style lang="css">
@@ -391,6 +344,11 @@ function getVacationInfo(day) {
   content: "Pt";
 }
 
+.day:nth-of-type(7n - 1):before,
+.day:nth-of-type(7n):before {
+  color: #991b1b;
+}
+
 .day:nth-of-type(7n - 1):before {
   content: "Sb";
 }
@@ -398,4 +356,8 @@ function getVacationInfo(day) {
 .day:nth-of-type(7n):before {
   content: "Nd";
 }
+
+.month-day:nth-of-type(7n - 1), .month-day:nth-of-type(7n) {
+  background-color: #fee2e2;
+}
 </style>

resources/js/Shared/Widgets/VacationStats.vue

@@ -1,5 +1,8 @@
 <template>
-  <section class="grid grid-cols-1 gap-4 md:grid-cols-1">
+  <section class="grid grid-cols-1 gap-4 md:grid-cols-2">
+    <div class="hidden p-4 bg-white shadow-md md:block">
+      <VacationChart :stats="stats" />
+    </div>
     <div class="h-full">
       <div class="grid grid-cols-2 gap-4 h-full">
         <div class="py-5 px-4 bg-white shadow-md sm:p-6">
@@ -74,6 +77,8 @@
 </template>
 
 <script setup>
+import VacationChart from '@/Shared/VacationChart'
+
 defineProps({
   stats: Object,
 })

tests/Feature/UserTest.php

@@ -73,10 +73,10 @@ class UserTest extends FeatureTestCase
 
     public function testUserListIsPaginated(): void
     {
-        User::factory()->count(50)->create();
+        User::factory()->count(15)->create();
         $admin = User::factory()->admin()->create();
 
-        $this->assertDatabaseCount("users", 51);
+        $this->assertDatabaseCount("users", 16);
 
         $this->actingAs($admin)
             ->get("/users?page=2")