wip

resources/js/Pages/Calendar.vue

@@ -46,7 +46,7 @@
       </div>
       <div v-if="can.generateTimesheet">
         <a
-          :href="`/timesheet/${selectedMonth.value}`"
+          :href="`/vacation/timesheet/${selectedMonth.value}`"
           class="inline-flex items-center px-4 py-3 border border-transparent text-sm leading-4 font-medium rounded-md shadow-sm text-white bg-blumilk-600 hover:bg-blumilk-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blumilk-500"
         >
           Pobierz plik Excel

resources/js/Pages/MonthlyUsage.vue

@@ -81,6 +81,7 @@ import { useMonthInfo } from '@/Composables/monthInfo'
 import VacationBar from '@/Shared/VacationBar'
 
 const props = defineProps({
+  years: Object,
   monthlyUsage: Object,
   currentMonth: String,
 })
@@ -89,6 +90,6 @@ const { getMonths } = useMonthInfo()
 const months = getMonths()
 
 function isCurrentMonth(month) {
-  return props.currentMonth === month.value
+  return (props.years.selected.year === props.years.current.year && props.currentMonth === month.value)
 }
 </script>

resources/js/Pages/VacationLimits.vue

@@ -14,7 +14,7 @@
     <div class="border-t border-gray-200">
       <div class="overflow-x-auto xl:overflow-x-visible overflow-y-auto xl:overflow-y-visible">
         <form @submit.prevent="submitVacationDays">
-          <table class="min-w-full divide-y divide-gray-200">
+          <table class="min-w-full divide-y divide-gray-200 border-b">
             <thead class="bg-gray-50">
               <tr>
                 <th

resources/js/Shared/MainMenu.vue

@@ -109,7 +109,7 @@
           <HomeIcon class="mr-4 flex-shrink-0 h-6 w-6 text-blumilk-200" />
           Strona główna
         </InertiaLink>
-        <div class="mt-1 pt-1">
+        <div class="mt-1 pt-1 space-y-1">
           <InertiaLink
             v-for="item in navigation"
             :key="item.name"
@@ -202,9 +202,9 @@
               as="button"
               method="post"
               :preserve-state="false"
-              class="font-medium text-blumilk-600 hover:text-blumilk-500"
+              class="font-semibold text-blumilk-600 hover:text-blumilk-500"
             >
-              Kliknij, aby wrócić do obecnego roku
+              Wróc do obecnego roku
             </inertialink>
           </div>
         </div>