Skip to content

Commit e3d0071

Browse files
authored
Merge pull request #218 from connorabbas/develop
Improvements
2 parents 64bed14 + 9536699 commit e3d0071

File tree

4 files changed

+20
-1
lines changed

4 files changed

+20
-1
lines changed

resources/js/composables/useAppLayout.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ export function useAppLayout() {
5656
route: route('profile.edit'),
5757
lucideIcon: Settings,
5858
},
59+
{
60+
separator: true
61+
},
5962
{
6063
label: 'Log Out',
6164
lucideIcon: LogOut,

resources/js/composables/usePaginatedData.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,19 @@ export function usePaginatedData(
161161
if (!filter?.value || !filter?.matchMode) {
162162
return;
163163
}
164-
if (filter.matchMode == FilterMatchMode.DATE_IS) {
164+
if (
165+
filter.matchMode == FilterMatchMode.DATE_IS ||
166+
filter.matchMode == FilterMatchMode.DATE_IS_NOT ||
167+
filter.matchMode == FilterMatchMode.DATE_BEFORE ||
168+
filter.matchMode == FilterMatchMode.DATE_AFTER
169+
) {
165170
filters.value[key].value = new Date(filter.value);
171+
} else if (filter.matchMode == FilterMatchMode.BETWEEN) {
172+
filter.value.forEach((value: any, index: number) => {
173+
if (typeof value === 'string') {
174+
filter.value[index] = new Date(value);
175+
}
176+
});
166177
} else if (
167178
typeof filter.value === 'string' &&
168179
filter.value !== '' &&
@@ -208,6 +219,9 @@ export function usePaginatedData(
208219
if (urlParams?.page) {
209220
pagination.value.page = parseInt(urlParams.page);
210221
}
222+
if (urlParams?.rows) {
223+
pagination.value.rows = parseInt(urlParams.rows);
224+
}
211225
}
212226

213227
onMounted(() => {

resources/js/layouts/app/HeaderLayout.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ const toggleMobileUserMenu = (event) => {
5656
id="mobile-user-menu-btn"
5757
:label="page.props.auth.user.name"
5858
severity="secondary"
59+
size="large"
5960
pt:root:class="flex flex-row-reverse justify-between"
6061
@click="toggleMobileUserMenu($event)"
6162
>

resources/js/layouts/app/SidebarLayout.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ const toggleMobileUserMenu = (event) => {
5555
:label="page.props.auth.user.name"
5656
pt:root:class="flex flex-row-reverse justify-between"
5757
severity="secondary"
58+
size="large"
5859
@click="toggleMobileUserMenu($event)"
5960
>
6061
<template #icon>

0 commit comments

Comments
 (0)