Skip to content

Commit 9e66a75

Browse files
committed
refactor: Improve vacation filtering and status handling
- Add status filtering to vacation list endpoint - Normalize request type parameter for filtering - Update vacation list query logic for better filtering - Remove unused 'pending-requests' route and component
1 parent 141d3c1 commit 9e66a75

5 files changed

Lines changed: 273 additions & 347 deletions

File tree

client/src/components/SideDrawer.vue

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
11
<template>
22
<v-card class="layout-container">
3-
<v-navigation-drawer
4-
v-if="$route.path != '/login'"
5-
v-model="drawer"
6-
theme="dark"
7-
:permanent="!isMobile"
8-
:temporary="isMobile"
9-
class="fixed-sidebar">
3+
<v-navigation-drawer v-if="$route.path != '/login'" v-model="drawer" theme="dark" :permanent="!isMobile"
4+
:temporary="isMobile" class="fixed-sidebar">
105
<router-link to="/">
116
<v-img :src="logo" max-width="110" class="ml-3 mt-5 mb-4"></v-img>
127
</router-link>
138
<v-divider></v-divider>
149
<v-list color="transparent">
1510
<template v-for="item in filteredItems" :key="item.title">
16-
<v-list-item
17-
:to="item.path"
18-
:prepend-icon="item.icon"
19-
color="white"
20-
:class="{ 'router-link-active': $route.path === item.path }"
21-
@click="isMobile && (drawer = false)">
11+
<v-list-item :to="item.path" :prepend-icon="item.icon" color="white"
12+
:class="{ 'router-link-active': $route.path === item.path }" @click="isMobile && (drawer = false)">
2213
{{ item.title }}
2314
</v-list-item>
2415
</template>
2516
</v-list>
2617
</v-navigation-drawer>
2718

2819
<div :class="$route.path != '/login' ? 'main-container' : ''">
29-
<CshrToolbar v-if="$route.path != '/login'" @logout="logout" @toggle-drawer="drawer = !drawer" :is-mobile="isMobile" />
20+
<CshrToolbar v-if="$route.path != '/login'" @logout="logout" @toggle-drawer="drawer = !drawer"
21+
:is-mobile="isMobile" />
3022
<div class="scrollable-content">
3123
<template v-if="isReadyRouter.state.value">
3224
<router-view />
@@ -94,11 +86,6 @@ export default {
9486
title: 'Requests',
9587
path: '/requests'
9688
},
97-
{
98-
icon: 'mdi-account-clock',
99-
title: 'Pending Requests',
100-
path: '/pending-requests'
101-
},
10289
{
10390
icon: 'mdi-bell',
10491
title: 'Notifications',

client/src/router/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const router = createRouter({
77
{ path: '/login', component: () => import('@/views/LoginView.vue') },
88
{ path: '/', component: () => import('@/views/CalendarView.vue') },
99
{ path: '/requests', component: () => import('@/views/RequestsView.vue') },
10-
{ path: '/pending-requests', component: () => import('@/views/PendingRequests.vue') },
1110
{ path: '/notifications', component: () => import('@/views/NotificationsView.vue') },
1211
{ path: '/locations', component: () => import('@/views/OfficesView.vue') },
1312
{ path: '/dashboard', component: () => import('@/views/DashboardView.vue') },

client/src/views/PendingRequests.vue

Lines changed: 0 additions & 209 deletions
This file was deleted.

0 commit comments

Comments
 (0)