Merge pull request '83-LOA-Feedback' (#104) from 83-LOA-Feedback into main
All checks were successful
Continuous Integration / Update Development (push) Successful in 2m42s
All checks were successful
Continuous Integration / Update Development (push) Successful in 2m42s
Reviewed-on: #104
This commit was merged in pull request #104.
This commit is contained in:
@@ -66,9 +66,11 @@ router.get("/history", async (req: Request, res: Response) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
router.get('/all', [requireRole("17th Administrator")], async (req, res) => {
|
router.get('/all', [requireRole("17th Administrator")], async (req: Request, res: Response) => {
|
||||||
try {
|
try {
|
||||||
const result = await getAllLOA();
|
const page = Number(req.query.page) || undefined;
|
||||||
|
const pageSize = Number(req.query.pageSize) || undefined;
|
||||||
|
const result = await getAllLOA(page, pageSize);
|
||||||
res.status(200).json(result)
|
res.status(200).json(result)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
import { toDateTime } from "@app/shared/utils/time";
|
import { toDateTime } from "@app/shared/utils/time";
|
||||||
import pool from "../db";
|
import pool from "../db";
|
||||||
import { LOARequest, LOAType } from '@app/shared/types/loa'
|
import { LOARequest, LOAType } from '@app/shared/types/loa'
|
||||||
|
import { PagedData } from '@app/shared/types/pagination'
|
||||||
|
|
||||||
export async function getLoaTypes(): Promise<LOAType[]> {
|
export async function getLoaTypes(): Promise<LOAType[]> {
|
||||||
return await pool.query('SELECT * FROM leave_of_absences_types;');
|
return await pool.query('SELECT * FROM leave_of_absences_types;');
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getAllLOA(page = 1, pageSize = 20): Promise<LOARequest[]> {
|
export async function getAllLOA(page = 1, pageSize = 10): Promise<PagedData<LOARequest>> {
|
||||||
const offset = (page - 1) * pageSize;
|
const offset = (page - 1) * pageSize;
|
||||||
|
|
||||||
const sql = `
|
const sql = `
|
||||||
@@ -26,9 +27,13 @@ export async function getAllLOA(page = 1, pageSize = 20): Promise<LOARequest[]>
|
|||||||
loa.start_date DESC
|
loa.start_date DESC
|
||||||
LIMIT ? OFFSET ?;
|
LIMIT ? OFFSET ?;
|
||||||
`;
|
`;
|
||||||
|
let loaList: LOARequest[] = await pool.query(sql, [pageSize, offset]) as LOARequest[];
|
||||||
|
|
||||||
let res: LOARequest[] = await pool.query(sql, [pageSize, offset]) as LOARequest[];
|
let loaCount = Number((await pool.query(`SELECT COUNT(*) as count FROM leave_of_absences;`))[0].count);
|
||||||
return res;
|
let pageCount = loaCount / pageSize;
|
||||||
|
|
||||||
|
let output: PagedData<LOARequest> = { data: loaList, pagination: { page: page, pageSize: pageSize, total: loaCount, totalPages: pageCount } }
|
||||||
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getUserLOA(userId: number): Promise<LOARequest[]> {
|
export async function getUserLOA(userId: number): Promise<LOARequest[]> {
|
||||||
@@ -73,7 +78,8 @@ export async function createNewLOA(data: LOARequest) {
|
|||||||
export async function closeLOA(id: number, closer: number) {
|
export async function closeLOA(id: number, closer: number) {
|
||||||
const sql = `UPDATE leave_of_absences
|
const sql = `UPDATE leave_of_absences
|
||||||
SET closed = 1,
|
SET closed = 1,
|
||||||
closed_by = ?
|
closed_by = ?,
|
||||||
|
ended_at = NOW()
|
||||||
WHERE leave_of_absences.id = ?`;
|
WHERE leave_of_absences.id = ?`;
|
||||||
let out = await pool.query(sql, [closer, id]);
|
let out = await pool.query(sql, [closer, id]);
|
||||||
console.log(out);
|
console.log(out);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ export enum MemberState {
|
|||||||
export type Member = {
|
export type Member = {
|
||||||
member_id: number;
|
member_id: number;
|
||||||
member_name: string;
|
member_name: string;
|
||||||
|
displayName?: string;
|
||||||
rank: string | null;
|
rank: string | null;
|
||||||
rank_date: string | null;
|
rank_date: string | null;
|
||||||
unit: string | null;
|
unit: string | null;
|
||||||
|
|||||||
11
shared/types/pagination.ts
Normal file
11
shared/types/pagination.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
export interface PagedData<T> {
|
||||||
|
data: T[]
|
||||||
|
pagination: pagination
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface pagination {
|
||||||
|
page: number
|
||||||
|
pageSize: number
|
||||||
|
total: number
|
||||||
|
totalPages: number
|
||||||
|
}
|
||||||
@@ -12,4 +12,4 @@ export function toDateTime(date: Date): string {
|
|||||||
const second = date.getSeconds().toString().padStart(2, "0");
|
const second = date.getSeconds().toString().padStart(2, "0");
|
||||||
|
|
||||||
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
|
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { LOARequest, LOAType } from '@shared/types/loa'
|
import { LOARequest, LOAType } from '@shared/types/loa'
|
||||||
|
import { PagedData } from '@shared/types/pagination'
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
const addr = import.meta.env.VITE_APIHOST;
|
const addr = import.meta.env.VITE_APIHOST;
|
||||||
|
|
||||||
@@ -58,8 +59,18 @@ export async function getMyLOA(): Promise<LOARequest | null> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getAllLOAs(): Promise<LOARequest[]> {
|
export async function getAllLOAs(page?: number, pageSize?: number): Promise<PagedData<LOARequest>> {
|
||||||
return fetch(`${addr}/loa/all`, {
|
const params = new URLSearchParams();
|
||||||
|
|
||||||
|
if (page !== undefined) {
|
||||||
|
params.set("page", page.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pageSize !== undefined) {
|
||||||
|
params.set("pageSize", pageSize.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return fetch(`${addr}/loa/all?${params}`, {
|
||||||
method: "GET",
|
method: "GET",
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json",
|
"Content-Type": "application/json",
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
import { Check, Search } from "lucide-vue-next"
|
import { Check, Search } from "lucide-vue-next"
|
||||||
import { ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
|
import { ComboboxAnchor, ComboboxEmpty, ComboboxGroup, ComboboxInput, ComboboxItem, ComboboxItemIndicator, ComboboxList } from "@/components/ui/combobox"
|
||||||
import { computed, onMounted, ref, watch } from "vue";
|
import { computed, onMounted, ref, watch } from "vue";
|
||||||
import { Member, getMembers } from "@/api/member";
|
import { getMembers } from "@/api/member";
|
||||||
|
import { Member } from "@shared/types/member";
|
||||||
import Button from "@/components/ui/button/Button.vue";
|
import Button from "@/components/ui/button/Button.vue";
|
||||||
import {
|
import {
|
||||||
CalendarDate,
|
CalendarDate,
|
||||||
@@ -70,6 +71,8 @@ const { handleSubmit, values, resetForm } = useForm({
|
|||||||
validationSchema: toTypedSchema(loaSchema),
|
validationSchema: toTypedSchema(loaSchema),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const formSubmitted = ref(false);
|
||||||
|
|
||||||
const onSubmit = handleSubmit(async (values) => {
|
const onSubmit = handleSubmit(async (values) => {
|
||||||
console.log(values);
|
console.log(values);
|
||||||
const out: LOARequest = {
|
const out: LOARequest = {
|
||||||
@@ -85,6 +88,7 @@ const onSubmit = handleSubmit(async (values) => {
|
|||||||
await submitLOA(out);
|
await submitLOA(out);
|
||||||
userStore.loadUser();
|
userStore.loadUser();
|
||||||
}
|
}
|
||||||
|
formSubmitted.value = true;
|
||||||
})
|
})
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
@@ -137,7 +141,7 @@ const maxEndDate = computed(() => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-1 flex flex-col gap-5">
|
<div class="flex-1 flex flex-col gap-5">
|
||||||
<form @submit="onSubmit" class="flex flex-col gap-2">
|
<form v-if="!formSubmitted" @submit="onSubmit" class="flex flex-col gap-2">
|
||||||
<div class="flex w-full gap-5">
|
<div class="flex w-full gap-5">
|
||||||
<VeeField v-slot="{ field, errors }" name="member_id">
|
<VeeField v-slot="{ field, errors }" name="member_id">
|
||||||
<Field>
|
<Field>
|
||||||
@@ -272,6 +276,24 @@ const maxEndDate = computed(() => {
|
|||||||
<Button type="submit">Submit</Button>
|
<Button type="submit">Submit</Button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
<div v-else class="flex flex-col gap-4 py-8 text-left">
|
||||||
|
<h2 class="text-xl font-semibold">
|
||||||
|
LOA Request Submitted
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<p class="max-w-md text-muted-foreground">
|
||||||
|
Your Leave of Absence request has been submitted successfully.
|
||||||
|
It will take effect on your selected start date.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="flex gap-3 mt-4">
|
||||||
|
<Button variant="secondary" @click="formSubmitted = false">
|
||||||
|
Submit another request
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -15,7 +15,7 @@ import {
|
|||||||
DropdownMenuItem,
|
DropdownMenuItem,
|
||||||
DropdownMenuTrigger,
|
DropdownMenuTrigger,
|
||||||
} from "@/components/ui/dropdown-menu"
|
} from "@/components/ui/dropdown-menu"
|
||||||
import { Ellipsis } from "lucide-vue-next";
|
import { ChevronDown, ChevronUp, Ellipsis, X } from "lucide-vue-next";
|
||||||
import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
|
import { cancelLOA, extendLOA, getAllLOAs, getMyLOAs } from "@/api/loa";
|
||||||
import { onMounted, ref, computed } from "vue";
|
import { onMounted, ref, computed } from "vue";
|
||||||
import { LOARequest } from "@shared/types/loa";
|
import { LOARequest } from "@shared/types/loa";
|
||||||
@@ -33,6 +33,15 @@ import {
|
|||||||
} from "@internationalized/date"
|
} from "@internationalized/date"
|
||||||
import { el } from "@fullcalendar/core/internal-common";
|
import { el } from "@fullcalendar/core/internal-common";
|
||||||
import MemberCard from "../members/MemberCard.vue";
|
import MemberCard from "../members/MemberCard.vue";
|
||||||
|
import {
|
||||||
|
Pagination,
|
||||||
|
PaginationContent,
|
||||||
|
PaginationEllipsis,
|
||||||
|
PaginationItem,
|
||||||
|
PaginationNext,
|
||||||
|
PaginationPrevious,
|
||||||
|
} from '@/components/ui/pagination'
|
||||||
|
import { pagination } from "@shared/types/pagination";
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
adminMode?: boolean
|
adminMode?: boolean
|
||||||
@@ -46,7 +55,9 @@ onMounted(async () => {
|
|||||||
|
|
||||||
async function loadLOAs() {
|
async function loadLOAs() {
|
||||||
if (props.adminMode) {
|
if (props.adminMode) {
|
||||||
LOAList.value = await getAllLOAs();
|
let result = await getAllLOAs(pageNum.value, pageSize.value);
|
||||||
|
LOAList.value = result.data;
|
||||||
|
pageData.value = result.pagination;
|
||||||
} else {
|
} else {
|
||||||
LOAList.value = await getMyLOAs();
|
LOAList.value = await getMyLOAs();
|
||||||
}
|
}
|
||||||
@@ -76,12 +87,6 @@ function loaStatus(loa: LOARequest): "Upcoming" | "Active" | "Overdue" | "Closed
|
|||||||
return "Overdue"; // fallback
|
return "Overdue"; // fallback
|
||||||
}
|
}
|
||||||
|
|
||||||
function sortByStartDate(loas: LOARequest[]): LOARequest[] {
|
|
||||||
return [...loas].sort(
|
|
||||||
(a, b) => new Date(b.start_date).getTime() - new Date(a.start_date).getTime()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function cancelAndReload(id: number) {
|
async function cancelAndReload(id: number) {
|
||||||
await cancelLOA(id, props.adminMode);
|
await cancelLOA(id, props.adminMode);
|
||||||
await loadLOAs();
|
await loadLOAs();
|
||||||
@@ -104,6 +109,26 @@ async function commitExtend() {
|
|||||||
isExtending.value = false;
|
isExtending.value = false;
|
||||||
await loadLOAs();
|
await loadLOAs();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const expanded = ref<number | null>(null);
|
||||||
|
const hoverID = ref<number | null>(null);
|
||||||
|
|
||||||
|
const pageNum = ref<number>(1);
|
||||||
|
const pageData = ref<pagination>();
|
||||||
|
|
||||||
|
const pageSize = ref<number>(15)
|
||||||
|
const pageSizeOptions = [10, 15, 30]
|
||||||
|
|
||||||
|
function setPageSize(size: number) {
|
||||||
|
pageSize.value = size
|
||||||
|
pageNum.value = 1;
|
||||||
|
loadLOAs();
|
||||||
|
}
|
||||||
|
|
||||||
|
function setPage(pagenum: number) {
|
||||||
|
pageNum.value = pagenum;
|
||||||
|
loadLOAs();
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@@ -139,51 +164,121 @@ async function commitExtend() {
|
|||||||
<TableHead>Type</TableHead>
|
<TableHead>Type</TableHead>
|
||||||
<TableHead>Start</TableHead>
|
<TableHead>Start</TableHead>
|
||||||
<TableHead>End</TableHead>
|
<TableHead>End</TableHead>
|
||||||
<TableHead class="w-[500px]">Reason</TableHead>
|
<!-- <TableHead class="w-[500px]">Reason</TableHead> -->
|
||||||
<TableHead>Posted on</TableHead>
|
<TableHead>Posted on</TableHead>
|
||||||
<TableHead>Status</TableHead>
|
<TableHead>Status</TableHead>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHeader>
|
</TableHeader>
|
||||||
<TableBody>
|
<TableBody>
|
||||||
<TableRow v-for="post in LOAList" :key="post.id" class="hover:bg-muted/50">
|
<template v-for="post in LOAList" :key="post.id">
|
||||||
<TableCell class="font-medium">
|
<TableRow class="hover:bg-muted/50 cursor-pointer" @click="expanded = post.id"
|
||||||
<MemberCard :member-id="post.member_id"></MemberCard>
|
@mouseenter="hoverID = post.id" @mouseleave="hoverID = null" :class="{
|
||||||
</TableCell>
|
'border-b-0': expanded === post.id,
|
||||||
<TableCell>{{ post.type_name }}</TableCell>
|
'bg-muted/50': hoverID === post.id
|
||||||
<TableCell>{{ formatDate(post.start_date) }}</TableCell>
|
}">
|
||||||
<TableCell>{{ post.extended_till ? formatDate(post.extended_till) : formatDate(post.end_date) }}
|
<TableCell class="font-medium">
|
||||||
</TableCell>
|
<MemberCard :member-id="post.member_id"></MemberCard>
|
||||||
<TableCell>{{ post.reason }}</TableCell>
|
</TableCell>
|
||||||
<TableCell>{{ formatDate(post.filed_date) }}</TableCell>
|
<TableCell>{{ post.type_name }}</TableCell>
|
||||||
<TableCell>
|
<TableCell>{{ formatDate(post.start_date) }}</TableCell>
|
||||||
<Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
|
<TableCell>{{ post.extended_till ? formatDate(post.extended_till) :
|
||||||
<Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
|
formatDate(post.end_date) }}
|
||||||
<Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
|
</TableCell>
|
||||||
<Badge v-else class="bg-gray-400">Ended</Badge>
|
<!-- <TableCell>{{ post.reason }}</TableCell> -->
|
||||||
</TableCell>
|
<TableCell>{{ formatDate(post.filed_date) }}</TableCell>
|
||||||
<TableCell @click.stop="" class="text-right">
|
<TableCell>
|
||||||
<DropdownMenu>
|
<Badge v-if="loaStatus(post) === 'Upcoming'" class="bg-blue-400">Upcoming</Badge>
|
||||||
<DropdownMenuTrigger class="cursor-pointer">
|
<Badge v-else-if="loaStatus(post) === 'Active'" class="bg-green-500">Active</Badge>
|
||||||
<Ellipsis></Ellipsis>
|
<Badge v-else-if="loaStatus(post) === 'Overdue'" class="bg-yellow-400">Overdue</Badge>
|
||||||
</DropdownMenuTrigger>
|
<Badge v-else class="bg-gray-400">Ended</Badge>
|
||||||
<DropdownMenuContent>
|
</TableCell>
|
||||||
<DropdownMenuItem v-if="!post.closed && props.adminMode"
|
<TableCell @click.stop="" class="text-right">
|
||||||
@click="isExtending = true; targetLOA = post">
|
<DropdownMenu>
|
||||||
Extend
|
<DropdownMenuTrigger class="cursor-pointer">
|
||||||
</DropdownMenuItem>
|
<Button variant="ghost">
|
||||||
<DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
|
<Ellipsis class="size-6"></Ellipsis>
|
||||||
@click="cancelAndReload(post.id)">End
|
</Button>
|
||||||
</DropdownMenuItem>
|
</DropdownMenuTrigger>
|
||||||
<!-- Fallback: no actions available -->
|
<DropdownMenuContent>
|
||||||
<p v-if="post.closed || (!props.adminMode && post.closed)" class="p-2 text-center text-sm">
|
<DropdownMenuItem v-if="!post.closed && props.adminMode"
|
||||||
No actions
|
@click="isExtending = true; targetLOA = post">
|
||||||
</p>
|
Extend
|
||||||
</DropdownMenuContent>
|
</DropdownMenuItem>
|
||||||
</DropdownMenu>
|
<DropdownMenuItem v-if="!post.closed" :variant="'destructive'"
|
||||||
</TableCell>
|
@click="cancelAndReload(post.id)">{{ loaStatus(post) === 'Upcoming' ?
|
||||||
</TableRow>
|
'Cancel' :
|
||||||
|
'End' }}
|
||||||
|
</DropdownMenuItem>
|
||||||
|
<!-- Fallback: no actions available -->
|
||||||
|
<p v-if="post.closed || (!props.adminMode && post.closed)"
|
||||||
|
class="p-2 text-center text-sm">
|
||||||
|
No actions
|
||||||
|
</p>
|
||||||
|
</DropdownMenuContent>
|
||||||
|
</DropdownMenu>
|
||||||
|
</TableCell>
|
||||||
|
<TableCell>
|
||||||
|
<Button v-if="expanded === post.id" @click.stop="expanded = null" variant="ghost">
|
||||||
|
<ChevronUp class="size-6" />
|
||||||
|
</Button>
|
||||||
|
<Button v-else @click.stop="expanded = post.id" variant="ghost">
|
||||||
|
<ChevronDown class="size-6" />
|
||||||
|
</Button>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
<TableRow v-if="expanded === post.id" @mouseenter="hoverID = post.id"
|
||||||
|
@mouseleave="hoverID = null" :class="{ 'bg-muted/50 border-t-0': hoverID === post.id }">
|
||||||
|
<TableCell :colspan="8" class="p-0">
|
||||||
|
<div class="w-full p-3 mb-6 space-y-3">
|
||||||
|
<div class="flex justify-between items-start gap-4">
|
||||||
|
<div class="flex-1">
|
||||||
|
<!-- Title -->
|
||||||
|
<p class="text-md font-semibold text-foreground">
|
||||||
|
Reason
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<!-- Content -->
|
||||||
|
<p
|
||||||
|
class="mt-1 text-md whitespace-pre-wrap leading-relaxed text-muted-foreground">
|
||||||
|
{{ post.reason }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</TableCell>
|
||||||
|
</TableRow>
|
||||||
|
|
||||||
|
</template>
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
|
<div class="mt-5 flex justify-between">
|
||||||
|
<div></div>
|
||||||
|
<Pagination v-slot="{ page }" :items-per-page="pageData?.pageSize || 10" :total="pageData?.total || 10"
|
||||||
|
:default-page="2" :page="pageNum" @update:page="setPage">
|
||||||
|
<PaginationContent v-slot="{ items }">
|
||||||
|
<PaginationPrevious />
|
||||||
|
<template v-for="(item, index) in items" :key="index">
|
||||||
|
<PaginationItem v-if="item.type === 'page'" :value="item.value"
|
||||||
|
:is-active="item.value === page">
|
||||||
|
{{ item.value }}
|
||||||
|
</PaginationItem>
|
||||||
|
</template>
|
||||||
|
<PaginationEllipsis :index="4" />
|
||||||
|
<PaginationNext />
|
||||||
|
</PaginationContent>
|
||||||
|
</Pagination>
|
||||||
|
<div class="flex items-center gap-3 text-sm">
|
||||||
|
<p class="text-muted-foreground text-nowrap">Per page:</p>
|
||||||
|
|
||||||
|
<button v-for="size in pageSizeOptions" :key="size" @click="setPageSize(size)"
|
||||||
|
class="px-2 py-1 rounded transition-colors" :class="{
|
||||||
|
'bg-muted font-semibold': pageSize === size,
|
||||||
|
'hover:bg-muted/50': pageSize !== size
|
||||||
|
}">
|
||||||
|
{{ size }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
33
ui/src/components/ui/pagination/Pagination.vue
Normal file
33
ui/src/components/ui/pagination/Pagination.vue
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
<script setup>
|
||||||
|
import { reactiveOmit } from "@vueuse/core";
|
||||||
|
import { PaginationRoot, useForwardPropsEmits } from "reka-ui";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
page: { type: Number, required: false },
|
||||||
|
defaultPage: { type: Number, required: false },
|
||||||
|
itemsPerPage: { type: Number, required: true },
|
||||||
|
total: { type: Number, required: false },
|
||||||
|
siblingCount: { type: Number, required: false },
|
||||||
|
disabled: { type: Boolean, required: false },
|
||||||
|
showEdges: { type: Boolean, required: false },
|
||||||
|
asChild: { type: Boolean, required: false },
|
||||||
|
as: { type: null, required: false },
|
||||||
|
class: { type: null, required: false },
|
||||||
|
});
|
||||||
|
const emits = defineEmits(["update:page"]);
|
||||||
|
|
||||||
|
const delegatedProps = reactiveOmit(props, "class");
|
||||||
|
const forwarded = useForwardPropsEmits(delegatedProps, emits);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<PaginationRoot
|
||||||
|
v-slot="slotProps"
|
||||||
|
data-slot="pagination"
|
||||||
|
v-bind="forwarded"
|
||||||
|
:class="cn('mx-auto flex w-full justify-center', props.class)"
|
||||||
|
>
|
||||||
|
<slot v-bind="slotProps" />
|
||||||
|
</PaginationRoot>
|
||||||
|
</template>
|
||||||
24
ui/src/components/ui/pagination/PaginationContent.vue
Normal file
24
ui/src/components/ui/pagination/PaginationContent.vue
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<script setup>
|
||||||
|
import { reactiveOmit } from "@vueuse/core";
|
||||||
|
import { PaginationList } from "reka-ui";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
asChild: { type: Boolean, required: false },
|
||||||
|
as: { type: null, required: false },
|
||||||
|
class: { type: null, required: false },
|
||||||
|
});
|
||||||
|
|
||||||
|
const delegatedProps = reactiveOmit(props, "class");
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<PaginationList
|
||||||
|
v-slot="slotProps"
|
||||||
|
data-slot="pagination-content"
|
||||||
|
v-bind="delegatedProps"
|
||||||
|
:class="cn('flex flex-row items-center gap-1', props.class)"
|
||||||
|
>
|
||||||
|
<slot v-bind="slotProps" />
|
||||||
|
</PaginationList>
|
||||||
|
</template>
|
||||||
27
ui/src/components/ui/pagination/PaginationEllipsis.vue
Normal file
27
ui/src/components/ui/pagination/PaginationEllipsis.vue
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
<script setup>
|
||||||
|
import { reactiveOmit } from "@vueuse/core";
|
||||||
|
import { MoreHorizontal } from "lucide-vue-next";
|
||||||
|
import { PaginationEllipsis } from "reka-ui";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
asChild: { type: Boolean, required: false },
|
||||||
|
as: { type: null, required: false },
|
||||||
|
class: { type: null, required: false },
|
||||||
|
});
|
||||||
|
|
||||||
|
const delegatedProps = reactiveOmit(props, "class");
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<PaginationEllipsis
|
||||||
|
data-slot="pagination-ellipsis"
|
||||||
|
v-bind="delegatedProps"
|
||||||
|
:class="cn('flex size-9 items-center justify-center', props.class)"
|
||||||
|
>
|
||||||
|
<slot>
|
||||||
|
<MoreHorizontal class="size-4" />
|
||||||
|
<span class="sr-only">More pages</span>
|
||||||
|
</slot>
|
||||||
|
</PaginationEllipsis>
|
||||||
|
</template>
|
||||||
36
ui/src/components/ui/pagination/PaginationFirst.vue
Normal file
36
ui/src/components/ui/pagination/PaginationFirst.vue
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
<script setup>
|
||||||
|
import { reactiveOmit } from "@vueuse/core";
|
||||||
|
import { ChevronLeftIcon } from "lucide-vue-next";
|
||||||
|
import { PaginationFirst, useForwardProps } from "reka-ui";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import { buttonVariants } from '@/components/ui/button';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
asChild: { type: Boolean, required: false },
|
||||||
|
as: { type: null, required: false },
|
||||||
|
size: { type: null, required: false, default: "default" },
|
||||||
|
class: { type: null, required: false },
|
||||||
|
});
|
||||||
|
|
||||||
|
const delegatedProps = reactiveOmit(props, "class", "size");
|
||||||
|
const forwarded = useForwardProps(delegatedProps);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<PaginationFirst
|
||||||
|
data-slot="pagination-first"
|
||||||
|
:class="
|
||||||
|
cn(
|
||||||
|
buttonVariants({ variant: 'ghost', size }),
|
||||||
|
'gap-1 px-2.5 sm:pr-2.5',
|
||||||
|
props.class,
|
||||||
|
)
|
||||||
|
"
|
||||||
|
v-bind="forwarded"
|
||||||
|
>
|
||||||
|
<slot>
|
||||||
|
<ChevronLeftIcon />
|
||||||
|
<span class="hidden sm:block">First</span>
|
||||||
|
</slot>
|
||||||
|
</PaginationFirst>
|
||||||
|
</template>
|
||||||
35
ui/src/components/ui/pagination/PaginationItem.vue
Normal file
35
ui/src/components/ui/pagination/PaginationItem.vue
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
<script setup>
|
||||||
|
import { reactiveOmit } from "@vueuse/core";
|
||||||
|
import { PaginationListItem } from "reka-ui";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import { buttonVariants } from '@/components/ui/button';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
value: { type: Number, required: true },
|
||||||
|
asChild: { type: Boolean, required: false },
|
||||||
|
as: { type: null, required: false },
|
||||||
|
size: { type: null, required: false, default: "icon" },
|
||||||
|
class: { type: null, required: false },
|
||||||
|
isActive: { type: Boolean, required: false },
|
||||||
|
});
|
||||||
|
|
||||||
|
const delegatedProps = reactiveOmit(props, "class", "size", "isActive");
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<PaginationListItem
|
||||||
|
data-slot="pagination-item"
|
||||||
|
v-bind="delegatedProps"
|
||||||
|
:class="
|
||||||
|
cn(
|
||||||
|
buttonVariants({
|
||||||
|
variant: isActive ? 'outline' : 'ghost',
|
||||||
|
size,
|
||||||
|
}),
|
||||||
|
props.class,
|
||||||
|
)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</PaginationListItem>
|
||||||
|
</template>
|
||||||
36
ui/src/components/ui/pagination/PaginationLast.vue
Normal file
36
ui/src/components/ui/pagination/PaginationLast.vue
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
<script setup>
|
||||||
|
import { reactiveOmit } from "@vueuse/core";
|
||||||
|
import { ChevronRightIcon } from "lucide-vue-next";
|
||||||
|
import { PaginationLast, useForwardProps } from "reka-ui";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import { buttonVariants } from '@/components/ui/button';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
asChild: { type: Boolean, required: false },
|
||||||
|
as: { type: null, required: false },
|
||||||
|
size: { type: null, required: false, default: "default" },
|
||||||
|
class: { type: null, required: false },
|
||||||
|
});
|
||||||
|
|
||||||
|
const delegatedProps = reactiveOmit(props, "class", "size");
|
||||||
|
const forwarded = useForwardProps(delegatedProps);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<PaginationLast
|
||||||
|
data-slot="pagination-last"
|
||||||
|
:class="
|
||||||
|
cn(
|
||||||
|
buttonVariants({ variant: 'ghost', size }),
|
||||||
|
'gap-1 px-2.5 sm:pr-2.5',
|
||||||
|
props.class,
|
||||||
|
)
|
||||||
|
"
|
||||||
|
v-bind="forwarded"
|
||||||
|
>
|
||||||
|
<slot>
|
||||||
|
<span class="hidden sm:block">Last</span>
|
||||||
|
<ChevronRightIcon />
|
||||||
|
</slot>
|
||||||
|
</PaginationLast>
|
||||||
|
</template>
|
||||||
36
ui/src/components/ui/pagination/PaginationNext.vue
Normal file
36
ui/src/components/ui/pagination/PaginationNext.vue
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
<script setup>
|
||||||
|
import { reactiveOmit } from "@vueuse/core";
|
||||||
|
import { ChevronRightIcon } from "lucide-vue-next";
|
||||||
|
import { PaginationNext, useForwardProps } from "reka-ui";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import { buttonVariants } from '@/components/ui/button';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
asChild: { type: Boolean, required: false },
|
||||||
|
as: { type: null, required: false },
|
||||||
|
size: { type: null, required: false, default: "default" },
|
||||||
|
class: { type: null, required: false },
|
||||||
|
});
|
||||||
|
|
||||||
|
const delegatedProps = reactiveOmit(props, "class", "size");
|
||||||
|
const forwarded = useForwardProps(delegatedProps);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<PaginationNext
|
||||||
|
data-slot="pagination-next"
|
||||||
|
:class="
|
||||||
|
cn(
|
||||||
|
buttonVariants({ variant: 'ghost', size }),
|
||||||
|
'gap-1 px-2.5 sm:pr-2.5',
|
||||||
|
props.class,
|
||||||
|
)
|
||||||
|
"
|
||||||
|
v-bind="forwarded"
|
||||||
|
>
|
||||||
|
<slot>
|
||||||
|
<span class="hidden sm:block">Next</span>
|
||||||
|
<ChevronRightIcon />
|
||||||
|
</slot>
|
||||||
|
</PaginationNext>
|
||||||
|
</template>
|
||||||
36
ui/src/components/ui/pagination/PaginationPrevious.vue
Normal file
36
ui/src/components/ui/pagination/PaginationPrevious.vue
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
<script setup>
|
||||||
|
import { reactiveOmit } from "@vueuse/core";
|
||||||
|
import { ChevronLeftIcon } from "lucide-vue-next";
|
||||||
|
import { PaginationPrev, useForwardProps } from "reka-ui";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import { buttonVariants } from '@/components/ui/button';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
asChild: { type: Boolean, required: false },
|
||||||
|
as: { type: null, required: false },
|
||||||
|
size: { type: null, required: false, default: "default" },
|
||||||
|
class: { type: null, required: false },
|
||||||
|
});
|
||||||
|
|
||||||
|
const delegatedProps = reactiveOmit(props, "class", "size");
|
||||||
|
const forwarded = useForwardProps(delegatedProps);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<PaginationPrev
|
||||||
|
data-slot="pagination-previous"
|
||||||
|
:class="
|
||||||
|
cn(
|
||||||
|
buttonVariants({ variant: 'ghost', size }),
|
||||||
|
'gap-1 px-2.5 sm:pr-2.5',
|
||||||
|
props.class,
|
||||||
|
)
|
||||||
|
"
|
||||||
|
v-bind="forwarded"
|
||||||
|
>
|
||||||
|
<slot>
|
||||||
|
<ChevronLeftIcon />
|
||||||
|
<span class="hidden sm:block">Previous</span>
|
||||||
|
</slot>
|
||||||
|
</PaginationPrev>
|
||||||
|
</template>
|
||||||
8
ui/src/components/ui/pagination/index.js
Normal file
8
ui/src/components/ui/pagination/index.js
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
export { default as Pagination } from "./Pagination.vue";
|
||||||
|
export { default as PaginationContent } from "./PaginationContent.vue";
|
||||||
|
export { default as PaginationEllipsis } from "./PaginationEllipsis.vue";
|
||||||
|
export { default as PaginationFirst } from "./PaginationFirst.vue";
|
||||||
|
export { default as PaginationItem } from "./PaginationItem.vue";
|
||||||
|
export { default as PaginationLast } from "./PaginationLast.vue";
|
||||||
|
export { default as PaginationNext } from "./PaginationNext.vue";
|
||||||
|
export { default as PaginationPrevious } from "./PaginationPrevious.vue";
|
||||||
@@ -30,10 +30,12 @@ const showLOADialog = ref(false);
|
|||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
<div class="max-w-5xl mx-auto pt-10">
|
<div class="max-w-5xl mx-auto pt-10">
|
||||||
<div class="flex justify-end mb-4">
|
<div class="flex justify-between mb-4">
|
||||||
<Button @click="showLOADialog = true">Post LOA</Button>
|
<h1 class="scroll-m-20 text-2xl font-semibold tracking-tight">LOA Log</h1>
|
||||||
|
<div>
|
||||||
|
<Button @click="showLOADialog = true">Post LOA</Button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<h1>LOA Log</h1>
|
|
||||||
<LoaList :admin-mode="true"></LoaList>
|
<LoaList :admin-mode="true"></LoaList>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user