diff --git a/src/app/(dashboard)/dashboard/commits/page.tsx b/src/app/(dashboard)/dashboard/commits/page.tsx
new file mode 100644
index 0000000..9bfcdc1
--- /dev/null
+++ b/src/app/(dashboard)/dashboard/commits/page.tsx
@@ -0,0 +1,20 @@
+import Breadcrumb from "@/components/breadcrumb";
+import ToolsTable from "@/components/commits-table/tools-table";
+import { dummyCommits } from "@/constants/data";
+import { Commit } from "@/types/commit";
+import React from "react";
+
+const breadcrumbItems = [
+  { title: "Dashboard", link: "#" },
+  { title: "Commits" },
+];
+const Page = () => {
+  return (
+    <div className="flex-1 space-y-4  p-4 md:p-8 pt-6">
+      <Breadcrumb items={breadcrumbItems} />
+      <ToolsTable commitsData={dummyCommits as Commit[]} />
+    </div>
+  );
+};
+
+export default Page;
diff --git a/src/components/commits-table/cell-action.tsx b/src/components/commits-table/cell-action.tsx
new file mode 100644
index 0000000..5ccdcaf
--- /dev/null
+++ b/src/components/commits-table/cell-action.tsx
@@ -0,0 +1,72 @@
+"use client";
+import { AlertModal } from "@/components/alert-modal";
+import { Button } from "@/components/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { useToast } from "@/components/ui/use-toast";
+import { Commit } from "@/types/commit";
+import { Criteria } from "@/types/criteria";
+import { Evaluation } from "@/types/evaluation";
+import { EvaluationStart } from "@/types/evaluation-start";
+import { Skill } from "@/types/skill";
+
+import { Edit, GitCommit, MoreHorizontal, Trash } from "lucide-react";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+
+interface CellActionProps {
+  data: Commit;
+}
+
+export const CellAction: React.FC<CellActionProps> = ({ data }) => {
+  const [loading, setLoading] = useState(false);
+  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+  const router = useRouter();
+  const { toast } = useToast();
+
+  const onDeleteConfirm = async () => {};
+
+  const handleUpdateStatus = async () => {};
+
+  return (
+    <>
+      <AlertModal
+        isOpen={isDeleteModalOpen}
+        onClose={() => setIsDeleteModalOpen(false)}
+        onConfirm={onDeleteConfirm}
+        loading={loading}
+      />
+      <DropdownMenu modal={false}>
+        <DropdownMenuTrigger asChild>
+          <Button variant="ghost" className="h-8 w-8 p-0">
+            <span className="sr-only">Open menu</span>
+            <MoreHorizontal className="h-4 w-4" />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end">
+          <DropdownMenuLabel>Actions</DropdownMenuLabel>
+
+          <DropdownMenuItem
+            className="cursor-pointer"
+            // onClick={() =>
+            //   router.push(`#`)
+            // }
+          >
+            <Edit className="mr-2 h-4 w-4" /> Edit
+          </DropdownMenuItem>
+          <DropdownMenuItem
+            className="cursor-pointer"
+            onClick={() => setIsDeleteModalOpen(true)}
+          >
+            <Trash className="mr-2 h-4 w-4" /> Delete
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </>
+  );
+};
diff --git a/src/components/commits-table/columns.tsx b/src/components/commits-table/columns.tsx
new file mode 100644
index 0000000..0bed911
--- /dev/null
+++ b/src/components/commits-table/columns.tsx
@@ -0,0 +1,145 @@
+"use client";
+import { DataTableColumnHeader } from "./data-table-column-header";
+import { CellAction } from "./cell-action";
+import { ColumnDef } from "@tanstack/react-table";
+import { Checkbox } from "@/components/ui/checkbox";
+import { formatDate } from "@/lib/format-date";
+import { Evaluation } from "@/types/evaluation";
+import { Commit } from "@/types/commit";
+import {
+  HoverCard,
+  HoverCardContent,
+  HoverCardTrigger,
+} from "../ui/hover-card";
+import { ScrollArea, ScrollBar } from "../ui/scroll-area";
+
+export const columns: ColumnDef<Commit>[] = [
+  {
+    id: "select",
+    header: ({ table }) => (
+      <Checkbox
+        checked={
+          table.getIsAllPageRowsSelected() ||
+          (table.getIsSomePageRowsSelected() && "indeterminate")
+        }
+        onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
+        aria-label="Select all"
+        className="translate-y-[2px]"
+      />
+    ),
+    cell: ({ row }) => (
+      <Checkbox
+        checked={row.getIsSelected()}
+        onCheckedChange={(value) => row.toggleSelected(!!value)}
+        aria-label="Select row"
+        className="translate-y-[2px]"
+      />
+    ),
+    enableSorting: false,
+    enableHiding: false,
+  },
+
+  {
+    accessorKey: "hash",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="HASH" />
+    ),
+    cell: ({ row }) => {
+      return (
+        <div className="w-fit">
+          <HoverCard>
+            <HoverCardTrigger>
+              <p className="max-w-[250px] truncate font-medium">
+                {row.getValue("hash")}
+              </p>
+            </HoverCardTrigger>
+            <HoverCardContent className="p-0">
+              <ScrollArea className="w-64 p-4">
+                <p className="">{row.getValue("hash")}</p>
+                <ScrollBar orientation="horizontal" />
+              </ScrollArea>
+            </HoverCardContent>
+          </HoverCard>
+        </div>
+      );
+    },
+  },
+
+  {
+    accessorKey: "status",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="STATUS" />
+    ),
+    cell: ({ row }) => {
+      return <p>{row.getValue("status")}</p>;
+    },
+    filterFn: (row, id, value) => {
+      return value.includes(row.getValue(id));
+    },
+  },
+
+  {
+    accessorKey: "retryCount",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="RETRY COUNT" />
+    ),
+    cell: ({ row }) => {
+      return <p>{row.getValue("retryCount")}</p>;
+    },
+  },
+
+  {
+    accessorKey: "type",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="TYPE" />
+    ),
+    cell: ({ row }) => {
+      return <p>{row.getValue("type")}</p>;
+    },
+  },
+  {
+    accessorKey: "evaluation",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="EVALUATION" />
+    ),
+    cell: ({ row }) => {
+      return (
+        <div className="w-fit">
+          <HoverCard>
+            <HoverCardTrigger>
+              <p className="max-w-[250px] truncate font-medium">
+                {row.getValue("evaluation")}
+              </p>
+            </HoverCardTrigger>
+            <HoverCardContent>
+              <p className="whitespace-pre-wrap">
+                {row.getValue("evaluation")}
+              </p>
+            </HoverCardContent>
+          </HoverCard>
+        </div>
+      );
+    },
+  },
+
+  {
+    accessorKey: "commitDate",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="COMMIT DATE" />
+    ),
+    cell: ({ row }) => {
+      return <p className="w-fit">{formatDate(row.getValue("commitDate"))}</p>;
+    },
+    filterFn: (row, id, value) => {
+      return value.includes(row.getValue(id));
+    },
+  },
+
+  {
+    id: "actions",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="ACTIONS" />
+    ),
+    cell: ({ row }) => <CellAction data={row.original} />,
+  },
+];
diff --git a/src/components/commits-table/data-table-column-header.tsx b/src/components/commits-table/data-table-column-header.tsx
new file mode 100644
index 0000000..85df45e
--- /dev/null
+++ b/src/components/commits-table/data-table-column-header.tsx
@@ -0,0 +1,72 @@
+import {
+    ArrowDownIcon,
+    ArrowUpIcon,
+    CaretSortIcon,
+    EyeNoneIcon,
+  } from "@radix-ui/react-icons"
+  import { Column } from "@tanstack/react-table"
+  
+  import { cn } from "@/lib/utils"
+  import { Button } from "@/components/ui/button"
+  import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuSeparator,
+    DropdownMenuTrigger,
+  } from "@/components/ui/dropdown-menu"
+  
+  interface DataTableColumnHeaderProps<TData, TValue>
+    extends React.HTMLAttributes<HTMLDivElement> {
+    column: Column<TData, TValue>
+    title: string
+  }
+  
+  export function DataTableColumnHeader<TData, TValue>({
+    column,
+    title,
+    className,
+  }: DataTableColumnHeaderProps<TData, TValue>) {
+    if (!column.getCanSort()) {
+      return <div className={cn(className)}>{title}</div>
+    }
+
+  
+    return (
+      <div className={cn("flex items-center space-x-2", className)}>
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <Button
+              variant="ghost"
+              size="sm"
+              className="-ml-3 h-8 data-[state=open]:bg-accent"
+            >
+              <span>{title}</span>
+              {column.getIsSorted() === "desc" ? (
+                <ArrowDownIcon className="ml-2 h-4 w-4" />
+              ) : column.getIsSorted() === "asc" ? (
+                <ArrowUpIcon className="ml-2 h-4 w-4" />
+              ) : (
+                <CaretSortIcon className="ml-2 h-4 w-4" />
+              )}
+            </Button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="start">
+            <DropdownMenuItem onClick={() => column.toggleSorting(false)}>
+              <ArrowUpIcon className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />
+              Asc
+            </DropdownMenuItem>
+            <DropdownMenuItem onClick={() => column.toggleSorting(true)}>
+              <ArrowDownIcon className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />
+              Desc
+            </DropdownMenuItem>
+            <DropdownMenuSeparator />
+            <DropdownMenuItem onClick={() => column.toggleVisibility(false)}>
+              <EyeNoneIcon className="mr-2 h-3.5 w-3.5 text-muted-foreground/70" />
+              Hide
+            </DropdownMenuItem>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </div>
+    )
+  }
\ No newline at end of file
diff --git a/src/components/commits-table/data-table-faceted-filter.tsx b/src/components/commits-table/data-table-faceted-filter.tsx
new file mode 100644
index 0000000..a5efee2
--- /dev/null
+++ b/src/components/commits-table/data-table-faceted-filter.tsx
@@ -0,0 +1,147 @@
+import * as React from "react"
+import { CheckIcon, PlusCircledIcon } from "@radix-ui/react-icons"
+import { Column } from "@tanstack/react-table"
+
+import { cn } from "@/lib/utils"
+import { Badge } from "@/components/ui/badge"
+import { Button } from "@/components/ui/button"
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+  CommandSeparator,
+} from "@/components/ui/command"
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover"
+import { Separator } from "@/components/ui/separator"
+
+interface DataTableFacetedFilterProps<TData, TValue> {
+  column?: Column<TData, TValue>
+  title?: string
+  options: {
+    label: string
+    value: string
+    icon?: React.ComponentType<{ className?: string }>
+  }[]
+}
+
+export function DataTableFacetedFilter<TData, TValue>({
+  column,
+  title,
+  options,
+}: DataTableFacetedFilterProps<TData, TValue>) {
+  const facets = column?.getFacetedUniqueValues()
+  const selectedValues = new Set(column?.getFilterValue() as string[])
+
+  return (
+    <Popover>
+      <PopoverTrigger asChild>
+        <Button variant="outline" size="sm" className="h-8 border-dashed">
+          <PlusCircledIcon className="mr-2 h-4 w-4" />
+          {title}
+          {selectedValues?.size > 0 && (
+            <>
+              <Separator orientation="vertical" className="mx-2 h-4" />
+              <Badge
+                variant="secondary"
+                className="rounded-sm px-1 font-normal lg:hidden"
+              >
+                {selectedValues.size}
+              </Badge>
+              <div className="hidden space-x-1 lg:flex">
+                {selectedValues.size > 2 ? (
+                  <Badge
+                    variant="secondary"
+                    className="rounded-sm px-1 font-normal"
+                  >
+                    {selectedValues.size} selected
+                  </Badge>
+                ) : (
+                  options
+                    .filter((option) => selectedValues.has(option.value))
+                    .map((option) => (
+                      <Badge
+                        variant="secondary"
+                        key={option.value}
+                        className="rounded-sm px-1 font-normal"
+                      >
+                        {option.label}
+                      </Badge>
+                    ))
+                )}
+              </div>
+            </>
+          )}
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className="w-[200px] p-0" align="start">
+        <Command>
+          <CommandInput placeholder={title} />
+          <CommandList>
+            <CommandEmpty>No results found.</CommandEmpty>
+            <CommandGroup>
+              {options.map((option) => {
+                const isSelected = selectedValues.has(option.value)
+                return (
+                  <CommandItem
+                    key={option.value}
+                    onSelect={() => {
+                      if (isSelected) {
+                        selectedValues.delete(option.value)
+                      } else {
+                        selectedValues.add(option.value)
+                      }
+                      const filterValues = Array.from(selectedValues)
+                      column?.setFilterValue(
+                        filterValues.length ? filterValues : undefined
+                      )
+                    }}
+                  >
+                    <div
+                      className={cn(
+                        "mr-2 flex h-4 w-4 items-center justify-center rounded-sm border border-primary",
+                        isSelected
+                          ? "bg-primary text-primary-foreground"
+                          : "opacity-50 [&_svg]:invisible"
+                      )}
+                    >
+                      <CheckIcon className={cn("h-4 w-4")} />
+                    </div>
+                    {option.icon && (
+                      <option.icon className="mr-2 h-4 w-4 text-muted-foreground" />
+                    )}
+                    <span>{option.label}</span>
+                    {facets?.get(option.value) && (
+                      <span className="ml-auto flex h-4 w-4 items-center justify-center font-mono text-xs">
+                        {facets.get(option.value)}
+                      </span>
+                    )}
+                  </CommandItem>
+                )
+              })}
+            </CommandGroup>
+            {selectedValues.size > 0 && (
+              <>
+                <CommandSeparator />
+                <CommandGroup>
+                  <CommandItem
+                    onSelect={() => column?.setFilterValue(undefined)}
+                    className="justify-center text-center"
+                  >
+                    Clear filters
+                  </CommandItem>
+                </CommandGroup>
+              </>
+            )}
+          </CommandList>
+        </Command>
+      </PopoverContent>
+    </Popover>
+  )
+}
\ No newline at end of file
diff --git a/src/components/commits-table/data-table-pagination.tsx b/src/components/commits-table/data-table-pagination.tsx
new file mode 100644
index 0000000..3c5a1d9
--- /dev/null
+++ b/src/components/commits-table/data-table-pagination.tsx
@@ -0,0 +1,97 @@
+import {
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  DoubleArrowLeftIcon,
+  DoubleArrowRightIcon,
+} from "@radix-ui/react-icons";
+import { Table } from "@tanstack/react-table";
+
+import { Button } from "@/components/ui/button";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+
+interface DataTablePaginationProps<TData> {
+  table: Table<TData>;
+}
+
+export function DataTablePagination<TData>({
+  table,
+}: DataTablePaginationProps<TData>) {
+  return (
+    <div className="grid grid-cols-2 md:grid-cols-[1fr_auto_auto] gap-x-6 gap-y-2">
+      <div className="text-sm text-muted-foreground">
+        {table.getFilteredSelectedRowModel().rows.length} of{" "}
+        {table.getFilteredRowModel().rows.length} row(s) selected.
+      </div>
+      <div className="flex items-center space-x-2">
+        <p className="text-sm font-medium">Rows per page</p>
+        <Select
+          value={`${table.getState().pagination.pageSize}`}
+          onValueChange={(value) => {
+            table.setPageSize(Number(value));
+          }}
+        >
+          <SelectTrigger className="h-8 w-[70px]">
+            <SelectValue placeholder={table.getState().pagination.pageSize} />
+          </SelectTrigger>
+          <SelectContent side="top">
+            {[10, 20, 30, 40, 50].map((pageSize) => (
+              <SelectItem key={pageSize} value={`${pageSize}`}>
+                {pageSize}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+      </div>
+      <div className="flex items-center gap-2">
+        <div className="text-sm font-medium">
+          Page {table.getState().pagination.pageIndex + 1} of{" "}
+          {table.getPageCount()}
+        </div>
+        <div className="flex items-center space-x-2">
+          <Button
+            variant="outline"
+            className="h-8 w-8 p-0 flex"
+            onClick={() => table.setPageIndex(0)}
+            disabled={!table.getCanPreviousPage()}
+          >
+            <span className="sr-only">Go to first page</span>
+            <DoubleArrowLeftIcon className="h-4 w-4" />
+          </Button>
+          <Button
+            variant="outline"
+            className="h-8 w-8 p-0"
+            onClick={() => table.previousPage()}
+            disabled={!table.getCanPreviousPage()}
+          >
+            <span className="sr-only">Go to previous page</span>
+            <ChevronLeftIcon className="h-4 w-4" />
+          </Button>
+          <Button
+            variant="outline"
+            className="h-8 w-8 p-0"
+            onClick={() => table.nextPage()}
+            disabled={!table.getCanNextPage()}
+          >
+            <span className="sr-only">Go to next page</span>
+            <ChevronRightIcon className="h-4 w-4" />
+          </Button>
+          <Button
+            variant="outline"
+            className="h-8 w-8 p-0 flex"
+            onClick={() => table.setPageIndex(table.getPageCount() - 1)}
+            disabled={!table.getCanNextPage()}
+          >
+            <span className="sr-only">Go to last page</span>
+            <DoubleArrowRightIcon className="h-4 w-4" />
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/commits-table/data-table-toolbar.tsx b/src/components/commits-table/data-table-toolbar.tsx
new file mode 100644
index 0000000..adbed42
--- /dev/null
+++ b/src/components/commits-table/data-table-toolbar.tsx
@@ -0,0 +1,78 @@
+"use client";
+
+import { Table } from "@tanstack/react-table";
+import { Input } from "@/components/ui/input";
+import { DataTableViewOptions } from "./data-table-view-options";
+import { DataTableFacetedFilter } from "./data-table-faceted-filter";
+import { Button } from "../ui/button";
+import { Cross2Icon } from "@radix-ui/react-icons";
+import { Commit } from "@/types/commit";
+
+interface DataTableToolbarProps<TData> {
+  table: Table<TData>;
+  data: Commit[];
+}
+
+export function DataTableToolbar<TData>({
+  table,
+  data,
+}: DataTableToolbarProps<TData>) {
+  const isFiltered = table.getState().columnFilters.length > 0;
+
+  const statusFilterOptions = Array.from(
+    new Set(data.map((d) => d.status))
+  ).map((v) => ({
+    label: v,
+    value: v,
+  }));
+
+  return (
+    <div className="flex items-center justify-between">
+      <div className="flex flex-1 items-center gap-2 flex-wrap">
+        <Input
+          placeholder="Search uploader..."
+          value={
+            (table.getColumn("uploaderAccount")?.getFilterValue() as string) ??
+            ""
+          }
+          onChange={(event: any) =>
+            table
+              .getColumn("uploaderAccount")
+              ?.setFilterValue(event.target.value)
+          }
+          className="h-8 w-[150px] lg:w-[250px]"
+        />
+        <Input
+          placeholder="Search developer user..."
+          value={
+            (table.getColumn("developerUser")?.getFilterValue() as string) ?? ""
+          }
+          onChange={(event: any) =>
+            table.getColumn("developerUser")?.setFilterValue(event.target.value)
+          }
+          className="h-8 w-[150px] lg:w-[250px]"
+        />
+
+        {table.getColumn("status") && (
+          <DataTableFacetedFilter
+            column={table.getColumn("status")}
+            title="STATUS"
+            options={statusFilterOptions}
+          />
+        )}
+
+        {isFiltered && (
+          <Button
+            variant="ghost"
+            onClick={() => table.resetColumnFilters()}
+            className="h-8 px-2 lg:px-3"
+          >
+            Reset
+            <Cross2Icon className="ml-2 h-4 w-4" />
+          </Button>
+        )}
+      </div>
+      <DataTableViewOptions table={table} />
+    </div>
+  );
+}
diff --git a/src/components/commits-table/data-table-view-options.tsx b/src/components/commits-table/data-table-view-options.tsx
new file mode 100644
index 0000000..6d56347
--- /dev/null
+++ b/src/components/commits-table/data-table-view-options.tsx
@@ -0,0 +1,59 @@
+"use client"
+
+import { DropdownMenuTrigger } from "@radix-ui/react-dropdown-menu"
+import { MixerHorizontalIcon } from "@radix-ui/react-icons"
+import { Table } from "@tanstack/react-table"
+
+import { Button } from "@/components/ui/button"
+import {
+  DropdownMenu,
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+} from "@/components/ui/dropdown-menu"
+
+interface DataTableViewOptionsProps<TData> {
+  table: Table<TData>
+}
+
+export function DataTableViewOptions<TData>({
+  table,
+}: DataTableViewOptionsProps<TData>) {
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <Button
+          variant="outline"
+          size="sm"
+          className="ml-auto hidden h-8 lg:flex"
+        >
+          <MixerHorizontalIcon className="mr-2 h-4 w-4" />
+          View
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end" className="w-[150px]">
+        <DropdownMenuLabel>Toggle columns</DropdownMenuLabel>
+        <DropdownMenuSeparator />
+        {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>
+  )
+}
\ No newline at end of file
diff --git a/src/components/commits-table/data-table.tsx b/src/components/commits-table/data-table.tsx
new file mode 100644
index 0000000..82c09da
--- /dev/null
+++ b/src/components/commits-table/data-table.tsx
@@ -0,0 +1,133 @@
+"use client";
+
+import * as React from "react";
+import {
+  ColumnDef,
+  ColumnFiltersState,
+  SortingState,
+  VisibilityState,
+  flexRender,
+  getCoreRowModel,
+  getFacetedRowModel,
+  getFacetedUniqueValues,
+  getFilteredRowModel,
+  getPaginationRowModel,
+  getSortedRowModel,
+  useReactTable,
+} from "@tanstack/react-table";
+
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table";
+
+import { DataTablePagination } from "./data-table-pagination";
+import { DataTableToolbar } from "./data-table-toolbar";
+import { ScrollArea, ScrollBar } from "@/components/ui/scroll-area";
+import { Skill } from "@/types/skill";
+import { Evaluation } from "@/types/evaluation";
+import { Commit } from "@/types/commit";
+
+interface DataTableProps<TData, TValue> {
+  columns: ColumnDef<TData, TValue>[];
+  data: TData[];
+}
+
+export function DataTable<TData, TValue>({
+  columns,
+  data,
+}: DataTableProps<TData, TValue>) {
+  const [rowSelection, setRowSelection] = React.useState({});
+  const [columnVisibility, setColumnVisibility] =
+    React.useState<VisibilityState>({});
+  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
+    []
+  );
+  const [sorting, setSorting] = React.useState<SortingState>([]);
+
+  const table = useReactTable({
+    data,
+    columns,
+    state: {
+      sorting,
+      columnVisibility,
+      rowSelection,
+      columnFilters,
+    },
+    enableRowSelection: true,
+    onRowSelectionChange: setRowSelection,
+    onSortingChange: setSorting,
+    onColumnFiltersChange: setColumnFilters,
+    onColumnVisibilityChange: setColumnVisibility,
+    getCoreRowModel: getCoreRowModel(),
+    getFilteredRowModel: getFilteredRowModel(),
+    getPaginationRowModel: getPaginationRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+    getFacetedRowModel: getFacetedRowModel(),
+    getFacetedUniqueValues: getFacetedUniqueValues(),
+  });
+
+  return (
+    <div className="space-y-4">
+      <DataTableToolbar table={table} data={data as Commit[]} />
+      {/* <div className="rounded-md border"> */}
+      <ScrollArea className="rounded-md border h-[66vh]">
+        <Table>
+          <TableHeader>
+            {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>
+            {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>
+        <ScrollBar orientation="horizontal" />
+      </ScrollArea>
+      {/* </div> */}
+      <DataTablePagination table={table} />
+    </div>
+  );
+}
diff --git a/src/components/commits-table/tools-table.tsx b/src/components/commits-table/tools-table.tsx
new file mode 100644
index 0000000..dd80345
--- /dev/null
+++ b/src/components/commits-table/tools-table.tsx
@@ -0,0 +1,39 @@
+"use client";
+
+import { Heading } from "@/components/ui/heading";
+import { Separator } from "@/components/ui/separator";
+import React from "react";
+import { DataTable } from "./data-table";
+import { columns } from "./columns";
+import Link from "next/link";
+import { Plus } from "lucide-react";
+import { buttonVariants } from "@/components/ui/button";
+import { Commit } from "@/types/commit";
+
+const ToolsTable = ({ commitsData }: { commitsData: Commit[] }) => {
+  return (
+    <>
+      <div className="flex items-start justify-between">
+        <Heading
+          title={`Commits (${commitsData.length})`}
+          description="Manage Commits"
+        />
+        <Link
+          href="#"
+          className={buttonVariants({
+            variant: "default",
+            // size: "sm",
+          })}
+          // className="text-xs md:text-sm"
+          // onClick={() => router.push(`/admin-dashboard/tools/add`)}
+        >
+          <Plus className="mr-2 h-4 w-4" /> Add Commit
+        </Link>
+      </div>
+      <Separator />
+      <DataTable data={commitsData} columns={columns} />
+    </>
+  );
+};
+
+export default ToolsTable;
diff --git a/src/components/evaluations-table/columns.tsx b/src/components/evaluations-table/columns.tsx
index d8da10a..2197f47 100644
--- a/src/components/evaluations-table/columns.tsx
+++ b/src/components/evaluations-table/columns.tsx
@@ -40,6 +40,9 @@ export const columns: ColumnDef<Evaluation>[] = [
     cell: ({ row }) => {
       return <p>{row.getValue("status")}</p>;
     },
+    filterFn: (row, id, value) => {
+      return value.includes(row.getValue(id));
+    },
   },
 
   {
diff --git a/src/constants/data.ts b/src/constants/data.ts
index f0e54cf..cb5ec26 100644
--- a/src/constants/data.ts
+++ b/src/constants/data.ts
@@ -1,5 +1,6 @@
 import { Account } from "@/types/account";
 import { ApiCommunication } from "@/types/api-communication";
+import { Commit } from "@/types/commit";
 import { Configuration } from "@/types/configuration";
 import { Criteria } from "@/types/criteria";
 import { Evaluation } from "@/types/evaluation";
@@ -296,3 +297,17 @@ export const dummyEvaluations: Evaluation[] = [
     uploadTime: new Date().toISOString(),
   },
 ];
+
+export const dummyCommits: Commit[] = [
+  {
+    id: 1,
+    hash: "9998211595b05c7f8555e4a129d7792bce7a8dd6_1",
+    status: "skills_extracted",
+    retryCount: 0,
+    type: "code",
+    evaluation:
+      "Uploaded at: 2023-09-20 00:00:00 - Uploader: jschultz@php.net - Developer: fabien@potencier.org - Status: finished",
+    commitDate: new Date().toISOString(),
+    skills: "Skill: PHP - Score: 0",
+  },
+];
diff --git a/src/types/commit.ts b/src/types/commit.ts
new file mode 100644
index 0000000..9c7151f
--- /dev/null
+++ b/src/types/commit.ts
@@ -0,0 +1,10 @@
+export interface Commit {
+    id: number;
+    hash: string;
+    status: string;
+    retryCount: number;
+    type: string;
+    evaluation: string;
+    commitDate: string;
+    skills: string;
+}
\ No newline at end of file