build-address added tested

frontend/pages/build-address/add/form.tsx

@@ -0,0 +1,250 @@
+"use client"
+import { useForm } from "react-hook-form"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Form, FormField, FormItem, FormLabel, FormControl, FormMessage } from "@/components/ui/form"
+import { Input } from "@/components/ui/input"
+import { Button } from "@/components/ui/button"
+import { Separator } from "@/components/ui/separator"
+import { DateTimePicker } from "@/components/ui/date-time-picker"
+import { buildAddressAddSchema, BuildAddressAdd } from "./schema"
+import { useAddBuildAddressMutation } from "./queries"
+
+const BuildAddressForm = ({ refetchTable }: { refetchTable: () => void }) => {
+
+    const form = useForm<BuildAddressAdd>({
+        resolver: zodResolver(buildAddressAddSchema),
+        defaultValues: {
+            buildNumber: "",
+            doorNumber: "",
+            floorNumber: "",
+            commentAddress: "",
+            letterAddress: "",
+            shortLetterAddress: "",
+            latitude: 0,
+            longitude: 0,
+            street: "",
+            expiryStarts: "",
+            expiryEnds: "",
+        },
+    });
+
+    const { handleSubmit } = form;
+
+    const mutation = useAddBuildAddressMutation();
+
+    function onSubmit(values: BuildAddressAdd) { mutation.mutate({ data: values }); setTimeout(() => refetchTable(), 400) };
+
+    return (
+        <Form {...form}>
+            <form
+                onSubmit={handleSubmit(onSubmit)}
+                className="space-y-6 p-4"
+            >
+                {/* ROW 1 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="buildNumber"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Build Number</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="12A" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="doorNumber"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Door Number</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="3" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                {/* ROW 2 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="floorNumber"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Floor Number</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="1" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="street"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Street ID</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="671f0d..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                {/* ROW 3 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="commentAddress"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Comment Address</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Near the market..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="letterAddress"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Letter Address</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="123 Lemon St" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                {/* ROW 4 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="shortLetterAddress"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Short Letter Address</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Lmn St 123" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="latitude"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Latitude</FormLabel>
+                                <FormControl>
+                                    <Input
+                                        type="number"
+                                        placeholder="41.0082"
+                                        value={field.value ?? ""}
+                                        onChange={(e) =>
+                                            field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                                        }
+                                    />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                {/* ROW 5 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="longitude"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Longitude</FormLabel>
+                                <FormControl>
+                                    <Input
+                                        type="number"
+                                        placeholder="28.9784"
+                                        value={field.value ?? ""}
+                                        onChange={(e) =>
+                                            field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                                        }
+                                    />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                <Separator />
+
+                {/* EXPIRY DATES */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="expiryStarts"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Starts</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="expiryEnds"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Ends</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+                <Button type="submit" className="w-full">
+                    Add Build Address
+                </Button>
+
+            </form>
+        </Form>
+    );
+};
+
+export { BuildAddressForm }

frontend/pages/build-address/add/page.tsx

@@ -0,0 +1,26 @@
+'use client';
+import { useState } from 'react';
+import { BuildAddressForm } from '@/pages/build-address/add/form';
+import { PeopleDataTableUpdate } from './table/data-table';
+import { useGraphQlBuildAddressesList } from '@/pages/build-address/queries';
+
+const PageAddBuildAddress = () => {
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+
+    const { data, isLoading, error, refetch } = useGraphQlBuildAddressesList({ limit, skip: (page - 1) * limit, sort, filters });
+
+    return (
+        <>
+            <PeopleDataTableUpdate
+                data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit}
+                onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch}
+            />
+            <BuildAddressForm refetchTable={refetch} />
+        </>
+    )
+}
+
+export { PageAddBuildAddress };

frontend/pages/build-address/add/queries.tsx

@@ -0,0 +1,22 @@
+'use client'
+import { useMutation } from '@tanstack/react-query'
+import { toISOIfNotZ } from '@/lib/utils';
+import { BuildAddressAdd } from './schema';
+
+const fetchGraphQlBuildAddressAdd = async (record: BuildAddressAdd): Promise<{ data: BuildAddressAdd | null; status: number }> => {
+    console.log('Fetching test data from local API');
+    try {
+        const res = await fetch('/api/build-address/add', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, status: res.status }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useAddBuildAddressMutation() {
+    return useMutation({
+        mutationFn: ({ data }: { data: BuildAddressAdd }) => fetchGraphQlBuildAddressAdd(data),
+        onSuccess: () => { console.log("Build address created successfully") },
+        onError: (error) => { console.error("Create build address failed:", error) },
+    })
+}

frontend/pages/build-address/add/schema.ts

@@ -0,0 +1,17 @@
+import { z } from "zod"
+
+export const buildAddressAddSchema = z.object({
+    buildNumber: z.string(),
+    doorNumber: z.string(),
+    floorNumber: z.string(),
+    commentAddress: z.string(),
+    letterAddress: z.string(),
+    shortLetterAddress: z.string(),
+    latitude: z.number(),
+    longitude: z.number(),
+    street: z.string().optional(),
+    expiryStarts: z.string().optional(),
+    expiryEnds: z.string().optional(),
+});
+
+export type BuildAddressAdd = z.infer<typeof buildAddressAddSchema>;

frontend/pages/build-address/add/table/columns.tsx

@@ -0,0 +1,124 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { Drawer, DrawerClose, DrawerContent, DrawerFooter, DrawerHeader, DrawerTrigger } from "@/components/ui/drawer"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { useSortable } from "@dnd-kit/sortable"
+import { IconGripVertical } from "@tabler/icons-react"
+import { useIsMobile } from "@/hooks/use-mobile"
+import { Separator } from "@/components/ui/separator"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+function DragHandle({ id }: { id: number }) {
+    const { attributes, listeners } = useSortable({ id })
+    return (
+        <Button {...attributes} {...listeners} variant="ghost" size="icon" className="text-muted-foreground size-7 hover:bg-transparent">
+            <IconGripVertical className="text-muted-foreground size-3" />
+            <span className="sr-only">Drag to reorder</span>
+        </Button>
+    )
+}
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "buildNumber",
+            header: "Build Number",
+        },
+        {
+            accessorKey: "doorNumber",
+            header: "Door Number",
+        },
+        {
+            accessorKey: "floorNumber",
+            header: "Floor Number",
+        },
+        {
+            accessorKey: "commentAddress",
+            header: "Comment Address",
+        },
+        {
+            accessorKey: "letterAddress",
+            header: "Letter Address",
+        },
+        {
+            accessorKey: "shortLetterAddress",
+            header: "Short Letter Address",
+        },
+        {
+            accessorKey: "latitude",
+            header: "Latitude",
+        },
+        {
+            accessorKey: "longitude",
+            header: "Longitude",
+        },
+        {
+            accessorKey: "street",
+            header: "StreetId",
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/build-address/update?uuid=${row.original.uuid}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+export { getColumns };

frontend/pages/build-address/add/table/data-table.tsx

@@ -0,0 +1,282 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { Home } from "lucide-react"
+import { useDeleteBuildAddressMutation } from "@/pages/build-address/queries"
+
+export function PeopleDataTableUpdate({
+    data,
+    totalCount,
+    currentPage,
+    pageSize,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable,
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage: number,
+    pageSize: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeleteBuildAddressMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize, }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        enableRowSelection: true,
+        getRowId: (row) => row._id.toString(),
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => {
+            const nextPagination = typeof updater === "function" ? updater(pagination) : updater;
+            onPageChange(nextPagination.pageIndex + 1); onPageSizeChange(nextPagination.pageSize);
+        },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
+
+    return (
+        <Tabs
+            defaultValue="outline"
+            className="w-full flex-col justify-start gap-6"
+        >
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/build-address") }}>
+                        <Home />
+                        <span className="hidden lg:inline">Back to Build Address</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline"
+                className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6"
+            >
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/build-address/add/table/schema.tsx

@@ -0,0 +1,24 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string(),
+    firstName: z.string().optional(),
+    surname: z.string().optional(),
+    middleName: z.string().optional(),
+    sexCode: z.string().optional(),
+    personRef: z.string().optional(),
+    personTag: z.string().optional(),
+    fatherName: z.string().optional(),
+    motherName: z.string().optional(),
+    countryCode: z.string().optional(),
+    nationalIdentityId: z.string().optional(),
+    birthPlace: z.string().optional(),
+    birthDate: z.string().optional(),
+    taxNo: z.string().optional(),
+    birthname: z.string().optional(),
+    expiryStarts: z.string().optional(),
+    expiryEnds: z.string().optional(),
+});
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/build-address/add/types.ts

@@ -0,0 +1,24 @@
+
+interface PeopleAdd {
+
+    firstName: string;
+    surname: string;
+    middleName?: string;
+    sexCode: string;
+    personRef?: string;
+    personTag?: string;
+    fatherName?: string;
+    motherName?: string;
+    countryCode: string;
+    nationalIdentityId: string;
+    birthPlace: string;
+    birthDate: string;
+    taxNo?: string;
+    birthname?: string;
+    expiryStarts?: string;
+    expiryEnds?: string;
+
+}
+
+
+export type { PeopleAdd };

frontend/pages/build-address/list/columns.tsx

@@ -0,0 +1,108 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { useSortable } from "@dnd-kit/sortable"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "buildNumber",
+            header: "Build Number",
+        },
+        {
+            accessorKey: "doorNumber",
+            header: "Door Number",
+        },
+        {
+            accessorKey: "floorNumber",
+            header: "Floor Number",
+        },
+        {
+            accessorKey: "commentAddress",
+            header: "Comment Address",
+        },
+        {
+            accessorKey: "letterAddress",
+            header: "Letter Address",
+        },
+        {
+            accessorKey: "shortLetterAddress",
+            header: "Short Letter Address",
+        },
+        {
+            accessorKey: "latitude",
+            header: "Latitude",
+        },
+        {
+            accessorKey: "longitude",
+            header: "Longitude",
+        },
+        {
+            accessorKey: "street",
+            header: "StreetId",
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/build-address/update?uuid=${row.original.uuid}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+
+export { getColumns };

frontend/pages/build-address/list/data-table.tsx

@@ -0,0 +1,270 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+    IconPlus,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { useDeleteBuildAddressMutation } from "../queries"
+
+export function BuildAddressDataTable({
+    data,
+    totalCount,
+    currentPage = 1,
+    pageSize = 10,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage?: number,
+    pageSize?: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void,
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeleteBuildAddressMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        getRowId: (row) => row._id.toString(),
+        enableRowSelection: true,
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => { const nextPagination = typeof updater === "function" ? updater(pagination) : updater; onPageChange(nextPagination.pageIndex + 1); onPageSizeChange(nextPagination.pageSize) },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
+
+    return (
+        <Tabs defaultValue="outline" className="w-full flex-col justify-start gap-6">
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/build-address/add") }}>
+                        <IconPlus />
+                        <span className="hidden lg:inline">Add Build Address</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline" className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6">
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/build-address/list/schema.tsx

@@ -0,0 +1,20 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string(),
+    buildNumber: z.string().optional(),
+    doorNumber: z.string().optional(),
+    floorNumber: z.string().optional(),
+    commentAddress: z.string().optional(),
+    letterAddress: z.string().optional(),
+    shortLetterAddress: z.string().optional(),
+    latitude: z.number().optional(),
+    longitude: z.number().optional(),
+    street: z.string().optional(),
+    expiryStarts: z.string().optional(),
+    expiryEnds: z.string().optional(),
+});
+
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/build-address/page.tsx

@@ -0,0 +1,25 @@
+'use client';
+import { BuildAddressDataTable } from './list/data-table';
+import { useGraphQlBuildAddressesList } from './queries';
+import { useState } from 'react';
+
+const PageBuildAddress = () => {
+
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+
+    const { data, isLoading, error, refetch } = useGraphQlBuildAddressesList({ limit, skip: (page - 1) * limit, sort, filters });
+
+    const handlePageChange = (newPage: number) => { setPage(newPage) };
+    const handlePageSizeChange = (newSize: number) => { setLimit(newSize); setPage(1) };
+
+    if (isLoading) { return <div className="flex items-center justify-center p-8">Loading...</div> }
+    if (error) { return <div className="flex items-center justify-center p-8 text-red-500">Error loading users</div> }
+
+    return <BuildAddressDataTable data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={handlePageChange} onPageSizeChange={handlePageSizeChange} refetchTable={refetch} />;
+
+};
+
+export { PageBuildAddress };

frontend/pages/build-address/queries.tsx

@@ -0,0 +1,36 @@
+'use client'
+import { useQuery, useMutation } from '@tanstack/react-query'
+import { ListArguments } from '@/types/listRequest'
+
+const fetchGraphQlBuildAddressesList = async (params: ListArguments): Promise<any> => {
+    console.log('Fetching test data from local API');
+    const { limit, skip, sort, filters } = params;
+    try {
+        const res = await fetch('/api/build-address/list', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify({ limit, skip, sort, filters }) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, totalCount: data.totalCount }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+const fetchGraphQlDeleteBuildAddress = async (uuid: string): Promise<boolean> => {
+    console.log('Fetching test data from local API');
+    try {
+        const res = await fetch(`/api/build-address/delete?uuid=${uuid}`, { method: 'GET', cache: 'no-store', credentials: "include" });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return data
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useGraphQlBuildAddressesList(params: ListArguments) {
+    return useQuery({ queryKey: ['graphql-build-addresses-list', params], queryFn: () => fetchGraphQlBuildAddressesList(params) })
+}
+
+export function useDeleteBuildAddressMutation() {
+    return useMutation({
+        mutationFn: ({ uuid }: { uuid: string }) => fetchGraphQlDeleteBuildAddress(uuid),
+        onSuccess: () => { console.log("Build address deleted successfully") },
+        onError: (error) => { console.error("Delete build address failed:", error) },
+    })
+}

frontend/pages/build-address/types.ts

@@ -0,0 +1,20 @@
+
+interface BuildAddress {
+
+    _id: string;
+    uuid: string;
+    buildNumber: string;
+    doorNumber: string;
+    floorNumber: string;
+    commentAddress: string;
+    letterAddress: string;
+    shortLetterAddress: string;
+    latitude: number;
+    longitude: number;
+    street: string;
+    expiryStarts: string | null;
+    expiryEnds: string | null;
+
+}
+
+export type { BuildAddress };

frontend/pages/build-address/update/form.tsx

@@ -0,0 +1,238 @@
+"use client"
+import { useForm } from "react-hook-form"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Form, FormField, FormItem, FormLabel, FormControl, FormMessage } from "@/components/ui/form"
+import { Input } from "@/components/ui/input"
+import { Button } from "@/components/ui/button"
+import { Separator } from "@/components/ui/separator"
+import { DateTimePicker } from "@/components/ui/date-time-picker"
+import { useUpdateBuildAddressMutation } from "@/pages/build-address/update/queries"
+import { buildAddressUpdateSchema, type BuildAddressUpdate } from "@/pages/build-address/update/schema"
+
+const BuildAddressForm = ({ refetchTable, initData, selectedUuid }: { refetchTable: () => void, initData: BuildAddressUpdate, selectedUuid: string }) => {
+
+    const form = useForm<BuildAddressUpdate>({ resolver: zodResolver(buildAddressUpdateSchema), defaultValues: { ...initData, street: "" } })
+
+    const { handleSubmit } = form
+
+    const mutation = useUpdateBuildAddressMutation();
+
+    function onSubmit(values: BuildAddressUpdate) { mutation.mutate({ data: values as any || initData, uuid: selectedUuid }); setTimeout(() => refetchTable(), 400) }
+
+    return (
+        <Form {...form}>
+            <form
+                onSubmit={handleSubmit(onSubmit)}
+                className="space-y-6 p-4"
+            >
+                {/* ROW 1 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="buildNumber"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Build Number</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="12A" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="doorNumber"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Door Number</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="3" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                {/* ROW 2 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="floorNumber"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Floor Number</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="1" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="street"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Street ID</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="671f0d..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                {/* ROW 3 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="commentAddress"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Comment Address</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Near the market..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="letterAddress"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Letter Address</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="123 Lemon St" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                {/* ROW 4 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="shortLetterAddress"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Short Letter Address</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Lmn St 123" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="latitude"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Latitude</FormLabel>
+                                <FormControl>
+                                    <Input
+                                        type="number"
+                                        placeholder="41.0082"
+                                        value={field.value ?? ""}
+                                        onChange={(e) =>
+                                            field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                                        }
+                                    />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                {/* ROW 5 */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="longitude"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Longitude</FormLabel>
+                                <FormControl>
+                                    <Input
+                                        type="number"
+                                        placeholder="28.9784"
+                                        value={field.value ?? ""}
+                                        onChange={(e) =>
+                                            field.onChange(e.target.value ? Number(e.target.value) : undefined)
+                                        }
+                                    />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                <Separator />
+
+                {/* EXPIRY DATES */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="expiryStarts"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Starts</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="expiryEnds"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Ends</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                </div>
+
+                <Button type="submit" className="w-full">
+                    Update Build Address
+                </Button>
+
+            </form>
+        </Form>
+    );
+
+}
+
+export { BuildAddressForm }

frontend/pages/build-address/update/page.tsx

@@ -0,0 +1,36 @@
+'use client';
+import { useState } from 'react';
+import { useGraphQlBuildAddressesList } from '@/pages/build-address/queries';
+import { BuildAddressDataTableUpdate } from '@/pages/build-address/update/table/data-table';
+import { BuildAddressForm } from '@/pages/build-address/update/form';
+import { useSearchParams, useRouter } from 'next/navigation'
+import { Button } from '@/components/ui/button';
+
+const PageUpdateBuildAddress = () => {
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+    const searchParams = useSearchParams()
+    const router = useRouter()
+    const uuid = searchParams?.get('uuid') || null
+    const backToBuildAddress = <>
+        <div>UUID not found in search params</div>
+        <Button onClick={() => router.push('/build-address')}>Back to Build Address</Button>
+    </>
+    if (!uuid) { return backToBuildAddress }
+    const { data, isLoading, error, refetch } = useGraphQlBuildAddressesList({ limit, skip: (page - 1) * limit, sort, filters: { ...filters, uuid } });
+    const initData = data?.data?.[0] || null;
+    if (!initData) { return backToBuildAddress }
+    return (
+        <>
+            <BuildAddressDataTableUpdate
+                data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit}
+                onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch}
+            />
+            <BuildAddressForm refetchTable={refetch} initData={initData} selectedUuid={uuid} />
+        </>
+    )
+}
+
+export { PageUpdateBuildAddress };

frontend/pages/build-address/update/queries.tsx

@@ -0,0 +1,21 @@
+'use client'
+import { useMutation } from '@tanstack/react-query'
+import { BuildAddressUpdate } from './types';
+
+const fetchGraphQlBuildAddressUpdate = async (record: BuildAddressUpdate, uuid: string): Promise<{ data: BuildAddressUpdate | null; status: number }> => {
+    console.log('Fetching test data from local API');
+    try {
+        const res = await fetch(`/api/build-address/update?uuid=${uuid || ''}`, { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, status: res.status }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useUpdateBuildAddressMutation() {
+    return useMutation({
+        mutationFn: ({ data, uuid }: { data: BuildAddressUpdate, uuid: string }) => fetchGraphQlBuildAddressUpdate(data, uuid),
+        onSuccess: () => { console.log("Build Address updated successfully") },
+        onError: (error) => { console.error("Update Build Address failed:", error) },
+    })
+}

frontend/pages/build-address/update/schema.ts

@@ -0,0 +1,17 @@
+import { z } from "zod"
+
+export const buildAddressUpdateSchema = z.object({
+    buildNumber: z.string().optional(),
+    doorNumber: z.string().optional(),
+    floorNumber: z.string().optional(),
+    commentAddress: z.string().optional(),
+    letterAddress: z.string().optional(),
+    shortLetterAddress: z.string().optional(),
+    latitude: z.number().optional(),
+    longitude: z.number().optional(),
+    street: z.string().optional(),
+    expiryStarts: z.string().optional(),
+    expiryEnds: z.string().optional(),
+});
+
+export type BuildAddressUpdate = z.infer<typeof buildAddressUpdateSchema>;

frontend/pages/build-address/update/table/columns.tsx

@@ -0,0 +1,225 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { Drawer, DrawerClose, DrawerContent, DrawerFooter, DrawerHeader, DrawerTrigger } from "@/components/ui/drawer"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { useSortable } from "@dnd-kit/sortable"
+import { IconGripVertical } from "@tabler/icons-react"
+import { useIsMobile } from "@/hooks/use-mobile"
+import { Separator } from "@/components/ui/separator"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+function TableCellViewer({ item }: { item: schemaType }) {
+    const isMobile = useIsMobile();
+
+    return (
+        <Drawer direction={isMobile ? "bottom" : "right"}>
+            <DrawerTrigger asChild>
+                <Button variant="link" className="text-foreground w-fit px-0 text-left">
+                    {item.email ?? "Unknown Email"}
+                </Button>
+            </DrawerTrigger>
+
+            <DrawerContent>
+                <DrawerHeader className="gap-1">
+                    <h2 className="text-lg font-semibold">{item.email}</h2>
+                    <p className="text-sm text-muted-foreground">
+                        User details
+                    </p>
+                </DrawerHeader>
+
+                <div className="flex flex-col gap-4 overflow-y-auto px-4 text-sm">
+
+                    {/* BASIC INFO */}
+                    <div className="grid grid-cols-2 gap-4">
+                        <div>
+                            <Label>Email</Label>
+                            <Input value={item.email ?? ""} readOnly />
+                        </div>
+
+                        <div>
+                            <Label>Phone</Label>
+                            <Input value={item.phone ?? ""} readOnly />
+                        </div>
+
+                        <div>
+                            <Label>Tag</Label>
+                            <Input value={item.tag ?? ""} readOnly />
+                        </div>
+
+                        <div>
+                            <Label>Active</Label>
+                            <Input value={item.active ? "Active" : "Inactive"} readOnly />
+                        </div>
+                    </div>
+
+                    <Separator />
+
+                    {/* DATES */}
+                    <div className="grid grid-cols-2 gap-4">
+                        <div>
+                            <Label>Created At</Label>
+                            <Input
+                                value={item.createdAt ? new Date(item.createdAt).toLocaleString() : ""}
+                                readOnly
+                            />
+                        </div>
+
+                        <div>
+                            <Label>Updated At</Label>
+                            <Input
+                                value={item.updatedAt ? new Date(item.updatedAt).toLocaleString() : ""}
+                                readOnly
+                            />
+                        </div>
+                    </div>
+
+                    <Separator />
+
+                    {/* TOKENS */}
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" className="w-full">
+                                Collection Tokens ({item.collectionTokens?.tokens?.length ?? 0})
+                            </Button>
+                        </DropdownMenuTrigger>
+
+                        <DropdownMenuContent className="w-72">
+                            <DropdownMenuLabel>Tokens</DropdownMenuLabel>
+                            <DropdownMenuSeparator />
+                            {(item.collectionTokens?.tokens ?? []).length === 0 && (<DropdownMenuItem disabled>No tokens found</DropdownMenuItem>)}
+                            {(item.collectionTokens?.tokens ?? []).map((t, i) => (
+                                <DropdownMenuItem key={i} className="flex flex-col gap-2">
+                                    <div className="grid grid-cols-2 gap-2 w-full">
+                                        <Input value={t.prefix} readOnly />
+                                        <Input value={t.token} readOnly />
+                                    </div>
+                                </DropdownMenuItem>
+                            ))}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+
+                </div>
+
+                <DrawerFooter>
+                    <DrawerClose asChild>
+                        <Button variant="outline">Close</Button>
+                    </DrawerClose>
+                </DrawerFooter>
+            </DrawerContent>
+        </Drawer>
+    );
+}
+
+function DragHandle({ id }: { id: number }) {
+    const { attributes, listeners } = useSortable({ id })
+    return (
+        <Button {...attributes} {...listeners} variant="ghost" size="icon" className="text-muted-foreground size-7 hover:bg-transparent">
+            <IconGripVertical className="text-muted-foreground size-3" />
+            <span className="sr-only">Drag to reorder</span>
+        </Button>
+    )
+}
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "buildNumber",
+            header: "Build Number",
+        },
+        {
+            accessorKey: "doorNumber",
+            header: "Door Number",
+        },
+        {
+            accessorKey: "floorNumber",
+            header: "Floor Number",
+        },
+        {
+            accessorKey: "commentAddress",
+            header: "Comment Address",
+        },
+        {
+            accessorKey: "letterAddress",
+            header: "Letter Address",
+        },
+        {
+            accessorKey: "shortLetterAddress",
+            header: "Short Letter Address",
+        },
+        {
+            accessorKey: "latitude",
+            header: "Latitude",
+        },
+        {
+            accessorKey: "longitude",
+            header: "Longitude",
+        },
+        {
+            accessorKey: "street",
+            header: "StreetId",
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+
+export { getColumns };

frontend/pages/build-address/update/table/data-table.tsx

@@ -0,0 +1,279 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { Home } from "lucide-react"
+import { useDeletePersonMutation } from "@/pages/people/queries"
+
+export function BuildAddressDataTableUpdate({
+    data,
+    totalCount,
+    currentPage,
+    pageSize,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable,
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage: number,
+    pageSize: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeletePersonMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize, }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        enableRowSelection: true,
+        getRowId: (row) => row._id.toString(),
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => {
+            const nextPagination = typeof updater === "function" ? updater(pagination) : updater;
+            onPageChange(nextPagination.pageIndex + 1); onPageSizeChange(nextPagination.pageSize);
+        },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
+
+    return (
+        <Tabs defaultValue="outline" className="w-full flex-col justify-start gap-6">
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/build-address") }}>
+                        <Home />
+                        <span className="hidden lg:inline">Back to Build Address</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline"
+                className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6"
+            >
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/build-address/update/table/schema.tsx

@@ -0,0 +1,47 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string().nullable().optional(),
+    expiryStarts: z.string().nullable().optional(),
+    expiryEnds: z.string().nullable().optional(),
+    isConfirmed: z.boolean().nullable().optional(),
+    deleted: z.boolean().nullable().optional(),
+    active: z.boolean().nullable().optional(),
+    crypUuId: z.string().nullable().optional(),
+    createdCredentialsToken: z.string().nullable().optional(),
+    updatedCredentialsToken: z.string().nullable().optional(),
+    confirmedCredentialsToken: z.string().nullable().optional(),
+    isNotificationSend: z.boolean().nullable().optional(),
+    isEmailSend: z.boolean().nullable().optional(),
+    refInt: z.number().nullable().optional(),
+    refId: z.string().nullable().optional(),
+    replicationId: z.number().nullable().optional(),
+    expiresAt: z.string().nullable().optional(),
+    resetToken: z.string().nullable().optional(),
+    password: z.string().nullable().optional(),
+    history: z.array(z.string()).optional(),
+    tag: z.string().nullable().optional(),
+    email: z.string().nullable().optional(),
+    phone: z.string().nullable().optional(),
+
+    collectionTokens: z
+        .object({
+            default: z.string().nullable().optional(),
+            tokens: z
+                .array(
+                    z.object({
+                        prefix: z.string(),
+                        token: z.string(),
+                    })
+                )
+                .optional(),
+        })
+        .nullable()
+        .optional(),
+
+    createdAt: z.string().nullable().optional(),
+    updatedAt: z.string().nullable().optional(),
+});
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/build-address/update/types.ts

@@ -0,0 +1,17 @@
+
+interface BuildAddressUpdate {
+    buildNumber: string;
+    doorNumber: string;
+    floorNumber: string;
+    commentAddress: string;
+    letterAddress: string;
+    shortLetterAddress: string;
+    latitude: number;
+    longitude: number;
+    street: string;
+    expiryStarts: string | null;
+    expiryEnds: string | null;
+}
+
+
+export type { BuildAddressUpdate };

frontend/pages/build-types/add/form.tsx

@@ -0,0 +1,144 @@
+"use client"
+import { useForm } from "react-hook-form"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Form, FormField, FormItem, FormLabel, FormControl, FormMessage } from "@/components/ui/form"
+import { Input } from "@/components/ui/input"
+import { Button } from "@/components/ui/button"
+import { Separator } from "@/components/ui/separator"
+import { BuildTypesAdd, buildTypesAddSchema } from "./schema"
+import { useAddBuildTypesMutation } from "./queries"
+import { DateTimePicker } from "@/components/ui/date-time-picker"
+
+const BuildTypesForm = ({ refetchTable }: { refetchTable: () => void }) => {
+
+    const form = useForm<BuildTypesAdd>({
+        resolver: zodResolver(buildTypesAddSchema),
+        defaultValues: {
+            type: "",
+            token: "",
+            typeToken: "",
+            description: "",
+            expiryStarts: "",
+            expiryEnds: "",
+        },
+    });
+
+    const { handleSubmit } = form;
+
+    const mutation = useAddBuildTypesMutation();
+
+    function onSubmit(values: BuildTypesAdd) { mutation.mutate({ data: values }); setTimeout(() => refetchTable(), 400) };
+
+    return (
+        <Form {...form}>
+            <form
+                onSubmit={handleSubmit(onSubmit)}
+                className="space-y-6 p-4"
+            >
+                {/* TYPE + TOKEN */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="type"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Type</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Type..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="token"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Token</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Token..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* TYPE TOKEN + DESCRIPTION */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="typeToken"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Type Token</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Type Token..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="description"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Description</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Description..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                <Separator />
+
+                {/* EXPIRY DATES */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="expiryStarts"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Starts</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="expiryEnds"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Ends</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                <Button type="submit" className="w-full">
+                    Update Build Type
+                </Button>
+            </form>
+        </Form>
+    );
+};
+
+export { BuildTypesForm }

frontend/pages/build-types/add/page.tsx

@@ -0,0 +1,26 @@
+'use client';
+import { useState } from 'react';
+import { useGraphQlBuildTypesList } from '@/pages/build-types/queries';
+import { BuildTypesForm } from './form';
+import { BuildTypesDataTableAdd } from './table/data-table';
+
+const PageAddBuildTypes = () => {
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+
+    const { data, isLoading, error, refetch } = useGraphQlBuildTypesList({ limit, skip: (page - 1) * limit, sort, filters });
+
+    return (
+        <>
+            <BuildTypesDataTableAdd
+                data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit}
+                onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch}
+            />
+            <BuildTypesForm refetchTable={refetch} />
+        </>
+    )
+}
+
+export { PageAddBuildTypes };

frontend/pages/build-types/add/queries.tsx

@@ -0,0 +1,25 @@
+'use client'
+import { useMutation } from '@tanstack/react-query'
+import { BuildTypesAdd } from './types'
+import { toISOIfNotZ } from '@/lib/utils';
+
+const fetchGraphQlBuildTypesAdd = async (record: BuildTypesAdd): Promise<{ data: BuildTypesAdd | null; status: number }> => {
+    console.log('Fetching test data from local API');
+    // record.birthDate = toISOIfNotZ(record.birthDate || "");
+    // record.expiryStarts = toISOIfNotZ(record.expiryStarts || "");
+    // record.expiryEnds = toISOIfNotZ(record.expiryEnds || "");
+    try {
+        const res = await fetch('/api/build-types/add', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, status: res.status }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useAddBuildTypesMutation() {
+    return useMutation({
+        mutationFn: ({ data }: { data: BuildTypesAdd }) => fetchGraphQlBuildTypesAdd(data),
+        onSuccess: () => { console.log("Build Types created successfully") },
+        onError: (error) => { console.error("Create build types failed:", error) },
+    })
+}

frontend/pages/build-types/add/schema.ts

@@ -0,0 +1,12 @@
+import { z } from "zod"
+
+export const buildTypesAddSchema = z.object({
+    type: z.string(),
+    token: z.string(),
+    typeToken: z.string(),
+    description: z.string(),
+    expiryStarts: z.string().optional(),
+    expiryEnds: z.string().optional(),
+});
+
+export type BuildTypesAdd = z.infer<typeof buildTypesAddSchema>;

frontend/pages/build-types/add/table/columns.tsx

@@ -0,0 +1,250 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { Drawer, DrawerClose, DrawerContent, DrawerFooter, DrawerHeader, DrawerTrigger } from "@/components/ui/drawer"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { useSortable } from "@dnd-kit/sortable"
+import { IconGripVertical } from "@tabler/icons-react"
+import { useIsMobile } from "@/hooks/use-mobile"
+import { Separator } from "@/components/ui/separator"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+// function TableCellViewer({ item }: { item: schemaType }) {
+//     const isMobile = useIsMobile();
+
+//     return (
+//         <Drawer direction={isMobile ? "bottom" : "right"}>
+//             <DrawerTrigger asChild>
+//                 <Button variant="link" className="text-foreground w-fit px-0 text-left">
+//                     {item.email ?? "Unknown Email"}
+//                 </Button>
+//             </DrawerTrigger>
+
+//             <DrawerContent>
+//                 <DrawerHeader className="gap-1">
+//                     <h2 className="text-lg font-semibold">{item.email}</h2>
+//                     <p className="text-sm text-muted-foreground">
+//                         User details
+//                     </p>
+//                 </DrawerHeader>
+
+//                 <div className="flex flex-col gap-4 overflow-y-auto px-4 text-sm">
+
+//                     {/* BASIC INFO */}
+//                     <div className="grid grid-cols-2 gap-4">
+//                         <div>
+//                             <Label>Email</Label>
+//                             <Input value={item.email ?? ""} readOnly />
+//                         </div>
+
+//                         <div>
+//                             <Label>Phone</Label>
+//                             <Input value={item.phone ?? ""} readOnly />
+//                         </div>
+
+//                         <div>
+//                             <Label>Tag</Label>
+//                             <Input value={item.tag ?? ""} readOnly />
+//                         </div>
+
+//                         <div>
+//                             <Label>Active</Label>
+//                             <Input value={item.active ? "Active" : "Inactive"} readOnly />
+//                         </div>
+//                     </div>
+
+//                     <Separator />
+
+//                     {/* DATES */}
+//                     <div className="grid grid-cols-2 gap-4">
+//                         <div>
+//                             <Label>Created At</Label>
+//                             <Input
+//                                 value={item.createdAt ? new Date(item.createdAt).toLocaleString() : ""}
+//                                 readOnly
+//                             />
+//                         </div>
+
+//                         <div>
+//                             <Label>Updated At</Label>
+//                             <Input
+//                                 value={item.updatedAt ? new Date(item.updatedAt).toLocaleString() : ""}
+//                                 readOnly
+//                             />
+//                         </div>
+//                     </div>
+
+//                     <Separator />
+
+//                     {/* TOKENS */}
+//                     <DropdownMenu>
+//                         <DropdownMenuTrigger asChild>
+//                             <Button variant="outline" className="w-full">
+//                                 Collection Tokens ({item.collectionTokens?.tokens?.length ?? 0})
+//                             </Button>
+//                         </DropdownMenuTrigger>
+
+//                         <DropdownMenuContent className="w-72">
+//                             <DropdownMenuLabel>Tokens</DropdownMenuLabel>
+//                             <DropdownMenuSeparator />
+//                             {(item.collectionTokens?.tokens ?? []).length === 0 && (<DropdownMenuItem disabled>No tokens found</DropdownMenuItem>)}
+//                             {(item.collectionTokens?.tokens ?? []).map((t, i) => (
+//                                 <DropdownMenuItem key={i} className="flex flex-col gap-2">
+//                                     <div className="grid grid-cols-2 gap-2 w-full">
+//                                         <Input value={t.prefix} readOnly />
+//                                         <Input value={t.token} readOnly />
+//                                     </div>
+//                                 </DropdownMenuItem>
+//                             ))}
+//                         </DropdownMenuContent>
+//                     </DropdownMenu>
+
+//                 </div>
+
+//                 <DrawerFooter>
+//                     <DrawerClose asChild>
+//                         <Button variant="outline">Close</Button>
+//                     </DrawerClose>
+//                 </DrawerFooter>
+//             </DrawerContent>
+//         </Drawer>
+//     );
+// }
+
+function DragHandle({ id }: { id: number }) {
+    const { attributes, listeners } = useSortable({ id })
+    return (
+        <Button {...attributes} {...listeners} variant="ghost" size="icon" className="text-muted-foreground size-7 hover:bg-transparent">
+            <IconGripVertical className="text-muted-foreground size-3" />
+            <span className="sr-only">Drag to reorder</span>
+        </Button>
+    )
+}
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "firstName",
+            header: "First Name",
+        },
+        {
+            accessorKey: "surname",
+            header: "Surname",
+        },
+        {
+            accessorKey: "middleName",
+            header: "Middle Name",
+        },
+        {
+            accessorKey: "sexCode",
+            header: "Sex",
+        },
+        {
+            accessorKey: "personRef",
+            header: "Person Ref",
+        },
+        {
+            accessorKey: "personTag",
+            header: "Person Tag",
+        },
+        {
+            accessorKey: "fatherName",
+            header: "Father Name",
+        },
+        {
+            accessorKey: "motherName",
+            header: "Mother Name",
+        },
+        {
+            accessorKey: "countryCode",
+            header: "Country",
+        },
+        {
+            accessorKey: "nationalIdentityId",
+            header: "National ID",
+        },
+        {
+            accessorKey: "birthPlace",
+            header: "Birth Place",
+        },
+        {
+            accessorKey: "active",
+            header: "Active",
+            cell: ({ getValue }) => getValue() ? (<div className="text-green-600 font-medium">Yes</div>) : (<div className="text-red-600 font-medium">No</div>),
+        },
+        {
+            accessorKey: "isConfirmed",
+            header: "Confirmed",
+            cell: ({ getValue }) => getValue() ? (<div className="text-green-600 font-medium">Yes</div>) : (<div className="text-red-600 font-medium">No</div>),
+        },
+        {
+            accessorKey: "birthDate",
+            header: "Birth Date",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/people/update?uuid=${row.original.uuid}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+
+export { getColumns };

frontend/pages/build-types/add/table/data-table.tsx

@@ -0,0 +1,287 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { Home } from "lucide-react"
+import { useDeleteUserMutation } from "@/pages/users/queries"
+
+export function BuildTypesDataTableAdd({
+    data,
+    totalCount,
+    currentPage,
+    pageSize,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable,
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage: number,
+    pageSize: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeleteUserMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize, }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        enableRowSelection: true,
+        getRowId: (row) => row._id.toString(),
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => {
+            const nextPagination = typeof updater === "function" ? updater(pagination) : updater;
+            onPageChange(nextPagination.pageIndex + 1);
+            onPageSizeChange(nextPagination.pageSize);
+        },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => {
+        const newSize = Number(value);
+        onPageSizeChange(newSize);
+        onPageChange(1);
+    }
+
+    return (
+        <Tabs
+            defaultValue="outline"
+            className="w-full flex-col justify-start gap-6"
+        >
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/build-types") }}>
+                        <Home />
+                        <span className="hidden lg:inline">Back to Build Types</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline"
+                className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6"
+            >
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/build-types/add/table/schema.tsx

@@ -0,0 +1,24 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string(),
+    firstName: z.string().optional(),
+    surname: z.string().optional(),
+    middleName: z.string().optional(),
+    sexCode: z.string().optional(),
+    personRef: z.string().optional(),
+    personTag: z.string().optional(),
+    fatherName: z.string().optional(),
+    motherName: z.string().optional(),
+    countryCode: z.string().optional(),
+    nationalIdentityId: z.string().optional(),
+    birthPlace: z.string().optional(),
+    birthDate: z.string().optional(),
+    taxNo: z.string().optional(),
+    birthname: z.string().optional(),
+    expiryStarts: z.string().optional(),
+    expiryEnds: z.string().optional(),
+});
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/build-types/add/types.ts

@@ -0,0 +1,14 @@
+
+interface BuildTypesAdd {
+
+    type: string;
+    token: string;
+    typeToken: string;
+    description: string;
+    expiryStarts?: string;
+    expiryEnds?: string;
+
+}
+
+
+export type { BuildTypesAdd };

frontend/pages/build-types/list/columns.tsx

@@ -0,0 +1,88 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { useSortable } from "@dnd-kit/sortable"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "type",
+            header: "Type",
+        },
+        {
+            accessorKey: "token",
+            header: "Token",
+        },
+        {
+            accessorKey: "typeToken",
+            header: "Type Token",
+        },
+        {
+            accessorKey: "description",
+            header: "Description",
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/build-types/update?uuid=${row.original.uuid}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+
+export { getColumns };

frontend/pages/build-types/list/data-table.tsx

@@ -0,0 +1,270 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+    IconPlus,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { useDeleteBuildTypeMutation } from "../queries"
+
+export function BuildTypesDataTable({
+    data,
+    totalCount,
+    currentPage = 1,
+    pageSize = 10,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage?: number,
+    pageSize?: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void,
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeleteBuildTypeMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        getRowId: (row) => row._id.toString(),
+        enableRowSelection: true,
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => { const nextPagination = typeof updater === "function" ? updater(pagination) : updater; onPageChange(nextPagination.pageIndex + 1); onPageSizeChange(nextPagination.pageSize) },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
+
+    return (
+        <Tabs defaultValue="outline" className="w-full flex-col justify-start gap-6">
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/build-types/add") }}>
+                        <IconPlus />
+                        <span className="hidden lg:inline">Add Build Type</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline" className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6">
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/build-types/list/schema.tsx

@@ -0,0 +1,16 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string(),
+    type: z.string(),
+    token: z.string(),
+    typeToken: z.string(),
+    description: z.string(),
+    createdAt: z.string(),
+    updatedAt: z.string(),
+    expiryStarts: z.string().nullable().optional(),
+    expiryEnds: z.string().nullable().optional(),
+});
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/build-types/page.tsx

@@ -0,0 +1,25 @@
+'use client';
+import { BuildTypesDataTable } from './list/data-table';
+import { useGraphQlBuildTypesList } from './queries';
+import { useState } from 'react';
+
+const PageBuildTypes = () => {
+
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+
+    const { data, isLoading, error, refetch } = useGraphQlBuildTypesList({ limit, skip: (page - 1) * limit, sort, filters });
+
+    const handlePageChange = (newPage: number) => { setPage(newPage) };
+    const handlePageSizeChange = (newSize: number) => { setLimit(newSize); setPage(1) };
+
+    if (isLoading) { return <div className="flex items-center justify-center p-8">Loading...</div> }
+    if (error) { return <div className="flex items-center justify-center p-8 text-red-500">Error loading users</div> }
+
+    return <BuildTypesDataTable data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={handlePageChange} onPageSizeChange={handlePageSizeChange} refetchTable={refetch} />;
+
+};
+
+export { PageBuildTypes };

frontend/pages/build-types/queries.tsx

@@ -0,0 +1,36 @@
+'use client'
+import { useQuery, useMutation } from '@tanstack/react-query'
+import { ListArguments } from '@/types/listRequest'
+
+const fetchGraphQlBuildTypesList = async (params: ListArguments): Promise<any> => {
+    console.log('Fetching test data from local API');
+    const { limit, skip, sort, filters } = params;
+    try {
+        const res = await fetch('/api/build-types/list', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify({ limit, skip, sort, filters }) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, totalCount: data.totalCount }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+const fetchGraphQlDeleteBuildType = async (uuid: string): Promise<boolean> => {
+    console.log('Fetching test data from local API');
+    try {
+        const res = await fetch(`/api/build-types/delete?uuid=${uuid}`, { method: 'GET', cache: 'no-store', credentials: "include" });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return data
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useGraphQlBuildTypesList(params: ListArguments) {
+    return useQuery({ queryKey: ['graphql-build-types-list', params], queryFn: () => fetchGraphQlBuildTypesList(params) })
+}
+
+export function useDeleteBuildTypeMutation() {
+    return useMutation({
+        mutationFn: ({ uuid }: { uuid: string }) => fetchGraphQlDeleteBuildType(uuid),
+        onSuccess: () => { console.log("Build type deleted successfully") },
+        onError: (error) => { console.error("Delete build type failed:", error) },
+    })
+}

frontend/pages/build-types/types.ts

@@ -0,0 +1,9 @@
+
+interface BuildType {
+    type: string;
+    token: string;
+    typeToken: string;
+    description: string;
+}
+
+export type { BuildType }

frontend/pages/build-types/update/form.tsx

@@ -0,0 +1,135 @@
+"use client"
+import { useForm } from "react-hook-form"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Form, FormField, FormItem, FormLabel, FormControl, FormMessage } from "@/components/ui/form"
+import { Input } from "@/components/ui/input"
+import { Button } from "@/components/ui/button"
+import { Separator } from "@/components/ui/separator"
+import { DateTimePicker } from "@/components/ui/date-time-picker"
+import { useUpdateBuildTypesMutation } from "@/pages/build-types/update/queries"
+import { buildTypesUpdateSchema, type BuildTypesUpdate } from "@/pages/build-types/update/schema"
+
+const BuildTypesForm = ({ refetchTable, initData, selectedUuid }: { refetchTable: () => void, initData: BuildTypesUpdate, selectedUuid: string }) => {
+
+    const form = useForm<BuildTypesUpdate>({ resolver: zodResolver(buildTypesUpdateSchema), defaultValues: { ...initData } })
+
+    const { handleSubmit } = form
+
+    const mutation = useUpdateBuildTypesMutation();
+
+    function onSubmit(values: BuildTypesUpdate) { mutation.mutate({ data: values as any || initData, uuid: selectedUuid }); setTimeout(() => refetchTable(), 400) }
+
+    return (
+        <Form {...form}>
+            <form
+                onSubmit={handleSubmit(onSubmit)}
+                className="space-y-6 p-4"
+            >
+                {/* TYPE + TOKEN */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="type"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Type</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Type..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="token"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Token</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Token..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* TYPE TOKEN + DESCRIPTION */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="typeToken"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Type Token</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Type Token..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="description"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Description</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Description..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                <Separator />
+
+                {/* EXPIRY STARTS + ENDS */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="expiryStarts"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Starts</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="expiryEnds"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Ends</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                <Button type="submit" className="w-full">
+                    Update Build Type
+                </Button>
+            </form>
+        </Form>
+    );
+
+}
+
+export { BuildTypesForm }

frontend/pages/build-types/update/page.tsx

@@ -0,0 +1,36 @@
+'use client';
+import { useState } from 'react';
+import { useGraphQlBuildTypesList } from '@/pages/build-types/queries';
+import { BuildTypesDataTableUpdate } from '@/pages/build-types/update/table/data-table';
+import { BuildTypesForm } from '@/pages/build-types/update/form';
+import { useSearchParams, useRouter } from 'next/navigation'
+import { Button } from '@/components/ui/button';
+
+const PageUpdateBuildTypes = () => {
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+    const searchParams = useSearchParams()
+    const router = useRouter()
+    const uuid = searchParams?.get('uuid') || null
+    const backToBuildTypes = <>
+        <div>UUID not found in search params</div>
+        <Button onClick={() => router.push('/build-types')}>Back to Build Types</Button>
+    </>
+    if (!uuid) { return backToBuildTypes }
+    const { data, isLoading, error, refetch } = useGraphQlBuildTypesList({ limit, skip: (page - 1) * limit, sort, filters: { ...filters, uuid } });
+    const initData = data?.data?.[0] || null;
+    if (!initData) { return backToBuildTypes }
+    return (
+        <>
+            <BuildTypesDataTableUpdate
+                data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit}
+                onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch}
+            />
+            <BuildTypesForm refetchTable={refetch} initData={initData} selectedUuid={uuid} />
+        </>
+    )
+}
+
+export { PageUpdateBuildTypes };

frontend/pages/build-types/update/queries.tsx

@@ -0,0 +1,21 @@
+'use client'
+import { useMutation } from '@tanstack/react-query'
+import { BuildTypesUpdate } from './types';
+
+const fetchGraphQlBuildTypesUpdate = async (record: BuildTypesUpdate, uuid: string): Promise<{ data: BuildTypesUpdate | null; status: number }> => {
+    console.log('Fetching test data from local API');
+    try {
+        const res = await fetch(`/api/build-types/update?uuid=${uuid || ''}`, { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, status: res.status }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useUpdateBuildTypesMutation() {
+    return useMutation({
+        mutationFn: ({ data, uuid }: { data: BuildTypesUpdate, uuid: string }) => fetchGraphQlBuildTypesUpdate(data, uuid),
+        onSuccess: () => { console.log("Build Types updated successfully") },
+        onError: (error) => { console.error("Update build types failed:", error) },
+    })
+}

frontend/pages/build-types/update/schema.ts

@@ -0,0 +1,12 @@
+import { z } from "zod"
+
+export const buildTypesUpdateSchema = z.object({
+    type: z.string(),
+    token: z.string(),
+    typeToken: z.string(),
+    description: z.string(),
+    expiryStarts: z.string(),
+    expiryEnds: z.string(),
+});
+
+export type BuildTypesUpdate = z.infer<typeof buildTypesUpdateSchema>;

frontend/pages/build-types/update/table/columns.tsx

@@ -0,0 +1,206 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { Drawer, DrawerClose, DrawerContent, DrawerFooter, DrawerHeader, DrawerTrigger } from "@/components/ui/drawer"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { useSortable } from "@dnd-kit/sortable"
+import { IconGripVertical } from "@tabler/icons-react"
+import { useIsMobile } from "@/hooks/use-mobile"
+import { Separator } from "@/components/ui/separator"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+function TableCellViewer({ item }: { item: schemaType }) {
+    const isMobile = useIsMobile();
+
+    return (
+        <Drawer direction={isMobile ? "bottom" : "right"}>
+            <DrawerTrigger asChild>
+                <Button variant="link" className="text-foreground w-fit px-0 text-left">
+                    {item.email ?? "Unknown Email"}
+                </Button>
+            </DrawerTrigger>
+
+            <DrawerContent>
+                <DrawerHeader className="gap-1">
+                    <h2 className="text-lg font-semibold">{item.email}</h2>
+                    <p className="text-sm text-muted-foreground">
+                        User details
+                    </p>
+                </DrawerHeader>
+
+                <div className="flex flex-col gap-4 overflow-y-auto px-4 text-sm">
+
+                    {/* BASIC INFO */}
+                    <div className="grid grid-cols-2 gap-4">
+                        <div>
+                            <Label>Email</Label>
+                            <Input value={item.email ?? ""} readOnly />
+                        </div>
+
+                        <div>
+                            <Label>Phone</Label>
+                            <Input value={item.phone ?? ""} readOnly />
+                        </div>
+
+                        <div>
+                            <Label>Tag</Label>
+                            <Input value={item.tag ?? ""} readOnly />
+                        </div>
+
+                        <div>
+                            <Label>Active</Label>
+                            <Input value={item.active ? "Active" : "Inactive"} readOnly />
+                        </div>
+                    </div>
+
+                    <Separator />
+
+                    {/* DATES */}
+                    <div className="grid grid-cols-2 gap-4">
+                        <div>
+                            <Label>Created At</Label>
+                            <Input
+                                value={item.createdAt ? new Date(item.createdAt).toLocaleString() : ""}
+                                readOnly
+                            />
+                        </div>
+
+                        <div>
+                            <Label>Updated At</Label>
+                            <Input
+                                value={item.updatedAt ? new Date(item.updatedAt).toLocaleString() : ""}
+                                readOnly
+                            />
+                        </div>
+                    </div>
+
+                    <Separator />
+
+                    {/* TOKENS */}
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" className="w-full">
+                                Collection Tokens ({item.collectionTokens?.tokens?.length ?? 0})
+                            </Button>
+                        </DropdownMenuTrigger>
+
+                        <DropdownMenuContent className="w-72">
+                            <DropdownMenuLabel>Tokens</DropdownMenuLabel>
+                            <DropdownMenuSeparator />
+                            {(item.collectionTokens?.tokens ?? []).length === 0 && (<DropdownMenuItem disabled>No tokens found</DropdownMenuItem>)}
+                            {(item.collectionTokens?.tokens ?? []).map((t, i) => (
+                                <DropdownMenuItem key={i} className="flex flex-col gap-2">
+                                    <div className="grid grid-cols-2 gap-2 w-full">
+                                        <Input value={t.prefix} readOnly />
+                                        <Input value={t.token} readOnly />
+                                    </div>
+                                </DropdownMenuItem>
+                            ))}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+
+                </div>
+
+                <DrawerFooter>
+                    <DrawerClose asChild>
+                        <Button variant="outline">Close</Button>
+                    </DrawerClose>
+                </DrawerFooter>
+            </DrawerContent>
+        </Drawer>
+    );
+}
+
+function DragHandle({ id }: { id: number }) {
+    const { attributes, listeners } = useSortable({ id })
+    return (
+        <Button {...attributes} {...listeners} variant="ghost" size="icon" className="text-muted-foreground size-7 hover:bg-transparent">
+            <IconGripVertical className="text-muted-foreground size-3" />
+            <span className="sr-only">Drag to reorder</span>
+        </Button>
+    )
+}
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "type",
+            header: "Type",
+        },
+        {
+            accessorKey: "token",
+            header: "Token",
+        },
+        {
+            accessorKey: "typeToken",
+            header: "Type Token",
+        },
+        {
+            accessorKey: "description",
+            header: "Description",
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/build-types/update?uuid=${row.original.uuid}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+export { getColumns };

frontend/pages/build-types/update/table/data-table.tsx

@@ -0,0 +1,280 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { Home } from "lucide-react"
+import { useDeletePersonMutation } from "@/pages/people/queries"
+
+export function BuildTypesDataTableUpdate({
+    data,
+    totalCount,
+    currentPage,
+    pageSize,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable,
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage: number,
+    pageSize: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeletePersonMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize, }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        enableRowSelection: true,
+        getRowId: (row) => row._id.toString(),
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => {
+            const nextPagination = typeof updater === "function" ? updater(pagination) : updater;
+            onPageChange(nextPagination.pageIndex + 1);
+            onPageSizeChange(nextPagination.pageSize);
+        },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
+
+    return (
+        <Tabs defaultValue="outline" className="w-full flex-col justify-start gap-6">
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/build-types") }}>
+                        <Home />
+                        <span className="hidden lg:inline">Back to Build Types</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline"
+                className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6"
+            >
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/build-types/update/table/schema.tsx

@@ -0,0 +1,47 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string().nullable().optional(),
+    expiryStarts: z.string().nullable().optional(),
+    expiryEnds: z.string().nullable().optional(),
+    isConfirmed: z.boolean().nullable().optional(),
+    deleted: z.boolean().nullable().optional(),
+    active: z.boolean().nullable().optional(),
+    crypUuId: z.string().nullable().optional(),
+    createdCredentialsToken: z.string().nullable().optional(),
+    updatedCredentialsToken: z.string().nullable().optional(),
+    confirmedCredentialsToken: z.string().nullable().optional(),
+    isNotificationSend: z.boolean().nullable().optional(),
+    isEmailSend: z.boolean().nullable().optional(),
+    refInt: z.number().nullable().optional(),
+    refId: z.string().nullable().optional(),
+    replicationId: z.number().nullable().optional(),
+    expiresAt: z.string().nullable().optional(),
+    resetToken: z.string().nullable().optional(),
+    password: z.string().nullable().optional(),
+    history: z.array(z.string()).optional(),
+    tag: z.string().nullable().optional(),
+    email: z.string().nullable().optional(),
+    phone: z.string().nullable().optional(),
+
+    collectionTokens: z
+        .object({
+            default: z.string().nullable().optional(),
+            tokens: z
+                .array(
+                    z.object({
+                        prefix: z.string(),
+                        token: z.string(),
+                    })
+                )
+                .optional(),
+        })
+        .nullable()
+        .optional(),
+
+    createdAt: z.string().nullable().optional(),
+    updatedAt: z.string().nullable().optional(),
+});
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/build-types/update/types.ts

@@ -0,0 +1,10 @@
+
+interface BuildTypesUpdate {
+    type: string;
+    token: string;
+    typeToken: string;
+    description: string;
+}
+
+
+export type { BuildTypesUpdate };

frontend/pages/builds/list/columns.tsx

@@ -0,0 +1,250 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { Drawer, DrawerClose, DrawerContent, DrawerFooter, DrawerHeader, DrawerTrigger } from "@/components/ui/drawer"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { useSortable } from "@dnd-kit/sortable"
+import { IconGripVertical } from "@tabler/icons-react"
+import { useIsMobile } from "@/hooks/use-mobile"
+import { Separator } from "@/components/ui/separator"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+// function TableCellViewer({ item }: { item: schemaType }) {
+//     const isMobile = useIsMobile();
+
+//     return (
+//         <Drawer direction={isMobile ? "bottom" : "right"}>
+//             <DrawerTrigger asChild>
+//                 <Button variant="link" className="text-foreground w-fit px-0 text-left">
+//                     {item.email ?? "Unknown Email"}
+//                 </Button>
+//             </DrawerTrigger>
+
+//             <DrawerContent>
+//                 <DrawerHeader className="gap-1">
+//                     <h2 className="text-lg font-semibold">{item.email}</h2>
+//                     <p className="text-sm text-muted-foreground">
+//                         User details
+//                     </p>
+//                 </DrawerHeader>
+
+//                 <div className="flex flex-col gap-4 overflow-y-auto px-4 text-sm">
+
+//                     {/* BASIC INFO */}
+//                     <div className="grid grid-cols-2 gap-4">
+//                         <div>
+//                             <Label>Email</Label>
+//                             <Input value={item.email ?? ""} readOnly />
+//                         </div>
+
+//                         <div>
+//                             <Label>Phone</Label>
+//                             <Input value={item.phone ?? ""} readOnly />
+//                         </div>
+
+//                         <div>
+//                             <Label>Tag</Label>
+//                             <Input value={item.tag ?? ""} readOnly />
+//                         </div>
+
+//                         <div>
+//                             <Label>Active</Label>
+//                             <Input value={item.active ? "Active" : "Inactive"} readOnly />
+//                         </div>
+//                     </div>
+
+//                     <Separator />
+
+//                     {/* DATES */}
+//                     <div className="grid grid-cols-2 gap-4">
+//                         <div>
+//                             <Label>Created At</Label>
+//                             <Input
+//                                 value={item.createdAt ? new Date(item.createdAt).toLocaleString() : ""}
+//                                 readOnly
+//                             />
+//                         </div>
+
+//                         <div>
+//                             <Label>Updated At</Label>
+//                             <Input
+//                                 value={item.updatedAt ? new Date(item.updatedAt).toLocaleString() : ""}
+//                                 readOnly
+//                             />
+//                         </div>
+//                     </div>
+
+//                     <Separator />
+
+//                     {/* TOKENS */}
+//                     <DropdownMenu>
+//                         <DropdownMenuTrigger asChild>
+//                             <Button variant="outline" className="w-full">
+//                                 Collection Tokens ({item.collectionTokens?.tokens?.length ?? 0})
+//                             </Button>
+//                         </DropdownMenuTrigger>
+
+//                         <DropdownMenuContent className="w-72">
+//                             <DropdownMenuLabel>Tokens</DropdownMenuLabel>
+//                             <DropdownMenuSeparator />
+//                             {(item.collectionTokens?.tokens ?? []).length === 0 && (<DropdownMenuItem disabled>No tokens found</DropdownMenuItem>)}
+//                             {(item.collectionTokens?.tokens ?? []).map((t, i) => (
+//                                 <DropdownMenuItem key={i} className="flex flex-col gap-2">
+//                                     <div className="grid grid-cols-2 gap-2 w-full">
+//                                         <Input value={t.prefix} readOnly />
+//                                         <Input value={t.token} readOnly />
+//                                     </div>
+//                                 </DropdownMenuItem>
+//                             ))}
+//                         </DropdownMenuContent>
+//                     </DropdownMenu>
+
+//                 </div>
+
+//                 <DrawerFooter>
+//                     <DrawerClose asChild>
+//                         <Button variant="outline">Close</Button>
+//                     </DrawerClose>
+//                 </DrawerFooter>
+//             </DrawerContent>
+//         </Drawer>
+//     );
+// }
+
+function DragHandle({ id }: { id: number }) {
+    const { attributes, listeners } = useSortable({ id })
+    return (
+        <Button {...attributes} {...listeners} variant="ghost" size="icon" className="text-muted-foreground size-7 hover:bg-transparent">
+            <IconGripVertical className="text-muted-foreground size-3" />
+            <span className="sr-only">Drag to reorder</span>
+        </Button>
+    )
+}
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "firstName",
+            header: "First Name",
+        },
+        {
+            accessorKey: "surname",
+            header: "Surname",
+        },
+        {
+            accessorKey: "middleName",
+            header: "Middle Name",
+        },
+        {
+            accessorKey: "sexCode",
+            header: "Sex",
+        },
+        {
+            accessorKey: "personRef",
+            header: "Person Ref",
+        },
+        {
+            accessorKey: "personTag",
+            header: "Person Tag",
+        },
+        {
+            accessorKey: "fatherName",
+            header: "Father Name",
+        },
+        {
+            accessorKey: "motherName",
+            header: "Mother Name",
+        },
+        {
+            accessorKey: "countryCode",
+            header: "Country",
+        },
+        {
+            accessorKey: "nationalIdentityId",
+            header: "National ID",
+        },
+        {
+            accessorKey: "birthPlace",
+            header: "Birth Place",
+        },
+        {
+            accessorKey: "active",
+            header: "Active",
+            cell: ({ getValue }) => getValue() ? (<div className="text-green-600 font-medium">Yes</div>) : (<div className="text-red-600 font-medium">No</div>),
+        },
+        {
+            accessorKey: "isConfirmed",
+            header: "Confirmed",
+            cell: ({ getValue }) => getValue() ? (<div className="text-green-600 font-medium">Yes</div>) : (<div className="text-red-600 font-medium">No</div>),
+        },
+        {
+            accessorKey: "birthDate",
+            header: "Birth Date",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/people/update?uuid=${row.original.uuid}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+
+export { getColumns };

frontend/pages/builds/list/data-table.tsx

@@ -0,0 +1,280 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+    IconPlus,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { useDeleteUserMutation } from "@/pages/users/queries"
+
+export function BuildDataTable({
+    data,
+    totalCount,
+    currentPage = 1,
+    pageSize = 10,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage?: number,
+    pageSize?: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void,
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeleteUserMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        getRowId: (row) => row._id.toString(),
+        enableRowSelection: true,
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => { const nextPagination = typeof updater === "function" ? updater(pagination) : updater; onPageChange(nextPagination.pageIndex + 1); onPageSizeChange(nextPagination.pageSize) },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
+
+    return (
+        <Tabs
+            defaultValue="outline"
+            className="w-full flex-col justify-start gap-6"
+        >
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/people/add") }}>
+                        <IconPlus />
+                        <span className="hidden lg:inline">Add Person</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline"
+                className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6"
+            >
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/builds/list/schema.tsx

@@ -0,0 +1,27 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string(),
+    firstName: z.string().nullable().optional(),
+    surname: z.string().nullable().optional(),
+    middleName: z.string().nullable().optional(),
+    sexCode: z.string().nullable().optional(),
+    personRef: z.string().nullable().optional(),
+    personTag: z.string().nullable().optional(),
+    fatherName: z.string().nullable().optional(),
+    motherName: z.string().nullable().optional(),
+    countryCode: z.string().nullable().optional(),
+    nationalIdentityId: z.string().nullable().optional(),
+    birthPlace: z.string().nullable().optional(),
+    birthDate: z.string().nullable().optional(),
+    taxNo: z.string().nullable().optional(),
+    birthname: z.string().nullable().optional(),
+    expiryStarts: z.string().nullable().optional(),
+    expiryEnds: z.string().nullable().optional(),
+    createdAt: z.string().nullable().optional(),
+    updatedAt: z.string().nullable().optional(),
+});
+
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/builds/page.tsx

@@ -0,0 +1,23 @@
+'use client';
+import { useGraphQlBuildsList } from './queries';
+import { useState } from 'react';
+import { BuildDataTable } from '@/pages/builds/list/data-table';
+
+const PageBuilds = () => {
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+
+    const { data, isLoading, error, refetch } = useGraphQlBuildsList({ limit, skip: (page - 1) * limit, sort, filters });
+
+    const handlePageChange = (newPage: number) => { setPage(newPage) };
+    const handlePageSizeChange = (newSize: number) => { setLimit(newSize); setPage(1) };
+    if (isLoading) { return <div className="flex items-center justify-center p-8">Loading...</div> }
+    if (error) { return <div className="flex items-center justify-center p-8 text-red-500">Error loading users</div> }
+
+    return <BuildDataTable data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={handlePageChange} onPageSizeChange={handlePageSizeChange} refetchTable={refetch} />;
+
+};
+
+export { PageBuilds };

frontend/pages/builds/queries.tsx

@@ -0,0 +1,36 @@
+'use client'
+import { useQuery, useMutation } from '@tanstack/react-query'
+import { ListArguments } from '@/types/listRequest'
+
+const fetchGraphQlBuildsList = async (params: ListArguments): Promise<any> => {
+    console.log('Fetching test data from local API');
+    const { limit, skip, sort, filters } = params;
+    try {
+        const res = await fetch('/api/builds/list', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify({ limit, skip, sort, filters }) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, totalCount: data.totalCount }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+const fetchGraphQlDeleteBuild = async (uuid: string): Promise<boolean> => {
+    console.log('Fetching test data from local API');
+    try {
+        const res = await fetch(`/api/builds/delete?uuid=${uuid}`, { method: 'GET', cache: 'no-store', credentials: "include" });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return data
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useGraphQlBuildsList(params: ListArguments) {
+    return useQuery({ queryKey: ['graphql-builds-list', params], queryFn: () => fetchGraphQlBuildsList(params) })
+}
+
+export function useDeleteBuildMutation() {
+    return useMutation({
+        mutationFn: ({ uuid }: { uuid: string }) => fetchGraphQlDeleteBuild(uuid),
+        onSuccess: () => { console.log("Person deleted successfully") },
+        onError: (error) => { console.error("Delete person failed:", error) },
+    })
+}

frontend/pages/builds/types.ts

@@ -0,0 +1,44 @@
+interface Build {
+    buildType: string;
+    collectionToken: string;
+    info: BuildInfo;
+    site?: string;
+    address?: string;
+    areas?: string[];
+    ibans?: BuildIban[];
+    responsibles?: BuildResponsible[];
+}
+
+interface BuildInfo {
+    govAddressCode: string;
+    buildName: string;
+    buildNo: string;
+    maxFloor: number;
+    undergroundFloor: number;
+    buildDate: Date;
+    decisionPeriodDate: Date;
+    taxNo: string;
+    liftCount: number;
+    heatingSystem: boolean;
+    coolingSystem: boolean;
+    hotWaterSystem: boolean;
+    blockServiceManCount: number;
+    securityServiceManCount: number;
+    garageCount: number;
+    managementRoomId: number;
+}
+
+interface BuildIban {
+    iban: string;
+    startDate: Date;
+    stopDate: Date;
+    bankCode: string;
+    xcomment: string;
+}
+
+interface BuildResponsible {
+    company: string;
+    person: string;
+}
+
+export type { Build, BuildInfo, BuildIban, BuildResponsible }

frontend/pages/people/add/form.tsx

@@ -0,0 +1,309 @@
+"use client"
+import { useForm } from "react-hook-form"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Form, FormField, FormItem, FormLabel, FormControl, FormMessage } from "@/components/ui/form"
+import { Input } from "@/components/ui/input"
+import { Button } from "@/components/ui/button"
+import { Separator } from "@/components/ui/separator"
+import { PeopleAdd, personAddSchema } from "./schema"
+import { useAddPeopleMutation } from "./queries"
+import { DateTimePicker } from "@/components/ui/date-time-picker"
+
+const PeopleForm = ({ refetchTable }: { refetchTable: () => void }) => {
+
+    const form = useForm<PeopleAdd>({
+        resolver: zodResolver(personAddSchema),
+        defaultValues: {
+            firstName: "",
+            surname: "",
+            middleName: "",
+            sexCode: "",
+            personRef: "",
+            personTag: "",
+            fatherName: "",
+            motherName: "",
+            countryCode: "",
+            nationalIdentityId: "",
+            birthPlace: "",
+            birthDate: "",
+            taxNo: "",
+            birthname: "",
+            expiryStarts: "",
+            expiryEnds: "",
+        },
+    });
+
+    const { handleSubmit } = form;
+
+    const mutation = useAddPeopleMutation();
+
+    function onSubmit(values: PeopleAdd) { mutation.mutate({ data: values }); setTimeout(() => refetchTable(), 400) };
+
+    return (
+        <Form {...form}>
+            <form onSubmit={handleSubmit(onSubmit)} className="space-y-6 p-4">
+                {/* BASIC INFO */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="firstName"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>First Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="John" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="surname"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Surname</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Doe" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* SECOND ROW */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="middleName"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Middle Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Alexander" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="sexCode"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Sex Code</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="M / F" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* THIRD ROW */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="personRef"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Person Ref</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="REF123" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="personTag"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Person Tag</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="TAG001" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* FAMILY INFO */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="fatherName"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Father Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Father..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="motherName"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Mother Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Mother..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* COUNTRY + NATIONAL ID */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="countryCode"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Country Code</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="TR" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="nationalIdentityId"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>National Identity ID</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="12345678901" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* BIRTH INFO */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="birthPlace"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Birth Place</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Istanbul" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="birthDate"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Birth Date</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* TAX/BIRTHNAME */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="taxNo"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Tax No</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Tax number..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="birthname"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Birth Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Birth name..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                <Separator />
+
+                {/* EXPIRY DATES */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="expiryStarts"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Starts</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="expiryEnds"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Ends</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                <Button type="submit" className="w-full">Create Person</Button>
+            </form>
+        </Form>
+    );
+};
+
+export { PeopleForm }

frontend/pages/people/add/page.tsx

@@ -0,0 +1,26 @@
+'use client';
+import { useState } from 'react';
+import { useGraphQlPeopleList } from '@/pages/people/queries';
+import { PeopleDataTableAdd } from '@/pages/people/add/table/data-table';
+import { PeopleForm } from '@/pages/people/add/form';
+
+const PageAddPerson = () => {
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+
+    const { data, isLoading, error, refetch } = useGraphQlPeopleList({ limit, skip: (page - 1) * limit, sort, filters });
+
+    return (
+        <>
+            <PeopleDataTableAdd
+                data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit}
+                onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch}
+            />
+            <PeopleForm refetchTable={refetch} />
+        </>
+    )
+}
+
+export { PageAddPerson };

frontend/pages/people/add/queries.tsx

@@ -0,0 +1,25 @@
+'use client'
+import { useMutation } from '@tanstack/react-query'
+import { PeopleAdd } from './types'
+import { toISOIfNotZ } from '@/lib/utils';
+
+const fetchGraphQlPeopleAdd = async (record: PeopleAdd): Promise<{ data: PeopleAdd | null; status: number }> => {
+    console.log('Fetching test data from local API');
+    record.birthDate = toISOIfNotZ(record.birthDate || "");
+    record.expiryStarts = toISOIfNotZ(record.expiryStarts || "");
+    record.expiryEnds = toISOIfNotZ(record.expiryEnds || "");
+    try {
+        const res = await fetch('/api/people/add', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, status: res.status }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useAddPeopleMutation() {
+    return useMutation({
+        mutationFn: ({ data }: { data: PeopleAdd }) => fetchGraphQlPeopleAdd(data),
+        onSuccess: () => { console.log("People created successfully") },
+        onError: (error) => { console.error("Create people failed:", error) },
+    })
+}

frontend/pages/people/add/schema.ts

@@ -0,0 +1,22 @@
+import { z } from "zod"
+
+export const personAddSchema = z.object({
+    firstName: z.string(),
+    surname: z.string(),
+    middleName: z.string().optional(),
+    sexCode: z.string(),
+    personRef: z.string().optional(),
+    personTag: z.string().optional(),
+    fatherName: z.string().optional(),
+    motherName: z.string().optional(),
+    countryCode: z.string(),
+    nationalIdentityId: z.string(),
+    birthPlace: z.string(),
+    birthDate: z.string(),
+    taxNo: z.string().optional(),
+    birthname: z.string().optional(),
+    expiryStarts: z.string(),
+    expiryEnds: z.string(),
+});
+
+export type PeopleAdd = z.infer<typeof personAddSchema>;

frontend/pages/people/add/table/columns.tsx

@@ -0,0 +1,105 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { Drawer, DrawerClose, DrawerContent, DrawerFooter, DrawerHeader, DrawerTrigger } from "@/components/ui/drawer"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { useSortable } from "@dnd-kit/sortable"
+import { IconGripVertical } from "@tabler/icons-react"
+import { useIsMobile } from "@/hooks/use-mobile"
+import { Separator } from "@/components/ui/separator"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+function DragHandle({ id }: { id: number }) {
+    const { attributes, listeners } = useSortable({ id })
+    return (
+        <Button {...attributes} {...listeners} variant="ghost" size="icon" className="text-muted-foreground size-7 hover:bg-transparent">
+            <IconGripVertical className="text-muted-foreground size-3" />
+            <span className="sr-only">Drag to reorder</span>
+        </Button>
+    )
+}
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "type",
+            header: "Type",
+        },
+        {
+            accessorKey: "token",
+            header: "Token",
+        },
+        {
+            accessorKey: "typeToken",
+            header: "Type Token",
+        },
+        {
+            accessorKey: "description",
+            header: "Description",
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/build-types/update?uuid=${row.original.uuid}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+
+export { getColumns };

frontend/pages/people/add/table/data-table.tsx

@@ -0,0 +1,287 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { Home } from "lucide-react"
+import { useDeleteUserMutation } from "@/pages/users/queries"
+
+export function PeopleDataTableAdd({
+    data,
+    totalCount,
+    currentPage,
+    pageSize,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable,
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage: number,
+    pageSize: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeleteUserMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize, }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        enableRowSelection: true,
+        getRowId: (row) => row._id.toString(),
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => {
+            const nextPagination = typeof updater === "function" ? updater(pagination) : updater;
+            onPageChange(nextPagination.pageIndex + 1);
+            onPageSizeChange(nextPagination.pageSize);
+        },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => {
+        const newSize = Number(value);
+        onPageSizeChange(newSize);
+        onPageChange(1);
+    }
+
+    return (
+        <Tabs
+            defaultValue="outline"
+            className="w-full flex-col justify-start gap-6"
+        >
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/people") }}>
+                        <Home />
+                        <span className="hidden lg:inline">Back to People</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline"
+                className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6"
+            >
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/people/add/table/schema.tsx

@@ -0,0 +1,24 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string(),
+    firstName: z.string().optional(),
+    surname: z.string().optional(),
+    middleName: z.string().optional(),
+    sexCode: z.string().optional(),
+    personRef: z.string().optional(),
+    personTag: z.string().optional(),
+    fatherName: z.string().optional(),
+    motherName: z.string().optional(),
+    countryCode: z.string().optional(),
+    nationalIdentityId: z.string().optional(),
+    birthPlace: z.string().optional(),
+    birthDate: z.string().optional(),
+    taxNo: z.string().optional(),
+    birthname: z.string().optional(),
+    expiryStarts: z.string().optional(),
+    expiryEnds: z.string().optional(),
+});
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/people/add/types.ts

@@ -0,0 +1,24 @@
+
+interface PeopleAdd {
+
+    firstName: string;
+    surname: string;
+    middleName?: string;
+    sexCode: string;
+    personRef?: string;
+    personTag?: string;
+    fatherName?: string;
+    motherName?: string;
+    countryCode: string;
+    nationalIdentityId: string;
+    birthPlace: string;
+    birthDate: string;
+    taxNo?: string;
+    birthname?: string;
+    expiryStarts?: string;
+    expiryEnds?: string;
+
+}
+
+
+export type { PeopleAdd };

frontend/pages/people/list/columns.tsx

@@ -0,0 +1,149 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { Drawer, DrawerClose, DrawerContent, DrawerFooter, DrawerHeader, DrawerTrigger } from "@/components/ui/drawer"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { useSortable } from "@dnd-kit/sortable"
+import { IconGripVertical } from "@tabler/icons-react"
+import { useIsMobile } from "@/hooks/use-mobile"
+import { Separator } from "@/components/ui/separator"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+
+function DragHandle({ id }: { id: number }) {
+    const { attributes, listeners } = useSortable({ id })
+    return (
+        <Button {...attributes} {...listeners} variant="ghost" size="icon" className="text-muted-foreground size-7 hover:bg-transparent">
+            <IconGripVertical className="text-muted-foreground size-3" />
+            <span className="sr-only">Drag to reorder</span>
+        </Button>
+    )
+}
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "firstName",
+            header: "First Name",
+        },
+        {
+            accessorKey: "surname",
+            header: "Surname",
+        },
+        {
+            accessorKey: "middleName",
+            header: "Middle Name",
+        },
+        {
+            accessorKey: "sexCode",
+            header: "Sex",
+        },
+        {
+            accessorKey: "personRef",
+            header: "Person Ref",
+        },
+        {
+            accessorKey: "personTag",
+            header: "Person Tag",
+        },
+        {
+            accessorKey: "fatherName",
+            header: "Father Name",
+        },
+        {
+            accessorKey: "motherName",
+            header: "Mother Name",
+        },
+        {
+            accessorKey: "countryCode",
+            header: "Country",
+        },
+        {
+            accessorKey: "nationalIdentityId",
+            header: "National ID",
+        },
+        {
+            accessorKey: "birthPlace",
+            header: "Birth Place",
+        },
+        {
+            accessorKey: "active",
+            header: "Active",
+            cell: ({ getValue }) => getValue() ? (<div className="text-green-600 font-medium">Yes</div>) : (<div className="text-red-600 font-medium">No</div>),
+        },
+        {
+            accessorKey: "isConfirmed",
+            header: "Confirmed",
+            cell: ({ getValue }) => getValue() ? (<div className="text-green-600 font-medium">Yes</div>) : (<div className="text-red-600 font-medium">No</div>),
+        },
+        {
+            accessorKey: "birthDate",
+            header: "Birth Date",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/people/update?uuid=${row.original.uuid}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+
+export { getColumns };

frontend/pages/people/list/data-table.tsx

@@ -0,0 +1,280 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+    IconPlus,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { useDeleteUserMutation } from "@/pages/users/queries"
+
+export function PeopleDataTable({
+    data,
+    totalCount,
+    currentPage = 1,
+    pageSize = 10,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage?: number,
+    pageSize?: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void,
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeleteUserMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        getRowId: (row) => row._id.toString(),
+        enableRowSelection: true,
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => { const nextPagination = typeof updater === "function" ? updater(pagination) : updater; onPageChange(nextPagination.pageIndex + 1); onPageSizeChange(nextPagination.pageSize) },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
+
+    return (
+        <Tabs
+            defaultValue="outline"
+            className="w-full flex-col justify-start gap-6"
+        >
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/people/add") }}>
+                        <IconPlus />
+                        <span className="hidden lg:inline">Add Person</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline"
+                className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6"
+            >
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/people/list/schema.tsx

@@ -0,0 +1,27 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string(),
+    firstName: z.string().nullable().optional(),
+    surname: z.string().nullable().optional(),
+    middleName: z.string().nullable().optional(),
+    sexCode: z.string().nullable().optional(),
+    personRef: z.string().nullable().optional(),
+    personTag: z.string().nullable().optional(),
+    fatherName: z.string().nullable().optional(),
+    motherName: z.string().nullable().optional(),
+    countryCode: z.string().nullable().optional(),
+    nationalIdentityId: z.string().nullable().optional(),
+    birthPlace: z.string().nullable().optional(),
+    birthDate: z.string().nullable().optional(),
+    taxNo: z.string().nullable().optional(),
+    birthname: z.string().nullable().optional(),
+    expiryStarts: z.string().nullable().optional(),
+    expiryEnds: z.string().nullable().optional(),
+    createdAt: z.string().nullable().optional(),
+    updatedAt: z.string().nullable().optional(),
+});
+
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/people/page.tsx

@@ -0,0 +1,22 @@
+'use client';
+import { useGraphQlPeopleList } from './queries';
+import { useState } from 'react';
+import { PeopleDataTable } from '@/pages/people/list/data-table';
+
+const PagePeople = () => {
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+
+    const { data, isLoading, error, refetch } = useGraphQlPeopleList({ limit, skip: (page - 1) * limit, sort, filters });
+
+    const handlePageChange = (newPage: number) => { setPage(newPage) };
+    const handlePageSizeChange = (newSize: number) => { setLimit(newSize); setPage(1) };
+    if (isLoading) { return <div className="flex items-center justify-center p-8">Loading...</div> }
+    if (error) { return <div className="flex items-center justify-center p-8 text-red-500">Error loading users</div> }
+
+    return <PeopleDataTable data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit} onPageChange={handlePageChange} onPageSizeChange={handlePageSizeChange} refetchTable={refetch} />;
+};
+
+export { PagePeople };

frontend/pages/people/queries.tsx

@@ -0,0 +1,37 @@
+'use client'
+import { useQuery, useMutation } from '@tanstack/react-query'
+import { PeopleListResponse } from './types'
+import { ListArguments } from '@/types/listRequest'
+
+const fetchGraphQlPeopleList = async (params: ListArguments): Promise<PeopleListResponse> => {
+    console.log('Fetching test data from local API');
+    const { limit, skip, sort, filters } = params;
+    try {
+        const res = await fetch('/api/people/list', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify({ limit, skip, sort, filters }) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, totalCount: data.totalCount }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+const fetchGraphQlDeletePerson = async (uuid: string): Promise<boolean> => {
+    console.log('Fetching test data from local API');
+    try {
+        const res = await fetch(`/api/people/delete?uuid=${uuid}`, { method: 'GET', cache: 'no-store', credentials: "include" });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return data
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useGraphQlPeopleList(params: ListArguments) {
+    return useQuery({ queryKey: ['graphql-people-list', params], queryFn: () => fetchGraphQlPeopleList(params) })
+}
+
+export function useDeletePersonMutation() {
+    return useMutation({
+        mutationFn: ({ uuid }: { uuid: string }) => fetchGraphQlDeletePerson(uuid),
+        onSuccess: () => { console.log("Person deleted successfully") },
+        onError: (error) => { console.error("Delete person failed:", error) },
+    })
+}

frontend/pages/people/types.ts

@@ -0,0 +1,31 @@
+
+interface People {
+    _id: string;
+    uuid: string;
+    firstName: string;
+    surname: string;
+    middleName: string;
+    sexCode: string;
+    personRef: string;
+    personTag: string;
+    fatherName: string;
+    motherName: string;
+    countryCode: string;
+    nationalIdentityId: string;
+    birthPlace: string;
+    birthDate: string;
+    taxNo: string;
+    birthname: string;
+    createdAt: string;
+    updatedAt: string;
+    expiryStarts: string;
+    expiryEnds: string;
+}
+
+
+interface PeopleListResponse {
+    data: People[] | null;
+    totalCount: number | null;
+}
+
+export type { People, PeopleListResponse }

frontend/pages/people/update/form.tsx

@@ -0,0 +1,294 @@
+"use client"
+import { useForm } from "react-hook-form"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Form, FormField, FormItem, FormLabel, FormControl, FormMessage } from "@/components/ui/form"
+import { Input } from "@/components/ui/input"
+import { Button } from "@/components/ui/button"
+import { Separator } from "@/components/ui/separator"
+import { DateTimePicker } from "@/components/ui/date-time-picker"
+import { useUpdatePeopleMutation } from "@/pages/people/update/queries"
+import { personUpdateSchema, type PeopleUpdate } from "@/pages/people/update/schema"
+
+const PeopleForm = ({ refetchTable, initData, selectedUuid }: { refetchTable: () => void, initData: PeopleUpdate, selectedUuid: string }) => {
+
+    const form = useForm<PeopleUpdate>({ resolver: zodResolver(personUpdateSchema), defaultValues: { ...initData } })
+
+    const { handleSubmit } = form
+
+    const mutation = useUpdatePeopleMutation();
+
+    function onSubmit(values: PeopleUpdate) { mutation.mutate({ data: values as any || initData, uuid: selectedUuid }); setTimeout(() => refetchTable(), 400) }
+
+    return (
+        <Form {...form}>
+            <form
+                onSubmit={handleSubmit(onSubmit)}
+                className="space-y-6 p-4"
+            >
+                {/* BASIC INFO */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="firstName"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>First Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="John" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="surname"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Surname</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Doe" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* SECOND ROW */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="middleName"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Middle Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Alexander" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="sexCode"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Sex Code</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="M / F" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* THIRD ROW */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="personRef"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Person Ref</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="REF123" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="personTag"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Person Tag</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="TAG001" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* FAMILY INFO */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="fatherName"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Father Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Father..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="motherName"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Mother Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Mother..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* COUNTRY + NATIONAL ID */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="countryCode"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Country Code</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="TR" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="nationalIdentityId"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>National Identity ID</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="12345678901" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* BIRTH INFO */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="birthPlace"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Birth Place</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Istanbul" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="birthDate"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Birth Date</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                {/* TAX/BIRTHNAME */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="taxNo"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Tax No</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Tax number..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="birthname"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Birth Name</FormLabel>
+                                <FormControl>
+                                    <Input placeholder="Birth name..." {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                <Separator />
+
+                {/* EXPIRY DATES */}
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+
+                    <FormField
+                        control={form.control}
+                        name="expiryStarts"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Starts</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+
+                    <FormField
+                        control={form.control}
+                        name="expiryEnds"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormLabel>Expiry Ends</FormLabel>
+                                <FormControl>
+                                    <DateTimePicker {...field} />
+                                </FormControl>
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </div>
+
+                <Button type="submit" className="w-full">
+                    Update Person
+                </Button>
+            </form>
+        </Form>
+    );
+}
+
+export { PeopleForm }

frontend/pages/people/update/page.tsx

@@ -0,0 +1,36 @@
+'use client';
+import { useState } from 'react';
+import { useGraphQlPeopleList } from '@/pages/people/queries';
+import { PeopleDataTableUpdate } from '@/pages/people/update/table/data-table';
+import { PeopleForm } from '@/pages/people/update/form';
+import { useSearchParams, useRouter } from 'next/navigation'
+import { Button } from '@/components/ui/button';
+
+const PageUpdatePeople = () => {
+    const [page, setPage] = useState(1);
+    const [limit, setLimit] = useState(10);
+    const [sort, setSort] = useState({ createdAt: 'desc' });
+    const [filters, setFilters] = useState({});
+    const searchParams = useSearchParams()
+    const router = useRouter()
+    const uuid = searchParams?.get('uuid') || null
+    const backToPeople = <>
+        <div>UUID not found in search params</div>
+        <Button onClick={() => router.push('/people')}>Back to People</Button>
+    </>
+    if (!uuid) { return backToPeople }
+    const { data, isLoading, error, refetch } = useGraphQlPeopleList({ limit, skip: (page - 1) * limit, sort, filters: { ...filters, uuid } });
+    const initData = data?.data?.[0] || null;
+    if (!initData) { return backToPeople }
+    return (
+        <>
+            <PeopleDataTableUpdate
+                data={data?.data || []} totalCount={data?.totalCount || 0} currentPage={page} pageSize={limit}
+                onPageChange={setPage} onPageSizeChange={setLimit} refetchTable={refetch}
+            />
+            <PeopleForm refetchTable={refetch} initData={initData} selectedUuid={uuid} />
+        </>
+    )
+}
+
+export { PageUpdatePeople };

frontend/pages/people/update/queries.tsx

@@ -0,0 +1,21 @@
+'use client'
+import { useMutation } from '@tanstack/react-query'
+import { UserUpdate } from './types';
+
+const fetchGraphQlPeopleUpdate = async (record: UserUpdate, uuid: string): Promise<{ data: UserUpdate | null; status: number }> => {
+    console.log('Fetching test data from local API');
+    try {
+        const res = await fetch(`/api/people/update?uuid=${uuid || ''}`, { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
+        if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }
+        const data = await res.json();
+        return { data: data.data, status: res.status }
+    } catch (error) { console.error('Error fetching test data:', error); throw error }
+};
+
+export function useUpdatePeopleMutation() {
+    return useMutation({
+        mutationFn: ({ data, uuid }: { data: UserUpdate, uuid: string }) => fetchGraphQlPeopleUpdate(data, uuid),
+        onSuccess: () => { console.log("People updated successfully") },
+        onError: (error) => { console.error("Update people failed:", error) },
+    })
+}

frontend/pages/people/update/schema.ts

@@ -0,0 +1,22 @@
+import { z } from "zod"
+
+export const personUpdateSchema = z.object({
+    firstName: z.string(),
+    surname: z.string(),
+    middleName: z.string().optional(),
+    sexCode: z.string(),
+    personRef: z.string().optional(),
+    personTag: z.string().optional(),
+    fatherName: z.string().optional(),
+    motherName: z.string().optional(),
+    countryCode: z.string().optional(),
+    nationalIdentityId: z.string().optional(),
+    birthPlace: z.string().optional(),
+    birthDate: z.string().optional(),
+    taxNo: z.string().optional(),
+    birthname: z.string().optional(),
+    expiryStarts: z.string().optional(),
+    expiryEnds: z.string().optional(),
+});
+
+export type PeopleUpdate = z.infer<typeof personUpdateSchema>;

frontend/pages/people/update/table/columns.tsx

@@ -0,0 +1,251 @@
+"use client"
+import { z } from "zod"
+import { Button } from "@/components/ui/button"
+import { Drawer, DrawerClose, DrawerContent, DrawerFooter, DrawerHeader, DrawerTrigger } from "@/components/ui/drawer"
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
+import { Input } from "@/components/ui/input"
+import { Label } from "@/components/ui/label"
+import { useSortable } from "@dnd-kit/sortable"
+import { IconGripVertical } from "@tabler/icons-react"
+import { useIsMobile } from "@/hooks/use-mobile"
+import { Separator } from "@/components/ui/separator"
+import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
+import { TableCell, TableRow } from "@/components/ui/table"
+import { CSS } from "@dnd-kit/utilities"
+import { schema, schemaType } from "./schema"
+import { dateToLocaleString } from "@/lib/utils"
+import { Pencil, Trash } from "lucide-react"
+
+function TableCellViewer({ item }: { item: schemaType }) {
+    const isMobile = useIsMobile();
+
+    return (
+        <Drawer direction={isMobile ? "bottom" : "right"}>
+            <DrawerTrigger asChild>
+                <Button variant="link" className="text-foreground w-fit px-0 text-left">
+                    {item.email ?? "Unknown Email"}
+                </Button>
+            </DrawerTrigger>
+
+            <DrawerContent>
+                <DrawerHeader className="gap-1">
+                    <h2 className="text-lg font-semibold">{item.email}</h2>
+                    <p className="text-sm text-muted-foreground">
+                        User details
+                    </p>
+                </DrawerHeader>
+
+                <div className="flex flex-col gap-4 overflow-y-auto px-4 text-sm">
+
+                    {/* BASIC INFO */}
+                    <div className="grid grid-cols-2 gap-4">
+                        <div>
+                            <Label>Email</Label>
+                            <Input value={item.email ?? ""} readOnly />
+                        </div>
+
+                        <div>
+                            <Label>Phone</Label>
+                            <Input value={item.phone ?? ""} readOnly />
+                        </div>
+
+                        <div>
+                            <Label>Tag</Label>
+                            <Input value={item.tag ?? ""} readOnly />
+                        </div>
+
+                        <div>
+                            <Label>Active</Label>
+                            <Input value={item.active ? "Active" : "Inactive"} readOnly />
+                        </div>
+                    </div>
+
+                    <Separator />
+
+                    {/* DATES */}
+                    <div className="grid grid-cols-2 gap-4">
+                        <div>
+                            <Label>Created At</Label>
+                            <Input
+                                value={item.createdAt ? new Date(item.createdAt).toLocaleString() : ""}
+                                readOnly
+                            />
+                        </div>
+
+                        <div>
+                            <Label>Updated At</Label>
+                            <Input
+                                value={item.updatedAt ? new Date(item.updatedAt).toLocaleString() : ""}
+                                readOnly
+                            />
+                        </div>
+                    </div>
+
+                    <Separator />
+
+                    {/* TOKENS */}
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" className="w-full">
+                                Collection Tokens ({item.collectionTokens?.tokens?.length ?? 0})
+                            </Button>
+                        </DropdownMenuTrigger>
+
+                        <DropdownMenuContent className="w-72">
+                            <DropdownMenuLabel>Tokens</DropdownMenuLabel>
+                            <DropdownMenuSeparator />
+                            {(item.collectionTokens?.tokens ?? []).length === 0 && (<DropdownMenuItem disabled>No tokens found</DropdownMenuItem>)}
+                            {(item.collectionTokens?.tokens ?? []).map((t, i) => (
+                                <DropdownMenuItem key={i} className="flex flex-col gap-2">
+                                    <div className="grid grid-cols-2 gap-2 w-full">
+                                        <Input value={t.prefix} readOnly />
+                                        <Input value={t.token} readOnly />
+                                    </div>
+                                </DropdownMenuItem>
+                            ))}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+
+                </div>
+
+                <DrawerFooter>
+                    <DrawerClose asChild>
+                        <Button variant="outline">Close</Button>
+                    </DrawerClose>
+                </DrawerFooter>
+            </DrawerContent>
+        </Drawer>
+    );
+}
+
+function DragHandle({ id }: { id: number }) {
+    const { attributes, listeners } = useSortable({ id })
+    return (
+        <Button {...attributes} {...listeners} variant="ghost" size="icon" className="text-muted-foreground size-7 hover:bg-transparent">
+            <IconGripVertical className="text-muted-foreground size-3" />
+            <span className="sr-only">Drag to reorder</span>
+        </Button>
+    )
+}
+
+export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
+    const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
+    return (
+        <TableRow data-state={row.getIsSelected() && "selected"} data-dragging={isDragging} ref={setNodeRef}
+            className="relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80"
+            style={{ transform: CSS.Transform.toString(transform), transition: transition }}
+        >
+            {row.getVisibleCells().map((cell) => (
+                <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
+            ))}
+        </TableRow>
+    )
+}
+
+
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+    return [
+        {
+            accessorKey: "uuid",
+            header: "UUID",
+            cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
+        },
+        {
+            accessorKey: "firstName",
+            header: "First Name",
+        },
+        {
+            accessorKey: "surname",
+            header: "Surname",
+        },
+        {
+            accessorKey: "middleName",
+            header: "Middle Name",
+        },
+        {
+            accessorKey: "sexCode",
+            header: "Sex",
+        },
+        {
+            accessorKey: "personRef",
+            header: "Person Ref",
+        },
+        {
+            accessorKey: "personTag",
+            header: "Person Tag",
+        },
+        {
+            accessorKey: "fatherName",
+            header: "Father Name",
+        },
+        {
+            accessorKey: "motherName",
+            header: "Mother Name",
+        },
+        {
+            accessorKey: "countryCode",
+            header: "Country",
+        },
+        {
+            accessorKey: "nationalIdentityId",
+            header: "National ID",
+        },
+        {
+            accessorKey: "birthPlace",
+            header: "Birth Place",
+        },
+        {
+            accessorKey: "active",
+            header: "Active",
+            cell: ({ getValue }) => getValue() ? (<div className="text-green-600 font-medium">Yes</div>) : (<div className="text-red-600 font-medium">No</div>),
+        },
+        {
+            accessorKey: "isConfirmed",
+            header: "Confirmed",
+            cell: ({ getValue }) => getValue() ? (<div className="text-green-600 font-medium">Yes</div>) : (<div className="text-red-600 font-medium">No</div>),
+        },
+        {
+            accessorKey: "birthDate",
+            header: "Birth Date",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "createdAt",
+            header: "Created",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "updatedAt",
+            header: "Updated",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
+        {
+            accessorKey: "expiryStarts",
+            header: "Expiry Starts",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            accessorKey: "expiryEnds",
+            header: "Expiry Ends",
+            cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
+        },
+        {
+            id: "actions",
+            header: "Actions",
+            cell: ({ row }) => {
+                return (
+                    <div>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/people/update?uuid=${row.original.uuid}`) }}>
+                            <Pencil />
+                        </Button>
+                        <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
+                            <Trash />
+                        </Button>
+                    </div>
+                );
+            },
+        }
+    ]
+}
+
+export { getColumns };

frontend/pages/people/update/table/data-table.tsx

@@ -0,0 +1,280 @@
+"use client"
+
+import * as React from "react"
+import {
+    closestCenter,
+    DndContext,
+    KeyboardSensor,
+    MouseSensor,
+    TouchSensor,
+    useSensor,
+    useSensors,
+    type UniqueIdentifier,
+} from "@dnd-kit/core"
+import { restrictToVerticalAxis } from "@dnd-kit/modifiers"
+import {
+    SortableContext,
+    verticalListSortingStrategy,
+} from "@dnd-kit/sortable"
+import {
+    IconChevronDown,
+    IconChevronLeft,
+    IconChevronRight,
+    IconChevronsLeft,
+    IconChevronsRight,
+    IconLayoutColumns,
+} from "@tabler/icons-react"
+import {
+    ColumnFiltersState,
+    flexRender,
+    getCoreRowModel,
+    getFacetedRowModel,
+    getFacetedUniqueValues,
+    getFilteredRowModel,
+    getSortedRowModel,
+    SortingState,
+    useReactTable,
+    VisibilityState,
+} from "@tanstack/react-table"
+
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuCheckboxItem,
+    DropdownMenuContent,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableRow,
+} from "@/components/ui/table"
+import {
+    Tabs,
+    TabsContent,
+    TabsList,
+    TabsTrigger,
+} from "@/components/ui/tabs"
+import { schemaType } from "./schema"
+import { getColumns, DraggableRow } from "./columns"
+import { useRouter } from "next/navigation"
+import { Home } from "lucide-react"
+import { useDeletePersonMutation } from "@/pages/people/queries"
+
+export function PeopleDataTableUpdate({
+    data,
+    totalCount,
+    currentPage,
+    pageSize,
+    onPageChange,
+    onPageSizeChange,
+    refetchTable,
+}: {
+    data: schemaType[],
+    totalCount: number,
+    currentPage: number,
+    pageSize: number,
+    onPageChange: (page: number) => void,
+    onPageSizeChange: (size: number) => void,
+    refetchTable: () => void
+}) {
+
+    const router = useRouter();
+    const [rowSelection, setRowSelection] = React.useState({})
+    const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({})
+    const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
+    const [sorting, setSorting] = React.useState<SortingState>([])
+    const sortableId = React.useId()
+    const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}))
+    const dataIds = React.useMemo<UniqueIdentifier[]>(() => data?.map(({ _id }) => _id) || [], [data])
+
+    const deleteMutation = useDeletePersonMutation()
+    const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
+    const columns = getColumns(router, deleteHandler);
+    const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize, }), [currentPage, pageSize])
+    const totalPages = Math.ceil(totalCount / pageSize)
+
+    const table = useReactTable({
+        data,
+        columns,
+        pageCount: totalPages,
+        state: { sorting, columnVisibility, rowSelection, columnFilters, pagination },
+        manualPagination: true,
+        enableRowSelection: true,
+        getRowId: (row) => row._id.toString(),
+        onRowSelectionChange: setRowSelection,
+        onSortingChange: setSorting,
+        onColumnFiltersChange: setColumnFilters,
+        onColumnVisibilityChange: setColumnVisibility,
+        onPaginationChange: (updater) => {
+            const nextPagination = typeof updater === "function" ? updater(pagination) : updater;
+            onPageChange(nextPagination.pageIndex + 1);
+            onPageSizeChange(nextPagination.pageSize);
+        },
+        getCoreRowModel: getCoreRowModel(),
+        getFilteredRowModel: getFilteredRowModel(),
+        getSortedRowModel: getSortedRowModel(),
+        getFacetedRowModel: getFacetedRowModel(),
+        getFacetedUniqueValues: getFacetedUniqueValues(),
+    })
+
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
+
+    return (
+        <Tabs defaultValue="outline" className="w-full flex-col justify-start gap-6">
+            <div className="flex items-center justify-between px-4 lg:px-6">
+                <Label htmlFor="view-selector" className="sr-only">
+                    View
+                </Label>
+                <Select defaultValue="outline">
+                    <SelectTrigger className="flex w-fit @4xl/main:hidden" size="sm" id="view-selector">
+                        <SelectValue placeholder="Select a view" />
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem value="outline">Outline</SelectItem>
+                        <SelectItem value="past-performance">Past Performance</SelectItem>
+                        <SelectItem value="key-personnel">Key Personnel</SelectItem>
+                        <SelectItem value="focus-documents">Focus Documents</SelectItem>
+                    </SelectContent>
+                </Select>
+                <div className="flex items-center gap-2">
+                    <DropdownMenu>
+                        <DropdownMenuTrigger asChild>
+                            <Button variant="outline" size="sm">
+                                <IconLayoutColumns />
+                                <span className="hidden lg:inline">Customize Columns</span>
+                                <span className="lg:hidden">Columns</span>
+                                <IconChevronDown />
+                            </Button>
+                        </DropdownMenuTrigger>
+                        <DropdownMenuContent align="end" className="w-56">
+                            {table.getAllColumns().filter((column) => typeof column.accessorFn !== "undefined" && column.getCanHide()).map((column) => {
+                                return (
+                                    <DropdownMenuCheckboxItem key={column.id} className="capitalize" checked={column.getIsVisible()} onCheckedChange={(value) => column.toggleVisibility(!!value)} >
+                                        {column.id}
+                                    </DropdownMenuCheckboxItem>
+                                )
+                            })}
+                        </DropdownMenuContent>
+                    </DropdownMenu>
+                    <Button variant="outline" size="sm" onClick={() => { router.push("/people") }}>
+                        <Home />
+                        <span className="hidden lg:inline">Back to People</span>
+                    </Button>
+                </div>
+            </div>
+            <TabsContent value="outline"
+                className="relative flex flex-col gap-4 overflow-auto px-4 lg:px-6"
+            >
+                <div className="overflow-hidden rounded-lg border">
+                    <DndContext collisionDetection={closestCenter} modifiers={[restrictToVerticalAxis]} sensors={sensors} id={sortableId} >
+                        <Table>
+                            <TableHeader className="bg-muted sticky top-0 z-10">
+                                {table.getHeaderGroups().map((headerGroup) => (
+                                    <TableRow key={headerGroup.id}>
+                                        {headerGroup.headers.map((header) => {
+                                            return (
+                                                <TableHead key={header.id} colSpan={header.colSpan}>
+                                                    {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
+                                                </TableHead>
+                                            )
+                                        })}
+                                    </TableRow>
+                                ))}
+                            </TableHeader>
+                            <TableBody className="**:data-[slot=table-cell]:first:w-8">
+                                {table.getRowModel().rows?.length ? (<SortableContext items={dataIds} strategy={verticalListSortingStrategy} >
+                                    {table.getRowModel().rows.map((row) => <DraggableRow key={row.id} row={row} />)}
+                                </SortableContext>) : (
+                                    <TableRow><TableCell colSpan={columns.length} className="h-24 text-center">No results.</TableCell></TableRow>
+                                )}
+                            </TableBody>
+                        </Table>
+                    </DndContext>
+                </div>
+                <div className="flex items-center justify-between px-4">
+                    <div className="text-muted-foreground hidden flex-1 text-sm lg:flex">
+                        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+                        {table.getFilteredRowModel().rows.length} row(s) selected.
+                    </div>
+                    <div className="flex w-full items-center gap-8 lg:w-fit">
+                        <div className="hidden items-center gap-2 lg:flex">
+                            <Label htmlFor="rows-per-page" className="text-sm font-medium">Rows per page</Label>
+                            <Select value={`${pageSize}`} onValueChange={handlePageSizeChange}>
+                                <SelectTrigger size="sm" className="w-20" id="rows-per-page">
+                                    <SelectValue placeholder={pageSize} />
+                                </SelectTrigger>
+                                <SelectContent side="top">
+                                    {[10, 20, 30].map((size) => <SelectItem key={size} value={`${size}`}>{size}</SelectItem>)}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Page {currentPage} of {totalPages}
+                        </div>
+                        <div className="flex w-fit items-center justify-center text-sm font-medium">
+                            Total Count: {totalCount}
+                        </div>
+                        <div className="ml-auto flex items-center gap-2 lg:ml-0">
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronsLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage - 1)}
+                                disabled={currentPage === 1}
+                            >
+                                <IconChevronLeft />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(currentPage + 1)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronRight />
+                            </Button>
+
+                            <Button
+                                variant="outline"
+                                size="icon"
+                                onClick={() => onPageChange(totalPages)}
+                                disabled={currentPage >= totalPages}
+                            >
+                                <IconChevronsRight />
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            </TabsContent>
+            <TabsContent value="past-performance" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="key-personnel" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+            <TabsContent value="focus-documents" className="flex flex-col px-4 lg:px-6">
+                <div className="aspect-video w-full flex-1 rounded-lg border border-dashed"></div>
+            </TabsContent>
+        </Tabs>
+    )
+}

frontend/pages/people/update/table/schema.tsx

@@ -0,0 +1,47 @@
+import { z } from "zod";
+
+export const schema = z.object({
+    _id: z.string(),
+    uuid: z.string().nullable().optional(),
+    expiryStarts: z.string().nullable().optional(),
+    expiryEnds: z.string().nullable().optional(),
+    isConfirmed: z.boolean().nullable().optional(),
+    deleted: z.boolean().nullable().optional(),
+    active: z.boolean().nullable().optional(),
+    crypUuId: z.string().nullable().optional(),
+    createdCredentialsToken: z.string().nullable().optional(),
+    updatedCredentialsToken: z.string().nullable().optional(),
+    confirmedCredentialsToken: z.string().nullable().optional(),
+    isNotificationSend: z.boolean().nullable().optional(),
+    isEmailSend: z.boolean().nullable().optional(),
+    refInt: z.number().nullable().optional(),
+    refId: z.string().nullable().optional(),
+    replicationId: z.number().nullable().optional(),
+    expiresAt: z.string().nullable().optional(),
+    resetToken: z.string().nullable().optional(),
+    password: z.string().nullable().optional(),
+    history: z.array(z.string()).optional(),
+    tag: z.string().nullable().optional(),
+    email: z.string().nullable().optional(),
+    phone: z.string().nullable().optional(),
+
+    collectionTokens: z
+        .object({
+            default: z.string().nullable().optional(),
+            tokens: z
+                .array(
+                    z.object({
+                        prefix: z.string(),
+                        token: z.string(),
+                    })
+                )
+                .optional(),
+        })
+        .nullable()
+        .optional(),
+
+    createdAt: z.string().nullable().optional(),
+    updatedAt: z.string().nullable().optional(),
+});
+
+export type schemaType = z.infer<typeof schema>;

frontend/pages/people/update/types.ts

@@ -0,0 +1,24 @@
+interface UserToken {
+    prefix: string;
+    token: string;
+}
+
+interface CollectionTokens {
+    default: string;
+    tokens: UserToken[];
+}
+
+interface UserUpdate {
+    expiryStarts: string;
+    expiryEnds: string;
+    isConfirmed: boolean;
+    isNotificationSend: boolean;
+    password: string;
+    tag: string;
+    email: string;
+    phone: string;
+    collectionTokens: CollectionTokens;
+}
+
+
+export type { UserUpdate };

frontend/pages/users/add/form.tsx

@@ -32,24 +32,15 @@ const UserForm = ({ refetchTable }: { refetchTable: () => void }) => {
 
     const { control, handleSubmit } = form
 
-    const { fields, append, remove } = useFieldArray({
-        control,
-        name: "collectionTokens.tokens",
-    })
+    const { fields, append, remove } = useFieldArray({ control, name: "collectionTokens.tokens" })
 
     const mutation = useAddUserMutation();
 
-    function onSubmit(values: UserAdd) {
-        mutation.mutate(values as any);
-        setTimeout(() => refetchTable(), 200);
-    }
+    function onSubmit(values: UserAdd) { mutation.mutate(values as any); setTimeout(() => refetchTable(), 400) }
 
     return (
         <Form {...form}>
-            <form
-                onSubmit={handleSubmit(onSubmit)}
-                className="space-y-6 p-4"
-            >
+            <form onSubmit={handleSubmit(onSubmit)} className="space-y-6 p-4">
                 {/* BASIC INFO */}
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
                     <FormField

frontend/pages/users/add/queries.tsx

@@ -1,9 +1,12 @@
 'use client'
 import { useMutation } from '@tanstack/react-query'
 import { UserAdd } from './types'
+import { toISOIfNotZ } from '@/lib/utils'
 
 const fetchGraphQlUsersAdd = async (record: UserAdd): Promise<{ data: UserAdd | null; status: number }> => {
     console.log('Fetching test data from local API');
+    record.expiryStarts = toISOIfNotZ(record.expiryStarts);
+    record.expiryEnds = toISOIfNotZ(record.expiryEnds);
     try {
         const res = await fetch('/api/users/add', { method: 'POST', cache: 'no-store', credentials: "include", body: JSON.stringify(record) });
         if (!res.ok) { const errorText = await res.text(); console.error('Test data API error:', errorText); throw new Error(`API error: ${res.status} ${res.statusText}`) }

frontend/pages/users/queries.tsx

@@ -35,5 +35,3 @@ export function useDeleteUserMutation() {
         onError: (error) => { console.error("Delete user failed:", error) },
     })
 }
-
-

frontend/pages/users/update/form.tsx

@@ -1,16 +1,17 @@
 "use client"
 import { useFieldArray, useForm } from "react-hook-form"
 import { zodResolver } from "@hookform/resolvers/zod"
-import { userUpdateSchema, type UserUpdate } from "./schema"
 import { Form, FormField, FormItem, FormLabel, FormControl, FormMessage } from "@/components/ui/form"
 import { Input } from "@/components/ui/input"
 import { Button } from "@/components/ui/button"
 import { Checkbox } from "@/components/ui/checkbox"
 import { Separator } from "@/components/ui/separator"
 import { DateTimePicker } from "@/components/ui/date-time-picker"
-import { useUpdateUserMutation } from "./queries"
+import { useUpdateUserMutation } from "@/pages/users/update/queries"
+import { userUpdateSchema, type UserUpdate } from "@/pages/users/update/schema"
 
 const UserForm = ({ refetchTable, initData, selectedUuid }: { refetchTable: () => void, initData: UserUpdate, selectedUuid: string }) => {
+
     const form = useForm<UserUpdate>({
         resolver: zodResolver(userUpdateSchema),
         defaultValues: {
@@ -31,9 +32,7 @@ const UserForm = ({ refetchTable, initData, selectedUuid }: { refetchTable: () =
 
     const mutation = useUpdateUserMutation();
 
-    function onSubmit(values: UserUpdate) {
-        mutation.mutate({ data: values as any || initData, uuid: selectedUuid }); setTimeout(() => refetchTable(), 200)
-    }
+    function onSubmit(values: UserUpdate) { mutation.mutate({ data: values as any || initData, uuid: selectedUuid }); setTimeout(() => refetchTable(), 400) }
 
     return (
         <Form {...form}>

frontend/pages/users/update/table/columns.tsx

@@ -1,14 +1,7 @@
 "use client"
 import { z } from "zod"
 import { Button } from "@/components/ui/button"
-import { Drawer, DrawerClose, DrawerContent, DrawerFooter, DrawerHeader, DrawerTrigger } from "@/components/ui/drawer"
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
-import { Input } from "@/components/ui/input"
-import { Label } from "@/components/ui/label"
 import { useSortable } from "@dnd-kit/sortable"
-import { IconGripVertical } from "@tabler/icons-react"
-import { useIsMobile } from "@/hooks/use-mobile"
-import { Separator } from "@/components/ui/separator"
 import { ColumnDef, flexRender, Row } from "@tanstack/react-table"
 import { TableCell, TableRow } from "@/components/ui/table"
 import { CSS } from "@dnd-kit/utilities"
@@ -16,117 +9,6 @@ import { schema, schemaType } from "./schema"
 import { dateToLocaleString } from "@/lib/utils"
 import { Pencil, Trash } from "lucide-react"
 
-function TableCellViewer({ item }: { item: schemaType }) {
-    const isMobile = useIsMobile();
-
-    return (
-        <Drawer direction={isMobile ? "bottom" : "right"}>
-            <DrawerTrigger asChild>
-                <Button variant="link" className="text-foreground w-fit px-0 text-left">
-                    {item.email ?? "Unknown Email"}
-                </Button>
-            </DrawerTrigger>
-
-            <DrawerContent>
-                <DrawerHeader className="gap-1">
-                    <h2 className="text-lg font-semibold">{item.email}</h2>
-                    <p className="text-sm text-muted-foreground">
-                        User details
-                    </p>
-                </DrawerHeader>
-
-                <div className="flex flex-col gap-4 overflow-y-auto px-4 text-sm">
-
-                    {/* BASIC INFO */}
-                    <div className="grid grid-cols-2 gap-4">
-                        <div>
-                            <Label>Email</Label>
-                            <Input value={item.email ?? ""} readOnly />
-                        </div>
-
-                        <div>
-                            <Label>Phone</Label>
-                            <Input value={item.phone ?? ""} readOnly />
-                        </div>
-
-                        <div>
-                            <Label>Tag</Label>
-                            <Input value={item.tag ?? ""} readOnly />
-                        </div>
-
-                        <div>
-                            <Label>Active</Label>
-                            <Input value={item.active ? "Active" : "Inactive"} readOnly />
-                        </div>
-                    </div>
-
-                    <Separator />
-
-                    {/* DATES */}
-                    <div className="grid grid-cols-2 gap-4">
-                        <div>
-                            <Label>Created At</Label>
-                            <Input
-                                value={item.createdAt ? new Date(item.createdAt).toLocaleString() : ""}
-                                readOnly
-                            />
-                        </div>
-
-                        <div>
-                            <Label>Updated At</Label>
-                            <Input
-                                value={item.updatedAt ? new Date(item.updatedAt).toLocaleString() : ""}
-                                readOnly
-                            />
-                        </div>
-                    </div>
-
-                    <Separator />
-
-                    {/* TOKENS */}
-                    <DropdownMenu>
-                        <DropdownMenuTrigger asChild>
-                            <Button variant="outline" className="w-full">
-                                Collection Tokens ({item.collectionTokens?.tokens?.length ?? 0})
-                            </Button>
-                        </DropdownMenuTrigger>
-
-                        <DropdownMenuContent className="w-72">
-                            <DropdownMenuLabel>Tokens</DropdownMenuLabel>
-                            <DropdownMenuSeparator />
-                            {(item.collectionTokens?.tokens ?? []).length === 0 && (<DropdownMenuItem disabled>No tokens found</DropdownMenuItem>)}
-                            {(item.collectionTokens?.tokens ?? []).map((t, i) => (
-                                <DropdownMenuItem key={i} className="flex flex-col gap-2">
-                                    <div className="grid grid-cols-2 gap-2 w-full">
-                                        <Input value={t.prefix} readOnly />
-                                        <Input value={t.token} readOnly />
-                                    </div>
-                                </DropdownMenuItem>
-                            ))}
-                        </DropdownMenuContent>
-                    </DropdownMenu>
-
-                </div>
-
-                <DrawerFooter>
-                    <DrawerClose asChild>
-                        <Button variant="outline">Close</Button>
-                    </DrawerClose>
-                </DrawerFooter>
-            </DrawerContent>
-        </Drawer>
-    );
-}
-
-function DragHandle({ id }: { id: number }) {
-    const { attributes, listeners } = useSortable({ id })
-    return (
-        <Button {...attributes} {...listeners} variant="ghost" size="icon" className="text-muted-foreground size-7 hover:bg-transparent">
-            <IconGripVertical className="text-muted-foreground size-3" />
-            <span className="sr-only">Drag to reorder</span>
-        </Button>
-    )
-}
 
 export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
     const { transform, transition, setNodeRef, isDragging } = useSortable({ id: row.original._id })
@@ -142,7 +24,7 @@ export function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
     )
 }
 
-function getColumns(deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
+function getColumns(router: any, deleteHandler: (id: string) => void): ColumnDef<schemaType>[] {
     return [
         {
             accessorKey: "uuid",
@@ -150,16 +32,48 @@ function getColumns(deleteHandler: (id: string) => void): ColumnDef<schemaType>[
             cell: ({ getValue }) => (<div className="font-mono text-xs bg-muted px-2 py-1 rounded break-all">{String(getValue())}</div>),
         },
         {
-            accessorKey: "email",
-            header: "Email",
+            accessorKey: "firstName",
+            header: "First Name",
         },
         {
-            accessorKey: "phone",
-            header: "Phone",
+            accessorKey: "surname",
+            header: "Surname",
         },
         {
-            accessorKey: "tag",
-            header: "Tag",
+            accessorKey: "middleName",
+            header: "Middle Name",
+        },
+        {
+            accessorKey: "sexCode",
+            header: "Sex",
+        },
+        {
+            accessorKey: "personRef",
+            header: "Person Ref",
+        },
+        {
+            accessorKey: "personTag",
+            header: "Person Tag",
+        },
+        {
+            accessorKey: "fatherName",
+            header: "Father Name",
+        },
+        {
+            accessorKey: "motherName",
+            header: "Mother Name",
+        },
+        {
+            accessorKey: "countryCode",
+            header: "Country",
+        },
+        {
+            accessorKey: "nationalIdentityId",
+            header: "National ID",
+        },
+        {
+            accessorKey: "birthPlace",
+            header: "Birth Place",
         },
         {
             accessorKey: "active",
@@ -171,6 +85,11 @@ function getColumns(deleteHandler: (id: string) => void): ColumnDef<schemaType>[
             header: "Confirmed",
             cell: ({ getValue }) => getValue() ? (<div className="text-green-600 font-medium">Yes</div>) : (<div className="text-red-600 font-medium">No</div>),
         },
+        {
+            accessorKey: "birthDate",
+            header: "Birth Date",
+            cell: ({ getValue }) => dateToLocaleString(getValue() as string),
+        },
         {
             accessorKey: "createdAt",
             header: "Created",
@@ -191,69 +110,15 @@ function getColumns(deleteHandler: (id: string) => void): ColumnDef<schemaType>[
             header: "Expiry Ends",
             cell: ({ getValue }) => getValue() ? dateToLocaleString(getValue() as string) : "-",
         },
-        {
-            accessorKey: "crypUuId",
-            header: "Encrypted UUID",
-        },
-        {
-            accessorKey: "history",
-            header: "History",
-            cell: ({ getValue }) => (<div className="truncate max-w-[150px] text-xs text-muted-foreground">{String(getValue() ?? "")}</div>),
-        },
-        {
-            accessorKey: "collectionTokens.tokens",
-            header: "Tokens",
-            cell: ({ row }) => {
-                const tokens = row.original.collectionTokens?.tokens ?? [];
-                const defaultToken = row.original.collectionTokens?.default;
-                if (!tokens.length) return "-";
-                return (
-                    <DropdownMenu>
-                        <DropdownMenuTrigger asChild>
-                            <Button variant="outline" className="h-8 px-2 text-xs">
-                                Tokens ({tokens.length})
-                            </Button>
-                        </DropdownMenuTrigger>
-                        <DropdownMenuContent className="w-72">
-                            <DropdownMenuLabel>Collection Tokens</DropdownMenuLabel>
-                            <DropdownMenuSeparator />
-                            {defaultToken && (
-                                <>
-                                    <DropdownMenuItem>
-                                        <div className="flex flex-col w-full">
-                                            <span className="font-semibold">Default</span>
-                                            <span className="font-mono text-xs text-muted-foreground break-all">
-                                                {defaultToken}
-                                            </span>
-                                        </div>
-                                    </DropdownMenuItem>
-                                    <DropdownMenuSeparator />
-                                </>
-                            )}
-                            {tokens.map((t, i) => (
-                                <DropdownMenuItem key={i} className="flex flex-col items-start">
-                                    <div className="w-full flex justify-between">
-                                        <span className="font-medium">{t.prefix}</span>
-                                        <span className="font-mono text-muted-foreground break-all">
-                                            {t.token}
-                                        </span>
-                                    </div>
-                                </DropdownMenuItem>
-                            ))}
-                        </DropdownMenuContent>
-                    </DropdownMenu>
-                );
-            },
-        },
         {
             id: "actions",
             header: "Actions",
             cell: ({ row }) => {
                 return (
                     <div>
-                        {/* <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/users/update/${row.original.uuid}`) }}>
+                        <Button className="bg-amber-400 text-black border-amber-400" variant="outline" size="sm" onClick={() => { router.push(`/users/update?uuid=${row.original.uuid}`) }}>
                             <Pencil />
-                        </Button> */}
+                        </Button>
                         <Button className="bg-red-700 text-white border-red-700 mx-4" variant="outline" size="sm" onClick={() => { deleteHandler(row.original.uuid || "") }}>
                             <Trash />
                         </Button>

frontend/pages/users/update/table/data-table.tsx

@@ -101,7 +101,7 @@ export function UserDataTableUpdate({
 
     const deleteMutation = useDeleteUserMutation()
     const deleteHandler = (id: string) => { deleteMutation.mutate({ uuid: id }); setTimeout(() => { refetchTable() }, 200) }
-    const columns = getColumns(deleteHandler);
+    const columns = getColumns(router, deleteHandler);
     const pagination = React.useMemo(() => ({ pageIndex: currentPage - 1, pageSize: pageSize, }), [currentPage, pageSize])
     const totalPages = Math.ceil(totalCount / pageSize)
 
@@ -129,11 +129,7 @@ export function UserDataTableUpdate({
         getFacetedUniqueValues: getFacetedUniqueValues(),
     })
 
-    const handlePageSizeChange = (value: string) => {
-        const newSize = Number(value);
-        onPageSizeChange(newSize);
-        onPageChange(1);
-    }
+    const handlePageSizeChange = (value: string) => { const newSize = Number(value); onPageSizeChange(newSize); onPageChange(1) }
 
     return (
         <Tabs