kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

wip

Browse Source
This commit is contained in:
EwelinaLasowy 2022-02-07 10:38:42 +01:00
parent 205fdd7671
commit 39665c9c31
2 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/js/Pages/VacationRequest/Index.vue
View File

@ -97,7 +97,7 @@
X X
</td> </td>
<td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500 flex items-center"> <td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500 flex items-center">
<ThumbDownIcon class="w-4 h-4 text-rose-600 mr-1"/> <span>{{ request.state }}</span> <ThumbDownIcon class="w-4 h-4 text-rose-600 mr-1" /> <span>{{ request.state }}</span>
</td> </td>
<td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500"> <td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
<InertiaLink :href="`/vacation-requests/${request.id}`"> <InertiaLink :href="`/vacation-requests/${request.id}`">
@ -179,7 +179,7 @@ import {
TrashIcon, TrashIcon,
XIcon, XIcon,
CheckIcon, CheckIcon,
DocumentTextIcon, DocumentTextIcon,
} from '@heroicons/vue/solid' } from '@heroicons/vue/solid'
export default { export default {
@ -193,8 +193,8 @@ export default {
ClockIcon, ClockIcon,
XIcon, XIcon,
CheckIcon, CheckIcon,
DocumentTextIcon, DocumentTextIcon,
ThumbDownIcon, ThumbDownIcon,
}, },
props: { props: {
requests: { requests: {

89
resources/js/Pages/VacationRequest/Show.vue
View File

@ -54,9 +54,18 @@
<dt class="text-sm font-medium text-gray-500"> <dt class="text-sm font-medium text-gray-500">
Komentarz Komentarz
</dt> </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 }} {{ request.comment }}
</dd> </dd>
<dd
v-else
class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"
>
-
</dd>
</div> </div>
<div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6"> <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"> <dt class="text-sm font-medium text-gray-500">
@ -183,37 +192,37 @@
</h3> </h3>
</div> </div>
<div class="border-t border-gray-200 px-4 py-4"> <div class="border-t border-gray-200 px-4 py-4">
<!-- <ul>--> <!-- <ul>-->
<!-- <li--> <!-- <li-->
<!-- v-for="(activity, index) in activities.data"--> <!-- v-for="(activity, index) in activities.data"-->
<!-- :key="activity.id"--> <!-- :key="activity.id"-->
<!-- >--> <!-- >-->
<!-- <div :class="{'relative pb-8': index !== activities.data.length - 1}">--> <!-- <div :class="{'relative pb-8': index !== activities.data.length - 1}">-->
<!-- <span--> <!-- <span-->
<!-- v-if="(index !== activities.data.length - 1)"--> <!-- v-if="(index !== activities.data.length - 1)"-->
<!-- class="absolute top-4 left-4 -ml-px h-full w-0.5 bg-gray-200"--> <!-- class="absolute top-4 left-4 -ml-px h-full w-0.5 bg-gray-200"-->
<!-- />--> <!-- />-->
<!-- <div class="relative flex space-x-3">--> <!-- <div class="relative flex space-x-3">-->
<!-- <div>--> <!-- <div>-->
<!-- <span--> <!-- <span-->
<!-- class="bg-blumilk-500 h-8 w-8 rounded-full flex items-center justify-center ring-8 ring-white">--> <!-- class="bg-blumilk-500 h-8 w-8 rounded-full flex items-center justify-center ring-8 ring-white">-->
<!-- <ThumbUpIcon class="w-5 h-5 text-white"/>--> <!-- <ThumbUpIcon class="w-5 h-5 text-white"/>-->
<!-- </span>--> <!-- </span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="min-w-0 flex-1 pt-1.5 flex justify-between space-x-4">--> <!-- <div class="min-w-0 flex-1 pt-1.5 flex justify-between space-x-4">-->
<!-- <div>--> <!-- <div>-->
<!-- <p class="text-sm text-gray-500">--> <!-- <p class="text-sm text-gray-500">-->
<!-- {{ activity.to }}--> <!-- {{ activity.to }}-->
<!-- </p>--> <!-- </p>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="text-right text-sm whitespace-nowrap text-gray-500">--> <!-- <div class="text-right text-sm whitespace-nowrap text-gray-500">-->
<!-- <time>{{ activity.date }}</time>--> <!-- <time>{{ activity.date }}</time>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </li>--> <!-- </li>-->
<!-- </ul>--> <!-- </ul>-->
<ul> <ul>
<li <li
v-for="(status, index) in statuses" v-for="(status, index) in statuses"
@ -236,14 +245,18 @@
</span> </span>
</div> </div>
<div class="min-w-0 flex-1 pt-1.5 flex justify-between space-x-4"> <div class="min-w-0 flex-1 pt-1.5 flex justify-between space-x-4">
<div> <div class="flex flex-col items-start">
<p class="text-sm text-gray-500"> <div class="text-sm font-medium text-gray-700">
{{ status.name }} {{ status.name }}
</p> </div>
</div> <div class="text-right text-sm whitespace-nowrap font-medium text-gray-400">
<div class="text-right text-sm whitespace-nowrap text-gray-500"> Jan Kowalski
<time>4 lutego 2022</time> </div>
</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>
</div> </div>
</div> </div>