Merge branch 'polishing-calendar' into #74-vacation-calendar

# Conflicts:
#	resources/js/Pages/Calendar.vue

resources/js/Pages/Calendar.vue

@@ -117,16 +117,7 @@
                 v-if="day.vacations.includes(user.id)"
                 class="flex justify-center items-center"
               >
-                <svg
-                  class="w-6 h-6 text-white"
-                  xmlns="http://www.w3.org/2000/svg"
-                  viewBox="0 0 640 512"
-                >
-                  <path
-                    fill="currentColor"
-                    d="M115.38 136.9l102.11 37.18c35.19-81.54 86.21-144.29 139-173.7-95.88-4.89-188.78 36.96-248.53 111.8-6.69 8.4-2.66 21.05 7.42 24.72zm132.25 48.16l238.48 86.83c35.76-121.38 18.7-231.66-42.63-253.98-7.4-2.7-15.13-4-23.09-4-58.02.01-128.27 69.17-172.76 171.15zM521.48 60.5c6.22 16.3 10.83 34.6 13.2 55.19 5.74 49.89-1.42 108.23-18.95 166.98l102.62 37.36c10.09 3.67 21.31-3.43 21.57-14.17 2.32-95.69-41.91-187.44-118.44-245.36zM560 447.98H321.06L386 269.5l-60.14-21.9-72.9 200.37H16c-8.84 0-16 7.16-16 16.01v32.01C0 504.83 7.16 512 16 512h544c8.84 0 16-7.17 16-16.01v-32.01c0-8.84-7.16-16-16-16z"
-                  />
-                </svg>
+                <VacationTypeCalendarIcon :type="day.vacationTypes[user.id]" />
               </div>
             </td>
           </tr>
@@ -141,10 +132,12 @@ import {Menu, MenuButton, MenuItem, MenuItems} from '@headlessui/vue'
 import {CheckIcon, ChevronDownIcon} from '@heroicons/vue/solid'
 import {computed} from 'vue'
 import {useMonthInfo} from '@/Composables/monthInfo'
+import VacationTypeCalendarIcon from '@/Shared/VacationTypeCalendarIcon'
 
 export default {
   name: 'VacationCalendar',
   components: {
+    VacationTypeCalendarIcon,
     Menu,
     MenuButton,
     MenuItem,

resources/js/Pages/Dashboard.vue

@@ -119,7 +119,7 @@
                         class="hover:underline focus:outline-none"
                       >
                         <span class="absolute inset-0" />
-                        Wniosek o {{ request.type.toLowerCase() }}
+                        Wniosek o {{ findType(request.type).text.toLowerCase() }}
                         [{{ request.name }}]
                       </InertiaLink>
                     </h3>
@@ -185,7 +185,7 @@
                         class="hover:underline focus:outline-none"
                       >
                         <span class="absolute inset-0" />
-                        Wniosek o {{ request.type.toLowerCase() }}
+                        Wniosek o {{ findType(request.type).text.toLowerCase() }}
                         [{{ request.name }}]
                       </InertiaLink>
                     </h3>
@@ -302,6 +302,7 @@ import {computed} from 'vue'
 import {usePage} from '@inertiajs/inertia-vue3'
 import Status from '@/Shared/Status'
 import VacationChart from '@/Shared/VacationChart'
+import {useVacationTypeInfo} from '@/Composables/vacationTypeInfo'
 
 export default {
   name: 'DashboardPage',
@@ -335,8 +336,11 @@ export default {
   setup() {
     const user = computed(() => usePage().props.value.auth.user)
 
+    const { findType } = useVacationTypeInfo()
+
     return {
       user,
+      findType,
     }
   },
 }

resources/js/Pages/VacationRequest/Index.vue

@@ -1,10 +1,10 @@
 <template>
-  <InertiaHead title="Twoje wnioski urlopowe" />
+  <InertiaHead title="Moje wnioski urlopowe" />
   <div class="bg-white shadow-md">
     <div class="flex justify-between items-center p-4 sm:px-6">
       <div>
         <h2 class="text-lg leading-6 font-medium text-gray-900">
-          Twoje wnioski urlopowe
+          Moje wnioski urlopowe
         </h2>
       </div>
       <div>
@@ -85,7 +85,7 @@
               </InertiaLink>
             </td>
             <td class="px-4 py-4 whitespace-nowrap text-sm font-medium text-gray-500">
-              {{ request.type }}
+              <VacationType :type="request.type" />
             </td>
             <td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
               {{ request.from }}
@@ -189,6 +189,7 @@ import {
   DocumentTextIcon,
 } from '@heroicons/vue/solid'
 import Status from '@/Shared/Status'
+import VacationType from '@/Shared/VacationType'
 
 export default {
   name: 'VacationRequestIndex',
@@ -204,6 +205,7 @@ export default {
     DocumentTextIcon,
     ThumbDownIcon,
     Status,
+    VacationType,
   },
   props: {
     requests: {

resources/js/Pages/VacationRequest/IndexForApprovers.vue

@@ -247,7 +247,7 @@
               </div>
             </td>
             <td class="px-4 py-4 whitespace-nowrap text-sm font-medium text-gray-500">
-              {{ request.type }}
+              <VacationType :type="request.type" />
             </td>
             <td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
               {{ request.from }}
@@ -353,6 +353,7 @@ import {
   XIcon,
 } from '@heroicons/vue/solid'
 import Status from '@/Shared/Status'
+import VacationType from '@/Shared/VacationType'
 import {watch, reactive} from 'vue'
 import {debounce} from 'lodash'
 import {Inertia} from '@inertiajs/inertia'
@@ -377,6 +378,7 @@ export default {
     DocumentTextIcon,
     ThumbDownIcon,
     Status,
+    VacationType,
     SelectorIcon,
     XCircleIcon,
   },

resources/js/Pages/VacationRequest/Show.vue

@@ -44,7 +44,7 @@
                 Rodzaj urlopu
               </dt>
               <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                {{ request.type }}
+                <VacationType :type="request.type" />
               </dd>
             </div>
             <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
@@ -65,7 +65,7 @@
                     {{ request.from }} - {{ request.to }} [Liczba dni: {{ request.days.length }}]
                   </template>
                   <template v-else>
-                    {{ request.from }}
+                    {{ request.from }} [Liczba dni: {{ request.days.length }}]
                   </template>
                 </span>
               </dd>
@@ -249,10 +249,12 @@
 import {PaperClipIcon} from '@heroicons/vue/outline'
 import Activity from '@/Shared/Activity'
 import Status from '@/Shared/Status'
+import VacationType from '@/Shared/VacationType'
 
 export default {
   name: 'VacationRequestShow',
   components: {
+    VacationType,
     Activity,
     PaperClipIcon,
     Status,