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

#62 - vacation request list for approvers (#69)

Browse Source 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* #5 - bump dependencies

* #43 - wip

* #43 - add composer script

* #43 - fix

* #43 - fix

* #43 - wip

* #43 - ecs fix

* #43 - cr fix

* #43 - cr fix

* #43 - fix

* #62 - wip

* #62 - wip

* #62 - wip

* #62 - fix

* #62 - fix

* #62 - fix

* #62 - fix

* #62 - fix

* #62 - ecs fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
This commit is contained in:
Adrian Hopek
2022-03-08 09:25:24 +01:00
committed by GitHub
parent af6f747aa2
commit db4be79c91
28 changed files with 753 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/js/Shared/Activity.vue
View File

@@ -48,7 +48,9 @@ export default {
},
},
setup(props) {
const statusInfo = computed(() => useStatusInfo(props.activity.state))
const { findStatus } = useStatusInfo()
const statusInfo = computed(() => findStatus(props.activity.state))
return {
statusInfo,

9
resources/js/Shared/MainMenu.vue
View File

@@ -74,7 +74,7 @@
v-for="item in navigation"
:key="item.name"
:href="item.href"
:class="[$page.url.startsWith(item.href) ? 'bg-blumilk-800 text-white' : 'text-blumilk-100 hover:text-white hover:bg-blumilk-600', 'group flex items-center px-2 py-2 text-base font-medium rounded-md']"
:class="[$page.url === item.href ? 'bg-blumilk-800 text-white' : 'text-blumilk-100 hover:text-white hover:bg-blumilk-600', 'group flex items-center px-2 py-2 text-base font-medium rounded-md']"
>
<component
:is="item.icon"
@@ -119,7 +119,7 @@
v-for="item in navigation"
:key="item.name"
:href="item.href"
:class="[$page.url.startsWith(item.href) ? 'bg-blumilk-800 text-white' : 'text-blumilk-100 hover:text-white hover:bg-blumilk-600', 'group flex items-center px-2 py-2 text-sm leading-6 font-medium rounded-md']"
:class="[$page.url === item.href ? 'bg-blumilk-800 text-white' : 'text-blumilk-100 hover:text-white hover:bg-blumilk-600', 'group flex items-center px-2 py-2 text-sm leading-6 font-medium rounded-md']"
>
<component
:is="item.icon"
@@ -281,7 +281,7 @@ import {
XIcon,
SunIcon,
StarIcon,
CalendarIcon,
CalendarIcon, DocumentTextIcon,
} from '@heroicons/vue/outline'
import {
CashIcon,
@@ -329,7 +329,8 @@ export default {
const navigation = computed(() =>
[
{name: 'Wnioski urlopowe', href: '/vacation-requests', icon: CollectionIcon, can: true},
{name: 'Moje wnioski', href: '/vacation-requests/me', icon: DocumentTextIcon, can: true},
{name: 'Wnioski urlopowe', href: '/vacation-requests', icon: CollectionIcon, can: auth.value.can.listAllVacationRequests},
{name: 'Kalendarz urlopów', href: '/vacation-calendar', icon: CalendarIcon, can: true},
{name: 'Dni wolne', href: '/holidays', icon: StarIcon, can: true},
{name: 'Limity urlopów', href: '/vacation-limits', icon: SunIcon, can: auth.value.can.manageVacationLimits},

4
resources/js/Shared/Status.vue
View File

@@ -25,7 +25,9 @@ export default {
},
},
setup(props) {
const statusInfo = computed(() => useStatusInfo(props.status))
const { findStatus } = useStatusInfo()
const statusInfo = computed(() => findStatus(props.status))
return {
statusInfo,