-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #93 from sgcarstrends/1-add-a-responsive-table-to-…
…show-the-data-and-trends Add DataTable and refactor existing table in makes
- Loading branch information
Showing
5 changed files
with
201 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| "use client"; | ||
|
|
||
| import Link from "next/link"; | ||
| import { ArrowUpDown } from "lucide-react"; | ||
| import { Button } from "@/components/ui/button"; | ||
| import type { Car } from "@/types"; | ||
| import type { ColumnDef } from "@tanstack/react-table"; | ||
|
|
||
| export const columns: ColumnDef<Car>[] = [ | ||
| { | ||
| accessorKey: "month", | ||
| header: ({ column }) => { | ||
| return ( | ||
| <Button | ||
| variant="ghost" | ||
| onClick={() => column.toggleSorting(column.getIsSorted() === "asc")} | ||
| > | ||
| Month | ||
| <ArrowUpDown className="ml-2 h-4 w-4" /> | ||
| </Button> | ||
| ); | ||
| }, | ||
| }, | ||
| { | ||
| accessorKey: "fuel_type", | ||
| header: "Fuel Type", | ||
| cell: ({ row }) => { | ||
| const type = row.getValue("fuel_type") as string; | ||
| return <Link href={`/cars/${type.toLowerCase()}`}>{type}</Link>; | ||
| }, | ||
| }, | ||
| { | ||
| accessorKey: "vehicle_type", | ||
| header: "Vehicle Type", | ||
| }, | ||
| { | ||
| accessorKey: "number", | ||
| header: "Count", | ||
| }, | ||
| ]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| "use client"; | ||
|
|
||
| import { useState } from "react"; | ||
| import { | ||
| type ColumnDef, | ||
| type ColumnFiltersState, | ||
| flexRender, | ||
| getCoreRowModel, | ||
| getFilteredRowModel, | ||
| getPaginationRowModel, | ||
| getSortedRowModel, | ||
| type SortingState, | ||
| useReactTable, | ||
| type VisibilityState, | ||
| } from "@tanstack/react-table"; | ||
| import { Button } from "@/components/ui/button"; | ||
| import { Input } from "@/components/ui/input"; | ||
| import { | ||
| Table, | ||
| TableBody, | ||
| TableCell, | ||
| TableHead, | ||
| TableHeader, | ||
| TableRow, | ||
| } from "@/components/ui/table"; | ||
|
|
||
| interface DataTableProps<TData, TValue> { | ||
| columns: ColumnDef<TData, TValue>[]; | ||
| data: TData[]; | ||
| } | ||
|
|
||
| export function DataTable<TData, TValue>({ | ||
| columns, | ||
| data, | ||
| }: DataTableProps<TData, TValue>) { | ||
| const [sorting, setSorting] = useState<SortingState>([]); | ||
| const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]); | ||
| const [columnVisibility, setColumnVisibility] = useState<VisibilityState>({}); | ||
|
|
||
| const table = useReactTable({ | ||
| data, | ||
| columns, | ||
| getCoreRowModel: getCoreRowModel(), | ||
| getPaginationRowModel: getPaginationRowModel(), | ||
| onSortingChange: setSorting, | ||
| getSortedRowModel: getSortedRowModel(), | ||
| onColumnFiltersChange: setColumnFilters, | ||
| getFilteredRowModel: getFilteredRowModel(), | ||
| onColumnVisibilityChange: setColumnVisibility, | ||
| state: { sorting, columnFilters, columnVisibility }, | ||
| }); | ||
|
|
||
| return ( | ||
| <div> | ||
| <div className="flex items-center py-4"> | ||
| <Input | ||
| placeholder="Filter months..." | ||
| value={(table.getColumn("month")?.getFilterValue() as string) ?? ""} | ||
| onChange={(event) => | ||
| table.getColumn("month")?.setFilterValue(event.target.value) | ||
| } | ||
| className="max-w-sm" | ||
| /> | ||
| </div> | ||
| <div className="rounded-md border"> | ||
| <Table> | ||
| <TableHeader> | ||
| {table.getHeaderGroups().map((headerGroup) => ( | ||
| <TableRow key={headerGroup.id}> | ||
| {headerGroup.headers.map((header) => { | ||
| return ( | ||
| <TableHead key={header.id}> | ||
| {header.isPlaceholder | ||
| ? null | ||
| : flexRender( | ||
| header.column.columnDef.header, | ||
| header.getContext(), | ||
| )} | ||
| </TableHead> | ||
| ); | ||
| })} | ||
| </TableRow> | ||
| ))} | ||
| </TableHeader> | ||
| <TableBody> | ||
| {table.getRowModel().rows?.length ? ( | ||
| table.getRowModel().rows.map((row) => ( | ||
| <TableRow | ||
| key={row.id} | ||
| data-state={row.getIsSelected() && "selected"} | ||
| > | ||
| {row.getVisibleCells().map((cell) => ( | ||
| <TableCell key={cell.id}> | ||
| {flexRender( | ||
| cell.column.columnDef.cell, | ||
| cell.getContext(), | ||
| )} | ||
| </TableCell> | ||
| ))} | ||
| </TableRow> | ||
| )) | ||
| ) : ( | ||
| <TableRow> | ||
| <TableCell | ||
| colSpan={columns.length} | ||
| className="h-24 text-center" | ||
| > | ||
| No results. | ||
| </TableCell> | ||
| </TableRow> | ||
| )} | ||
| </TableBody> | ||
| </Table> | ||
| </div> | ||
| <div className="flex items-center justify-end space-x-2 py-4"> | ||
| <Button | ||
| variant="outline" | ||
| size="sm" | ||
| onClick={() => table.previousPage()} | ||
| disabled={!table.getCanPreviousPage()} | ||
| > | ||
| Previous | ||
| </Button> | ||
| <Button | ||
| variant="outline" | ||
| size="sm" | ||
| onClick={() => table.nextPage()} | ||
| disabled={!table.getCanNextPage()} | ||
| > | ||
| Next | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.