Made buttons and text default shadcdn

Author: brian-kim31

app/next-client-app/app/(protected)/datasets/columns.tsx

@@ -8,7 +8,7 @@ import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
-  DropdownMenuTrigger,
+  DropdownMenuTrigger
 } from "@/components/ui/dropdown-menu";
 import { EyeNoneIcon, EyeOpenIcon, Pencil2Icon } from "@radix-ui/react-icons";
 import { format } from "date-fns/format";
@@ -22,7 +22,7 @@ export const columns: ColumnDef<DataSet>[] = [
       <DataTableColumnHeader column={column} title="ID" sortName="id" />
     ),
     enableHiding: false,
-    enableSorting: true,
+    enableSorting: true
   },
   {
     id: "Name",
@@ -35,12 +35,15 @@ export const columns: ColumnDef<DataSet>[] = [
       const { id, name } = row.original;
       return (
         <Link href={`/datasets/${id}/`}>
-          <Button variant={"link"} className="font-bold">
+          <Button
+            variant="link"
+            className="font-bold text-black dark:text-white"
+          >
             {name}
           </Button>
         </Link>
       );
-    },
+    }
   },
   {
     id: "Data Partner",
@@ -54,7 +57,7 @@ export const columns: ColumnDef<DataSet>[] = [
       />
     ),
     enableHiding: true,
-    enableSorting: true,
+    enableSorting: true
   },
   {
     accessorKey: "visibility",
@@ -66,7 +69,7 @@ export const columns: ColumnDef<DataSet>[] = [
       />
     ),
     enableHiding: true,
-    enableSorting: true,
+    enableSorting: true
   },
 
   {
@@ -84,7 +87,7 @@ export const columns: ColumnDef<DataSet>[] = [
     cell: ({ row }) => {
       const date = new Date(row.original.created_at);
       return format(date, "MMM dd, yyyy h:mm a");
-    },
+    }
   },
   {
     id: "actions",
@@ -111,7 +114,7 @@ export const columns: ColumnDef<DataSet>[] = [
                   id: id,
                   hidden: hidden,
                   ObjName: row.original.name,
-                  type: "datasets",
+                  type: "datasets"
                 })
               }
             >
@@ -132,6 +135,6 @@ export const columns: ColumnDef<DataSet>[] = [
       );
     },
     header: "Actions",
-    enableHiding: false,
-  },
+    enableHiding: false
+  }
 ];

app/next-client-app/app/(protected)/scanreports/[id]/columns.tsx

@@ -22,7 +22,7 @@ export const columns: ColumnDef<ScanReportTable>[] = [
       return (
         <div>
           <Link href={`/scanreports/${scan_report}/tables/${id}`}>
-            <Button variant={"link"} className="font-bold">
+            <Button variant="link" className="font-bold text-black dark:text-white">
               {name}
             </Button>
           </Link>

app/next-client-app/app/(protected)/scanreports/[id]/mapping_rules/columns.tsx

@@ -78,7 +78,7 @@ export const columns: ColumnDef<MappingRule>[] = [
                 <p className="text-destructive">{key}</p>{" "}
                 <ArrowRight size="16px" className="ml-2" />
               </div>
-              <p className="text-success-foreground">
+              <p className="text-success">
                 {term_mapping[key]} {omop_term}
               </p>
             </div>

app/next-client-app/app/(protected)/scanreports/[id]/tables/[tableId]/columns.tsx

@@ -33,7 +33,7 @@ export const columns = (
               prePath.endsWith("/") ? prePath : prePath + "/"
             }fields/${id}`}
           >
-            <Button variant="link" className="font-bold">
+            <Button variant="link" className="font-bold text-black dark:text-white">
               {name}
             </Button>
           </Link>

app/next-client-app/app/(protected)/scanreports/columns.tsx

@@ -44,7 +44,7 @@ export const columns: ColumnDef<ScanReport>[] = [
       const { id, dataset } = row.original;
       return (
         <Link href={`/scanreports/${id}`}>
-          <Button variant={"link"} className="font-bold">
+          <Button variant="link" className="font-bold text-black dark:text-white">
             {dataset}
           </Button>
         </Link>

app/next-client-app/components/scanreports/DeleteDialog.tsx

@@ -6,7 +6,7 @@ import {
   DialogDescription,
   DialogFooter,
   DialogHeader,
-  DialogTitle,
+  DialogTitle
 } from "../ui/dialog";
 import { toast } from "sonner";
 import { Button } from "../ui/button";
@@ -28,7 +28,7 @@ const DeleteDialog = ({
   redirect = false,
   isOpen,
   setOpen = () => {},
-  needTrigger = false,
+  needTrigger = false
 }: DeleteDialogProps) => {
   const router = useRouter();
 
@@ -47,7 +47,7 @@ const DeleteDialog = ({
     <Dialog open={isOpen} onOpenChange={() => setOpen(false)}>
       {needTrigger && (
         <DialogTrigger asChild>
-          <div className="hover:bg-accent text-destructive relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-destructive data-[disabled]:pointer-events-none data-[disabled]:opacity-50">
+          <div className="text-black dark:text-white hover:text-destructive hover:dark:text-destructive hover:bg-accent relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-destructive data-[disabled]:pointer-events-none data-[disabled]:opacity-50">
             <TrashIcon className="mr-2 size-4" />
             Delete Scan Report
           </div>

app/next-client-app/components/scanreports/EditButton.tsx

@@ -11,7 +11,7 @@ export function EditButton({
   type,
   permissions,
   prePath,
-  generalStatus,
+  generalStatus
 }: {
   scanreportId?: number;
   tableId?: number;
@@ -40,6 +40,11 @@ export function EditButton({
       <Button
         variant={type === "table" || type === "field" ? "secondary" : "default"}
         disabled={canEdit ? false : true}
+        className={cn(
+          type === "table" || type === "field"
+            ? "hover:bg-gray-300 dark:hover:bg-gray-700"
+            : "hover:bg-primary/90"
+        )}
       >
         {type === "table" ? "Edit Table" : type === "field" ? "Edit Field" : ""}
         <Pencil className="ml-2 size-4" />

app/next-client-app/components/ui/button.tsx

@@ -1,16 +1,16 @@
-import * as React from "react"
-import { Slot } from "@radix-ui/react-slot"
-import { cva, type VariantProps } from "class-variance-authority"
+import * as React from "react";
+import { Slot } from "@radix-ui/react-slot";
+import { cva, type VariantProps } from "class-variance-authority";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 const buttonVariants = cva(
   "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
   {
     variants: {
       variant: {
         default:
-          "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
+          "bg-black text-white dark:bg-white dark:text-black shadow-xs hover:bg-black/90 dark:hover:bg-white/90",
         destructive:
           "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
         outline:
@@ -19,21 +19,21 @@ const buttonVariants = cva(
           "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
         ghost:
           "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
-        link: "text-primary underline-offset-4 hover:underline",
+        link: "text-primary underline-offset-4 hover:underline"
       },
       size: {
         default: "h-9 px-4 py-2 has-[>svg]:px-3",
         sm: "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5",
         lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
-        icon: "size-9",
-      },
+        icon: "size-9"
+      }
     },
     defaultVariants: {
       variant: "default",
-      size: "default",
-    },
+      size: "default"
+    }
   }
-)
+);
 
 function Button({
   className,
@@ -43,17 +43,17 @@ function Button({
   ...props
 }: React.ComponentProps<"button"> &
   VariantProps<typeof buttonVariants> & {
-    asChild?: boolean
+    asChild?: boolean;
   }) {
-  const Comp = asChild ? Slot : "button"
+  const Comp = asChild ? Slot : "button";
 
   return (
     <Comp
       data-slot="button"
       className={cn(buttonVariants({ variant, size, className }))}
       {...props}
     />
-  )
+  );
 }
 
-export { Button, buttonVariants }
+export { Button, buttonVariants };