Skip to content

Commit f626915

Browse files
improve pagination on user and event list
1 parent 5e16b1c commit f626915

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

frontend/src/ui/assets/css/styling/pagination.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.pagination {
22
@apply flex items-stretch justify-end space-x-2;
33
@apply px-8 py-2 md:px-16 xl:pr-20;
4-
@apply sticky bottom-0 left-0 z-10 bg-primary-50 xl:px-20;
4+
@apply bg-primary-50 xl:px-20;
55
}
66

77
.pagination-page {

frontend/src/ui/assets/css/styling/table.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ table.v-table {
77

88
@media (min-width: 768px) {
99
table.v-table {
10-
margin-left: -2rem;
11-
margin-right: -2rem;
12-
width: calc(100% + 4rem);
10+
margin-left: -1.5rem;
11+
margin-right: -1.5rem;
12+
width: calc(100% + 3rem);
1313
}
1414

1515
.v-table th:first-child,
1616
.v-table td:first-child {
17-
padding-right: 2rem !important;
17+
padding-right: 1.5rem !important;
1818
}
1919

2020
.v-table th:last-child,
2121
.v-table td:last-child {
22-
padding-left: 2rem !important;
22+
padding-left: 1.5rem !important;
2323
}
2424
}
2525

frontend/src/ui/views/admin/events/list/EventsAdminView.vue

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
<teleport to="#nav-right">
44
<NavbarFilter v-model="filter" placeholder="Events durchsuchen" />
55
</teleport>
6-
<div
7-
class="sticky top-12 z-20 hidden bg-primary-50 px-4 pb-8 pt-4 md:pl-12 md:pr-16 md:pt-8 xl:top-0 xl:block xl:pl-16 xl:pr-20"
8-
>
6+
<div class="top-0 hidden bg-primary-50 px-4 pb-8 pl-16 pr-20 pt-8 xl:block">
97
<div class="flex items-center space-x-4">
108
<VInputText v-model="filter" class="input-search w-96" placeholder="Reisen filtern">
119
<template #before>
@@ -28,12 +26,12 @@
2826
</div>
2927
</div>
3028

31-
<VTabs v-model="tab" :tabs="tabs" class="sticky top-12 z-20 bg-primary-50 pt-4 xl:top-[6.625rem]" />
29+
<VTabs v-model="tab" :tabs="tabs" class="sticky top-12 z-20 bg-primary-50 pt-4 xl:top-0 xl:pt-8" />
3230
<div class="w-full">
3331
<VTable
3432
:items="filteredEvents"
35-
:page-size="-1"
36-
class="interactive-table scrollbar-invisible overflow-x-auto px-8 md:px-16 xl:px-20"
33+
:page-size="20"
34+
class="interactive-table no-header scrollbar-invisible overflow-x-auto px-8 pt-4 md:px-16 xl:px-20"
3735
@click="editEvent($event)"
3836
>
3937
<template #head>

frontend/src/ui/views/admin/users/list/UsersListView.vue

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
<teleport to="#nav-right">
44
<NavbarFilter v-model="filter" placeholder="Nutzer durchsuchen" />
55
</teleport>
6-
<div
7-
class="sticky left-0 top-12 z-20 hidden border-b border-primary-200 bg-primary-50 px-4 pb-8 pt-4 md:pl-12 md:pr-16 md:pt-8 xl:top-0 xl:block xl:pl-16 xl:pr-20"
8-
>
6+
<div class="top-0 hidden bg-primary-50 px-4 pb-8 pl-16 pr-20 pt-8 xl:block">
97
<div class="flex items-center space-x-4">
108
<VInputText v-model="filter" class="input-search w-96" placeholder="Nutzer filtern">
119
<template #before>
@@ -22,12 +20,13 @@
2220
</div>
2321
</div>
2422
</div>
23+
<VTabs v-model="tab" :tabs="tabs" class="sticky top-12 z-20 bg-primary-50 pt-4 xl:top-0 xl:pt-8" />
2524
<div class="w-full">
2625
<VTable
2726
:items="filteredUsers"
2827
:page-size="20"
2928
:query="true"
30-
class="interactive-table scrollbar-invisible overflow-x-auto px-8 md:px-16 xl:px-20"
29+
class="interactive-table no-header scrollbar-invisible overflow-x-auto px-8 pt-4 md:px-16 xl:px-20"
3130
@click="editUser($event)"
3231
>
3332
<template #head>
@@ -201,6 +200,7 @@ import { ArrayUtils } from '@/common';
201200
import type { Position, User } from '@/domain';
202201
import { EventType } from '@/domain';
203202
import type { Dialog } from '@/ui/components/common';
203+
import { VTabs } from '@/ui/components/common';
204204
import { ContextMenuButton, VInputCheckBox, VInputText, VTable } from '@/ui/components/common';
205205
import NavbarFilter from '@/ui/components/utils/NavbarFilter.vue';
206206
import { useAuthUseCase, useEventUseCase, useUsersUseCase } from '@/ui/composables/Application';
@@ -231,6 +231,8 @@ const usersService = useUserService();
231231
const authUseCase = useAuthUseCase();
232232
const router = useRouter();
233233
234+
const tab = ref<string>('Alle Nutzer');
235+
const tabs = ref<string[]>(['Alle Nutzer']);
234236
const filter = ref<string>('');
235237
const filterOnlyActive = ref<boolean>(false);
236238
const users = ref<UserRegistrations[] | undefined>(undefined);

0 commit comments

Comments
 (0)