diff --git a/src/figma-make/components/base/accordion.tsx b/src/figma-make/components/base/accordion.tsx
new file mode 100644
index 00000000..8ee5962e
--- /dev/null
+++ b/src/figma-make/components/base/accordion.tsx
@@ -0,0 +1,66 @@
+'use client';
+
+import * as React from 'react';
+import * as AccordionPrimitive from '@radix-ui/react-accordion';
+import { ChevronDownIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function Accordion({
+  ...props
+}: React.ComponentProps<typeof AccordionPrimitive.Root>) {
+  return <AccordionPrimitive.Root data-slot='accordion' {...props} />;
+}
+
+function AccordionItem({
+  className,
+  ...props
+}: React.ComponentProps<typeof AccordionPrimitive.Item>) {
+  return (
+    <AccordionPrimitive.Item
+      data-slot='accordion-item'
+      className={cn('border-b last:border-b-0', className)}
+      {...props}
+    />
+  );
+}
+
+function AccordionTrigger({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof AccordionPrimitive.Trigger>) {
+  return (
+    <AccordionPrimitive.Header className='flex'>
+      <AccordionPrimitive.Trigger
+        data-slot='accordion-trigger'
+        className={cn(
+          'focus-visible:border-ring focus-visible:ring-ring/50 flex flex-1 items-start justify-between gap-4 rounded-md py-4 text-left text-sm font-medium transition-all outline-none hover:underline focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 [&[data-state=open]>svg]:rotate-180',
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <ChevronDownIcon className='text-muted-foreground pointer-events-none size-4 shrink-0 translate-y-0.5 transition-transform duration-200' />
+      </AccordionPrimitive.Trigger>
+    </AccordionPrimitive.Header>
+  );
+}
+
+function AccordionContent({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof AccordionPrimitive.Content>) {
+  return (
+    <AccordionPrimitive.Content
+      data-slot='accordion-content'
+      className='data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down overflow-hidden text-sm'
+      {...props}
+    >
+      <div className={cn('pt-0 pb-4', className)}>{children}</div>
+    </AccordionPrimitive.Content>
+  );
+}
+
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };
diff --git a/src/figma-make/components/base/alert-dialog.tsx b/src/figma-make/components/base/alert-dialog.tsx
new file mode 100644
index 00000000..57cb4888
--- /dev/null
+++ b/src/figma-make/components/base/alert-dialog.tsx
@@ -0,0 +1,157 @@
+'use client';
+
+import * as React from 'react';
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
+
+import { cn } from '@/lib/helper';
+import { buttonVariants } from '@/figma-make/components/base/button';
+
+function AlertDialog({
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Root>) {
+  return <AlertDialogPrimitive.Root data-slot='alert-dialog' {...props} />;
+}
+
+function AlertDialogTrigger({
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Trigger>) {
+  return (
+    <AlertDialogPrimitive.Trigger data-slot='alert-dialog-trigger' {...props} />
+  );
+}
+
+function AlertDialogPortal({
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Portal>) {
+  return (
+    <AlertDialogPrimitive.Portal data-slot='alert-dialog-portal' {...props} />
+  );
+}
+
+function AlertDialogOverlay({
+  className,
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Overlay>) {
+  return (
+    <AlertDialogPrimitive.Overlay
+      data-slot='alert-dialog-overlay'
+      className={cn(
+        'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Content>) {
+  return (
+    <AlertDialogPortal>
+      <AlertDialogOverlay />
+      <AlertDialogPrimitive.Content
+        data-slot='alert-dialog-content'
+        className={cn(
+          'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg',
+          className
+        )}
+        {...props}
+      />
+    </AlertDialogPortal>
+  );
+}
+
+function AlertDialogHeader({
+  className,
+  ...props
+}: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='alert-dialog-header'
+      className={cn('flex flex-col gap-2 text-center sm:text-left', className)}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogFooter({
+  className,
+  ...props
+}: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='alert-dialog-footer'
+      className={cn(
+        'flex flex-col-reverse gap-2 sm:flex-row sm:justify-end',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogTitle({
+  className,
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Title>) {
+  return (
+    <AlertDialogPrimitive.Title
+      data-slot='alert-dialog-title'
+      className={cn('text-lg font-semibold', className)}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogDescription({
+  className,
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Description>) {
+  return (
+    <AlertDialogPrimitive.Description
+      data-slot='alert-dialog-description'
+      className={cn('text-muted-foreground text-sm', className)}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogAction({
+  className,
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Action>) {
+  return (
+    <AlertDialogPrimitive.Action
+      className={cn(buttonVariants(), className)}
+      {...props}
+    />
+  );
+}
+
+function AlertDialogCancel({
+  className,
+  ...props
+}: React.ComponentProps<typeof AlertDialogPrimitive.Cancel>) {
+  return (
+    <AlertDialogPrimitive.Cancel
+      className={cn(buttonVariants({ variant: 'outline' }), className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  AlertDialog,
+  AlertDialogPortal,
+  AlertDialogOverlay,
+  AlertDialogTrigger,
+  AlertDialogContent,
+  AlertDialogHeader,
+  AlertDialogFooter,
+  AlertDialogTitle,
+  AlertDialogDescription,
+  AlertDialogAction,
+  AlertDialogCancel,
+};
diff --git a/src/figma-make/components/base/alert.tsx b/src/figma-make/components/base/alert.tsx
new file mode 100644
index 00000000..0bf997df
--- /dev/null
+++ b/src/figma-make/components/base/alert.tsx
@@ -0,0 +1,66 @@
+import * as React from 'react';
+import { cva, type VariantProps } from 'class-variance-authority';
+
+import { cn } from '@/lib/helper';
+
+const alertVariants = cva(
+  'relative w-full rounded-lg border px-4 py-3 text-sm grid has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current',
+  {
+    variants: {
+      variant: {
+        default: 'bg-card text-card-foreground',
+        destructive:
+          'text-destructive bg-card [&>svg]:text-current *:data-[slot=alert-description]:text-destructive/90',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+    },
+  }
+);
+
+function Alert({
+  className,
+  variant,
+  ...props
+}: React.ComponentProps<'div'> & VariantProps<typeof alertVariants>) {
+  return (
+    <div
+      data-slot='alert'
+      role='alert'
+      className={cn(alertVariants({ variant }), className)}
+      {...props}
+    />
+  );
+}
+
+function AlertTitle({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='alert-title'
+      className={cn(
+        'col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AlertDescription({
+  className,
+  ...props
+}: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='alert-description'
+      className={cn(
+        'text-muted-foreground col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Alert, AlertTitle, AlertDescription };
diff --git a/src/figma-make/components/base/aspect-ratio.tsx b/src/figma-make/components/base/aspect-ratio.tsx
new file mode 100644
index 00000000..f43071bd
--- /dev/null
+++ b/src/figma-make/components/base/aspect-ratio.tsx
@@ -0,0 +1,11 @@
+'use client';
+
+import * as AspectRatioPrimitive from '@radix-ui/react-aspect-ratio';
+
+function AspectRatio({
+  ...props
+}: React.ComponentProps<typeof AspectRatioPrimitive.Root>) {
+  return <AspectRatioPrimitive.Root data-slot='aspect-ratio' {...props} />;
+}
+
+export { AspectRatio };
diff --git a/src/figma-make/components/base/avatar.tsx b/src/figma-make/components/base/avatar.tsx
new file mode 100644
index 00000000..3f3be511
--- /dev/null
+++ b/src/figma-make/components/base/avatar.tsx
@@ -0,0 +1,53 @@
+'use client';
+
+import * as React from 'react';
+import * as AvatarPrimitive from '@radix-ui/react-avatar';
+
+import { cn } from '@/lib/helper';
+
+function Avatar({
+  className,
+  ...props
+}: React.ComponentProps<typeof AvatarPrimitive.Root>) {
+  return (
+    <AvatarPrimitive.Root
+      data-slot='avatar'
+      className={cn(
+        'relative flex size-10 shrink-0 overflow-hidden rounded-full',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function AvatarImage({
+  className,
+  ...props
+}: React.ComponentProps<typeof AvatarPrimitive.Image>) {
+  return (
+    <AvatarPrimitive.Image
+      data-slot='avatar-image'
+      className={cn('aspect-square size-full', className)}
+      {...props}
+    />
+  );
+}
+
+function AvatarFallback({
+  className,
+  ...props
+}: React.ComponentProps<typeof AvatarPrimitive.Fallback>) {
+  return (
+    <AvatarPrimitive.Fallback
+      data-slot='avatar-fallback'
+      className={cn(
+        'bg-muted flex size-full items-center justify-center rounded-full',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Avatar, AvatarImage, AvatarFallback };
diff --git a/src/figma-make/components/base/badge.tsx b/src/figma-make/components/base/badge.tsx
new file mode 100644
index 00000000..32aad05e
--- /dev/null
+++ b/src/figma-make/components/base/badge.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { cn } from '@/lib/helper';
+
+export interface BadgeProps extends React.HTMLAttributes<HTMLDivElement> {
+  variant?: 'default' | 'success' | 'secondary' | 'destructive' | 'outline';
+}
+
+function Badge({ className, variant = 'default', ...props }: BadgeProps) {
+  return (
+    <div
+      className={cn(
+        'inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',
+        {
+          'bg-blue-100 text-blue-700': variant === 'default',
+          'bg-green-100 text-green-700': variant === 'success',
+          'bg-gray-100 text-gray-700': variant === 'secondary',
+          'bg-red-100 text-red-700': variant === 'destructive',
+          'border border-gray-200 text-gray-700': variant === 'outline',
+        },
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Badge };
diff --git a/src/figma-make/components/base/breadcrumb.tsx b/src/figma-make/components/base/breadcrumb.tsx
new file mode 100644
index 00000000..f1837b8d
--- /dev/null
+++ b/src/figma-make/components/base/breadcrumb.tsx
@@ -0,0 +1,109 @@
+import * as React from 'react';
+import { Slot } from '@radix-ui/react-slot';
+import { ChevronRight, MoreHorizontal } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function Breadcrumb({ ...props }: React.ComponentProps<'nav'>) {
+  return <nav aria-label='breadcrumb' data-slot='breadcrumb' {...props} />;
+}
+
+function BreadcrumbList({ className, ...props }: React.ComponentProps<'ol'>) {
+  return (
+    <ol
+      data-slot='breadcrumb-list'
+      className={cn(
+        'text-muted-foreground flex flex-wrap items-center gap-1.5 text-sm break-words sm:gap-2.5',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function BreadcrumbItem({ className, ...props }: React.ComponentProps<'li'>) {
+  return (
+    <li
+      data-slot='breadcrumb-item'
+      className={cn('inline-flex items-center gap-1.5', className)}
+      {...props}
+    />
+  );
+}
+
+function BreadcrumbLink({
+  asChild,
+  className,
+  ...props
+}: React.ComponentProps<'a'> & {
+  asChild?: boolean;
+}) {
+  const Comp = asChild ? Slot : 'a';
+
+  return (
+    <Comp
+      data-slot='breadcrumb-link'
+      className={cn('hover:text-foreground transition-colors', className)}
+      {...props}
+    />
+  );
+}
+
+function BreadcrumbPage({ className, ...props }: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot='breadcrumb-page'
+      role='link'
+      aria-disabled='true'
+      aria-current='page'
+      className={cn('text-foreground font-normal', className)}
+      {...props}
+    />
+  );
+}
+
+function BreadcrumbSeparator({
+  children,
+  className,
+  ...props
+}: React.ComponentProps<'li'>) {
+  return (
+    <li
+      data-slot='breadcrumb-separator'
+      role='presentation'
+      aria-hidden='true'
+      className={cn('[&>svg]:size-3.5', className)}
+      {...props}
+    >
+      {children ?? <ChevronRight />}
+    </li>
+  );
+}
+
+function BreadcrumbEllipsis({
+  className,
+  ...props
+}: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot='breadcrumb-ellipsis'
+      role='presentation'
+      aria-hidden='true'
+      className={cn('flex size-9 items-center justify-center', className)}
+      {...props}
+    >
+      <MoreHorizontal className='size-4' />
+      <span className='sr-only'>More</span>
+    </span>
+  );
+}
+
+export {
+  Breadcrumb,
+  BreadcrumbList,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbPage,
+  BreadcrumbSeparator,
+  BreadcrumbEllipsis,
+};
diff --git a/src/figma-make/components/base/button.tsx b/src/figma-make/components/base/button.tsx
new file mode 100644
index 00000000..660e57fd
--- /dev/null
+++ b/src/figma-make/components/base/button.tsx
@@ -0,0 +1,58 @@
+import * as React from 'react';
+import { Slot } from '@radix-ui/react-slot';
+import { cva, type VariantProps } from 'class-variance-authority';
+
+import { cn } from '@/lib/helper';
+
+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 hover:bg-primary/90',
+        destructive:
+          'bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60',
+        outline:
+          'border bg-background text-foreground hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50',
+        secondary:
+          'bg-secondary text-secondary-foreground 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',
+      },
+      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 rounded-md',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+      size: 'default',
+    },
+  }
+);
+
+const Button = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentProps<'button'> &
+    VariantProps<typeof buttonVariants> & {
+      asChild?: boolean;
+    }
+>(({ className, variant, size, asChild = false, ...props }, ref) => {
+  const Comp = asChild ? Slot : 'button';
+
+  return (
+    <Comp
+      ref={ref}
+      data-slot='button'
+      className={cn(buttonVariants({ variant, size, className }))}
+      {...props}
+    />
+  );
+});
+
+Button.displayName = 'Button';
+
+export { Button, buttonVariants };
diff --git a/src/figma-make/components/base/card.tsx b/src/figma-make/components/base/card.tsx
new file mode 100644
index 00000000..038cfcc4
--- /dev/null
+++ b/src/figma-make/components/base/card.tsx
@@ -0,0 +1,92 @@
+import * as React from 'react';
+
+import { cn } from '@/lib/helper';
+
+function Card({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='card'
+      className={cn(
+        'bg-card text-card-foreground flex flex-col gap-6 rounded-xl border',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CardHeader({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='card-header'
+      className={cn(
+        '@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 pt-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CardTitle({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <h4
+      data-slot='card-title'
+      className={cn('leading-none', className)}
+      {...props}
+    />
+  );
+}
+
+function CardDescription({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <p
+      data-slot='card-description'
+      className={cn('text-muted-foreground', className)}
+      {...props}
+    />
+  );
+}
+
+function CardAction({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='card-action'
+      className={cn(
+        'col-start-2 row-span-2 row-start-1 self-start justify-self-end',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CardContent({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='card-content'
+      className={cn('px-6 [&:last-child]:pb-6', className)}
+      {...props}
+    />
+  );
+}
+
+function CardFooter({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='card-footer'
+      className={cn('flex items-center px-6 pb-6 [.border-t]:pt-6', className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  Card,
+  CardHeader,
+  CardFooter,
+  CardTitle,
+  CardAction,
+  CardDescription,
+  CardContent,
+};
diff --git a/src/figma-make/components/base/carousel.tsx b/src/figma-make/components/base/carousel.tsx
new file mode 100644
index 00000000..3eb5ce8e
--- /dev/null
+++ b/src/figma-make/components/base/carousel.tsx
@@ -0,0 +1,241 @@
+'use client';
+
+import * as React from 'react';
+import useEmblaCarousel, {
+  type UseEmblaCarouselType,
+} from 'embla-carousel-react';
+import { ArrowLeft, ArrowRight } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+import { Button } from '@/figma-make/components/base/button';
+
+type CarouselApi = UseEmblaCarouselType[1];
+type UseCarouselParameters = Parameters<typeof useEmblaCarousel>;
+type CarouselOptions = UseCarouselParameters[0];
+type CarouselPlugin = UseCarouselParameters[1];
+
+type CarouselProps = {
+  opts?: CarouselOptions;
+  plugins?: CarouselPlugin;
+  orientation?: 'horizontal' | 'vertical';
+  setApi?: (api: CarouselApi) => void;
+};
+
+type CarouselContextProps = {
+  carouselRef: ReturnType<typeof useEmblaCarousel>[0];
+  api: ReturnType<typeof useEmblaCarousel>[1];
+  scrollPrev: () => void;
+  scrollNext: () => void;
+  canScrollPrev: boolean;
+  canScrollNext: boolean;
+} & CarouselProps;
+
+const CarouselContext = React.createContext<CarouselContextProps | null>(null);
+
+function useCarousel() {
+  const context = React.useContext(CarouselContext);
+
+  if (!context) {
+    throw new Error('useCarousel must be used within a <Carousel />');
+  }
+
+  return context;
+}
+
+function Carousel({
+  orientation = 'horizontal',
+  opts,
+  setApi,
+  plugins,
+  className,
+  children,
+  ...props
+}: React.ComponentProps<'div'> & CarouselProps) {
+  const [carouselRef, api] = useEmblaCarousel(
+    {
+      ...opts,
+      axis: orientation === 'horizontal' ? 'x' : 'y',
+    },
+    plugins
+  );
+  const [canScrollPrev, setCanScrollPrev] = React.useState(false);
+  const [canScrollNext, setCanScrollNext] = React.useState(false);
+
+  const onSelect = React.useCallback((api: CarouselApi) => {
+    if (!api) return;
+    setCanScrollPrev(api.canScrollPrev());
+    setCanScrollNext(api.canScrollNext());
+  }, []);
+
+  const scrollPrev = React.useCallback(() => {
+    api?.scrollPrev();
+  }, [api]);
+
+  const scrollNext = React.useCallback(() => {
+    api?.scrollNext();
+  }, [api]);
+
+  const handleKeyDown = React.useCallback(
+    (event: React.KeyboardEvent<HTMLDivElement>) => {
+      if (event.key === 'ArrowLeft') {
+        event.preventDefault();
+        scrollPrev();
+      } else if (event.key === 'ArrowRight') {
+        event.preventDefault();
+        scrollNext();
+      }
+    },
+    [scrollPrev, scrollNext]
+  );
+
+  React.useEffect(() => {
+    if (!api || !setApi) return;
+    setApi(api);
+  }, [api, setApi]);
+
+  React.useEffect(() => {
+    if (!api) return;
+    onSelect(api);
+    api.on('reInit', onSelect);
+    api.on('select', onSelect);
+
+    return () => {
+      api?.off('select', onSelect);
+    };
+  }, [api, onSelect]);
+
+  return (
+    <CarouselContext.Provider
+      value={{
+        carouselRef,
+        api: api,
+        opts,
+        orientation:
+          orientation || (opts?.axis === 'y' ? 'vertical' : 'horizontal'),
+        scrollPrev,
+        scrollNext,
+        canScrollPrev,
+        canScrollNext,
+      }}
+    >
+      <div
+        onKeyDownCapture={handleKeyDown}
+        className={cn('relative', className)}
+        role='region'
+        aria-roledescription='carousel'
+        data-slot='carousel'
+        {...props}
+      >
+        {children}
+      </div>
+    </CarouselContext.Provider>
+  );
+}
+
+function CarouselContent({ className, ...props }: React.ComponentProps<'div'>) {
+  const { carouselRef, orientation } = useCarousel();
+
+  return (
+    <div
+      ref={carouselRef}
+      className='overflow-hidden'
+      data-slot='carousel-content'
+    >
+      <div
+        className={cn(
+          'flex',
+          orientation === 'horizontal' ? '-ml-4' : '-mt-4 flex-col',
+          className
+        )}
+        {...props}
+      />
+    </div>
+  );
+}
+
+function CarouselItem({ className, ...props }: React.ComponentProps<'div'>) {
+  const { orientation } = useCarousel();
+
+  return (
+    <div
+      role='group'
+      aria-roledescription='slide'
+      data-slot='carousel-item'
+      className={cn(
+        'min-w-0 shrink-0 grow-0 basis-full',
+        orientation === 'horizontal' ? 'pl-4' : 'pt-4',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CarouselPrevious({
+  className,
+  variant = 'outline',
+  size = 'icon',
+  ...props
+}: React.ComponentProps<typeof Button>) {
+  const { orientation, scrollPrev, canScrollPrev } = useCarousel();
+
+  return (
+    <Button
+      data-slot='carousel-previous'
+      variant={variant}
+      size={size}
+      className={cn(
+        'absolute size-8 rounded-full',
+        orientation === 'horizontal'
+          ? 'top-1/2 -left-12 -translate-y-1/2'
+          : '-top-12 left-1/2 -translate-x-1/2 rotate-90',
+        className
+      )}
+      disabled={!canScrollPrev}
+      onClick={scrollPrev}
+      {...props}
+    >
+      <ArrowLeft />
+      <span className='sr-only'>Previous slide</span>
+    </Button>
+  );
+}
+
+function CarouselNext({
+  className,
+  variant = 'outline',
+  size = 'icon',
+  ...props
+}: React.ComponentProps<typeof Button>) {
+  const { orientation, scrollNext, canScrollNext } = useCarousel();
+
+  return (
+    <Button
+      data-slot='carousel-next'
+      variant={variant}
+      size={size}
+      className={cn(
+        'absolute size-8 rounded-full',
+        orientation === 'horizontal'
+          ? 'top-1/2 -right-12 -translate-y-1/2'
+          : '-bottom-12 left-1/2 -translate-x-1/2 rotate-90',
+        className
+      )}
+      disabled={!canScrollNext}
+      onClick={scrollNext}
+      {...props}
+    >
+      <ArrowRight />
+      <span className='sr-only'>Next slide</span>
+    </Button>
+  );
+}
+
+export {
+  type CarouselApi,
+  Carousel,
+  CarouselContent,
+  CarouselItem,
+  CarouselPrevious,
+  CarouselNext,
+};
diff --git a/src/figma-make/components/base/checkbox.tsx b/src/figma-make/components/base/checkbox.tsx
new file mode 100644
index 00000000..930b49fe
--- /dev/null
+++ b/src/figma-make/components/base/checkbox.tsx
@@ -0,0 +1,32 @@
+'use client';
+
+import * as React from 'react';
+import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
+import { CheckIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function Checkbox({
+  className,
+  ...props
+}: React.ComponentProps<typeof CheckboxPrimitive.Root>) {
+  return (
+    <CheckboxPrimitive.Root
+      data-slot='checkbox'
+      className={cn(
+        'peer border bg-input-background dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-[4px] border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50',
+        className
+      )}
+      {...props}
+    >
+      <CheckboxPrimitive.Indicator
+        data-slot='checkbox-indicator'
+        className='flex items-center justify-center text-current transition-none'
+      >
+        <CheckIcon className='size-3.5' />
+      </CheckboxPrimitive.Indicator>
+    </CheckboxPrimitive.Root>
+  );
+}
+
+export { Checkbox };
diff --git a/src/figma-make/components/base/collapsible.tsx b/src/figma-make/components/base/collapsible.tsx
new file mode 100644
index 00000000..3ed0ecd2
--- /dev/null
+++ b/src/figma-make/components/base/collapsible.tsx
@@ -0,0 +1,33 @@
+'use client';
+
+import * as CollapsiblePrimitive from '@radix-ui/react-collapsible';
+
+function Collapsible({
+  ...props
+}: React.ComponentProps<typeof CollapsiblePrimitive.Root>) {
+  return <CollapsiblePrimitive.Root data-slot='collapsible' {...props} />;
+}
+
+function CollapsibleTrigger({
+  ...props
+}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleTrigger>) {
+  return (
+    <CollapsiblePrimitive.CollapsibleTrigger
+      data-slot='collapsible-trigger'
+      {...props}
+    />
+  );
+}
+
+function CollapsibleContent({
+  ...props
+}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleContent>) {
+  return (
+    <CollapsiblePrimitive.CollapsibleContent
+      data-slot='collapsible-content'
+      {...props}
+    />
+  );
+}
+
+export { Collapsible, CollapsibleTrigger, CollapsibleContent };
diff --git a/src/figma-make/components/base/command.tsx b/src/figma-make/components/base/command.tsx
new file mode 100644
index 00000000..90478b0e
--- /dev/null
+++ b/src/figma-make/components/base/command.tsx
@@ -0,0 +1,177 @@
+'use client';
+
+import * as React from 'react';
+import { Command as CommandPrimitive } from 'cmdk';
+import { SearchIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+} from '@/figma-make/components/base/dialog';
+
+function Command({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive>) {
+  return (
+    <CommandPrimitive
+      data-slot='command'
+      className={cn(
+        'bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CommandDialog({
+  title = 'Command Palette',
+  description = 'Search for a command to run...',
+  children,
+  ...props
+}: React.ComponentProps<typeof Dialog> & {
+  title?: string;
+  description?: string;
+}) {
+  return (
+    <Dialog {...props}>
+      <DialogHeader className='sr-only'>
+        <DialogTitle>{title}</DialogTitle>
+        <DialogDescription>{description}</DialogDescription>
+      </DialogHeader>
+      <DialogContent className='overflow-hidden p-0'>
+        <Command className='[&_[cmdk-group-heading]]:text-muted-foreground **:data-[slot=command-input-wrapper]:h-12 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]]:px-2 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5'>
+          {children}
+        </Command>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+function CommandInput({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Input>) {
+  return (
+    <div
+      data-slot='command-input-wrapper'
+      className='flex h-9 items-center gap-2 border-b px-3'
+    >
+      <SearchIcon className='size-4 shrink-0 opacity-50' />
+      <CommandPrimitive.Input
+        data-slot='command-input'
+        className={cn(
+          'placeholder:text-muted-foreground flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-hidden disabled:cursor-not-allowed disabled:opacity-50',
+          className
+        )}
+        {...props}
+      />
+    </div>
+  );
+}
+
+function CommandList({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.List>) {
+  return (
+    <CommandPrimitive.List
+      data-slot='command-list'
+      className={cn(
+        'max-h-[300px] scroll-py-1 overflow-x-hidden overflow-y-auto',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CommandEmpty({
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Empty>) {
+  return (
+    <CommandPrimitive.Empty
+      data-slot='command-empty'
+      className='py-6 text-center text-sm'
+      {...props}
+    />
+  );
+}
+
+function CommandGroup({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Group>) {
+  return (
+    <CommandPrimitive.Group
+      data-slot='command-group'
+      className={cn(
+        'text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden p-1 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CommandSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Separator>) {
+  return (
+    <CommandPrimitive.Separator
+      data-slot='command-separator'
+      className={cn('bg-border -mx-1 h-px', className)}
+      {...props}
+    />
+  );
+}
+
+function CommandItem({
+  className,
+  ...props
+}: React.ComponentProps<typeof CommandPrimitive.Item>) {
+  return (
+    <CommandPrimitive.Item
+      data-slot='command-item'
+      className={cn(
+        "data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function CommandShortcut({
+  className,
+  ...props
+}: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot='command-shortcut'
+      className={cn(
+        'text-muted-foreground ml-auto text-xs tracking-widest',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  Command,
+  CommandDialog,
+  CommandInput,
+  CommandList,
+  CommandEmpty,
+  CommandGroup,
+  CommandItem,
+  CommandShortcut,
+  CommandSeparator,
+};
diff --git a/src/figma-make/components/base/context-menu.tsx b/src/figma-make/components/base/context-menu.tsx
new file mode 100644
index 00000000..c0b924fa
--- /dev/null
+++ b/src/figma-make/components/base/context-menu.tsx
@@ -0,0 +1,252 @@
+'use client';
+
+import * as React from 'react';
+import * as ContextMenuPrimitive from '@radix-ui/react-context-menu';
+import { CheckIcon, ChevronRightIcon, CircleIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function ContextMenu({
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Root>) {
+  return <ContextMenuPrimitive.Root data-slot='context-menu' {...props} />;
+}
+
+function ContextMenuTrigger({
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Trigger>) {
+  return (
+    <ContextMenuPrimitive.Trigger data-slot='context-menu-trigger' {...props} />
+  );
+}
+
+function ContextMenuGroup({
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Group>) {
+  return (
+    <ContextMenuPrimitive.Group data-slot='context-menu-group' {...props} />
+  );
+}
+
+function ContextMenuPortal({
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Portal>) {
+  return (
+    <ContextMenuPrimitive.Portal data-slot='context-menu-portal' {...props} />
+  );
+}
+
+function ContextMenuSub({
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Sub>) {
+  return <ContextMenuPrimitive.Sub data-slot='context-menu-sub' {...props} />;
+}
+
+function ContextMenuRadioGroup({
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.RadioGroup>) {
+  return (
+    <ContextMenuPrimitive.RadioGroup
+      data-slot='context-menu-radio-group'
+      {...props}
+    />
+  );
+}
+
+function ContextMenuSubTrigger({
+  className,
+  inset,
+  children,
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.SubTrigger> & {
+  inset?: boolean;
+}) {
+  return (
+    <ContextMenuPrimitive.SubTrigger
+      data-slot='context-menu-sub-trigger'
+      data-inset={inset}
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronRightIcon className='ml-auto' />
+    </ContextMenuPrimitive.SubTrigger>
+  );
+}
+
+function ContextMenuSubContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.SubContent>) {
+  return (
+    <ContextMenuPrimitive.SubContent
+      data-slot='context-menu-sub-content'
+      className={cn(
+        'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-context-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function ContextMenuContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Content>) {
+  return (
+    <ContextMenuPrimitive.Portal>
+      <ContextMenuPrimitive.Content
+        data-slot='context-menu-content'
+        className={cn(
+          'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-context-menu-content-available-height) min-w-[8rem] origin-(--radix-context-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md',
+          className
+        )}
+        {...props}
+      />
+    </ContextMenuPrimitive.Portal>
+  );
+}
+
+function ContextMenuItem({
+  className,
+  inset,
+  variant = 'default',
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Item> & {
+  inset?: boolean;
+  variant?: 'default' | 'destructive';
+}) {
+  return (
+    <ContextMenuPrimitive.Item
+      data-slot='context-menu-item'
+      data-inset={inset}
+      data-variant={variant}
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function ContextMenuCheckboxItem({
+  className,
+  children,
+  checked,
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.CheckboxItem>) {
+  return (
+    <ContextMenuPrimitive.CheckboxItem
+      data-slot='context-menu-checkbox-item'
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      checked={checked}
+      {...props}
+    >
+      <span className='pointer-events-none absolute left-2 flex size-3.5 items-center justify-center'>
+        <ContextMenuPrimitive.ItemIndicator>
+          <CheckIcon className='size-4' />
+        </ContextMenuPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </ContextMenuPrimitive.CheckboxItem>
+  );
+}
+
+function ContextMenuRadioItem({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.RadioItem>) {
+  return (
+    <ContextMenuPrimitive.RadioItem
+      data-slot='context-menu-radio-item'
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      <span className='pointer-events-none absolute left-2 flex size-3.5 items-center justify-center'>
+        <ContextMenuPrimitive.ItemIndicator>
+          <CircleIcon className='size-2 fill-current' />
+        </ContextMenuPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </ContextMenuPrimitive.RadioItem>
+  );
+}
+
+function ContextMenuLabel({
+  className,
+  inset,
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Label> & {
+  inset?: boolean;
+}) {
+  return (
+    <ContextMenuPrimitive.Label
+      data-slot='context-menu-label'
+      data-inset={inset}
+      className={cn(
+        'text-foreground px-2 py-1.5 text-sm font-medium data-[inset]:pl-8',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function ContextMenuSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Separator>) {
+  return (
+    <ContextMenuPrimitive.Separator
+      data-slot='context-menu-separator'
+      className={cn('bg-border -mx-1 my-1 h-px', className)}
+      {...props}
+    />
+  );
+}
+
+function ContextMenuShortcut({
+  className,
+  ...props
+}: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot='context-menu-shortcut'
+      className={cn(
+        'text-muted-foreground ml-auto text-xs tracking-widest',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  ContextMenu,
+  ContextMenuTrigger,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuCheckboxItem,
+  ContextMenuRadioItem,
+  ContextMenuLabel,
+  ContextMenuSeparator,
+  ContextMenuShortcut,
+  ContextMenuGroup,
+  ContextMenuPortal,
+  ContextMenuSub,
+  ContextMenuSubContent,
+  ContextMenuSubTrigger,
+  ContextMenuRadioGroup,
+};
diff --git a/src/figma-make/components/base/date-picker.tsx b/src/figma-make/components/base/date-picker.tsx
new file mode 100644
index 00000000..abd3414f
--- /dev/null
+++ b/src/figma-make/components/base/date-picker.tsx
@@ -0,0 +1,190 @@
+import * as React from 'react';
+import { useState } from 'react';
+import {
+  ChevronLeft,
+  ChevronRight,
+  Calendar as CalendarIcon,
+} from 'lucide-react';
+import { Button } from '@/figma-make/components/base/button';
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@/figma-make/components/base/popover';
+import { Input } from '@/figma-make/components/base/input';
+import { Label } from '@/figma-make/components/base/label';
+
+interface DatePickerProps {
+  date: string;
+  onDateChange: (date: string) => void;
+  disabled?: boolean;
+  placeholder?: string;
+  formatDisplay?: (date: string) => string;
+}
+
+export function DatePicker({
+  date,
+  onDateChange,
+  disabled = false,
+  placeholder = 'Select date',
+  formatDisplay,
+}: DatePickerProps) {
+  const [open, setOpen] = useState(false);
+  const [currentMonth, setCurrentMonth] = useState(() => {
+    const d = date ? new Date(date) : new Date();
+    return { year: d.getFullYear(), month: d.getMonth() };
+  });
+
+  const defaultFormatDisplay = (dateStr: string) => {
+    if (!dateStr) return placeholder;
+    const d = new Date(dateStr + 'T00:00:00');
+    return d.toLocaleDateString('id-ID', {
+      weekday: 'long',
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric',
+    });
+  };
+
+  const formatDateInput = (dateStr: string) => {
+    if (!dateStr) return '';
+    const d = new Date(dateStr + 'T00:00:00');
+    return d.toLocaleDateString('en-GB', {
+      day: '2-digit',
+      month: '2-digit',
+      year: 'numeric',
+    });
+  };
+
+  const displayFormatter = formatDisplay || defaultFormatDisplay;
+
+  const navigateMonth = (direction: 'prev' | 'next') => {
+    const newDate = new Date(
+      currentMonth.year,
+      currentMonth.month + (direction === 'next' ? 1 : -1)
+    );
+    setCurrentMonth({ year: newDate.getFullYear(), month: newDate.getMonth() });
+  };
+
+  const handleDateSelect = (dateStr: string) => {
+    onDateChange(dateStr);
+    setOpen(false);
+  };
+
+  const handleManualInput = (value: string) => {
+    onDateChange(value);
+    setOpen(false);
+  };
+
+  const renderCalendar = () => {
+    const { year, month } = currentMonth;
+    const firstDay = new Date(year, month, 1).getDay();
+    const adjustedFirstDay = firstDay === 0 ? 6 : firstDay - 1; // Monday = 0
+    const daysInMonth = new Date(year, month + 1, 0).getDate();
+    const monthName = new Date(year, month).toLocaleDateString('en-US', {
+      month: 'long',
+    });
+
+    const days = [];
+
+    // Empty cells before first day
+    for (let i = 0; i < adjustedFirstDay; i++) {
+      days.push(<div key={`empty-${i}`} className='h-9 w-9' />);
+    }
+
+    // Days of the month
+    for (let day = 1; day <= daysInMonth; day++) {
+      const dateStr = `${year}-${String(month + 1).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
+      const isSelected = dateStr === date;
+      const isToday = dateStr === new Date().toISOString().split('T')[0];
+
+      days.push(
+        <button
+          key={day}
+          onClick={() => handleDateSelect(dateStr)}
+          className={`
+            h-9 w-9 rounded-md text-sm font-medium transition-colors
+            ${isSelected ? 'bg-[#0069e0] text-white hover:bg-[#0052b3]' : ''}
+            ${!isSelected && isToday ? 'border border-[#0069e0] text-[#0069e0]' : ''}
+            ${!isSelected && !isToday ? 'hover:bg-gray-100 text-gray-700' : ''}
+          `}
+        >
+          {day}
+        </button>
+      );
+    }
+
+    return (
+      <div className='p-3'>
+        <div className='flex items-center justify-between mb-3'>
+          <button
+            onClick={() => navigateMonth('prev')}
+            className='p-1 hover:bg-gray-100 rounded-md transition-colors'
+          >
+            <ChevronLeft className='w-4 h-4 text-gray-600' />
+          </button>
+          <div className='font-semibold text-sm text-gray-900'>
+            {monthName} {year}
+          </div>
+          <button
+            onClick={() => navigateMonth('next')}
+            className='p-1 hover:bg-gray-100 rounded-md transition-colors'
+          >
+            <ChevronRight className='w-4 h-4 text-gray-600' />
+          </button>
+        </div>
+        <div className='grid grid-cols-7 gap-1 mb-2'>
+          {['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'].map((day) => (
+            <div
+              key={day}
+              className='h-9 w-9 flex items-center justify-center text-xs font-medium text-gray-500'
+            >
+              {day}
+            </div>
+          ))}
+        </div>
+        <div className='grid grid-cols-7 gap-1'>{days}</div>
+      </div>
+    );
+  };
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button
+          variant='outline'
+          disabled={disabled}
+          className='w-full justify-start text-left font-normal border-gray-200 hover:bg-gray-50'
+        >
+          <CalendarIcon className='mr-2 h-4 w-4 text-gray-500' />
+          {date ? (
+            <span className='text-gray-900'>{displayFormatter(date)}</span>
+          ) : (
+            <span className='text-gray-500'>{placeholder}</span>
+          )}
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent
+        className='w-auto p-0 bg-white shadow-lg rounded-xl'
+        align='start'
+      >
+        {renderCalendar()}
+        <div className='p-3 border-t border-gray-200'>
+          <Label
+            htmlFor='manual-date'
+            className='text-xs text-gray-600 mb-1.5 block'
+          >
+            Atau ketik manual (YYYY-MM-DD):
+          </Label>
+          <Input
+            id='manual-date'
+            type='date'
+            value={date}
+            onChange={(e) => handleManualInput(e.target.value)}
+            className='text-sm border-gray-200'
+          />
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/src/figma-make/components/base/date-range-picker.tsx b/src/figma-make/components/base/date-range-picker.tsx
new file mode 100644
index 00000000..d1bca47e
--- /dev/null
+++ b/src/figma-make/components/base/date-range-picker.tsx
@@ -0,0 +1,352 @@
+import * as React from 'react';
+import { useState } from 'react';
+import {
+  ChevronLeft,
+  ChevronRight,
+  Calendar as CalendarIcon,
+} from 'lucide-react';
+import { Button } from '@/figma-make/components/base/button';
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@/figma-make/components/base/popover';
+import { Input } from '@/figma-make/components/base/input';
+
+interface DateRange {
+  from: string;
+  to: string;
+}
+
+interface DateRangePickerProps {
+  dateFrom: string;
+  dateTo: string;
+  onDateChange: (from: string, to: string) => void;
+  disabled?: boolean;
+}
+
+const PRESET_OPTIONS = [
+  { label: 'Last 7 days', value: 'last_7_days' },
+  { label: 'Last 14 Days', value: 'last_14_days' },
+  { label: 'Last 30 Days', value: 'last_30_days' },
+  { label: 'Last 3 months', value: 'last_3_months' },
+  { label: 'Last 12 months', value: 'last_12_months' },
+  { label: 'Month to date', value: 'month_to_date' },
+  { label: 'Quarter to date', value: 'quarter_to_date' },
+  { label: 'All time', value: 'all_time' },
+  { label: 'Custom', value: 'custom' },
+];
+
+export function DateRangePicker({
+  dateFrom,
+  dateTo,
+  onDateChange,
+  disabled = false,
+}: DateRangePickerProps) {
+  const [open, setOpen] = useState(false);
+  const [selectedPreset, setSelectedPreset] = useState('custom');
+  const [tempDateFrom, setTempDateFrom] = useState(dateFrom);
+  const [tempDateTo, setTempDateTo] = useState(dateTo);
+  const [currentMonth1, setCurrentMonth1] = useState(() => {
+    const date = dateFrom ? new Date(dateFrom) : new Date();
+    return { year: date.getFullYear(), month: date.getMonth() };
+  });
+  const [currentMonth2, setCurrentMonth2] = useState(() => {
+    const date = dateFrom ? new Date(dateFrom) : new Date();
+    const nextMonth = new Date(date.getFullYear(), date.getMonth() + 1);
+    return { year: nextMonth.getFullYear(), month: nextMonth.getMonth() };
+  });
+
+  const formatDateDisplay = (dateStr: string) => {
+    if (!dateStr) return 'Select date';
+    const date = new Date(dateStr);
+    return date.toLocaleDateString('en-GB', {
+      day: '2-digit',
+      month: '2-digit',
+      year: 'numeric',
+    });
+  };
+
+  const handlePresetClick = (preset: string) => {
+    setSelectedPreset(preset);
+    const today = new Date();
+    let from = '';
+    let to = today.toISOString().split('T')[0];
+
+    switch (preset) {
+      case 'last_7_days':
+        from = new Date(today.getTime() - 6 * 24 * 60 * 60 * 1000)
+          .toISOString()
+          .split('T')[0];
+        break;
+      case 'last_14_days':
+        from = new Date(today.getTime() - 13 * 24 * 60 * 60 * 1000)
+          .toISOString()
+          .split('T')[0];
+        break;
+      case 'last_30_days':
+        from = new Date(today.getTime() - 29 * 24 * 60 * 60 * 1000)
+          .toISOString()
+          .split('T')[0];
+        break;
+      case 'last_3_months':
+        from = new Date(
+          today.getFullYear(),
+          today.getMonth() - 3,
+          today.getDate()
+        )
+          .toISOString()
+          .split('T')[0];
+        break;
+      case 'last_12_months':
+        from = new Date(
+          today.getFullYear(),
+          today.getMonth() - 12,
+          today.getDate()
+        )
+          .toISOString()
+          .split('T')[0];
+        break;
+      case 'month_to_date':
+        from = new Date(today.getFullYear(), today.getMonth(), 1)
+          .toISOString()
+          .split('T')[0];
+        break;
+      case 'quarter_to_date':
+        const quarter = Math.floor(today.getMonth() / 3);
+        from = new Date(today.getFullYear(), quarter * 3, 1)
+          .toISOString()
+          .split('T')[0];
+        break;
+      case 'all_time':
+        from = '2020-01-01';
+        break;
+      case 'custom':
+        from = tempDateFrom;
+        to = tempDateTo;
+        break;
+    }
+
+    setTempDateFrom(from);
+    setTempDateTo(to);
+  };
+
+  const handleSetDate = () => {
+    onDateChange(tempDateFrom, tempDateTo);
+    setOpen(false);
+  };
+
+  const handleCancel = () => {
+    setTempDateFrom(dateFrom);
+    setTempDateTo(dateTo);
+    setOpen(false);
+  };
+
+  const navigateMonth = (direction: 'prev' | 'next', calendar: 1 | 2) => {
+    if (calendar === 1) {
+      const newDate = new Date(
+        currentMonth1.year,
+        currentMonth1.month + (direction === 'next' ? 1 : -1)
+      );
+      setCurrentMonth1({
+        year: newDate.getFullYear(),
+        month: newDate.getMonth(),
+      });
+    } else {
+      const newDate = new Date(
+        currentMonth2.year,
+        currentMonth2.month + (direction === 'next' ? 1 : -1)
+      );
+      setCurrentMonth2({
+        year: newDate.getFullYear(),
+        month: newDate.getMonth(),
+      });
+    }
+  };
+
+  const renderCalendar = (
+    year: number,
+    month: number,
+    onNavigate: (dir: 'prev' | 'next') => void
+  ) => {
+    const firstDay = new Date(year, month, 1).getDay();
+    const daysInMonth = new Date(year, month + 1, 0).getDate();
+    const monthName = new Date(year, month).toLocaleDateString('en-US', {
+      month: 'long',
+    });
+
+    const days = [];
+    for (let i = 0; i < firstDay; i++) {
+      days.push(<div key={`empty-${i}`} className='h-9 w-9' />);
+    }
+
+    for (let day = 1; day <= daysInMonth; day++) {
+      const dateStr = `${year}-${String(month + 1).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
+      const isInRange =
+        tempDateFrom &&
+        tempDateTo &&
+        dateStr >= tempDateFrom &&
+        dateStr <= tempDateTo;
+      const isStart = dateStr === tempDateFrom;
+      const isEnd = dateStr === tempDateTo;
+      const isToday = dateStr === new Date().toISOString().split('T')[0];
+
+      days.push(
+        <button
+          key={day}
+          onClick={() => {
+            if (selectedPreset !== 'custom') {
+              setSelectedPreset('custom');
+            }
+            if (!tempDateFrom || (tempDateFrom && tempDateTo)) {
+              setTempDateFrom(dateStr);
+              setTempDateTo('');
+            } else {
+              if (dateStr < tempDateFrom) {
+                setTempDateTo(tempDateFrom);
+                setTempDateFrom(dateStr);
+              } else {
+                setTempDateTo(dateStr);
+              }
+            }
+          }}
+          className={`
+            h-9 w-9 rounded-md text-sm font-medium transition-colors
+            ${isStart || isEnd ? 'bg-[#0069e0] text-white hover:bg-[#0052b3]' : ''}
+            ${isInRange && !isStart && !isEnd ? 'bg-blue-50 text-blue-900' : ''}
+            ${!isInRange && !isStart && !isEnd ? 'hover:bg-gray-100 text-gray-700' : ''}
+            ${isToday && !isStart && !isEnd && !isInRange ? 'border border-[#0069e0]' : ''}
+          `}
+        >
+          {day}
+        </button>
+      );
+    }
+
+    return (
+      <div className='p-3'>
+        <div className='flex items-center justify-between mb-3'>
+          <button
+            onClick={() => onNavigate('prev')}
+            className='p-1 hover:bg-gray-100 rounded-md transition-colors'
+          >
+            <ChevronLeft className='w-4 h-4 text-gray-600' />
+          </button>
+          <div className='font-semibold text-sm text-gray-900'>
+            {monthName} {year}
+          </div>
+          <button
+            onClick={() => onNavigate('next')}
+            className='p-1 hover:bg-gray-100 rounded-md transition-colors'
+          >
+            <ChevronRight className='w-4 h-4 text-gray-600' />
+          </button>
+        </div>
+        <div className='grid grid-cols-7 gap-1 mb-2'>
+          {['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'].map((day) => (
+            <div
+              key={day}
+              className='h-9 w-9 flex items-center justify-center text-xs font-medium text-gray-500'
+            >
+              {day}
+            </div>
+          ))}
+        </div>
+        <div className='grid grid-cols-7 gap-1'>{days}</div>
+      </div>
+    );
+  };
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button
+          variant='outline'
+          disabled={disabled}
+          className='justify-start text-left font-normal border-gray-200 hover:bg-gray-50'
+        >
+          <CalendarIcon className='mr-2 h-4 w-4 text-gray-500' />
+          {dateFrom && dateTo ? (
+            <span className='text-gray-900'>
+              {formatDateDisplay(dateFrom)} → {formatDateDisplay(dateTo)}
+            </span>
+          ) : (
+            <span className='text-gray-500'>Select date range</span>
+          )}
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent
+        className='w-auto p-0 bg-white shadow-lg rounded-xl'
+        align='start'
+      >
+        <div className='flex'>
+          {/* Preset Sidebar */}
+          <div className='w-40 border-r border-gray-200 p-3 bg-gray-50'>
+            {PRESET_OPTIONS.map((preset) => (
+              <button
+                key={preset.value}
+                onClick={() => handlePresetClick(preset.value)}
+                className={`
+                  w-full text-left px-3 py-2 rounded-md text-sm transition-colors mb-1
+                  ${
+                    selectedPreset === preset.value
+                      ? 'bg-blue-50 text-blue-900 font-medium'
+                      : 'text-gray-700 hover:bg-gray-100'
+                  }
+                `}
+              >
+                {preset.label}
+              </button>
+            ))}
+          </div>
+
+          {/* Calendar Section */}
+          <div>
+            <div className='flex'>
+              {renderCalendar(currentMonth1.year, currentMonth1.month, (dir) =>
+                navigateMonth(dir, 1)
+              )}
+              {renderCalendar(currentMonth2.year, currentMonth2.month, (dir) =>
+                navigateMonth(dir, 2)
+              )}
+            </div>
+
+            {/* Date Input & Actions */}
+            <div className='border-t border-gray-200 p-4 flex items-center justify-between gap-3'>
+              <div className='flex items-center gap-2'>
+                <Input
+                  type='text'
+                  value={formatDateDisplay(tempDateFrom)}
+                  readOnly
+                  className='w-28 text-sm text-center border-gray-200'
+                />
+                <span className='text-gray-400'>→</span>
+                <Input
+                  type='text'
+                  value={formatDateDisplay(tempDateTo)}
+                  readOnly
+                  className='w-28 text-sm text-center border-gray-200'
+                />
+              </div>
+              <div className='flex gap-2'>
+                <Button
+                  variant='outline'
+                  onClick={handleCancel}
+                  className='border-gray-200'
+                >
+                  Cancel
+                </Button>
+                <Button
+                  onClick={handleSetDate}
+                  className='bg-[#0069e0] hover:bg-[#0052b3] text-white'
+                >
+                  Set Date
+                </Button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/src/figma-make/components/base/dialog.tsx b/src/figma-make/components/base/dialog.tsx
new file mode 100644
index 00000000..ca74ac69
--- /dev/null
+++ b/src/figma-make/components/base/dialog.tsx
@@ -0,0 +1,140 @@
+'use client';
+
+import * as React from 'react';
+import * as DialogPrimitive from '@radix-ui/react-dialog';
+import { XIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function Dialog({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Root>) {
+  return <DialogPrimitive.Root data-slot='dialog' {...props} />;
+}
+
+function DialogTrigger({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Trigger>) {
+  return <DialogPrimitive.Trigger data-slot='dialog-trigger' {...props} />;
+}
+
+function DialogPortal({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Portal>) {
+  return <DialogPrimitive.Portal data-slot='dialog-portal' {...props} />;
+}
+
+function DialogClose({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Close>) {
+  return <DialogPrimitive.Close data-slot='dialog-close' {...props} />;
+}
+
+const DialogOverlay = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Overlay>,
+  React.ComponentProps<typeof DialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => {
+  return (
+    <DialogPrimitive.Overlay
+      ref={ref}
+      data-slot='dialog-overlay'
+      className={cn(
+        'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50',
+        className
+      )}
+      {...props}
+    />
+  );
+});
+
+DialogOverlay.displayName = 'DialogOverlay';
+
+const DialogContent = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Content>,
+  React.ComponentProps<typeof DialogPrimitive.Content>
+>(({ className, children, ...props }, ref) => {
+  return (
+    <DialogPortal data-slot='dialog-portal'>
+      <DialogOverlay />
+      <DialogPrimitive.Content
+        ref={ref}
+        data-slot='dialog-content'
+        className={cn(
+          'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg',
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4">
+          <XIcon />
+          <span className='sr-only'>Close</span>
+        </DialogPrimitive.Close>
+      </DialogPrimitive.Content>
+    </DialogPortal>
+  );
+});
+
+DialogContent.displayName = 'DialogContent';
+
+function DialogHeader({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='dialog-header'
+      className={cn('flex flex-col gap-2 text-center sm:text-left', className)}
+      {...props}
+    />
+  );
+}
+
+function DialogFooter({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='dialog-footer'
+      className={cn(
+        'flex flex-col-reverse gap-2 sm:flex-row sm:justify-end',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function DialogTitle({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Title>) {
+  return (
+    <DialogPrimitive.Title
+      data-slot='dialog-title'
+      className={cn('text-lg leading-none font-semibold', className)}
+      {...props}
+    />
+  );
+}
+
+function DialogDescription({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Description>) {
+  return (
+    <DialogPrimitive.Description
+      data-slot='dialog-description'
+      className={cn('text-muted-foreground text-sm', className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogOverlay,
+  DialogPortal,
+  DialogTitle,
+  DialogTrigger,
+};
diff --git a/src/figma-make/components/base/drawer.tsx b/src/figma-make/components/base/drawer.tsx
new file mode 100644
index 00000000..1a4f2993
--- /dev/null
+++ b/src/figma-make/components/base/drawer.tsx
@@ -0,0 +1,132 @@
+'use client';
+
+import * as React from 'react';
+import { Drawer as DrawerPrimitive } from 'vaul';
+
+import { cn } from '@/lib/helper';
+
+function Drawer({
+  ...props
+}: React.ComponentProps<typeof DrawerPrimitive.Root>) {
+  return <DrawerPrimitive.Root data-slot='drawer' {...props} />;
+}
+
+function DrawerTrigger({
+  ...props
+}: React.ComponentProps<typeof DrawerPrimitive.Trigger>) {
+  return <DrawerPrimitive.Trigger data-slot='drawer-trigger' {...props} />;
+}
+
+function DrawerPortal({
+  ...props
+}: React.ComponentProps<typeof DrawerPrimitive.Portal>) {
+  return <DrawerPrimitive.Portal data-slot='drawer-portal' {...props} />;
+}
+
+function DrawerClose({
+  ...props
+}: React.ComponentProps<typeof DrawerPrimitive.Close>) {
+  return <DrawerPrimitive.Close data-slot='drawer-close' {...props} />;
+}
+
+function DrawerOverlay({
+  className,
+  ...props
+}: React.ComponentProps<typeof DrawerPrimitive.Overlay>) {
+  return (
+    <DrawerPrimitive.Overlay
+      data-slot='drawer-overlay'
+      className={cn(
+        'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function DrawerContent({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof DrawerPrimitive.Content>) {
+  return (
+    <DrawerPortal data-slot='drawer-portal'>
+      <DrawerOverlay />
+      <DrawerPrimitive.Content
+        data-slot='drawer-content'
+        className={cn(
+          'group/drawer-content bg-background fixed z-50 flex h-auto flex-col',
+          'data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:max-h-[80vh] data-[vaul-drawer-direction=top]:rounded-b-lg data-[vaul-drawer-direction=top]:border-b',
+          'data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[80vh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t',
+          'data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-3/4 data-[vaul-drawer-direction=right]:border-l data-[vaul-drawer-direction=right]:sm:max-w-sm',
+          'data-[vaul-drawer-direction=left]:inset-y-0 data-[vaul-drawer-direction=left]:left-0 data-[vaul-drawer-direction=left]:w-3/4 data-[vaul-drawer-direction=left]:border-r data-[vaul-drawer-direction=left]:sm:max-w-sm',
+          className
+        )}
+        {...props}
+      >
+        <div className='bg-muted mx-auto mt-4 hidden h-2 w-[100px] shrink-0 rounded-full group-data-[vaul-drawer-direction=bottom]/drawer-content:block' />
+        {children}
+      </DrawerPrimitive.Content>
+    </DrawerPortal>
+  );
+}
+
+function DrawerHeader({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='drawer-header'
+      className={cn('flex flex-col gap-1.5 p-4', className)}
+      {...props}
+    />
+  );
+}
+
+function DrawerFooter({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='drawer-footer'
+      className={cn('mt-auto flex flex-col gap-2 p-4', className)}
+      {...props}
+    />
+  );
+}
+
+function DrawerTitle({
+  className,
+  ...props
+}: React.ComponentProps<typeof DrawerPrimitive.Title>) {
+  return (
+    <DrawerPrimitive.Title
+      data-slot='drawer-title'
+      className={cn('text-foreground font-semibold', className)}
+      {...props}
+    />
+  );
+}
+
+function DrawerDescription({
+  className,
+  ...props
+}: React.ComponentProps<typeof DrawerPrimitive.Description>) {
+  return (
+    <DrawerPrimitive.Description
+      data-slot='drawer-description'
+      className={cn('text-muted-foreground text-sm', className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  Drawer,
+  DrawerPortal,
+  DrawerOverlay,
+  DrawerTrigger,
+  DrawerClose,
+  DrawerContent,
+  DrawerHeader,
+  DrawerFooter,
+  DrawerTitle,
+  DrawerDescription,
+};
diff --git a/src/figma-make/components/base/dropdown-menu.tsx b/src/figma-make/components/base/dropdown-menu.tsx
new file mode 100644
index 00000000..19154ca2
--- /dev/null
+++ b/src/figma-make/components/base/dropdown-menu.tsx
@@ -0,0 +1,257 @@
+'use client';
+
+import * as React from 'react';
+import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
+import { CheckIcon, ChevronRightIcon, CircleIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function DropdownMenu({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
+  return <DropdownMenuPrimitive.Root data-slot='dropdown-menu' {...props} />;
+}
+
+function DropdownMenuPortal({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>) {
+  return (
+    <DropdownMenuPrimitive.Portal data-slot='dropdown-menu-portal' {...props} />
+  );
+}
+
+function DropdownMenuTrigger({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>) {
+  return (
+    <DropdownMenuPrimitive.Trigger
+      data-slot='dropdown-menu-trigger'
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuContent({
+  className,
+  sideOffset = 4,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
+  return (
+    <DropdownMenuPrimitive.Portal>
+      <DropdownMenuPrimitive.Content
+        data-slot='dropdown-menu-content'
+        sideOffset={sideOffset}
+        className={cn(
+          'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md',
+          className
+        )}
+        {...props}
+      />
+    </DropdownMenuPrimitive.Portal>
+  );
+}
+
+function DropdownMenuGroup({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Group>) {
+  return (
+    <DropdownMenuPrimitive.Group data-slot='dropdown-menu-group' {...props} />
+  );
+}
+
+function DropdownMenuItem({
+  className,
+  inset,
+  variant = 'default',
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
+  inset?: boolean;
+  variant?: 'default' | 'destructive';
+}) {
+  return (
+    <DropdownMenuPrimitive.Item
+      data-slot='dropdown-menu-item'
+      data-inset={inset}
+      data-variant={variant}
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuCheckboxItem({
+  className,
+  children,
+  checked,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem>) {
+  return (
+    <DropdownMenuPrimitive.CheckboxItem
+      data-slot='dropdown-menu-checkbox-item'
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      checked={checked}
+      {...props}
+    >
+      <span className='pointer-events-none absolute left-2 flex size-3.5 items-center justify-center'>
+        <DropdownMenuPrimitive.ItemIndicator>
+          <CheckIcon className='size-4' />
+        </DropdownMenuPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </DropdownMenuPrimitive.CheckboxItem>
+  );
+}
+
+function DropdownMenuRadioGroup({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioGroup>) {
+  return (
+    <DropdownMenuPrimitive.RadioGroup
+      data-slot='dropdown-menu-radio-group'
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuRadioItem({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem>) {
+  return (
+    <DropdownMenuPrimitive.RadioItem
+      data-slot='dropdown-menu-radio-item'
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      <span className='pointer-events-none absolute left-2 flex size-3.5 items-center justify-center'>
+        <DropdownMenuPrimitive.ItemIndicator>
+          <CircleIcon className='size-2 fill-current' />
+        </DropdownMenuPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </DropdownMenuPrimitive.RadioItem>
+  );
+}
+
+function DropdownMenuLabel({
+  className,
+  inset,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {
+  inset?: boolean;
+}) {
+  return (
+    <DropdownMenuPrimitive.Label
+      data-slot='dropdown-menu-label'
+      data-inset={inset}
+      className={cn(
+        'px-2 py-1.5 text-sm font-medium data-[inset]:pl-8',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Separator>) {
+  return (
+    <DropdownMenuPrimitive.Separator
+      data-slot='dropdown-menu-separator'
+      className={cn('bg-border -mx-1 my-1 h-px', className)}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuShortcut({
+  className,
+  ...props
+}: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot='dropdown-menu-shortcut'
+      className={cn(
+        'text-muted-foreground ml-auto text-xs tracking-widest',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuSub({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {
+  return <DropdownMenuPrimitive.Sub data-slot='dropdown-menu-sub' {...props} />;
+}
+
+function DropdownMenuSubTrigger({
+  className,
+  inset,
+  children,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
+  inset?: boolean;
+}) {
+  return (
+    <DropdownMenuPrimitive.SubTrigger
+      data-slot='dropdown-menu-sub-trigger'
+      data-inset={inset}
+      className={cn(
+        'focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8',
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronRightIcon className='ml-auto size-4' />
+    </DropdownMenuPrimitive.SubTrigger>
+  );
+}
+
+function DropdownMenuSubContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
+  return (
+    <DropdownMenuPrimitive.SubContent
+      data-slot='dropdown-menu-sub-content'
+      className={cn(
+        'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  DropdownMenu,
+  DropdownMenuPortal,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuLabel,
+  DropdownMenuItem,
+  DropdownMenuCheckboxItem,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut,
+  DropdownMenuSub,
+  DropdownMenuSubTrigger,
+  DropdownMenuSubContent,
+};
diff --git a/src/figma-make/components/base/form.tsx b/src/figma-make/components/base/form.tsx
new file mode 100644
index 00000000..436cd098
--- /dev/null
+++ b/src/figma-make/components/base/form.tsx
@@ -0,0 +1,168 @@
+'use client';
+
+import * as React from 'react';
+import * as LabelPrimitive from '@radix-ui/react-label';
+import { Slot } from '@radix-ui/react-slot';
+import {
+  Controller,
+  FormProvider,
+  useFormContext,
+  useFormState,
+  type ControllerProps,
+  type FieldPath,
+  type FieldValues,
+} from 'react-hook-form';
+
+import { cn } from '@/lib/helper';
+import { Label } from '@/figma-make/components/base/label';
+
+const Form = FormProvider;
+
+type FormFieldContextValue<
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
+> = {
+  name: TName;
+};
+
+const FormFieldContext = React.createContext<FormFieldContextValue>(
+  {} as FormFieldContextValue
+);
+
+const FormField = <
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
+>({
+  ...props
+}: ControllerProps<TFieldValues, TName>) => {
+  return (
+    <FormFieldContext.Provider value={{ name: props.name }}>
+      <Controller {...props} />
+    </FormFieldContext.Provider>
+  );
+};
+
+const useFormField = () => {
+  const fieldContext = React.useContext(FormFieldContext);
+  const itemContext = React.useContext(FormItemContext);
+  const { getFieldState } = useFormContext();
+  const formState = useFormState({ name: fieldContext.name });
+  const fieldState = getFieldState(fieldContext.name, formState);
+
+  if (!fieldContext) {
+    throw new Error('useFormField should be used within <FormField>');
+  }
+
+  const { id } = itemContext;
+
+  return {
+    id,
+    name: fieldContext.name,
+    formItemId: `${id}-form-item`,
+    formDescriptionId: `${id}-form-item-description`,
+    formMessageId: `${id}-form-item-message`,
+    ...fieldState,
+  };
+};
+
+type FormItemContextValue = {
+  id: string;
+};
+
+const FormItemContext = React.createContext<FormItemContextValue>(
+  {} as FormItemContextValue
+);
+
+function FormItem({ className, ...props }: React.ComponentProps<'div'>) {
+  const id = React.useId();
+
+  return (
+    <FormItemContext.Provider value={{ id }}>
+      <div
+        data-slot='form-item'
+        className={cn('grid gap-2', className)}
+        {...props}
+      />
+    </FormItemContext.Provider>
+  );
+}
+
+function FormLabel({
+  className,
+  ...props
+}: React.ComponentProps<typeof LabelPrimitive.Root>) {
+  const { error, formItemId } = useFormField();
+
+  return (
+    <Label
+      data-slot='form-label'
+      data-error={!!error}
+      className={cn('data-[error=true]:text-destructive', className)}
+      htmlFor={formItemId}
+      {...props}
+    />
+  );
+}
+
+function FormControl({ ...props }: React.ComponentProps<typeof Slot>) {
+  const { error, formItemId, formDescriptionId, formMessageId } =
+    useFormField();
+
+  return (
+    <Slot
+      data-slot='form-control'
+      id={formItemId}
+      aria-describedby={
+        !error
+          ? `${formDescriptionId}`
+          : `${formDescriptionId} ${formMessageId}`
+      }
+      aria-invalid={!!error}
+      {...props}
+    />
+  );
+}
+
+function FormDescription({ className, ...props }: React.ComponentProps<'p'>) {
+  const { formDescriptionId } = useFormField();
+
+  return (
+    <p
+      data-slot='form-description'
+      id={formDescriptionId}
+      className={cn('text-muted-foreground text-sm', className)}
+      {...props}
+    />
+  );
+}
+
+function FormMessage({ className, ...props }: React.ComponentProps<'p'>) {
+  const { error, formMessageId } = useFormField();
+  const body = error ? String(error?.message ?? '') : props.children;
+
+  if (!body) {
+    return null;
+  }
+
+  return (
+    <p
+      data-slot='form-message'
+      id={formMessageId}
+      className={cn('text-destructive text-sm', className)}
+      {...props}
+    >
+      {body}
+    </p>
+  );
+}
+
+export {
+  useFormField,
+  Form,
+  FormItem,
+  FormLabel,
+  FormControl,
+  FormDescription,
+  FormMessage,
+  FormField,
+};
diff --git a/src/figma-make/components/base/hover-card.tsx b/src/figma-make/components/base/hover-card.tsx
new file mode 100644
index 00000000..4bd77faf
--- /dev/null
+++ b/src/figma-make/components/base/hover-card.tsx
@@ -0,0 +1,44 @@
+'use client';
+
+import * as React from 'react';
+import * as HoverCardPrimitive from '@radix-ui/react-hover-card';
+
+import { cn } from '@/lib/helper';
+
+function HoverCard({
+  ...props
+}: React.ComponentProps<typeof HoverCardPrimitive.Root>) {
+  return <HoverCardPrimitive.Root data-slot='hover-card' {...props} />;
+}
+
+function HoverCardTrigger({
+  ...props
+}: React.ComponentProps<typeof HoverCardPrimitive.Trigger>) {
+  return (
+    <HoverCardPrimitive.Trigger data-slot='hover-card-trigger' {...props} />
+  );
+}
+
+function HoverCardContent({
+  className,
+  align = 'center',
+  sideOffset = 4,
+  ...props
+}: React.ComponentProps<typeof HoverCardPrimitive.Content>) {
+  return (
+    <HoverCardPrimitive.Portal data-slot='hover-card-portal'>
+      <HoverCardPrimitive.Content
+        data-slot='hover-card-content'
+        align={align}
+        sideOffset={sideOffset}
+        className={cn(
+          'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-64 origin-(--radix-hover-card-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden',
+          className
+        )}
+        {...props}
+      />
+    </HoverCardPrimitive.Portal>
+  );
+}
+
+export { HoverCard, HoverCardTrigger, HoverCardContent };
diff --git a/src/figma-make/components/base/input-otp.tsx b/src/figma-make/components/base/input-otp.tsx
new file mode 100644
index 00000000..5aa46d3b
--- /dev/null
+++ b/src/figma-make/components/base/input-otp.tsx
@@ -0,0 +1,77 @@
+'use client';
+
+import * as React from 'react';
+import { OTPInput, OTPInputContext } from 'input-otp';
+import { MinusIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function InputOTP({
+  className,
+  containerClassName,
+  ...props
+}: React.ComponentProps<typeof OTPInput> & {
+  containerClassName?: string;
+}) {
+  return (
+    <OTPInput
+      data-slot='input-otp'
+      containerClassName={cn(
+        'flex items-center gap-2 has-disabled:opacity-50',
+        containerClassName
+      )}
+      className={cn('disabled:cursor-not-allowed', className)}
+      {...props}
+    />
+  );
+}
+
+function InputOTPGroup({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='input-otp-group'
+      className={cn('flex items-center gap-1', className)}
+      {...props}
+    />
+  );
+}
+
+function InputOTPSlot({
+  index,
+  className,
+  ...props
+}: React.ComponentProps<'div'> & {
+  index: number;
+}) {
+  const inputOTPContext = React.useContext(OTPInputContext);
+  const { char, hasFakeCaret, isActive } = inputOTPContext?.slots[index] ?? {};
+
+  return (
+    <div
+      data-slot='input-otp-slot'
+      data-active={isActive}
+      className={cn(
+        'data-[active=true]:border-ring data-[active=true]:ring-ring/50 data-[active=true]:aria-invalid:ring-destructive/20 dark:data-[active=true]:aria-invalid:ring-destructive/40 aria-invalid:border-destructive data-[active=true]:aria-invalid:border-destructive dark:bg-input/30 border-input relative flex h-9 w-9 items-center justify-center border-y border-r text-sm bg-input-background transition-all outline-none first:rounded-l-md first:border-l last:rounded-r-md data-[active=true]:z-10 data-[active=true]:ring-[3px]',
+        className
+      )}
+      {...props}
+    >
+      {char}
+      {hasFakeCaret && (
+        <div className='pointer-events-none absolute inset-0 flex items-center justify-center'>
+          <div className='animate-caret-blink bg-foreground h-4 w-px duration-1000' />
+        </div>
+      )}
+    </div>
+  );
+}
+
+function InputOTPSeparator({ ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div data-slot='input-otp-separator' role='separator' {...props}>
+      <MinusIcon />
+    </div>
+  );
+}
+
+export { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator };
diff --git a/src/figma-make/components/base/input.tsx b/src/figma-make/components/base/input.tsx
new file mode 100644
index 00000000..e5f7a94d
--- /dev/null
+++ b/src/figma-make/components/base/input.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react';
+
+import { cn } from '@/lib/helper';
+
+function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
+  return (
+    <input
+      type={type}
+      data-slot='input'
+      className={cn(
+        'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border px-3 py-1 text-base bg-input-background transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+        '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',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Input };
diff --git a/src/figma-make/components/base/label.tsx b/src/figma-make/components/base/label.tsx
new file mode 100644
index 00000000..7d5226ae
--- /dev/null
+++ b/src/figma-make/components/base/label.tsx
@@ -0,0 +1,24 @@
+'use client';
+
+import * as React from 'react';
+import * as LabelPrimitive from '@radix-ui/react-label';
+
+import { cn } from '@/lib/helper';
+
+function Label({
+  className,
+  ...props
+}: React.ComponentProps<typeof LabelPrimitive.Root>) {
+  return (
+    <LabelPrimitive.Root
+      data-slot='label'
+      className={cn(
+        'flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Label };
diff --git a/src/figma-make/components/base/menubar.tsx b/src/figma-make/components/base/menubar.tsx
new file mode 100644
index 00000000..fec5a59c
--- /dev/null
+++ b/src/figma-make/components/base/menubar.tsx
@@ -0,0 +1,276 @@
+'use client';
+
+import * as React from 'react';
+import * as MenubarPrimitive from '@radix-ui/react-menubar';
+import { CheckIcon, ChevronRightIcon, CircleIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function Menubar({
+  className,
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Root>) {
+  return (
+    <MenubarPrimitive.Root
+      data-slot='menubar'
+      className={cn(
+        'bg-background flex h-9 items-center gap-1 rounded-md border p-1 shadow-xs',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function MenubarMenu({
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Menu>) {
+  return <MenubarPrimitive.Menu data-slot='menubar-menu' {...props} />;
+}
+
+function MenubarGroup({
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Group>) {
+  return <MenubarPrimitive.Group data-slot='menubar-group' {...props} />;
+}
+
+function MenubarPortal({
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Portal>) {
+  return <MenubarPrimitive.Portal data-slot='menubar-portal' {...props} />;
+}
+
+function MenubarRadioGroup({
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.RadioGroup>) {
+  return (
+    <MenubarPrimitive.RadioGroup data-slot='menubar-radio-group' {...props} />
+  );
+}
+
+function MenubarTrigger({
+  className,
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Trigger>) {
+  return (
+    <MenubarPrimitive.Trigger
+      data-slot='menubar-trigger'
+      className={cn(
+        'focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex items-center rounded-sm px-2 py-1 text-sm font-medium outline-hidden select-none',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function MenubarContent({
+  className,
+  align = 'start',
+  alignOffset = -4,
+  sideOffset = 8,
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Content>) {
+  return (
+    <MenubarPortal>
+      <MenubarPrimitive.Content
+        data-slot='menubar-content'
+        align={align}
+        alignOffset={alignOffset}
+        sideOffset={sideOffset}
+        className={cn(
+          'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[12rem] origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-md',
+          className
+        )}
+        {...props}
+      />
+    </MenubarPortal>
+  );
+}
+
+function MenubarItem({
+  className,
+  inset,
+  variant = 'default',
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Item> & {
+  inset?: boolean;
+  variant?: 'default' | 'destructive';
+}) {
+  return (
+    <MenubarPrimitive.Item
+      data-slot='menubar-item'
+      data-inset={inset}
+      data-variant={variant}
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function MenubarCheckboxItem({
+  className,
+  children,
+  checked,
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.CheckboxItem>) {
+  return (
+    <MenubarPrimitive.CheckboxItem
+      data-slot='menubar-checkbox-item'
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-xs py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      checked={checked}
+      {...props}
+    >
+      <span className='pointer-events-none absolute left-2 flex size-3.5 items-center justify-center'>
+        <MenubarPrimitive.ItemIndicator>
+          <CheckIcon className='size-4' />
+        </MenubarPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </MenubarPrimitive.CheckboxItem>
+  );
+}
+
+function MenubarRadioItem({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.RadioItem>) {
+  return (
+    <MenubarPrimitive.RadioItem
+      data-slot='menubar-radio-item'
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-xs py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      <span className='pointer-events-none absolute left-2 flex size-3.5 items-center justify-center'>
+        <MenubarPrimitive.ItemIndicator>
+          <CircleIcon className='size-2 fill-current' />
+        </MenubarPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </MenubarPrimitive.RadioItem>
+  );
+}
+
+function MenubarLabel({
+  className,
+  inset,
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Label> & {
+  inset?: boolean;
+}) {
+  return (
+    <MenubarPrimitive.Label
+      data-slot='menubar-label'
+      data-inset={inset}
+      className={cn(
+        'px-2 py-1.5 text-sm font-medium data-[inset]:pl-8',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function MenubarSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Separator>) {
+  return (
+    <MenubarPrimitive.Separator
+      data-slot='menubar-separator'
+      className={cn('bg-border -mx-1 my-1 h-px', className)}
+      {...props}
+    />
+  );
+}
+
+function MenubarShortcut({
+  className,
+  ...props
+}: React.ComponentProps<'span'>) {
+  return (
+    <span
+      data-slot='menubar-shortcut'
+      className={cn(
+        'text-muted-foreground ml-auto text-xs tracking-widest',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function MenubarSub({
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.Sub>) {
+  return <MenubarPrimitive.Sub data-slot='menubar-sub' {...props} />;
+}
+
+function MenubarSubTrigger({
+  className,
+  inset,
+  children,
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.SubTrigger> & {
+  inset?: boolean;
+}) {
+  return (
+    <MenubarPrimitive.SubTrigger
+      data-slot='menubar-sub-trigger'
+      data-inset={inset}
+      className={cn(
+        'focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-none select-none data-[inset]:pl-8',
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronRightIcon className='ml-auto h-4 w-4' />
+    </MenubarPrimitive.SubTrigger>
+  );
+}
+
+function MenubarSubContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof MenubarPrimitive.SubContent>) {
+  return (
+    <MenubarPrimitive.SubContent
+      data-slot='menubar-sub-content'
+      className={cn(
+        'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  Menubar,
+  MenubarPortal,
+  MenubarMenu,
+  MenubarTrigger,
+  MenubarContent,
+  MenubarGroup,
+  MenubarSeparator,
+  MenubarLabel,
+  MenubarItem,
+  MenubarShortcut,
+  MenubarCheckboxItem,
+  MenubarRadioGroup,
+  MenubarRadioItem,
+  MenubarSub,
+  MenubarSubTrigger,
+  MenubarSubContent,
+};
diff --git a/src/figma-make/components/base/multi-select.tsx b/src/figma-make/components/base/multi-select.tsx
new file mode 100644
index 00000000..e41fa5b2
--- /dev/null
+++ b/src/figma-make/components/base/multi-select.tsx
@@ -0,0 +1,143 @@
+'use client';
+
+import * as React from 'react';
+import { Check, ChevronsUpDown, X } from 'lucide-react';
+import { cn } from '@/lib/helper';
+import { Button } from '@/figma-make/components/base/button';
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from '@/figma-make/components/base/command';
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@/figma-make/components/base/popover';
+import { Badge } from '@/figma-make/components/base/badge';
+
+export interface Option {
+  value: string;
+  label: string;
+}
+
+interface MultiSelectProps {
+  options: Option[];
+  selected: string[];
+  onChange: (selected: string[]) => void;
+  onSearchChange?: (value: string) => void;
+  placeholder?: string;
+  className?: string;
+  disabled?: boolean;
+}
+
+export function MultiSelect({
+  options,
+  selected,
+  onChange,
+  onSearchChange,
+  placeholder = 'Select items...',
+  className,
+  disabled,
+}: MultiSelectProps) {
+  const [open, setOpen] = React.useState(false);
+
+  const handleUnselect = (item: string) => {
+    onChange(selected.filter((i) => i !== item));
+  };
+
+  const handleSelect = (item: string) => {
+    if (selected.includes(item)) {
+      handleUnselect(item);
+    } else {
+      onChange([...selected, item]);
+    }
+  };
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button
+          variant='outline'
+          role='combobox'
+          aria-expanded={open}
+          className={cn(
+            'w-full justify-between items-center h-auto min-h-9 py-2 px-3',
+            className
+          )}
+          disabled={disabled}
+        >
+          <div className='flex flex-wrap gap-1'>
+            {selected.length > 0 ? (
+              selected.map((item) => {
+                const option = options.find((o) => o.value === item);
+                return (
+                  <Badge variant='outline' key={item} className='mr-1 mb-1'>
+                    {option?.label || item}
+                    <div
+                      className='ml-1 ring-offset-background rounded-full outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 cursor-pointer'
+                      onKeyDown={(e) => {
+                        if (e.key === 'Enter') {
+                          handleUnselect(item);
+                        }
+                      }}
+                      onMouseDown={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                      }}
+                      onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        handleUnselect(item);
+                      }}
+                    >
+                      <X className='h-3 w-3 text-muted-foreground hover:text-foreground' />
+                    </div>
+                  </Badge>
+                );
+              })
+            ) : (
+              <span className='text-muted-foreground font-normal'>
+                {placeholder}
+              </span>
+            )}
+          </div>
+          <ChevronsUpDown className='ml-2 h-4 w-4 shrink-0 opacity-50' />
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className='w-full p-0' align='start'>
+        <Command>
+          <CommandInput
+            placeholder={`Search ${placeholder.toLowerCase()}...`}
+            onValueChange={onSearchChange}
+          />
+          <CommandEmpty>No item found.</CommandEmpty>
+          <CommandList>
+            <CommandGroup className='max-h-64 overflow-auto'>
+              {options.map((option) => (
+                <CommandItem
+                  key={option.value}
+                  onSelect={() => handleSelect(option.value)}
+                  className='cursor-pointer'
+                >
+                  <Check
+                    className={cn(
+                      'mr-2 h-4 w-4',
+                      selected.includes(option.value)
+                        ? 'opacity-100'
+                        : 'opacity-0'
+                    )}
+                  />
+                  {option.label}
+                </CommandItem>
+              ))}
+            </CommandGroup>
+          </CommandList>
+        </Command>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/src/figma-make/components/base/navigation-menu.tsx b/src/figma-make/components/base/navigation-menu.tsx
new file mode 100644
index 00000000..d70640d6
--- /dev/null
+++ b/src/figma-make/components/base/navigation-menu.tsx
@@ -0,0 +1,168 @@
+import * as React from 'react';
+import * as NavigationMenuPrimitive from '@radix-ui/react-navigation-menu';
+import { cva } from 'class-variance-authority';
+import { ChevronDownIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function NavigationMenu({
+  className,
+  children,
+  viewport = true,
+  ...props
+}: React.ComponentProps<typeof NavigationMenuPrimitive.Root> & {
+  viewport?: boolean;
+}) {
+  return (
+    <NavigationMenuPrimitive.Root
+      data-slot='navigation-menu'
+      data-viewport={viewport}
+      className={cn(
+        'group/navigation-menu relative flex max-w-max flex-1 items-center justify-center',
+        className
+      )}
+      {...props}
+    >
+      {children}
+      {viewport && <NavigationMenuViewport />}
+    </NavigationMenuPrimitive.Root>
+  );
+}
+
+function NavigationMenuList({
+  className,
+  ...props
+}: React.ComponentProps<typeof NavigationMenuPrimitive.List>) {
+  return (
+    <NavigationMenuPrimitive.List
+      data-slot='navigation-menu-list'
+      className={cn(
+        'group flex flex-1 list-none items-center justify-center gap-1',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function NavigationMenuItem({
+  className,
+  ...props
+}: React.ComponentProps<typeof NavigationMenuPrimitive.Item>) {
+  return (
+    <NavigationMenuPrimitive.Item
+      data-slot='navigation-menu-item'
+      className={cn('relative', className)}
+      {...props}
+    />
+  );
+}
+
+const navigationMenuTriggerStyle = cva(
+  'group inline-flex h-9 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=open]:hover:bg-accent data-[state=open]:text-accent-foreground data-[state=open]:focus:bg-accent data-[state=open]:bg-accent/50 focus-visible:ring-ring/50 outline-none transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1'
+);
+
+function NavigationMenuTrigger({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof NavigationMenuPrimitive.Trigger>) {
+  return (
+    <NavigationMenuPrimitive.Trigger
+      data-slot='navigation-menu-trigger'
+      className={cn(navigationMenuTriggerStyle(), 'group', className)}
+      {...props}
+    >
+      {children}{' '}
+      <ChevronDownIcon
+        className='relative top-[1px] ml-1 size-3 transition duration-300 group-data-[state=open]:rotate-180'
+        aria-hidden='true'
+      />
+    </NavigationMenuPrimitive.Trigger>
+  );
+}
+
+function NavigationMenuContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof NavigationMenuPrimitive.Content>) {
+  return (
+    <NavigationMenuPrimitive.Content
+      data-slot='navigation-menu-content'
+      className={cn(
+        'data-[motion^=from-]:animate-in data-[motion^=to-]:animate-out data-[motion^=from-]:fade-in data-[motion^=to-]:fade-out data-[motion=from-end]:slide-in-from-right-52 data-[motion=from-start]:slide-in-from-left-52 data-[motion=to-end]:slide-out-to-right-52 data-[motion=to-start]:slide-out-to-left-52 top-0 left-0 w-full p-2 pr-2.5 md:absolute md:w-auto',
+        'group-data-[viewport=false]/navigation-menu:bg-popover group-data-[viewport=false]/navigation-menu:text-popover-foreground group-data-[viewport=false]/navigation-menu:data-[state=open]:animate-in group-data-[viewport=false]/navigation-menu:data-[state=closed]:animate-out group-data-[viewport=false]/navigation-menu:data-[state=closed]:zoom-out-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:zoom-in-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:fade-in-0 group-data-[viewport=false]/navigation-menu:data-[state=closed]:fade-out-0 group-data-[viewport=false]/navigation-menu:top-full group-data-[viewport=false]/navigation-menu:mt-1.5 group-data-[viewport=false]/navigation-menu:overflow-hidden group-data-[viewport=false]/navigation-menu:rounded-md group-data-[viewport=false]/navigation-menu:border group-data-[viewport=false]/navigation-menu:shadow group-data-[viewport=false]/navigation-menu:duration-200 **:data-[slot=navigation-menu-link]:focus:ring-0 **:data-[slot=navigation-menu-link]:focus:outline-none',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function NavigationMenuViewport({
+  className,
+  ...props
+}: React.ComponentProps<typeof NavigationMenuPrimitive.Viewport>) {
+  return (
+    <div
+      className={cn(
+        'absolute top-full left-0 isolate z-50 flex justify-center'
+      )}
+    >
+      <NavigationMenuPrimitive.Viewport
+        data-slot='navigation-menu-viewport'
+        className={cn(
+          'origin-top-center bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90 relative mt-1.5 h-[var(--radix-navigation-menu-viewport-height)] w-full overflow-hidden rounded-md border shadow md:w-[var(--radix-navigation-menu-viewport-width)]',
+          className
+        )}
+        {...props}
+      />
+    </div>
+  );
+}
+
+function NavigationMenuLink({
+  className,
+  ...props
+}: React.ComponentProps<typeof NavigationMenuPrimitive.Link>) {
+  return (
+    <NavigationMenuPrimitive.Link
+      data-slot='navigation-menu-link'
+      className={cn(
+        "data-[active=true]:focus:bg-accent data-[active=true]:hover:bg-accent data-[active=true]:bg-accent/50 data-[active=true]:text-accent-foreground hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus-visible:ring-ring/50 [&_svg:not([class*='text-'])]:text-muted-foreground flex flex-col gap-1 rounded-sm p-2 text-sm transition-all outline-none focus-visible:ring-[3px] focus-visible:outline-1 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function NavigationMenuIndicator({
+  className,
+  ...props
+}: React.ComponentProps<typeof NavigationMenuPrimitive.Indicator>) {
+  return (
+    <NavigationMenuPrimitive.Indicator
+      data-slot='navigation-menu-indicator'
+      className={cn(
+        'data-[state=visible]:animate-in data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:fade-in top-full z-[1] flex h-1.5 items-end justify-center overflow-hidden',
+        className
+      )}
+      {...props}
+    >
+      <div className='bg-border relative top-[60%] h-2 w-2 rotate-45 rounded-tl-sm shadow-md' />
+    </NavigationMenuPrimitive.Indicator>
+  );
+}
+
+export {
+  NavigationMenu,
+  NavigationMenuList,
+  NavigationMenuItem,
+  NavigationMenuContent,
+  NavigationMenuTrigger,
+  NavigationMenuLink,
+  NavigationMenuIndicator,
+  NavigationMenuViewport,
+  navigationMenuTriggerStyle,
+};
diff --git a/src/figma-make/components/base/pagination.tsx b/src/figma-make/components/base/pagination.tsx
new file mode 100644
index 00000000..9e2826d3
--- /dev/null
+++ b/src/figma-make/components/base/pagination.tsx
@@ -0,0 +1,127 @@
+import * as React from 'react';
+import {
+  ChevronLeftIcon,
+  ChevronRightIcon,
+  MoreHorizontalIcon,
+} from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+import { Button, buttonVariants } from '@/figma-make/components/base/button';
+
+function Pagination({ className, ...props }: React.ComponentProps<'nav'>) {
+  return (
+    <nav
+      role='navigation'
+      aria-label='pagination'
+      data-slot='pagination'
+      className={cn('mx-auto flex w-full justify-center', className)}
+      {...props}
+    />
+  );
+}
+
+function PaginationContent({
+  className,
+  ...props
+}: React.ComponentProps<'ul'>) {
+  return (
+    <ul
+      data-slot='pagination-content'
+      className={cn('flex flex-row items-center gap-1', className)}
+      {...props}
+    />
+  );
+}
+
+function PaginationItem({ ...props }: React.ComponentProps<'li'>) {
+  return <li data-slot='pagination-item' {...props} />;
+}
+
+type PaginationLinkProps = {
+  isActive?: boolean;
+} & Pick<React.ComponentProps<typeof Button>, 'size'> &
+  React.ComponentProps<'a'>;
+
+function PaginationLink({
+  className,
+  isActive,
+  size = 'icon',
+  ...props
+}: PaginationLinkProps) {
+  return (
+    <a
+      aria-current={isActive ? 'page' : undefined}
+      data-slot='pagination-link'
+      data-active={isActive}
+      className={cn(
+        buttonVariants({
+          variant: isActive ? 'outline' : 'ghost',
+          size,
+        }),
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function PaginationPrevious({
+  className,
+  ...props
+}: React.ComponentProps<typeof PaginationLink>) {
+  return (
+    <PaginationLink
+      aria-label='Go to previous page'
+      size='default'
+      className={cn('gap-1 px-2.5 sm:pl-2.5', className)}
+      {...props}
+    >
+      <ChevronLeftIcon />
+      <span className='hidden sm:block'>Previous</span>
+    </PaginationLink>
+  );
+}
+
+function PaginationNext({
+  className,
+  ...props
+}: React.ComponentProps<typeof PaginationLink>) {
+  return (
+    <PaginationLink
+      aria-label='Go to next page'
+      size='default'
+      className={cn('gap-1 px-2.5 sm:pr-2.5', className)}
+      {...props}
+    >
+      <span className='hidden sm:block'>Next</span>
+      <ChevronRightIcon />
+    </PaginationLink>
+  );
+}
+
+function PaginationEllipsis({
+  className,
+  ...props
+}: React.ComponentProps<'span'>) {
+  return (
+    <span
+      aria-hidden
+      data-slot='pagination-ellipsis'
+      className={cn('flex size-9 items-center justify-center', className)}
+      {...props}
+    >
+      <MoreHorizontalIcon className='size-4' />
+      <span className='sr-only'>More pages</span>
+    </span>
+  );
+}
+
+export {
+  Pagination,
+  PaginationContent,
+  PaginationLink,
+  PaginationItem,
+  PaginationPrevious,
+  PaginationNext,
+  PaginationEllipsis,
+};
diff --git a/src/figma-make/components/base/popover.tsx b/src/figma-make/components/base/popover.tsx
new file mode 100644
index 00000000..d46aaed1
--- /dev/null
+++ b/src/figma-make/components/base/popover.tsx
@@ -0,0 +1,48 @@
+'use client';
+
+import * as React from 'react';
+import * as PopoverPrimitive from '@radix-ui/react-popover';
+
+import { cn } from '@/lib/helper';
+
+function Popover({
+  ...props
+}: React.ComponentProps<typeof PopoverPrimitive.Root>) {
+  return <PopoverPrimitive.Root data-slot='popover' {...props} />;
+}
+
+function PopoverTrigger({
+  ...props
+}: React.ComponentProps<typeof PopoverPrimitive.Trigger>) {
+  return <PopoverPrimitive.Trigger data-slot='popover-trigger' {...props} />;
+}
+
+function PopoverContent({
+  className,
+  align = 'center',
+  sideOffset = 4,
+  ...props
+}: React.ComponentProps<typeof PopoverPrimitive.Content>) {
+  return (
+    <PopoverPrimitive.Portal>
+      <PopoverPrimitive.Content
+        data-slot='popover-content'
+        align={align}
+        sideOffset={sideOffset}
+        className={cn(
+          'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--radix-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden',
+          className
+        )}
+        {...props}
+      />
+    </PopoverPrimitive.Portal>
+  );
+}
+
+function PopoverAnchor({
+  ...props
+}: React.ComponentProps<typeof PopoverPrimitive.Anchor>) {
+  return <PopoverPrimitive.Anchor data-slot='popover-anchor' {...props} />;
+}
+
+export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };
diff --git a/src/figma-make/components/base/progress.tsx b/src/figma-make/components/base/progress.tsx
new file mode 100644
index 00000000..cb132275
--- /dev/null
+++ b/src/figma-make/components/base/progress.tsx
@@ -0,0 +1,31 @@
+'use client';
+
+import * as React from 'react';
+import * as ProgressPrimitive from '@radix-ui/react-progress';
+
+import { cn } from '@/lib/helper';
+
+function Progress({
+  className,
+  value,
+  ...props
+}: React.ComponentProps<typeof ProgressPrimitive.Root>) {
+  return (
+    <ProgressPrimitive.Root
+      data-slot='progress'
+      className={cn(
+        'bg-primary/20 relative h-2 w-full overflow-hidden rounded-full',
+        className
+      )}
+      {...props}
+    >
+      <ProgressPrimitive.Indicator
+        data-slot='progress-indicator'
+        className='bg-primary h-full w-full flex-1 transition-all'
+        style={{ transform: `translateX(-${100 - (value || 0)}%)` }}
+      />
+    </ProgressPrimitive.Root>
+  );
+}
+
+export { Progress };
diff --git a/src/figma-make/components/base/radio-group.tsx b/src/figma-make/components/base/radio-group.tsx
new file mode 100644
index 00000000..3fd1c6de
--- /dev/null
+++ b/src/figma-make/components/base/radio-group.tsx
@@ -0,0 +1,45 @@
+'use client';
+
+import * as React from 'react';
+import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
+import { CircleIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function RadioGroup({
+  className,
+  ...props
+}: React.ComponentProps<typeof RadioGroupPrimitive.Root>) {
+  return (
+    <RadioGroupPrimitive.Root
+      data-slot='radio-group'
+      className={cn('grid gap-3', className)}
+      {...props}
+    />
+  );
+}
+
+function RadioGroupItem({
+  className,
+  ...props
+}: React.ComponentProps<typeof RadioGroupPrimitive.Item>) {
+  return (
+    <RadioGroupPrimitive.Item
+      data-slot='radio-group-item'
+      className={cn(
+        'border-input text-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 aspect-square size-4 shrink-0 rounded-full border shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50',
+        className
+      )}
+      {...props}
+    >
+      <RadioGroupPrimitive.Indicator
+        data-slot='radio-group-indicator'
+        className='relative flex items-center justify-center'
+      >
+        <CircleIcon className='fill-primary absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2' />
+      </RadioGroupPrimitive.Indicator>
+    </RadioGroupPrimitive.Item>
+  );
+}
+
+export { RadioGroup, RadioGroupItem };
diff --git a/src/figma-make/components/base/resizable.tsx b/src/figma-make/components/base/resizable.tsx
new file mode 100644
index 00000000..3a7f1a4c
--- /dev/null
+++ b/src/figma-make/components/base/resizable.tsx
@@ -0,0 +1,56 @@
+'use client';
+
+import * as React from 'react';
+import { GripVerticalIcon } from 'lucide-react';
+import * as ResizablePrimitive from 'react-resizable-panels';
+
+import { cn } from '@/lib/helper';
+
+function ResizablePanelGroup({
+  className,
+  ...props
+}: React.ComponentProps<typeof ResizablePrimitive.PanelGroup>) {
+  return (
+    <ResizablePrimitive.PanelGroup
+      data-slot='resizable-panel-group'
+      className={cn(
+        'flex h-full w-full data-[panel-group-direction=vertical]:flex-col',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function ResizablePanel({
+  ...props
+}: React.ComponentProps<typeof ResizablePrimitive.Panel>) {
+  return <ResizablePrimitive.Panel data-slot='resizable-panel' {...props} />;
+}
+
+function ResizableHandle({
+  withHandle,
+  className,
+  ...props
+}: React.ComponentProps<typeof ResizablePrimitive.PanelResizeHandle> & {
+  withHandle?: boolean;
+}) {
+  return (
+    <ResizablePrimitive.PanelResizeHandle
+      data-slot='resizable-handle'
+      className={cn(
+        'bg-border focus-visible:ring-ring relative flex w-px items-center justify-center after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:outline-hidden data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 [&[data-panel-group-direction=vertical]>div]:rotate-90',
+        className
+      )}
+      {...props}
+    >
+      {withHandle && (
+        <div className='bg-border z-10 flex h-4 w-3 items-center justify-center rounded-xs border'>
+          <GripVerticalIcon className='size-2.5' />
+        </div>
+      )}
+    </ResizablePrimitive.PanelResizeHandle>
+  );
+}
+
+export { ResizablePanelGroup, ResizablePanel, ResizableHandle };
diff --git a/src/figma-make/components/base/scroll-area.tsx b/src/figma-make/components/base/scroll-area.tsx
new file mode 100644
index 00000000..30c7fff5
--- /dev/null
+++ b/src/figma-make/components/base/scroll-area.tsx
@@ -0,0 +1,58 @@
+'use client';
+
+import * as React from 'react';
+import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';
+
+import { cn } from '@/lib/helper';
+
+function ScrollArea({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof ScrollAreaPrimitive.Root>) {
+  return (
+    <ScrollAreaPrimitive.Root
+      data-slot='scroll-area'
+      className={cn('relative', className)}
+      {...props}
+    >
+      <ScrollAreaPrimitive.Viewport
+        data-slot='scroll-area-viewport'
+        className='focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1'
+      >
+        {children}
+      </ScrollAreaPrimitive.Viewport>
+      <ScrollBar />
+      <ScrollAreaPrimitive.Corner />
+    </ScrollAreaPrimitive.Root>
+  );
+}
+
+function ScrollBar({
+  className,
+  orientation = 'vertical',
+  ...props
+}: React.ComponentProps<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>) {
+  return (
+    <ScrollAreaPrimitive.ScrollAreaScrollbar
+      data-slot='scroll-area-scrollbar'
+      orientation={orientation}
+      className={cn(
+        'flex touch-none p-px transition-colors select-none',
+        orientation === 'vertical' &&
+          'h-full w-2.5 border-l border-l-transparent',
+        orientation === 'horizontal' &&
+          'h-2.5 flex-col border-t border-t-transparent',
+        className
+      )}
+      {...props}
+    >
+      <ScrollAreaPrimitive.ScrollAreaThumb
+        data-slot='scroll-area-thumb'
+        className='bg-border relative flex-1 rounded-full'
+      />
+    </ScrollAreaPrimitive.ScrollAreaScrollbar>
+  );
+}
+
+export { ScrollArea, ScrollBar };
diff --git a/src/figma-make/components/base/select.tsx b/src/figma-make/components/base/select.tsx
new file mode 100644
index 00000000..e5ebd0e4
--- /dev/null
+++ b/src/figma-make/components/base/select.tsx
@@ -0,0 +1,185 @@
+'use client';
+
+import * as React from 'react';
+import * as SelectPrimitive from '@radix-ui/react-select';
+import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function Select({
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Root>) {
+  return <SelectPrimitive.Root data-slot='select' {...props} />;
+}
+
+function SelectGroup({
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Group>) {
+  return <SelectPrimitive.Group data-slot='select-group' {...props} />;
+}
+
+function SelectValue({
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Value>) {
+  return <SelectPrimitive.Value data-slot='select-value' {...props} />;
+}
+
+function SelectTrigger({
+  className,
+  size = 'default',
+  children,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
+  size?: 'sm' | 'default';
+}) {
+  return (
+    <SelectPrimitive.Trigger
+      data-slot='select-trigger'
+      data-size={size}
+      className={cn(
+        "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-full items-center justify-between gap-2 rounded-md border bg-input-background px-3 py-2 text-sm whitespace-nowrap transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <SelectPrimitive.Icon asChild>
+        <ChevronDownIcon className='size-4 opacity-50' />
+      </SelectPrimitive.Icon>
+    </SelectPrimitive.Trigger>
+  );
+}
+
+function SelectContent({
+  className,
+  children,
+  position = 'popper',
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Content>) {
+  return (
+    <SelectPrimitive.Portal>
+      <SelectPrimitive.Content
+        data-slot='select-content'
+        className={cn(
+          'bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md',
+          position === 'popper' &&
+            'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
+          className
+        )}
+        position={position}
+        {...props}
+      >
+        <SelectScrollUpButton />
+        <SelectPrimitive.Viewport
+          className={cn(
+            'p-1',
+            position === 'popper' &&
+              'h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1'
+          )}
+        >
+          {children}
+        </SelectPrimitive.Viewport>
+        <SelectScrollDownButton />
+      </SelectPrimitive.Content>
+    </SelectPrimitive.Portal>
+  );
+}
+
+function SelectLabel({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Label>) {
+  return (
+    <SelectPrimitive.Label
+      data-slot='select-label'
+      className={cn('text-muted-foreground px-2 py-1.5 text-xs', className)}
+      {...props}
+    />
+  );
+}
+
+function SelectItem({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Item>) {
+  return (
+    <SelectPrimitive.Item
+      data-slot='select-item'
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+        className
+      )}
+      {...props}
+    >
+      <span className='absolute right-2 flex size-3.5 items-center justify-center'>
+        <SelectPrimitive.ItemIndicator>
+          <CheckIcon className='size-4' />
+        </SelectPrimitive.ItemIndicator>
+      </span>
+      <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+    </SelectPrimitive.Item>
+  );
+}
+
+function SelectSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Separator>) {
+  return (
+    <SelectPrimitive.Separator
+      data-slot='select-separator'
+      className={cn('bg-border pointer-events-none -mx-1 my-1 h-px', className)}
+      {...props}
+    />
+  );
+}
+
+function SelectScrollUpButton({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {
+  return (
+    <SelectPrimitive.ScrollUpButton
+      data-slot='select-scroll-up-button'
+      className={cn(
+        'flex cursor-default items-center justify-center py-1',
+        className
+      )}
+      {...props}
+    >
+      <ChevronUpIcon className='size-4' />
+    </SelectPrimitive.ScrollUpButton>
+  );
+}
+
+function SelectScrollDownButton({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {
+  return (
+    <SelectPrimitive.ScrollDownButton
+      data-slot='select-scroll-down-button'
+      className={cn(
+        'flex cursor-default items-center justify-center py-1',
+        className
+      )}
+      {...props}
+    >
+      <ChevronDownIcon className='size-4' />
+    </SelectPrimitive.ScrollDownButton>
+  );
+}
+
+export {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectLabel,
+  SelectScrollDownButton,
+  SelectScrollUpButton,
+  SelectSeparator,
+  SelectTrigger,
+  SelectValue,
+};
diff --git a/src/figma-make/components/base/separator.tsx b/src/figma-make/components/base/separator.tsx
new file mode 100644
index 00000000..9fa31f28
--- /dev/null
+++ b/src/figma-make/components/base/separator.tsx
@@ -0,0 +1,28 @@
+'use client';
+
+import * as React from 'react';
+import * as SeparatorPrimitive from '@radix-ui/react-separator';
+
+import { cn } from '@/lib/helper';
+
+function Separator({
+  className,
+  orientation = 'horizontal',
+  decorative = true,
+  ...props
+}: React.ComponentProps<typeof SeparatorPrimitive.Root>) {
+  return (
+    <SeparatorPrimitive.Root
+      data-slot='separator-root'
+      decorative={decorative}
+      orientation={orientation}
+      className={cn(
+        'bg-border shrink-0 data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Separator };
diff --git a/src/figma-make/components/base/sheet.tsx b/src/figma-make/components/base/sheet.tsx
new file mode 100644
index 00000000..515c47d1
--- /dev/null
+++ b/src/figma-make/components/base/sheet.tsx
@@ -0,0 +1,139 @@
+'use client';
+
+import * as React from 'react';
+import * as SheetPrimitive from '@radix-ui/react-dialog';
+import { XIcon } from 'lucide-react';
+
+import { cn } from '@/lib/helper';
+
+function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {
+  return <SheetPrimitive.Root data-slot='sheet' {...props} />;
+}
+
+function SheetTrigger({
+  ...props
+}: React.ComponentProps<typeof SheetPrimitive.Trigger>) {
+  return <SheetPrimitive.Trigger data-slot='sheet-trigger' {...props} />;
+}
+
+function SheetClose({
+  ...props
+}: React.ComponentProps<typeof SheetPrimitive.Close>) {
+  return <SheetPrimitive.Close data-slot='sheet-close' {...props} />;
+}
+
+function SheetPortal({
+  ...props
+}: React.ComponentProps<typeof SheetPrimitive.Portal>) {
+  return <SheetPrimitive.Portal data-slot='sheet-portal' {...props} />;
+}
+
+function SheetOverlay({
+  className,
+  ...props
+}: React.ComponentProps<typeof SheetPrimitive.Overlay>) {
+  return (
+    <SheetPrimitive.Overlay
+      data-slot='sheet-overlay'
+      className={cn(
+        'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function SheetContent({
+  className,
+  children,
+  side = 'right',
+  ...props
+}: React.ComponentProps<typeof SheetPrimitive.Content> & {
+  side?: 'top' | 'right' | 'bottom' | 'left';
+}) {
+  return (
+    <SheetPortal>
+      <SheetOverlay />
+      <SheetPrimitive.Content
+        data-slot='sheet-content'
+        className={cn(
+          'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500',
+          side === 'right' &&
+            'data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right inset-y-0 right-0 h-full w-3/4 border-l sm:max-w-sm',
+          side === 'left' &&
+            'data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left inset-y-0 left-0 h-full w-3/4 border-r sm:max-w-sm',
+          side === 'top' &&
+            'data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 h-auto border-b',
+          side === 'bottom' &&
+            'data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto border-t',
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <SheetPrimitive.Close className='ring-offset-background focus:ring-ring data-[state=open]:bg-secondary absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none'>
+          <XIcon className='size-4' />
+          <span className='sr-only'>Close</span>
+        </SheetPrimitive.Close>
+      </SheetPrimitive.Content>
+    </SheetPortal>
+  );
+}
+
+function SheetHeader({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='sheet-header'
+      className={cn('flex flex-col gap-1.5 p-4', className)}
+      {...props}
+    />
+  );
+}
+
+function SheetFooter({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='sheet-footer'
+      className={cn('mt-auto flex flex-col gap-2 p-4', className)}
+      {...props}
+    />
+  );
+}
+
+function SheetTitle({
+  className,
+  ...props
+}: React.ComponentProps<typeof SheetPrimitive.Title>) {
+  return (
+    <SheetPrimitive.Title
+      data-slot='sheet-title'
+      className={cn('text-foreground font-semibold', className)}
+      {...props}
+    />
+  );
+}
+
+function SheetDescription({
+  className,
+  ...props
+}: React.ComponentProps<typeof SheetPrimitive.Description>) {
+  return (
+    <SheetPrimitive.Description
+      data-slot='sheet-description'
+      className={cn('text-muted-foreground text-sm', className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  Sheet,
+  SheetTrigger,
+  SheetClose,
+  SheetContent,
+  SheetHeader,
+  SheetFooter,
+  SheetTitle,
+  SheetDescription,
+};
diff --git a/src/figma-make/components/base/sidebar.tsx b/src/figma-make/components/base/sidebar.tsx
new file mode 100644
index 00000000..0f0fdcdb
--- /dev/null
+++ b/src/figma-make/components/base/sidebar.tsx
@@ -0,0 +1,726 @@
+'use client';
+
+import * as React from 'react';
+import { Slot } from '@radix-ui/react-slot';
+import { VariantProps, cva } from 'class-variance-authority';
+import { PanelLeftIcon } from 'lucide-react';
+
+import { useIsMobile } from '@/figma-make/components/base/use-mobile';
+import { cn } from '@/lib/helper';
+import { Button } from '@/figma-make/components/base/button';
+import { Input } from '@/figma-make/components/base/input';
+import { Separator } from '@/figma-make/components/base/separator';
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+} from '@/figma-make/components/base/sheet';
+import { Skeleton } from '@/figma-make/components/base/skeleton';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '@/figma-make/components/base/tooltip';
+
+const SIDEBAR_COOKIE_NAME = 'sidebar_state';
+const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
+const SIDEBAR_WIDTH = '16rem';
+const SIDEBAR_WIDTH_MOBILE = '18rem';
+const SIDEBAR_WIDTH_ICON = '3rem';
+const SIDEBAR_KEYBOARD_SHORTCUT = 'b';
+
+type SidebarContextProps = {
+  state: 'expanded' | 'collapsed';
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  openMobile: boolean;
+  setOpenMobile: (open: boolean) => void;
+  isMobile: boolean;
+  toggleSidebar: () => void;
+};
+
+const SidebarContext = React.createContext<SidebarContextProps | null>(null);
+
+function useSidebar() {
+  const context = React.useContext(SidebarContext);
+  if (!context) {
+    throw new Error('useSidebar must be used within a SidebarProvider.');
+  }
+
+  return context;
+}
+
+function SidebarProvider({
+  defaultOpen = true,
+  open: openProp,
+  onOpenChange: setOpenProp,
+  className,
+  style,
+  children,
+  ...props
+}: React.ComponentProps<'div'> & {
+  defaultOpen?: boolean;
+  open?: boolean;
+  onOpenChange?: (open: boolean) => void;
+}) {
+  const isMobile = useIsMobile();
+  const [openMobile, setOpenMobile] = React.useState(false);
+
+  // This is the internal state of the sidebar.
+  // We use openProp and setOpenProp for control from outside the component.
+  const [_open, _setOpen] = React.useState(defaultOpen);
+  const open = openProp ?? _open;
+  const setOpen = React.useCallback(
+    (value: boolean | ((value: boolean) => boolean)) => {
+      const openState = typeof value === 'function' ? value(open) : value;
+      if (setOpenProp) {
+        setOpenProp(openState);
+      } else {
+        _setOpen(openState);
+      }
+
+      // This sets the cookie to keep the sidebar state.
+      document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`;
+    },
+    [setOpenProp, open]
+  );
+
+  // Helper to toggle the sidebar.
+  const toggleSidebar = React.useCallback(() => {
+    return isMobile ? setOpenMobile((open) => !open) : setOpen((open) => !open);
+  }, [isMobile, setOpen, setOpenMobile]);
+
+  // Adds a keyboard shortcut to toggle the sidebar.
+  React.useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (
+        event.key === SIDEBAR_KEYBOARD_SHORTCUT &&
+        (event.metaKey || event.ctrlKey)
+      ) {
+        event.preventDefault();
+        toggleSidebar();
+      }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    return () => window.removeEventListener('keydown', handleKeyDown);
+  }, [toggleSidebar]);
+
+  // We add a state so that we can do data-state="expanded" or "collapsed".
+  // This makes it easier to style the sidebar with Tailwind classes.
+  const state = open ? 'expanded' : 'collapsed';
+
+  const contextValue = React.useMemo<SidebarContextProps>(
+    () => ({
+      state,
+      open,
+      setOpen,
+      isMobile,
+      openMobile,
+      setOpenMobile,
+      toggleSidebar,
+    }),
+    [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar]
+  );
+
+  return (
+    <SidebarContext.Provider value={contextValue}>
+      <TooltipProvider delayDuration={0}>
+        <div
+          data-slot='sidebar-wrapper'
+          style={
+            {
+              '--sidebar-width': SIDEBAR_WIDTH,
+              '--sidebar-width-icon': SIDEBAR_WIDTH_ICON,
+              ...style,
+            } as React.CSSProperties
+          }
+          className={cn(
+            'group/sidebar-wrapper has-data-[variant=inset]:bg-sidebar flex min-h-svh w-full',
+            className
+          )}
+          {...props}
+        >
+          {children}
+        </div>
+      </TooltipProvider>
+    </SidebarContext.Provider>
+  );
+}
+
+function Sidebar({
+  side = 'left',
+  variant = 'sidebar',
+  collapsible = 'offcanvas',
+  className,
+  children,
+  ...props
+}: React.ComponentProps<'div'> & {
+  side?: 'left' | 'right';
+  variant?: 'sidebar' | 'floating' | 'inset';
+  collapsible?: 'offcanvas' | 'icon' | 'none';
+}) {
+  const { isMobile, state, openMobile, setOpenMobile } = useSidebar();
+
+  if (collapsible === 'none') {
+    return (
+      <div
+        data-slot='sidebar'
+        className={cn(
+          'bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col',
+          className
+        )}
+        {...props}
+      >
+        {children}
+      </div>
+    );
+  }
+
+  if (isMobile) {
+    return (
+      <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
+        <SheetContent
+          data-sidebar='sidebar'
+          data-slot='sidebar'
+          data-mobile='true'
+          className='bg-sidebar text-sidebar-foreground w-(--sidebar-width) p-0 [&>button]:hidden'
+          style={
+            {
+              '--sidebar-width': SIDEBAR_WIDTH_MOBILE,
+            } as React.CSSProperties
+          }
+          side={side}
+        >
+          <SheetHeader className='sr-only'>
+            <SheetTitle>Sidebar</SheetTitle>
+            <SheetDescription>Displays the mobile sidebar.</SheetDescription>
+          </SheetHeader>
+          <div className='flex h-full w-full flex-col'>{children}</div>
+        </SheetContent>
+      </Sheet>
+    );
+  }
+
+  return (
+    <div
+      className='group peer text-sidebar-foreground hidden md:block'
+      data-state={state}
+      data-collapsible={state === 'collapsed' ? collapsible : ''}
+      data-variant={variant}
+      data-side={side}
+      data-slot='sidebar'
+    >
+      {/* This is what handles the sidebar gap on desktop */}
+      <div
+        data-slot='sidebar-gap'
+        className={cn(
+          'relative w-(--sidebar-width) bg-transparent transition-[width] duration-200 ease-linear',
+          'group-data-[collapsible=offcanvas]:w-0',
+          'group-data-[side=right]:rotate-180',
+          variant === 'floating' || variant === 'inset'
+            ? 'group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]'
+            : 'group-data-[collapsible=icon]:w-(--sidebar-width-icon)'
+        )}
+      />
+      <div
+        data-slot='sidebar-container'
+        className={cn(
+          'fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex',
+          side === 'left'
+            ? 'left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]'
+            : 'right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]',
+          // Adjust the padding for floating and inset variants.
+          variant === 'floating' || variant === 'inset'
+            ? 'p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]'
+            : 'group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l',
+          className
+        )}
+        {...props}
+      >
+        <div
+          data-sidebar='sidebar'
+          data-slot='sidebar-inner'
+          className='bg-sidebar group-data-[variant=floating]:border-sidebar-border flex h-full w-full flex-col group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:shadow-sm'
+        >
+          {children}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function SidebarTrigger({
+  className,
+  onClick,
+  ...props
+}: React.ComponentProps<typeof Button>) {
+  const { toggleSidebar } = useSidebar();
+
+  return (
+    <Button
+      data-sidebar='trigger'
+      data-slot='sidebar-trigger'
+      variant='ghost'
+      size='icon'
+      className={cn('size-7', className)}
+      onClick={(event) => {
+        onClick?.(event);
+        toggleSidebar();
+      }}
+      {...props}
+    >
+      <PanelLeftIcon />
+      <span className='sr-only'>Toggle Sidebar</span>
+    </Button>
+  );
+}
+
+function SidebarRail({ className, ...props }: React.ComponentProps<'button'>) {
+  const { toggleSidebar } = useSidebar();
+
+  return (
+    <button
+      data-sidebar='rail'
+      data-slot='sidebar-rail'
+      aria-label='Toggle Sidebar'
+      tabIndex={-1}
+      onClick={toggleSidebar}
+      title='Toggle Sidebar'
+      className={cn(
+        'hover:after:bg-sidebar-border absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear group-data-[side=left]:-right-4 group-data-[side=right]:left-0 after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] sm:flex',
+        'in-data-[side=left]:cursor-w-resize in-data-[side=right]:cursor-e-resize',
+        '[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize',
+        'hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full',
+        '[[data-side=left][data-collapsible=offcanvas]_&]:-right-2',
+        '[[data-side=right][data-collapsible=offcanvas]_&]:-left-2',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function SidebarInset({ className, ...props }: React.ComponentProps<'main'>) {
+  return (
+    <main
+      data-slot='sidebar-inset'
+      className={cn(
+        'bg-background relative flex w-full flex-1 flex-col',
+        'md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function SidebarInput({
+  className,
+  ...props
+}: React.ComponentProps<typeof Input>) {
+  return (
+    <Input
+      data-slot='sidebar-input'
+      data-sidebar='input'
+      className={cn('bg-background h-8 w-full shadow-none', className)}
+      {...props}
+    />
+  );
+}
+
+function SidebarHeader({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='sidebar-header'
+      data-sidebar='header'
+      className={cn('flex flex-col gap-2 p-2', className)}
+      {...props}
+    />
+  );
+}
+
+function SidebarFooter({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='sidebar-footer'
+      data-sidebar='footer'
+      className={cn('flex flex-col gap-2 p-2', className)}
+      {...props}
+    />
+  );
+}
+
+function SidebarSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof Separator>) {
+  return (
+    <Separator
+      data-slot='sidebar-separator'
+      data-sidebar='separator'
+      className={cn('bg-sidebar-border mx-2 w-auto', className)}
+      {...props}
+    />
+  );
+}
+
+function SidebarContent({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='sidebar-content'
+      data-sidebar='content'
+      className={cn(
+        'flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function SidebarGroup({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='sidebar-group'
+      data-sidebar='group'
+      className={cn('relative flex w-full min-w-0 flex-col p-2', className)}
+      {...props}
+    />
+  );
+}
+
+function SidebarGroupLabel({
+  className,
+  asChild = false,
+  ...props
+}: React.ComponentProps<'div'> & { asChild?: boolean }) {
+  const Comp = asChild ? Slot : 'div';
+
+  return (
+    <Comp
+      data-slot='sidebar-group-label'
+      data-sidebar='group-label'
+      className={cn(
+        'text-sidebar-foreground/70 ring-sidebar-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0',
+        'group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function SidebarGroupAction({
+  className,
+  asChild = false,
+  ...props
+}: React.ComponentProps<'button'> & { asChild?: boolean }) {
+  const Comp = asChild ? Slot : 'button';
+
+  return (
+    <Comp
+      data-slot='sidebar-group-action'
+      data-sidebar='group-action'
+      className={cn(
+        'text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-md p-0 outline-hidden transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0',
+        // Increases the hit area of the button on mobile.
+        'after:absolute after:-inset-2 md:after:hidden',
+        'group-data-[collapsible=icon]:hidden',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function SidebarGroupContent({
+  className,
+  ...props
+}: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='sidebar-group-content'
+      data-sidebar='group-content'
+      className={cn('w-full text-sm', className)}
+      {...props}
+    />
+  );
+}
+
+function SidebarMenu({ className, ...props }: React.ComponentProps<'ul'>) {
+  return (
+    <ul
+      data-slot='sidebar-menu'
+      data-sidebar='menu'
+      className={cn('flex w-full min-w-0 flex-col gap-1', className)}
+      {...props}
+    />
+  );
+}
+
+function SidebarMenuItem({ className, ...props }: React.ComponentProps<'li'>) {
+  return (
+    <li
+      data-slot='sidebar-menu-item'
+      data-sidebar='menu-item'
+      className={cn('group/menu-item relative', className)}
+      {...props}
+    />
+  );
+}
+
+const sidebarMenuButtonVariants = cva(
+  'peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0',
+  {
+    variants: {
+      variant: {
+        default: 'hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',
+        outline:
+          'bg-background shadow-[0_0_0_1px_hsl(var(--sidebar-border))] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidebar-accent))]',
+      },
+      size: {
+        default: 'h-8 text-sm',
+        sm: 'h-7 text-xs',
+        lg: 'h-12 text-sm group-data-[collapsible=icon]:p-0!',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+      size: 'default',
+    },
+  }
+);
+
+function SidebarMenuButton({
+  asChild = false,
+  isActive = false,
+  variant = 'default',
+  size = 'default',
+  tooltip,
+  className,
+  ...props
+}: React.ComponentProps<'button'> & {
+  asChild?: boolean;
+  isActive?: boolean;
+  tooltip?: string | React.ComponentProps<typeof TooltipContent>;
+} & VariantProps<typeof sidebarMenuButtonVariants>) {
+  const Comp = asChild ? Slot : 'button';
+  const { isMobile, state } = useSidebar();
+
+  const button = (
+    <Comp
+      data-slot='sidebar-menu-button'
+      data-sidebar='menu-button'
+      data-size={size}
+      data-active={isActive}
+      className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
+      {...props}
+    />
+  );
+
+  if (!tooltip) {
+    return button;
+  }
+
+  if (typeof tooltip === 'string') {
+    tooltip = {
+      children: tooltip,
+    };
+  }
+
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>{button}</TooltipTrigger>
+      <TooltipContent
+        side='right'
+        align='center'
+        hidden={state !== 'collapsed' || isMobile}
+        {...tooltip}
+      />
+    </Tooltip>
+  );
+}
+
+function SidebarMenuAction({
+  className,
+  asChild = false,
+  showOnHover = false,
+  ...props
+}: React.ComponentProps<'button'> & {
+  asChild?: boolean;
+  showOnHover?: boolean;
+}) {
+  const Comp = asChild ? Slot : 'button';
+
+  return (
+    <Comp
+      data-slot='sidebar-menu-action'
+      data-sidebar='menu-action'
+      className={cn(
+        'text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground peer-hover/menu-button:text-sidebar-accent-foreground absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-md p-0 outline-hidden transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0',
+        // Increases the hit area of the button on mobile.
+        'after:absolute after:-inset-2 md:after:hidden',
+        'peer-data-[size=sm]/menu-button:top-1',
+        'peer-data-[size=default]/menu-button:top-1.5',
+        'peer-data-[size=lg]/menu-button:top-2.5',
+        'group-data-[collapsible=icon]:hidden',
+        showOnHover &&
+          'peer-data-[active=true]/menu-button:text-sidebar-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function SidebarMenuBadge({
+  className,
+  ...props
+}: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='sidebar-menu-badge'
+      data-sidebar='menu-badge'
+      className={cn(
+        'text-sidebar-foreground pointer-events-none absolute right-1 flex h-5 min-w-5 items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums select-none',
+        'peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground',
+        'peer-data-[size=sm]/menu-button:top-1',
+        'peer-data-[size=default]/menu-button:top-1.5',
+        'peer-data-[size=lg]/menu-button:top-2.5',
+        'group-data-[collapsible=icon]:hidden',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function SidebarMenuSkeleton({
+  className,
+  showIcon = false,
+  ...props
+}: React.ComponentProps<'div'> & {
+  showIcon?: boolean;
+}) {
+  // Random width between 50 to 90%.
+  const width = React.useMemo(() => {
+    return `${Math.floor(Math.random() * 40) + 50}%`;
+  }, []);
+
+  return (
+    <div
+      data-slot='sidebar-menu-skeleton'
+      data-sidebar='menu-skeleton'
+      className={cn('flex h-8 items-center gap-2 rounded-md px-2', className)}
+      {...props}
+    >
+      {showIcon && (
+        <Skeleton
+          className='size-4 rounded-md'
+          data-sidebar='menu-skeleton-icon'
+        />
+      )}
+      <Skeleton
+        className='h-4 max-w-(--skeleton-width) flex-1'
+        data-sidebar='menu-skeleton-text'
+        style={
+          {
+            '--skeleton-width': width,
+          } as React.CSSProperties
+        }
+      />
+    </div>
+  );
+}
+
+function SidebarMenuSub({ className, ...props }: React.ComponentProps<'ul'>) {
+  return (
+    <ul
+      data-slot='sidebar-menu-sub'
+      data-sidebar='menu-sub'
+      className={cn(
+        'border-sidebar-border mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l px-2.5 py-0.5',
+        'group-data-[collapsible=icon]:hidden',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function SidebarMenuSubItem({
+  className,
+  ...props
+}: React.ComponentProps<'li'>) {
+  return (
+    <li
+      data-slot='sidebar-menu-sub-item'
+      data-sidebar='menu-sub-item'
+      className={cn('group/menu-sub-item relative', className)}
+      {...props}
+    />
+  );
+}
+
+function SidebarMenuSubButton({
+  asChild = false,
+  size = 'md',
+  isActive = false,
+  className,
+  ...props
+}: React.ComponentProps<'a'> & {
+  asChild?: boolean;
+  size?: 'sm' | 'md';
+  isActive?: boolean;
+}) {
+  const Comp = asChild ? Slot : 'a';
+
+  return (
+    <Comp
+      data-slot='sidebar-menu-sub-button'
+      data-sidebar='menu-sub-button'
+      data-size={size}
+      data-active={isActive}
+      className={cn(
+        'text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground active:bg-sidebar-accent active:text-sidebar-accent-foreground [&>svg]:text-sidebar-accent-foreground flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 outline-hidden focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0',
+        'data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground',
+        size === 'sm' && 'text-xs',
+        size === 'md' && 'text-sm',
+        'group-data-[collapsible=icon]:hidden',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  Sidebar,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupAction,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarHeader,
+  SidebarInput,
+  SidebarInset,
+  SidebarMenu,
+  SidebarMenuAction,
+  SidebarMenuBadge,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSkeleton,
+  SidebarMenuSub,
+  SidebarMenuSubButton,
+  SidebarMenuSubItem,
+  SidebarProvider,
+  SidebarRail,
+  SidebarSeparator,
+  SidebarTrigger,
+  useSidebar,
+};
diff --git a/src/figma-make/components/base/skeleton.tsx b/src/figma-make/components/base/skeleton.tsx
new file mode 100644
index 00000000..5c420fb1
--- /dev/null
+++ b/src/figma-make/components/base/skeleton.tsx
@@ -0,0 +1,13 @@
+import { cn } from '@/lib/helper';
+
+function Skeleton({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      data-slot='skeleton'
+      className={cn('bg-accent animate-pulse rounded-md', className)}
+      {...props}
+    />
+  );
+}
+
+export { Skeleton };
diff --git a/src/figma-make/components/base/slider.tsx b/src/figma-make/components/base/slider.tsx
new file mode 100644
index 00000000..07871423
--- /dev/null
+++ b/src/figma-make/components/base/slider.tsx
@@ -0,0 +1,63 @@
+'use client';
+
+import * as React from 'react';
+import * as SliderPrimitive from '@radix-ui/react-slider';
+
+import { cn } from '@/lib/helper';
+
+function Slider({
+  className,
+  defaultValue,
+  value,
+  min = 0,
+  max = 100,
+  ...props
+}: React.ComponentProps<typeof SliderPrimitive.Root>) {
+  const _values = React.useMemo(
+    () =>
+      Array.isArray(value)
+        ? value
+        : Array.isArray(defaultValue)
+          ? defaultValue
+          : [min, max],
+    [value, defaultValue, min, max]
+  );
+
+  return (
+    <SliderPrimitive.Root
+      data-slot='slider'
+      defaultValue={defaultValue}
+      value={value}
+      min={min}
+      max={max}
+      className={cn(
+        'relative flex w-full touch-none items-center select-none data-[disabled]:opacity-50 data-[orientation=vertical]:h-full data-[orientation=vertical]:min-h-44 data-[orientation=vertical]:w-auto data-[orientation=vertical]:flex-col',
+        className
+      )}
+      {...props}
+    >
+      <SliderPrimitive.Track
+        data-slot='slider-track'
+        className={cn(
+          'bg-muted relative grow overflow-hidden rounded-full data-[orientation=horizontal]:h-4 data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-1.5'
+        )}
+      >
+        <SliderPrimitive.Range
+          data-slot='slider-range'
+          className={cn(
+            'bg-primary absolute data-[orientation=horizontal]:h-full data-[orientation=vertical]:w-full'
+          )}
+        />
+      </SliderPrimitive.Track>
+      {Array.from({ length: _values.length }, (_, index) => (
+        <SliderPrimitive.Thumb
+          data-slot='slider-thumb'
+          key={index}
+          className='border-primary bg-background ring-ring/50 block size-4 shrink-0 rounded-full border shadow-sm transition-[color,box-shadow] hover:ring-4 focus-visible:ring-4 focus-visible:outline-hidden disabled:pointer-events-none disabled:opacity-50'
+        />
+      ))}
+    </SliderPrimitive.Root>
+  );
+}
+
+export { Slider };
diff --git a/src/figma-make/components/base/sonner.tsx b/src/figma-make/components/base/sonner.tsx
new file mode 100644
index 00000000..a3612b55
--- /dev/null
+++ b/src/figma-make/components/base/sonner.tsx
@@ -0,0 +1,25 @@
+'use client';
+
+import { useTheme } from 'next-themes';
+import { Toaster as Sonner, ToasterProps } from 'sonner';
+
+const Toaster = ({ ...props }: ToasterProps) => {
+  const { theme = 'system' } = useTheme();
+
+  return (
+    <Sonner
+      theme={theme as ToasterProps['theme']}
+      className='toaster group'
+      style={
+        {
+          '--normal-bg': 'var(--popover)',
+          '--normal-text': 'var(--popover-foreground)',
+          '--normal-border': 'var(--border)',
+        } as React.CSSProperties
+      }
+      {...props}
+    />
+  );
+};
+
+export { Toaster };
diff --git a/src/figma-make/components/base/status-badge.tsx b/src/figma-make/components/base/status-badge.tsx
new file mode 100644
index 00000000..feb89d8b
--- /dev/null
+++ b/src/figma-make/components/base/status-badge.tsx
@@ -0,0 +1,49 @@
+import * as React from 'react';
+import { cn } from '@/lib/helper';
+
+export interface StatusBadgeProps extends React.HTMLAttributes<HTMLDivElement> {
+  variant?: 'active' | 'pending' | 'inactive';
+  children: React.ReactNode;
+}
+
+const StatusBadge = React.forwardRef<HTMLDivElement, StatusBadgeProps>(
+  ({ className, variant = 'pending', children, ...props }, ref) => {
+    const variants = {
+      active: 'bg-green-100/50 text-gray-900',
+      pending: 'bg-gray-100/80 text-gray-900',
+      inactive: 'bg-red-100/50 text-gray-900',
+    };
+
+    const dotColors = {
+      active: '#008000',
+      pending: '#D9D9D9',
+      inactive: '#FF3A3A',
+    };
+
+    return (
+      <div
+        ref={ref}
+        className={cn(
+          'inline-flex items-center gap-1 px-2 py-1 rounded-lg border border-black/5',
+          variants[variant],
+          className
+        )}
+        {...props}
+      >
+        <svg
+          className='w-3 h-3'
+          fill='none'
+          preserveAspectRatio='none'
+          viewBox='0 0 12 12'
+        >
+          <circle cx='6' cy='6' r='6' fill={dotColors[variant]} />
+        </svg>
+        <span className='text-xs font-medium leading-6'>{children}</span>
+      </div>
+    );
+  }
+);
+
+StatusBadge.displayName = 'StatusBadge';
+
+export { StatusBadge };
diff --git a/src/figma-make/components/base/switch.tsx b/src/figma-make/components/base/switch.tsx
new file mode 100644
index 00000000..0290eeeb
--- /dev/null
+++ b/src/figma-make/components/base/switch.tsx
@@ -0,0 +1,31 @@
+'use client';
+
+import * as React from 'react';
+import * as SwitchPrimitive from '@radix-ui/react-switch';
+
+import { cn } from '@/lib/helper';
+
+function Switch({
+  className,
+  ...props
+}: React.ComponentProps<typeof SwitchPrimitive.Root>) {
+  return (
+    <SwitchPrimitive.Root
+      data-slot='switch'
+      className={cn(
+        'peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-switch-background focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50',
+        className
+      )}
+      {...props}
+    >
+      <SwitchPrimitive.Thumb
+        data-slot='switch-thumb'
+        className={cn(
+          'bg-card dark:data-[state=unchecked]:bg-card-foreground dark:data-[state=checked]:bg-primary-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0'
+        )}
+      />
+    </SwitchPrimitive.Root>
+  );
+}
+
+export { Switch };
diff --git a/src/figma-make/components/base/table.tsx b/src/figma-make/components/base/table.tsx
new file mode 100644
index 00000000..e83460b9
--- /dev/null
+++ b/src/figma-make/components/base/table.tsx
@@ -0,0 +1,116 @@
+'use client';
+
+import * as React from 'react';
+
+import { cn } from '@/lib/helper';
+
+function Table({ className, ...props }: React.ComponentProps<'table'>) {
+  return (
+    <div
+      data-slot='table-container'
+      className='relative w-full overflow-x-auto'
+    >
+      <table
+        data-slot='table'
+        className={cn('w-full caption-bottom text-sm', className)}
+        {...props}
+      />
+    </div>
+  );
+}
+
+function TableHeader({ className, ...props }: React.ComponentProps<'thead'>) {
+  return (
+    <thead
+      data-slot='table-header'
+      className={cn('[&_tr]:border-b', className)}
+      {...props}
+    />
+  );
+}
+
+function TableBody({ className, ...props }: React.ComponentProps<'tbody'>) {
+  return (
+    <tbody
+      data-slot='table-body'
+      className={cn('[&_tr:last-child]:border-0', className)}
+      {...props}
+    />
+  );
+}
+
+function TableFooter({ className, ...props }: React.ComponentProps<'tfoot'>) {
+  return (
+    <tfoot
+      data-slot='table-footer'
+      className={cn(
+        'bg-muted/50 border-t font-medium [&>tr]:last:border-b-0',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function TableRow({ className, ...props }: React.ComponentProps<'tr'>) {
+  return (
+    <tr
+      data-slot='table-row'
+      className={cn(
+        'hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function TableHead({ className, ...props }: React.ComponentProps<'th'>) {
+  return (
+    <th
+      data-slot='table-head'
+      className={cn(
+        'text-foreground h-10 px-2 text-left align-middle font-medium whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function TableCell({ className, ...props }: React.ComponentProps<'td'>) {
+  return (
+    <td
+      data-slot='table-cell'
+      className={cn(
+        'p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function TableCaption({
+  className,
+  ...props
+}: React.ComponentProps<'caption'>) {
+  return (
+    <caption
+      data-slot='table-caption'
+      className={cn('text-muted-foreground mt-4 text-sm', className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  Table,
+  TableHeader,
+  TableBody,
+  TableFooter,
+  TableHead,
+  TableRow,
+  TableCell,
+  TableCaption,
+};
diff --git a/src/figma-make/components/base/tabs.tsx b/src/figma-make/components/base/tabs.tsx
new file mode 100644
index 00000000..791dadb8
--- /dev/null
+++ b/src/figma-make/components/base/tabs.tsx
@@ -0,0 +1,66 @@
+'use client';
+
+import * as React from 'react';
+import * as TabsPrimitive from '@radix-ui/react-tabs';
+
+import { cn } from '@/lib/helper';
+
+function Tabs({
+  className,
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.Root>) {
+  return (
+    <TabsPrimitive.Root
+      data-slot='tabs'
+      className={cn('flex flex-col gap-2', className)}
+      {...props}
+    />
+  );
+}
+
+function TabsList({
+  className,
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.List>) {
+  return (
+    <TabsPrimitive.List
+      data-slot='tabs-list'
+      className={cn(
+        'bg-muted text-muted-foreground inline-flex h-9 w-fit items-center justify-center rounded-xl p-[3px] flex',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function TabsTrigger({
+  className,
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.Trigger>) {
+  return (
+    <TabsPrimitive.Trigger
+      data-slot='tabs-trigger'
+      className={cn(
+        "data-[state=active]:bg-card dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-xl border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+function TabsContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof TabsPrimitive.Content>) {
+  return (
+    <TabsPrimitive.Content
+      data-slot='tabs-content'
+      className={cn('flex-1 outline-none', className)}
+      {...props}
+    />
+  );
+}
+
+export { Tabs, TabsList, TabsTrigger, TabsContent };
diff --git a/src/figma-make/components/base/textarea.tsx b/src/figma-make/components/base/textarea.tsx
new file mode 100644
index 00000000..589cbaf3
--- /dev/null
+++ b/src/figma-make/components/base/textarea.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react';
+
+import { cn } from '@/lib/helper';
+
+function Textarea({ className, ...props }: React.ComponentProps<'textarea'>) {
+  return (
+    <textarea
+      data-slot='textarea'
+      className={cn(
+        'resize-none border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-input-background px-3 py-2 text-base transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+        className
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Textarea };
diff --git a/src/figma-make/components/base/toggle-group.tsx b/src/figma-make/components/base/toggle-group.tsx
new file mode 100644
index 00000000..11705c18
--- /dev/null
+++ b/src/figma-make/components/base/toggle-group.tsx
@@ -0,0 +1,73 @@
+'use client';
+
+import * as React from 'react';
+import * as ToggleGroupPrimitive from '@radix-ui/react-toggle-group';
+import { type VariantProps } from 'class-variance-authority';
+
+import { cn } from '@/lib/helper';
+import { toggleVariants } from '@/figma-make/components/base/toggle';
+
+const ToggleGroupContext = React.createContext<
+  VariantProps<typeof toggleVariants>
+>({
+  size: 'default',
+  variant: 'default',
+});
+
+function ToggleGroup({
+  className,
+  variant,
+  size,
+  children,
+  ...props
+}: React.ComponentProps<typeof ToggleGroupPrimitive.Root> &
+  VariantProps<typeof toggleVariants>) {
+  return (
+    <ToggleGroupPrimitive.Root
+      data-slot='toggle-group'
+      data-variant={variant}
+      data-size={size}
+      className={cn(
+        'group/toggle-group flex w-fit items-center rounded-md data-[variant=outline]:shadow-xs',
+        className
+      )}
+      {...props}
+    >
+      <ToggleGroupContext.Provider value={{ variant, size }}>
+        {children}
+      </ToggleGroupContext.Provider>
+    </ToggleGroupPrimitive.Root>
+  );
+}
+
+function ToggleGroupItem({
+  className,
+  children,
+  variant,
+  size,
+  ...props
+}: React.ComponentProps<typeof ToggleGroupPrimitive.Item> &
+  VariantProps<typeof toggleVariants>) {
+  const context = React.useContext(ToggleGroupContext);
+
+  return (
+    <ToggleGroupPrimitive.Item
+      data-slot='toggle-group-item'
+      data-variant={context.variant || variant}
+      data-size={context.size || size}
+      className={cn(
+        toggleVariants({
+          variant: context.variant || variant,
+          size: context.size || size,
+        }),
+        'min-w-0 flex-1 shrink-0 rounded-none shadow-none first:rounded-l-md last:rounded-r-md focus:z-10 focus-visible:z-10 data-[variant=outline]:border-l-0 data-[variant=outline]:first:border-l',
+        className
+      )}
+      {...props}
+    >
+      {children}
+    </ToggleGroupPrimitive.Item>
+  );
+}
+
+export { ToggleGroup, ToggleGroupItem };
diff --git a/src/figma-make/components/base/toggle.tsx b/src/figma-make/components/base/toggle.tsx
new file mode 100644
index 00000000..a9d79983
--- /dev/null
+++ b/src/figma-make/components/base/toggle.tsx
@@ -0,0 +1,47 @@
+'use client';
+
+import * as React from 'react';
+import * as TogglePrimitive from '@radix-ui/react-toggle';
+import { cva, type VariantProps } from 'class-variance-authority';
+
+import { cn } from '@/lib/helper';
+
+const toggleVariants = cva(
+  "inline-flex items-center justify-center gap-2 rounded-md text-sm font-medium hover:bg-muted hover:text-muted-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] outline-none transition-[color,box-shadow] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive whitespace-nowrap",
+  {
+    variants: {
+      variant: {
+        default: 'bg-transparent',
+        outline:
+          'border border-input bg-transparent hover:bg-accent hover:text-accent-foreground',
+      },
+      size: {
+        default: 'h-9 px-2 min-w-9',
+        sm: 'h-8 px-1.5 min-w-8',
+        lg: 'h-10 px-2.5 min-w-10',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+      size: 'default',
+    },
+  }
+);
+
+function Toggle({
+  className,
+  variant,
+  size,
+  ...props
+}: React.ComponentProps<typeof TogglePrimitive.Root> &
+  VariantProps<typeof toggleVariants>) {
+  return (
+    <TogglePrimitive.Root
+      data-slot='toggle'
+      className={cn(toggleVariants({ variant, size, className }))}
+      {...props}
+    />
+  );
+}
+
+export { Toggle, toggleVariants };
diff --git a/src/figma-make/components/base/tooltip.tsx b/src/figma-make/components/base/tooltip.tsx
new file mode 100644
index 00000000..b0aaae30
--- /dev/null
+++ b/src/figma-make/components/base/tooltip.tsx
@@ -0,0 +1,61 @@
+'use client';
+
+import * as React from 'react';
+import * as TooltipPrimitive from '@radix-ui/react-tooltip';
+
+import { cn } from '@/lib/helper';
+
+function TooltipProvider({
+  delayDuration = 0,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
+  return (
+    <TooltipPrimitive.Provider
+      data-slot='tooltip-provider'
+      delayDuration={delayDuration}
+      {...props}
+    />
+  );
+}
+
+function Tooltip({
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Root>) {
+  return (
+    <TooltipProvider>
+      <TooltipPrimitive.Root data-slot='tooltip' {...props} />
+    </TooltipProvider>
+  );
+}
+
+function TooltipTrigger({
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
+  return <TooltipPrimitive.Trigger data-slot='tooltip-trigger' {...props} />;
+}
+
+function TooltipContent({
+  className,
+  sideOffset = 0,
+  children,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Content>) {
+  return (
+    <TooltipPrimitive.Portal>
+      <TooltipPrimitive.Content
+        data-slot='tooltip-content'
+        sideOffset={sideOffset}
+        className={cn(
+          'bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance',
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <TooltipPrimitive.Arrow className='bg-primary fill-primary z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]' />
+      </TooltipPrimitive.Content>
+    </TooltipPrimitive.Portal>
+  );
+}
+
+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };
diff --git a/src/figma-make/components/base/use-mobile.ts b/src/figma-make/components/base/use-mobile.ts
new file mode 100644
index 00000000..6be5f6c1
--- /dev/null
+++ b/src/figma-make/components/base/use-mobile.ts
@@ -0,0 +1,21 @@
+import * as React from 'react';
+
+const MOBILE_BREAKPOINT = 768;
+
+export function useIsMobile() {
+  const [isMobile, setIsMobile] = React.useState<boolean | undefined>(
+    undefined
+  );
+
+  React.useEffect(() => {
+    const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
+    const onChange = () => {
+      setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+    };
+    mql.addEventListener('change', onChange);
+    setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+    return () => mql.removeEventListener('change', onChange);
+  }, []);
+
+  return !!isMobile;
+}
diff --git a/src/figma-make/components/pages/daily-checklist/DailyChecklistContent.tsx b/src/figma-make/components/pages/daily-checklist/DailyChecklistContent.tsx
new file mode 100644
index 00000000..af40ba0a
--- /dev/null
+++ b/src/figma-make/components/pages/daily-checklist/DailyChecklistContent.tsx
@@ -0,0 +1,1581 @@
+'use client';
+
+import * as React from 'react';
+import { useState, useEffect } from 'react';
+import { Plus, X, Save, Send, Info, FilePlus, ListChecks } from 'lucide-react';
+import { Card, CardContent } from '@/figma-make/components/base/card';
+import { Button } from '@/figma-make/components/base/button';
+import { Label } from '@/figma-make/components/base/label';
+import { Input } from '@/figma-make/components/base/input';
+import { Textarea } from '@/figma-make/components/base/textarea';
+import { Badge } from '@/figma-make/components/base/badge';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/figma-make/components/base/select';
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+  DialogFooter,
+} from '@/figma-make/components/base/dialog';
+import { DatePicker } from '@/figma-make/components/base/date-picker';
+import { toast } from 'sonner';
+import { supabase, isSupabaseConfigured } from '@/figma-make/lib/supabase';
+
+// Static categories
+const CATEGORIES = [
+  { value: 'pullet_open', label: 'Pullet Open' },
+  { value: 'pullet_close', label: 'Pullet Close' },
+  { value: 'produksi_open', label: 'Produksi Open' },
+  { value: 'produksi_close', label: 'Produksi Close' },
+];
+
+const TIME_TYPE_ORDER = ['umum', 'pagi', 'siang', 'sore', 'malam'];
+const TIME_TYPE_LABELS: { [key: string]: string } = {
+  umum: 'Umum',
+  pagi: 'Pagi',
+  siang: 'Siang',
+  sore: 'Sore',
+  malam: 'Malam',
+};
+
+interface Kandang {
+  id: string;
+  name: string;
+}
+
+interface Phase {
+  id: string;
+  name: 'string';
+  category: string;
+}
+
+interface Activity {
+  id: string;
+  phase_id: string;
+  name: string;
+  description?: string;
+  time_type: string;
+}
+
+interface Employee {
+  id: string;
+  name: string;
+  kandang_id: string;
+}
+
+interface TaskAssignment {
+  task_id: string;
+  employee_id: string;
+  checked: boolean;
+  note: string | null;
+}
+
+export function DailyChecklistContent() {
+  const [date, setDate] = useState(() => {
+    const today = new Date();
+    return today.toISOString().split('T')[0];
+  });
+  const [kandangId, setKandangId] = useState('');
+  const [selectedCategory, setSelectedCategory] = useState('');
+  const [selectedPhaseIds, setSelectedPhaseIds] = useState<string[]>([]);
+  const [checklistName, setChecklistName] = useState('');
+
+  const [kandangList, setKandangList] = useState<Kandang[]>([]);
+  const [allPhases, setAllPhases] = useState<Phase[]>([]);
+  const [employees, setEmployees] = useState<Employee[]>([]);
+  const [selectedEmployees, setSelectedEmployees] = useState<Employee[]>([]);
+
+  const [dailyChecklistId, setDailyChecklistId] = useState<string | null>(null);
+  const [checklistStatus, setChecklistStatus] = useState<string>('DRAFT');
+  const [isEditMode, setIsEditMode] = useState(false);
+
+  // Activities grouped by phase
+  const [activitiesByPhase, setActivitiesByPhase] = useState<{
+    [phaseId: string]: Activity[];
+  }>({});
+
+  // Task IDs mapped by phase_activity_id for quick lookup
+  const [taskIdsByPhaseActivityId, setTaskIdsByPhaseActivityId] = useState<{
+    [phaseActivityId: string]: string;
+  }>({});
+
+  // Assignments: { task_id: { employee_id: { checked, note } } }
+  const [assignments, setAssignments] = useState<{
+    [taskId: string]: {
+      [employeeId: string]: { checked: boolean; note: string };
+    };
+  }>({});
+
+  const [showAbkModal, setShowAbkModal] = useState(false);
+  const [showPhaseModal, setShowPhaseModal] = useState(false);
+  const [tempSelectedEmployees, setTempSelectedEmployees] = useState<
+    Employee[]
+  >([]);
+  const [tempSelectedPhaseIds, setTempSelectedPhaseIds] = useState<string[]>(
+    []
+  );
+  const [searchAbk, setSearchAbk] = useState('');
+  const [searchPhase, setSearchPhase] = useState('');
+
+  const [loading, setLoading] = useState(false);
+  const [initialLoading, setInitialLoading] = useState(true);
+  const [datePickerOpen, setDatePickerOpen] = useState(false);
+
+  // Format date for display
+  const formatDateForDisplay = (dateStr: string) => {
+    if (!dateStr) return 'Pilih tanggal';
+    const [year, month, day] = dateStr.split('-');
+    const date = new Date(parseInt(year), parseInt(month) - 1, parseInt(day));
+    return date.toLocaleDateString('id-ID', {
+      weekday: 'long',
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric',
+    });
+  };
+
+  // Fetch master data on mount
+  useEffect(() => {
+    if (!isSupabaseConfigured()) {
+      console.warn(
+        'Supabase not configured. Please add environment variables.'
+      );
+      setInitialLoading(false);
+      return;
+    }
+
+    fetchKandang();
+    fetchAllPhases();
+    setInitialLoading(false);
+  }, []);
+
+  // Check for existing checklist when unique key changes
+  useEffect(() => {
+    const checkAndLoadChecklist = async () => {
+      if (!date || !kandangId || !selectedCategory || !isSupabaseConfigured()) {
+        setDailyChecklistId(null);
+        setChecklistStatus('DRAFT');
+        setIsEditMode(false);
+        setSelectedPhaseIds([]);
+        setActivitiesByPhase({});
+        setTaskIdsByPhaseActivityId({});
+        setAssignments({});
+        return;
+      }
+
+      try {
+        // UPSERT to get or create checklist (UNIQUE KEY: date, kandang_id, category)
+        const { data: checklist, error } = await supabase
+          .from('daily_checklists')
+          .upsert(
+            {
+              date,
+              kandang_id: kandangId,
+              category: selectedCategory,
+              status: 'DRAFT',
+              updated_at: new Date().toISOString(),
+            },
+            {
+              onConflict: 'date,kandang_id,category',
+              ignoreDuplicates: false,
+            }
+          )
+          .select()
+          .single();
+
+        if (error) {
+          console.error('Error upserting checklist:', error);
+          toast.error('Gagal memuat checklist');
+          return;
+        }
+
+        setDailyChecklistId(checklist.id);
+        setChecklistStatus(checklist.status);
+
+        // Load existing phases for this checklist
+        const { data: existingPhases, error: phaseError } = await supabase
+          .from('daily_checklist_phases')
+          .select('phase_id')
+          .eq('checklist_id', checklist.id); // ✅ Uses checklist_id
+
+        if (phaseError) {
+          console.error('Error loading phases:', phaseError);
+        } else if (existingPhases && existingPhases.length > 0) {
+          // Existing checklist - EDIT MODE
+          setIsEditMode(true);
+          const phaseIds = existingPhases.map((p) => p.phase_id);
+          setSelectedPhaseIds(phaseIds);
+
+          if (checklist.status === 'DRAFT') {
+            toast.info('Checklist ditemukan - Mode Edit (Draft)', {
+              description:
+                'Anda dapat menambah atau mengubah data checklist ini',
+            });
+          } else {
+            toast.warning(`Checklist sudah ${checklist.status}`, {
+              description: 'Checklist tidak dapat diedit',
+            });
+          }
+        } else {
+          // New checklist - CREATE MODE
+          setIsEditMode(false);
+          setSelectedPhaseIds([]);
+        }
+      } catch (error) {
+        console.error('Error checking checklist:', error);
+      }
+    };
+
+    checkAndLoadChecklist();
+  }, [date, kandangId, selectedCategory]);
+
+  // Load activities and tasks when phases change
+  useEffect(() => {
+    const loadActivitiesAndTasks = async () => {
+      if (
+        !dailyChecklistId ||
+        selectedPhaseIds.length === 0 ||
+        !isSupabaseConfigured()
+      ) {
+        setActivitiesByPhase({});
+        setTaskIdsByPhaseActivityId({});
+        return;
+      }
+
+      try {
+        // Fetch activities for selected phases
+        const { data: activities, error: actError } = await supabase
+          .from('phase_activities')
+          .select('id, phase_id, name, description, time_type')
+          .in('phase_id', selectedPhaseIds)
+          .order('id', { ascending: true }); // ✅ Urutan berdasarkan ID (yang paling awal diinput di atas)
+
+        if (actError) {
+          console.error('Error loading activities:', actError);
+          toast.error('Gagal memuat aktivitas');
+          return;
+        }
+
+        // Group activities by phase
+        const grouped: { [phaseId: string]: Activity[] } = {};
+        (activities || []).forEach((act) => {
+          if (!grouped[act.phase_id]) {
+            grouped[act.phase_id] = [];
+          }
+          grouped[act.phase_id].push(act);
+        });
+        setActivitiesByPhase(grouped);
+
+        // Ensure tasks exist for all activities (UPSERT)
+        const taskUpserts = (activities || []).map((act) => ({
+          checklist_id: dailyChecklistId,
+          phase_activity_id: act.id,
+          phase_id: act.phase_id,
+          time_type: act.time_type,
+          notes: null,
+        }));
+
+        if (taskUpserts.length > 0) {
+          const { data: tasks, error: taskError } = await supabase
+            .from('daily_checklist_activity_tasks')
+            .upsert(taskUpserts, {
+              onConflict: 'checklist_id,phase_activity_id',
+              ignoreDuplicates: false,
+            })
+            .select('id, phase_activity_id');
+
+          if (taskError) {
+            console.error('Error upserting tasks:', taskError);
+            return;
+          }
+
+          // Build task ID lookup
+          const taskMap: { [phaseActivityId: string]: string } = {};
+          (tasks || []).forEach((task) => {
+            taskMap[task.phase_activity_id] = task.id;
+          });
+          setTaskIdsByPhaseActivityId(taskMap);
+
+          // Load existing assignments for these tasks
+          await loadAssignments(tasks.map((t) => t.id));
+        }
+      } catch (error) {
+        console.error('Error loading activities and tasks:', error);
+      }
+    };
+
+    loadActivitiesAndTasks();
+  }, [dailyChecklistId, selectedPhaseIds]);
+
+  // Load employees when kandang changes
+  useEffect(() => {
+    if (kandangId && isSupabaseConfigured()) {
+      fetchEmployees(kandangId);
+      // ✅ Clear selected employees ketika kandang berubah (reset ABK assignment)
+      setSelectedEmployees([]);
+      setAssignments({});
+    } else {
+      setEmployees([]);
+      setSelectedEmployees([]);
+      setAssignments({});
+    }
+  }, [kandangId]);
+
+  const loadAssignments = async (taskIds: string[]) => {
+    if (taskIds.length === 0 || !isSupabaseConfigured()) return;
+
+    try {
+      const { data, error } = await supabase
+        .from('daily_checklist_activity_task_assignments')
+        .select('task_id, employee_id, checked, note')
+        .in('task_id', taskIds);
+
+      if (error) {
+        console.error('Error loading assignments:', error);
+        return;
+      }
+
+      // Build assignments map
+      const assignmentMap: {
+        [taskId: string]: {
+          [employeeId: string]: { checked: boolean; note: string };
+        };
+      } = {};
+
+      (data || []).forEach((assignment) => {
+        if (!assignmentMap[assignment.task_id]) {
+          assignmentMap[assignment.task_id] = {};
+        }
+        assignmentMap[assignment.task_id][assignment.employee_id] = {
+          checked: assignment.checked,
+          note: assignment.note || '',
+        };
+      });
+
+      setAssignments(assignmentMap);
+
+      // Load employees from assignments
+      const employeeIds = Array.from(
+        new Set((data || []).map((a) => a.employee_id))
+      );
+      if (employeeIds.length > 0) {
+        const { data: empData, error: empError } = await supabase
+          .from('employees')
+          .select('id, name, kandang_id')
+          .in('id', employeeIds);
+
+        if (!empError && empData) {
+          setSelectedEmployees(empData);
+        }
+      }
+    } catch (error) {
+      console.error('Error loading assignments:', error);
+    }
+  };
+
+  const fetchKandang = async () => {
+    if (!isSupabaseConfigured()) return;
+
+    try {
+      const { data, error } = await supabase
+        .from('kandang')
+        .select('id, name')
+        .order('name', { ascending: true });
+
+      if (error) {
+        console.error('Error fetching kandang:', error);
+        return;
+      }
+
+      setKandangList(data || []);
+    } catch (error) {
+      console.error('Error fetching kandang:', error);
+    }
+  };
+
+  const fetchAllPhases = async () => {
+    if (!isSupabaseConfigured()) return;
+
+    try {
+      const { data, error } = await supabase
+        .from('phases')
+        .select('id, name, category')
+        .order('id', { ascending: true }); // ✅ Urutan berdasarkan ID (yang paling awal diinput di atas)
+
+      if (error) {
+        console.error('Error fetching phases:', error);
+        return;
+      }
+
+      setAllPhases(data || []);
+    } catch (error) {
+      console.error('Error fetching phases:', error);
+    }
+  };
+
+  const fetchEmployees = async (kandangId: string) => {
+    if (!isSupabaseConfigured()) return;
+
+    try {
+      const { data, error } = await supabase
+        .from('employees')
+        .select('id, name, kandang_id')
+        .eq('kandang_id', kandangId)
+        .eq('is_active', true)
+        .order('name', { ascending: true });
+
+      if (error) {
+        console.error('Error fetching employees:', error);
+        return;
+      }
+
+      setEmployees(data || []);
+    } catch (error) {
+      console.error('Error fetching employees:', error);
+    }
+  };
+
+  // Phase selection modal
+  const handleAddPhase = () => {
+    if (!selectedCategory) {
+      toast.error('Pilih kategori terlebih dahulu');
+      return;
+    }
+    setTempSelectedPhaseIds([...selectedPhaseIds]);
+    setSearchPhase('');
+    setShowPhaseModal(true);
+  };
+
+  const toggleTempPhase = (phaseId: string) => {
+    if (tempSelectedPhaseIds.includes(phaseId)) {
+      setTempSelectedPhaseIds(
+        tempSelectedPhaseIds.filter((id) => id !== phaseId)
+      );
+    } else {
+      setTempSelectedPhaseIds([...tempSelectedPhaseIds, phaseId]);
+    }
+  };
+
+  const applyPhaseSelection = async () => {
+    if (!dailyChecklistId || !isSupabaseConfigured()) {
+      toast.error('Checklist belum tersedia');
+      return;
+    }
+
+    try {
+      // Delete existing phase links
+      await supabase
+        .from('daily_checklist_phases')
+        .delete()
+        .eq('checklist_id', dailyChecklistId);
+
+      // Insert new phase links
+      if (tempSelectedPhaseIds.length > 0) {
+        const phaseLinks = tempSelectedPhaseIds.map((phaseId) => ({
+          checklist_id: dailyChecklistId,
+          phase_id: phaseId,
+        }));
+
+        const { error } = await supabase
+          .from('daily_checklist_phases')
+          .insert(phaseLinks);
+
+        if (error) {
+          console.error('Error saving phases:', error);
+          toast.error('Gagal menyimpan fase');
+          return;
+        }
+      }
+
+      setSelectedPhaseIds([...tempSelectedPhaseIds]);
+      setShowPhaseModal(false);
+      setSearchPhase('');
+      toast.success('Fase berhasil disimpan');
+    } catch (error) {
+      console.error('Error applying phase selection:', error);
+      toast.error('Terjadi kesalahan');
+    }
+  };
+
+  // ABK selection modal
+  const handleAddAbk = () => {
+    if (!kandangId) {
+      toast.error('Pilih kandang terlebih dahulu');
+      return;
+    }
+    setTempSelectedEmployees([...selectedEmployees]);
+    setSearchAbk('');
+    setShowAbkModal(true);
+  };
+
+  const toggleTempEmployee = (employee: Employee) => {
+    const isSelected = tempSelectedEmployees.find((e) => e.id === employee.id);
+    if (isSelected) {
+      setTempSelectedEmployees(
+        tempSelectedEmployees.filter((e) => e.id !== employee.id)
+      );
+    } else {
+      setTempSelectedEmployees([...tempSelectedEmployees, employee]);
+    }
+  };
+
+  const toggleSelectAllAbk = () => {
+    if (tempSelectedEmployees.length === employees.length) {
+      setTempSelectedEmployees([]);
+    } else {
+      setTempSelectedEmployees([...employees]);
+    }
+  };
+
+  const applyAbkSelection = async () => {
+    if (!dailyChecklistId) {
+      toast.error('Checklist belum tersedia');
+      return;
+    }
+
+    // Remove assignments for employees that were deselected
+    const removedEmployees = selectedEmployees.filter(
+      (emp) => !tempSelectedEmployees.find((temp) => temp.id === emp.id)
+    );
+
+    if (removedEmployees.length > 0 && isSupabaseConfigured()) {
+      const taskIds = Object.values(taskIdsByPhaseActivityId);
+      if (taskIds.length > 0) {
+        await supabase
+          .from('daily_checklist_activity_task_assignments')
+          .delete()
+          .in('task_id', taskIds)
+          .in(
+            'employee_id',
+            removedEmployees.map((e) => e.id)
+          );
+      }
+
+      // Remove from state
+      const newAssignments = { ...assignments };
+      Object.keys(newAssignments).forEach((taskId) => {
+        removedEmployees.forEach((emp) => {
+          delete newAssignments[taskId][emp.id];
+        });
+      });
+      setAssignments(newAssignments);
+    }
+
+    // Add assignments for newly selected employees (upsert with checked=false)
+    const addedEmployees = tempSelectedEmployees.filter(
+      (temp) => !selectedEmployees.find((emp) => emp.id === temp.id)
+    );
+
+    if (addedEmployees.length > 0 && isSupabaseConfigured()) {
+      const taskIds = Object.values(taskIdsByPhaseActivityId);
+      const newAssignments: {
+        task_id: string;
+        employee_id: string;
+        checked: boolean;
+        note: string | null;
+      }[] = [];
+
+      taskIds.forEach((taskId) => {
+        addedEmployees.forEach((emp) => {
+          newAssignments.push({
+            task_id: taskId,
+            employee_id: emp.id,
+            checked: false,
+            note: null,
+          });
+        });
+      });
+
+      if (newAssignments.length > 0) {
+        await supabase
+          .from('daily_checklist_activity_task_assignments')
+          .upsert(newAssignments, {
+            onConflict: 'task_id,employee_id',
+            ignoreDuplicates: false,
+          });
+      }
+    }
+
+    setSelectedEmployees([...tempSelectedEmployees]);
+    setShowAbkModal(false);
+    setSearchAbk('');
+    toast.success('ABK berhasil disimpan');
+  };
+
+  const handleRemoveAbk = async (employeeId: string) => {
+    if (!isSupabaseConfigured()) return;
+
+    // Delete assignments for this employee
+    const taskIds = Object.values(taskIdsByPhaseActivityId);
+    if (taskIds.length > 0) {
+      await supabase
+        .from('daily_checklist_activity_task_assignments')
+        .delete()
+        .in('task_id', taskIds)
+        .eq('employee_id', employeeId);
+    }
+
+    // Remove from state
+    const newAssignments = { ...assignments };
+    Object.keys(newAssignments).forEach((taskId) => {
+      delete newAssignments[taskId][employeeId];
+    });
+    setAssignments(newAssignments);
+
+    setSelectedEmployees(selectedEmployees.filter((e) => e.id !== employeeId));
+  };
+
+  const handleCheckboxChange = async (
+    activityId: string,
+    employeeId: string,
+    checked: boolean
+  ) => {
+    const taskId = taskIdsByPhaseActivityId[activityId];
+
+    console.log('[CHECKBOX] Click detected:', {
+      activityId,
+      employeeId,
+      checked,
+      taskId,
+      hasTaskId: !!taskId,
+      isSupabaseConfigured: isSupabaseConfigured(),
+      checklistStatus,
+      isEditable,
+    });
+
+    if (!taskId) {
+      console.error('[CHECKBOX] No taskId found for activityId:', activityId);
+      console.error('[CHECKBOX] Available taskIds:', taskIdsByPhaseActivityId);
+      toast.error('Task ID tidak ditemukan. Coba refresh halaman.');
+      return;
+    }
+
+    if (!isSupabaseConfigured()) {
+      console.error('[CHECKBOX] Supabase not configured');
+      toast.error('Database tidak terkonfigurasi');
+      return;
+    }
+
+    if (!isEditable) {
+      console.warn(
+        '[CHECKBOX] Checklist is not editable, status:',
+        checklistStatus
+      );
+      return;
+    }
+
+    // Optimistically update UI first
+    setAssignments((prev) => {
+      const updated = {
+        ...prev,
+        [taskId]: {
+          ...prev[taskId],
+          [employeeId]: {
+            checked,
+            note: prev[taskId]?.[employeeId]?.note || '',
+          },
+        },
+      };
+      console.log(
+        '[CHECKBOX] State updated optimistically:',
+        updated[taskId]?.[employeeId]
+      );
+      return updated;
+    });
+
+    // Update database
+    const payload = {
+      task_id: taskId,
+      employee_id: employeeId,
+      checked,
+      note: assignments[taskId]?.[employeeId]?.note || null,
+    };
+
+    console.log('[CHECKBOX] Saving to database:', payload);
+
+    const { error } = await supabase
+      .from('daily_checklist_activity_task_assignments')
+      .upsert(payload, {
+        onConflict: 'task_id,employee_id',
+        ignoreDuplicates: false,
+      });
+
+    if (error) {
+      console.error('[CHECKBOX] Database error:', error);
+      toast.error('Gagal menyimpan: ' + error.message);
+
+      // Revert state on error
+      setAssignments((prev) => ({
+        ...prev,
+        [taskId]: {
+          ...prev[taskId],
+          [employeeId]: {
+            checked: !checked,
+            note: prev[taskId]?.[employeeId]?.note || '',
+          },
+        },
+      }));
+      return;
+    }
+
+    console.log('[CHECKBOX] Saved successfully');
+  };
+
+  const handleNoteChange = async (
+    activityId: string,
+    employeeId: string,
+    note: string
+  ) => {
+    const taskId = taskIdsByPhaseActivityId[activityId];
+    if (!taskId || !isSupabaseConfigured()) return;
+
+    // Update database
+    const { error } = await supabase
+      .from('daily_checklist_activity_task_assignments')
+      .upsert(
+        {
+          task_id: taskId,
+          employee_id: employeeId,
+          checked: assignments[taskId]?.[employeeId]?.checked || false,
+          note: note || null,
+        },
+        {
+          onConflict: 'task_id,employee_id',
+          ignoreDuplicates: false,
+        }
+      );
+
+    if (error) {
+      console.error('Error updating note:', error);
+      return;
+    }
+
+    // Update state
+    setAssignments((prev) => ({
+      ...prev,
+      [taskId]: {
+        ...prev[taskId],
+        [employeeId]: {
+          checked: prev[taskId]?.[employeeId]?.checked || false,
+          note,
+        },
+      },
+    }));
+  };
+
+  const handleSubmit = async () => {
+    if (!dailyChecklistId || !isSupabaseConfigured()) return;
+
+    if (selectedEmployees.length === 0) {
+      toast.error('Pilih minimal 1 ABK');
+      return;
+    }
+
+    if (selectedPhaseIds.length === 0) {
+      toast.error('Pilih minimal 1 fase');
+      return;
+    }
+
+    setLoading(true);
+
+    try {
+      // Update status to SUBMITTED
+      const { error } = await supabase
+        .from('daily_checklists')
+        .update({
+          status: 'SUBMITTED',
+          updated_at: new Date().toISOString(),
+        })
+        .eq('id', dailyChecklistId);
+
+      if (error) {
+        console.error('Error submitting:', error);
+        toast.error('Gagal submit checklist');
+        return;
+      }
+
+      setChecklistStatus('SUBMITTED');
+      toast.success('Checklist berhasil disubmit untuk approval');
+    } catch (error) {
+      console.error('Error submitting:', error);
+      toast.error('Terjadi kesalahan');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleSaveDraft = async () => {
+    if (!dailyChecklistId) return;
+
+    toast.success('Draft tersimpan otomatis');
+  };
+
+  // Filter functions
+  const filteredEmployees = employees.filter((emp) =>
+    emp.name.toLowerCase().includes(searchAbk.toLowerCase())
+  );
+
+  const availablePhases = allPhases.filter(
+    (p) => p.category === selectedCategory
+  );
+  const filteredPhases = availablePhases.filter((phase) =>
+    phase.name.toLowerCase().includes(searchPhase.toLowerCase())
+  );
+
+  const isAllAbkSelected =
+    tempSelectedEmployees.length === employees.length && employees.length > 0;
+  const isAllPhasesSelected =
+    tempSelectedPhaseIds.length === availablePhases.length &&
+    availablePhases.length > 0;
+
+  // Group activities by PHASE → TIME_TYPE → ACTIVITIES
+  const groupActivitiesByPhase = () => {
+    const grouped: {
+      [phaseId: string]: {
+        phase: Phase;
+        timeGroups: {
+          [timeType: string]: Activity[];
+        };
+      };
+    } = {};
+
+    const selectedPhasesData = allPhases.filter((p) =>
+      selectedPhaseIds.includes(p.id)
+    );
+
+    selectedPhasesData.forEach((phase) => {
+      const phaseActivities = activitiesByPhase[phase.id] || [];
+
+      if (!grouped[phase.id]) {
+        grouped[phase.id] = {
+          phase,
+          timeGroups: {},
+        };
+      }
+
+      // Group activities by time_type within this phase
+      phaseActivities.forEach((activity) => {
+        const timeType = activity.time_type || 'umum';
+
+        if (!grouped[phase.id].timeGroups[timeType]) {
+          grouped[phase.id].timeGroups[timeType] = [];
+        }
+
+        grouped[phase.id].timeGroups[timeType].push(activity);
+      });
+    });
+
+    return grouped;
+  };
+
+  const isEditable = checklistStatus === 'DRAFT';
+
+  if (initialLoading) {
+    return (
+      <div className='min-h-screen'>
+        <div className='p-6'>
+          <div className='mb-6'>
+            <h1 className='text-2xl font-semibold text-gray-900'>
+              Daily Checklist
+            </h1>
+            <p className='text-sm text-gray-600 mt-1'>
+              Checklist Harian Aktivitas Kandang
+            </p>
+          </div>
+          <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+            <CardContent className='p-12 text-center text-gray-500'>
+              Memuat data...
+            </CardContent>
+          </Card>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className='min-h-screen bg-[#F9FAFB]'>
+      <div className='p-6'>
+        {/* Page Title */}
+        <div className='mb-6'>
+          <div className='flex items-center gap-3'>
+            <h1 className='text-2xl font-semibold text-gray-900'>
+              Daily Checklist
+            </h1>
+            {isEditMode && (
+              <Badge
+                variant='outline'
+                className='border-amber-300 text-amber-700 bg-white'
+              >
+                <Info className='w-3 h-3 mr-1' />
+                Mode Edit
+              </Badge>
+            )}
+            {checklistStatus !== 'DRAFT' && (
+              <Badge
+                variant='outline'
+                className='border-blue-300 text-blue-700 bg-white'
+              >
+                {checklistStatus}
+              </Badge>
+            )}
+          </div>
+          <p className='text-sm text-gray-600 mt-1'>
+            Checklist Harian Aktivitas Kandang
+          </p>
+        </div>
+
+        {/* Main Card */}
+        <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+          <CardContent className='p-6'>
+            {/* Form Section */}
+            <div className='grid grid-cols-1 md:grid-cols-3 gap-4 mb-6 pb-6 border-b border-gray-200'>
+              <div>
+                <Label htmlFor='date'>
+                  Tanggal <span className='text-red-500'>*</span>
+                </Label>
+                <div className='mt-1.5'>
+                  <DatePicker
+                    date={date}
+                    onDateChange={setDate}
+                    disabled={!isEditable}
+                    placeholder='Pilih tanggal'
+                    formatDisplay={formatDateForDisplay}
+                  />
+                </div>
+              </div>
+
+              <div>
+                <Label htmlFor='kandang'>
+                  Kandang <span className='text-red-500'>*</span>
+                </Label>
+                <Select
+                  value={kandangId}
+                  onValueChange={setKandangId}
+                  disabled={!isEditable}
+                >
+                  <SelectTrigger
+                    id='kandang'
+                    className='mt-1.5 border-gray-200'
+                  >
+                    <SelectValue placeholder='Pilih kandang' />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {kandangList.map((kandang) => (
+                      <SelectItem key={kandang.id} value={kandang.id}>
+                        {kandang.name}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
+
+              <div>
+                <Label htmlFor='category'>
+                  Kategori <span className='text-red-500'>*</span>
+                </Label>
+                <Select
+                  value={selectedCategory}
+                  onValueChange={setSelectedCategory}
+                  disabled={!isEditable}
+                >
+                  <SelectTrigger
+                    id='category'
+                    className='mt-1.5 border-gray-200'
+                  >
+                    <SelectValue placeholder='Pilih kategori' />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {CATEGORIES.map((category) => (
+                      <SelectItem key={category.value} value={category.value}>
+                        {category.label}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
+            </div>
+
+            {/* Phase Selection Section */}
+            {dailyChecklistId && (
+              <div className='mb-6 pb-6 border-b border-gray-200'>
+                <div className='flex items-center justify-between mb-3'>
+                  <Label>Fase / Tahap</Label>
+                  <Button
+                    onClick={handleAddPhase}
+                    size='sm'
+                    variant='outline'
+                    className='border-[#0069e0] text-[#0069e0] hover:bg-blue-50'
+                    disabled={!selectedCategory || !isEditable}
+                  >
+                    <Plus className='w-4 h-4 mr-1' />
+                    Pilih Fase
+                  </Button>
+                </div>
+
+                {selectedPhaseIds.length > 0 ? (
+                  <div className='flex flex-wrap gap-2'>
+                    {allPhases
+                      .filter((p) => selectedPhaseIds.includes(p.id))
+                      .map((phase) => (
+                        <Badge
+                          key={phase.id}
+                          variant='secondary'
+                          className='px-3 py-1.5 bg-blue-50 text-blue-700 border border-blue-200 rounded-lg'
+                        >
+                          {phase.name}
+                        </Badge>
+                      ))}
+                  </div>
+                ) : (
+                  <p className='text-sm text-gray-500'>
+                    Belum ada fase dipilih
+                  </p>
+                )}
+              </div>
+            )}
+
+            {/* ABK Assignment Section */}
+            {dailyChecklistId && selectedPhaseIds.length > 0 && (
+              <div className='mb-6 pb-6 border-b border-gray-200'>
+                <div className='flex items-center justify-between mb-3'>
+                  <Label>ABK Assignment</Label>
+                  <Button
+                    onClick={handleAddAbk}
+                    size='sm'
+                    variant='outline'
+                    className='border-[#0069e0] text-[#0069e0] hover:bg-blue-50'
+                    disabled={!kandangId || !isEditable}
+                  >
+                    <Plus className='w-4 h-4 mr-1' />
+                    Tambah ABK
+                  </Button>
+                </div>
+
+                {selectedEmployees.length > 0 ? (
+                  <div className='flex flex-wrap gap-2'>
+                    {selectedEmployees.map((emp) => (
+                      <Badge
+                        key={emp.id}
+                        variant='secondary'
+                        className='px-3 py-1.5 bg-gray-100 text-gray-700 border border-gray-200 rounded-lg'
+                      >
+                        {emp.name}
+                        {isEditable && (
+                          <button
+                            onClick={() => handleRemoveAbk(emp.id)}
+                            className='ml-2 hover:text-gray-900'
+                          >
+                            <X className='w-3 h-3' />
+                          </button>
+                        )}
+                      </Badge>
+                    ))}
+                  </div>
+                ) : (
+                  <p className='text-sm text-gray-500'>Belum ada ABK dipilih</p>
+                )}
+              </div>
+            )}
+
+            {/* Activity Checklist Table */}
+            {dailyChecklistId &&
+            selectedPhaseIds.length > 0 &&
+            selectedEmployees.length > 0 ? (
+              <div>
+                <h3 className='font-semibold text-gray-900 mb-4'>
+                  Checklist Aktivitas
+                </h3>
+                {Object.keys(activitiesByPhase).length > 0 ? (
+                  <div className='overflow-x-auto'>
+                    <table className='w-full border border-gray-200 rounded-lg'>
+                      <thead>
+                        <tr className='bg-gray-50 border-b border-gray-200'>
+                          <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700 border-r border-gray-200 min-w-[200px]'>
+                            Aktivitas
+                          </th>
+                          {selectedEmployees.map((emp) => (
+                            <th
+                              key={emp.id}
+                              className='text-center py-3 px-4 text-sm font-semibold text-gray-700 border-r border-gray-200 min-w-[100px]'
+                            >
+                              {emp.name}
+                            </th>
+                          ))}
+                          <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700 min-w-[200px]'>
+                            Catatan
+                          </th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        {Object.keys(groupActivitiesByPhase()).flatMap(
+                          (phaseId) => {
+                            const phaseData = groupActivitiesByPhase()[phaseId];
+                            const { phase, timeGroups } = phaseData;
+                            const timeTypes = Object.keys(timeGroups).sort(
+                              (a, b) =>
+                                TIME_TYPE_ORDER.indexOf(a) -
+                                TIME_TYPE_ORDER.indexOf(b)
+                            );
+
+                            // Count total activities in this phase
+                            const totalActivities = timeTypes.reduce(
+                              (sum, timeType) =>
+                                sum + timeGroups[timeType].length,
+                              0
+                            );
+
+                            // Build all rows for this phase
+                            const rows = [];
+
+                            // PHASE Header (Main parent) - BLUE
+                            rows.push(
+                              <tr
+                                key={`phase-${phaseId}`}
+                                className='bg-blue-50 border-b border-blue-200'
+                              >
+                                <td
+                                  colSpan={selectedEmployees.length + 2}
+                                  className='py-2.5 px-4'
+                                >
+                                  <div className='flex items-center gap-2'>
+                                    <span className='text-sm font-semibold text-blue-900'>
+                                      {phase.name}
+                                    </span>
+                                    <Badge
+                                      variant='secondary'
+                                      className='text-xs bg-blue-100 text-blue-700 border-blue-200 rounded-lg'
+                                    >
+                                      {totalActivities} aktivitas
+                                    </Badge>
+                                  </div>
+                                </td>
+                              </tr>
+                            );
+
+                            // TIME_TYPE sub-headers and activities
+                            timeTypes.forEach((timeType) => {
+                              const activities = timeGroups[timeType];
+                              const hasMultipleTimeTypes = timeTypes.length > 1;
+
+                              // TIME Header (optional, only if phase has multiple time types) - GRAY SOFT
+                              if (hasMultipleTimeTypes) {
+                                rows.push(
+                                  <tr
+                                    key={`time-${phaseId}-${timeType}`}
+                                    className='bg-gray-50 border-b border-gray-200'
+                                  >
+                                    <td
+                                      colSpan={selectedEmployees.length + 2}
+                                      className='py-2 px-4 pl-8'
+                                    >
+                                      <span className='text-xs font-medium text-gray-600'>
+                                        {TIME_TYPE_LABELS[timeType]} (
+                                        {activities.length} aktivitas)
+                                      </span>
+                                    </td>
+                                  </tr>
+                                );
+                              }
+
+                              // ACTIVITY rows (Child rows with checkboxes)
+                              activities.forEach((activity, index) => {
+                                const taskId =
+                                  taskIdsByPhaseActivityId[activity.id];
+                                const indentClass = hasMultipleTimeTypes
+                                  ? 'pl-12'
+                                  : 'pl-8';
+
+                                rows.push(
+                                  <tr
+                                    key={`activity-${activity.id}`}
+                                    className={
+                                      index % 2 === 0
+                                        ? 'bg-white'
+                                        : 'bg-gray-50/50'
+                                    }
+                                  >
+                                    <td
+                                      className={`py-3 px-4 ${indentClass} border-r border-gray-200`}
+                                    >
+                                      <p className='text-sm text-gray-900'>
+                                        {activity.name}
+                                      </p>
+                                      {activity.description && (
+                                        <p className='text-xs text-gray-500 mt-0.5'>
+                                          {activity.description}
+                                        </p>
+                                      )}
+                                    </td>
+                                    {selectedEmployees.map((emp) => (
+                                      <td
+                                        key={emp.id}
+                                        className='text-center py-3 px-4 border-r border-gray-200'
+                                      >
+                                        <input
+                                          type='checkbox'
+                                          checked={
+                                            assignments[taskId]?.[emp.id]
+                                              ?.checked || false
+                                          }
+                                          onChange={(e) =>
+                                            handleCheckboxChange(
+                                              activity.id,
+                                              emp.id,
+                                              e.target.checked
+                                            )
+                                          }
+                                          disabled={!isEditable}
+                                          className='checkbox-clean'
+                                        />
+                                      </td>
+                                    ))}
+                                    <td className='py-3 px-4'>
+                                      <Textarea
+                                        value={
+                                          taskId && selectedEmployees.length > 0
+                                            ? assignments[taskId]?.[
+                                                selectedEmployees[0].id
+                                              ]?.note || ''
+                                            : ''
+                                        }
+                                        onChange={(e) => {
+                                          if (selectedEmployees.length > 0) {
+                                            handleNoteChange(
+                                              activity.id,
+                                              selectedEmployees[0].id,
+                                              e.target.value
+                                            );
+                                          }
+                                        }}
+                                        placeholder='Catatan (opsional)'
+                                        disabled={!isEditable}
+                                        className='text-sm min-h-[36px] resize-none'
+                                        rows={1}
+                                      />
+                                    </td>
+                                  </tr>
+                                );
+                              });
+                            });
+
+                            return rows;
+                          }
+                        )}
+                      </tbody>
+                    </table>
+                  </div>
+                ) : (
+                  <div className='flex flex-col items-center justify-center py-16 text-center'>
+                    <ListChecks className='w-16 h-16 text-gray-300 mb-4' />
+                    <h3 className='text-lg font-semibold text-gray-700 mb-2'>
+                      Tidak Ada Aktivitas
+                    </h3>
+                    <p className='text-sm text-gray-500 max-w-md'>
+                      Tidak ada aktivitas untuk fase yang dipilih. Silakan
+                      tambahkan aktivitas di Master Aktivitas.
+                    </p>
+                  </div>
+                )}
+              </div>
+            ) : (
+              <div className='flex flex-col items-center justify-center py-16 text-center'>
+                {!dailyChecklistId ? (
+                  <div>
+                    <FilePlus className='w-16 h-16 text-gray-300 mb-4 mx-auto' />
+                    <h3 className='text-lg font-semibold text-gray-700 mb-2'>
+                      Mulai Checklist Baru
+                    </h3>
+                    <p className='text-sm text-gray-500 max-w-md'>
+                      Pilih tanggal, kandang, dan kategori untuk memulai
+                      checklist harian Anda.
+                    </p>
+                  </div>
+                ) : selectedPhaseIds.length === 0 ? (
+                  <div className='flex flex-col items-center text-center'>
+                    <FilePlus className='w-16 h-16 text-gray-300 mb-4' />
+                    <h3 className='text-lg font-semibold text-gray-700 mb-2'>
+                      Pilih Fase / Tahap
+                    </h3>
+                    <p className='text-sm text-gray-500 max-w-md'>
+                      Klik tombol {'"'}Pilih Fase{'"'} untuk memilih tahap
+                      aktivitas yang akan dikerjakan.
+                    </p>
+                  </div>
+                ) : (
+                  <div>
+                    <FilePlus className='w-16 h-16 text-gray-300 mb-4 mx-auto' />
+                    <h3 className='text-lg font-semibold text-gray-700 mb-2'>
+                      Pilih ABK
+                    </h3>
+                    <p className='text-sm text-gray-500 max-w-md'>
+                      Klik tombol {'"'}Tambah ABK{'"'} untuk memilih pekerja
+                      yang akan ditugaskan.
+                    </p>
+                  </div>
+                )}
+              </div>
+            )}
+
+            {/* Action Buttons */}
+            {dailyChecklistId &&
+              selectedPhaseIds.length > 0 &&
+              selectedEmployees.length > 0 &&
+              isEditable && (
+                <div className='flex justify-end gap-3 mt-6 pt-6 border-t border-gray-200'>
+                  <Button
+                    onClick={handleSaveDraft}
+                    variant='outline'
+                    disabled={loading}
+                    className='border-gray-200'
+                  >
+                    <Save className='w-4 h-4 mr-2' />
+                    Simpan Draft
+                  </Button>
+                  <Button
+                    onClick={handleSubmit}
+                    disabled={loading}
+                    className='bg-[#0069e0] hover:bg-[#0052b3] text-white'
+                  >
+                    <Send className='w-4 h-4 mr-2' />
+                    Submit Checklist
+                  </Button>
+                </div>
+              )}
+          </CardContent>
+        </Card>
+      </div>
+
+      {/* Phase Selection Modal */}
+      <Dialog
+        open={showPhaseModal}
+        onOpenChange={() => setShowPhaseModal(false)}
+      >
+        <DialogContent className='sm:max-w-lg bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle>Pilih Fase / Tahap</DialogTitle>
+            <DialogDescription>
+              Pilih satu atau lebih fase yang akan dikerjakan
+            </DialogDescription>
+          </DialogHeader>
+
+          <div className='pb-3 border-b border-gray-200'>
+            <Input
+              type='text'
+              placeholder='Cari nama fase...'
+              value={searchPhase}
+              onChange={(e) => setSearchPhase(e.target.value)}
+              className='border-gray-200'
+            />
+          </div>
+
+          {availablePhases.length > 0 && (
+            <div className='flex items-center gap-3 px-1 py-2'>
+              <label className='flex items-center gap-2 cursor-pointer group'>
+                <input
+                  type='checkbox'
+                  checked={isAllPhasesSelected}
+                  onChange={() => {
+                    if (isAllPhasesSelected) {
+                      setTempSelectedPhaseIds([]);
+                    } else {
+                      setTempSelectedPhaseIds(availablePhases.map((p) => p.id));
+                    }
+                  }}
+                  className='checkbox-clean'
+                />
+                <span className='text-sm font-medium text-gray-700 group-hover:text-gray-900'>
+                  Pilih Semua ({availablePhases.length} Fase)
+                </span>
+              </label>
+            </div>
+          )}
+
+          <div className='max-h-[320px] overflow-y-auto -mx-1 px-1'>
+            {filteredPhases.length > 0 ? (
+              <div className='space-y-1.5'>
+                {filteredPhases.map((phase) => {
+                  const isChecked = tempSelectedPhaseIds.includes(phase.id);
+
+                  return (
+                    <label
+                      key={phase.id}
+                      className={`flex items-start gap-3 px-4 py-3 rounded-lg border cursor-pointer transition-all ${
+                        isChecked
+                          ? 'bg-blue-50 border-[#0069e0]'
+                          : 'bg-white border-gray-200 hover:bg-gray-50 hover:border-gray-300'
+                      }`}
+                    >
+                      <input
+                        type='checkbox'
+                        checked={isChecked}
+                        onChange={() => toggleTempPhase(phase.id)}
+                        className='checkbox-clean mt-0.5'
+                      />
+                      <div className='flex-1 min-w-0'>
+                        <p className='text-sm font-medium text-gray-900'>
+                          {phase.name}
+                        </p>
+                      </div>
+                    </label>
+                  );
+                })}
+              </div>
+            ) : (
+              <p className='text-center text-gray-500 py-8 text-sm'>
+                {searchPhase
+                  ? 'Tidak ada fase ditemukan'
+                  : 'Tidak ada fase tersedia'}
+              </p>
+            )}
+          </div>
+
+          <DialogFooter className='flex items-center justify-between border-t border-gray-200 pt-4'>
+            <div className='text-sm text-gray-600'>
+              <Badge
+                variant='secondary'
+                className='bg-gray-100 text-gray-700 border-gray-200'
+              >
+                Terpilih: {tempSelectedPhaseIds.length} Fase
+              </Badge>
+            </div>
+            <div className='flex gap-2'>
+              <Button
+                variant='outline'
+                onClick={() => setShowPhaseModal(false)}
+                className='border-gray-200'
+              >
+                Batal
+              </Button>
+              <Button
+                onClick={applyPhaseSelection}
+                className='bg-[#0069e0] hover:bg-[#0052b3] text-white'
+              >
+                Terapkan
+              </Button>
+            </div>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      {/* ABK Selection Modal */}
+      <Dialog open={showAbkModal} onOpenChange={() => setShowAbkModal(false)}>
+        <DialogContent className='sm:max-w-lg bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle>Pilih ABK</DialogTitle>
+            <DialogDescription>
+              Pilih satu atau lebih ABK yang ditugaskan
+            </DialogDescription>
+          </DialogHeader>
+
+          <div className='pb-3 border-b border-gray-200'>
+            <Input
+              type='text'
+              placeholder='Cari nama ABK...'
+              value={searchAbk}
+              onChange={(e) => setSearchAbk(e.target.value)}
+              className='border-gray-200'
+            />
+          </div>
+
+          {employees.length > 0 && (
+            <div className='flex items-center gap-3 px-1 py-2'>
+              <label className='flex items-center gap-2 cursor-pointer group'>
+                <input
+                  type='checkbox'
+                  checked={isAllAbkSelected}
+                  onChange={toggleSelectAllAbk}
+                  className='checkbox-clean'
+                />
+                <span className='text-sm font-medium text-gray-700 group-hover:text-gray-900'>
+                  Pilih Semua ({employees.length} ABK)
+                </span>
+              </label>
+            </div>
+          )}
+
+          <div className='max-h-[320px] overflow-y-auto -mx-1 px-1'>
+            {filteredEmployees.length > 0 ? (
+              <div className='space-y-1.5'>
+                {filteredEmployees.map((emp) => {
+                  const isChecked = tempSelectedEmployees.find(
+                    (e) => e.id === emp.id
+                  );
+                  const kandang = kandangList.find(
+                    (k) => k.id === emp.kandang_id
+                  );
+
+                  return (
+                    <label
+                      key={emp.id}
+                      className={`flex items-start gap-3 px-4 py-3 rounded-lg border cursor-pointer transition-all ${
+                        isChecked
+                          ? 'bg-blue-50 border-[#0069e0]'
+                          : 'bg-white border-gray-200 hover:bg-gray-50 hover:border-gray-300'
+                      }`}
+                    >
+                      <input
+                        type='checkbox'
+                        checked={!!isChecked}
+                        onChange={() => toggleTempEmployee(emp)}
+                        className='checkbox-clean mt-0.5'
+                      />
+                      <div className='flex-1 min-w-0'>
+                        <p className='text-sm font-medium text-gray-900'>
+                          {emp.name}
+                        </p>
+                        {kandang && (
+                          <p className='text-xs text-gray-500 mt-0.5'>
+                            {kandang.name}
+                          </p>
+                        )}
+                      </div>
+                    </label>
+                  );
+                })}
+              </div>
+            ) : (
+              <p className='text-center text-gray-500 py-8 text-sm'>
+                {searchAbk
+                  ? 'Tidak ada ABK ditemukan'
+                  : 'Tidak ada ABK tersedia'}
+              </p>
+            )}
+          </div>
+
+          <DialogFooter className='flex items-center justify-between border-t border-gray-200 pt-4'>
+            <div className='text-sm text-gray-600'>
+              <Badge
+                variant='secondary'
+                className='bg-gray-100 text-gray-700 border-gray-200'
+              >
+                Terpilih: {tempSelectedEmployees.length} ABK
+              </Badge>
+            </div>
+            <div className='flex gap-2'>
+              <Button
+                variant='outline'
+                onClick={() => setShowAbkModal(false)}
+                className='border-gray-200'
+              >
+                Batal
+              </Button>
+              <Button
+                onClick={applyAbkSelection}
+                className='bg-[#0069e0] hover:bg-[#0052b3] text-white'
+              >
+                Terapkan
+              </Button>
+            </div>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </div>
+  );
+}
diff --git a/src/figma-make/components/pages/dashboard/Dashboard.tsx b/src/figma-make/components/pages/dashboard/Dashboard.tsx
new file mode 100644
index 00000000..5d866ffc
--- /dev/null
+++ b/src/figma-make/components/pages/dashboard/Dashboard.tsx
@@ -0,0 +1,712 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import {
+  Card,
+  CardContent,
+  CardHeader,
+  CardTitle,
+} from '@/figma-make/components/base/card';
+import { Label } from '@/figma-make/components/base/label';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/figma-make/components/base/select';
+import { Input } from '@/figma-make/components/base/input';
+import { Badge } from '@/figma-make/components/base/badge';
+import {
+  Calendar as CalendarIcon,
+  Users,
+  AlertCircle,
+  Info,
+} from 'lucide-react';
+import { DateRangePicker } from '@/figma-make/components/base/date-range-picker';
+import {
+  BarChart,
+  Bar,
+  XAxis,
+  YAxis,
+  CartesianGrid,
+  Tooltip,
+  Legend,
+  ResponsiveContainer,
+  Cell,
+} from 'recharts';
+import { supabase, isSupabaseConfigured } from '@/figma-make/lib/supabase';
+import { toast } from 'sonner';
+
+interface EmployeePerformance {
+  employee_id: string;
+  employee_name: string;
+  kandang_id: string;
+  kandang_name: string;
+  total_activities_in_category: number; // Total aktivitas di kategori
+  completed_activities: number; // Aktivitas yang sudah di-check
+  completion_rate: number;
+  last_activity_date: string | null;
+  color: string; // Color based on kandang
+}
+
+interface Kandang {
+  id: string;
+  name: string;
+}
+
+interface Category {
+  id: string;
+  name: string;
+}
+
+interface ChecklistKandang {
+  id: string;
+  date: string;
+  kandang_id: string;
+  category: string;
+  kandang: {
+    id: string;
+    name: string;
+  } | null;
+}
+
+interface AssignmentEmployee {
+  id: string;
+  task_id: string;
+  employee_id: string;
+  checked: boolean;
+  updated_at: string;
+  employee: {
+    id: string;
+    name: string;
+  } | null;
+}
+
+const KANDANG_COLORS = [
+  '#0069e0', // Blue (primary)
+  '#10B981', // Green
+  '#F59E0B', // Amber
+  '#EF4444', // Red
+  '#8B5CF6', // Violet
+  '#EC4899', // Pink
+  '#14B8A6', // Teal
+  '#F97316', // Orange
+];
+
+const CATEGORY_LABELS: { [key: string]: string } = {
+  pullet_open: 'Pullet Open',
+  pullet_close: 'Pullet Close',
+  produksi_open: 'Produksi Open',
+  produksi_close: 'Produksi Close',
+};
+
+export function Dashboard() {
+  const [loading, setLoading] = useState(false);
+  const [employeePerformance, setEmployeePerformance] = useState<
+    EmployeePerformance[]
+  >([]);
+
+  // Master data
+  const [kandangList, setKandangList] = useState<Kandang[]>([]);
+  const [categoryList, setCategoryList] = useState<Category[]>([]);
+
+  // Filters
+  const [dateFrom, setDateFrom] = useState('');
+  const [dateTo, setDateTo] = useState('');
+  const [kandangFilter, setKandangFilter] = useState('ALL');
+  const [categoryFilter, setCategoryFilter] = useState('ALL');
+
+  // Color mapping for kandang
+  const [kandangColorMap, setKandangColorMap] = useState<{
+    [key: string]: string;
+  }>({});
+
+  useEffect(() => {
+    fetchMasterData();
+  }, []);
+
+  useEffect(() => {
+    // Only fetch when date filters are set
+    if (dateFrom && dateTo) {
+      fetchEmployeePerformance();
+    } else {
+      setEmployeePerformance([]);
+    }
+  }, [dateFrom, dateTo, kandangFilter, categoryFilter]);
+
+  const fetchMasterData = async () => {
+    if (!isSupabaseConfigured()) return;
+
+    try {
+      // Fetch kandang
+      const { data: kandangData, error: kandangError } = await supabase
+        .from('kandang')
+        .select('id, name')
+        .order('name', { ascending: true });
+
+      if (kandangError) {
+        console.error('Error fetching kandang:', kandangError);
+      } else {
+        setKandangList(kandangData || []);
+
+        // Create color mapping
+        const colorMap: { [key: string]: string } = {};
+        (kandangData || []).forEach((k, index) => {
+          colorMap[k.id] = KANDANG_COLORS[index % KANDANG_COLORS.length];
+        });
+        setKandangColorMap(colorMap);
+      }
+
+      // Set categories from CATEGORY_LABELS (hardcoded list)
+      const categories: Category[] = Object.keys(CATEGORY_LABELS).map((id) => ({
+        id,
+        name: CATEGORY_LABELS[id],
+      }));
+      setCategoryList(categories);
+    } catch (error) {
+      console.error('Error fetching master data:', error);
+    }
+  };
+
+  const fetchEmployeePerformance = async () => {
+    if (!isSupabaseConfigured() || !dateFrom || !dateTo) {
+      return;
+    }
+
+    try {
+      setLoading(true);
+
+      // Step 1: Get all checklists in date range + filters
+      let checklistQuery = supabase
+        .from('daily_checklists')
+        .select(
+          `
+          id,
+          date,
+          kandang_id,
+          category,
+          kandang:kandang_id (
+            id,
+            name
+          )
+        `
+        )
+        .gte('date', dateFrom)
+        .lte('date', dateTo);
+
+      if (kandangFilter !== 'ALL') {
+        checklistQuery = checklistQuery.eq('kandang_id', kandangFilter);
+      }
+
+      if (categoryFilter !== 'ALL') {
+        checklistQuery = checklistQuery.eq('category', categoryFilter);
+      }
+
+      const { data: checklists, error: checklistError } = await checklistQuery;
+
+      if (checklistError) {
+        console.error('Error fetching checklists:', checklistError);
+        toast.error('Gagal memuat data checklist');
+        return;
+      }
+
+      if (!checklists || checklists.length === 0) {
+        setEmployeePerformance([]);
+        return;
+      }
+
+      const checklistsData = checklists as unknown as ChecklistKandang[];
+
+      // Step 2: Get all tasks from these checklists
+      const checklistIds = checklistsData.map((c) => c.id);
+      const { data: tasks, error: tasksError } = await supabase
+        .from('daily_checklist_activity_tasks')
+        .select('id, checklist_id')
+        .in('checklist_id', checklistIds);
+
+      if (tasksError) {
+        console.error('Error fetching tasks:', tasksError);
+        return;
+      }
+
+      if (!tasks || tasks.length === 0) {
+        setEmployeePerformance([]);
+        return;
+      }
+
+      const taskIds = tasks.map((t) => t.id);
+
+      // Step 3: Get all assignments for these tasks
+      const { data: assignments, error: assignmentsError } = await supabase
+        .from('daily_checklist_activity_task_assignments')
+        .select(
+          `
+          id,
+          task_id,
+          employee_id,
+          checked,
+          updated_at,
+          employee:employee_id (
+            id,
+            name
+          )
+        `
+        )
+        .in('task_id', taskIds);
+
+      if (assignmentsError) {
+        console.error('Error fetching assignments:', assignmentsError);
+        return;
+      }
+
+      if (!assignments || assignments.length === 0) {
+        setEmployeePerformance([]);
+        return;
+      }
+
+      const assignmentsData = assignments as unknown as AssignmentEmployee[];
+
+      // Step 4: Calculate total activities in selected category (if filtered)
+      let totalActivitiesInCategory = 0;
+
+      if (categoryFilter !== 'ALL') {
+        // Get total activities from master data for this category
+        const { data: phases } = await supabase
+          .from('phases')
+          .select('id')
+          .eq('category_id', categoryFilter);
+
+        if (phases && phases.length > 0) {
+          const phaseIds = phases.map((p) => p.id);
+          const { count } = await supabase
+            .from('activities')
+            .select('*', { count: 'exact', head: true })
+            .in('phase_id', phaseIds);
+
+          totalActivitiesInCategory = count || 0;
+        }
+      }
+
+      // Step 5: Group by employee and calculate performance
+      const employeeMap = new Map<
+        string,
+        {
+          employee_id: string;
+          employee_name: string;
+          kandang_id: string;
+          kandang_name: string;
+          completed_count: number;
+          total_count: number;
+          last_activity_date: string | null;
+        }
+      >();
+
+      assignmentsData.forEach((assignment) => {
+        const task = tasks.find((t) => t.id === assignment.task_id);
+        if (!task) return;
+
+        const checklist = checklistsData.find(
+          (c) => c.id === task.checklist_id
+        );
+        if (!checklist) return;
+
+        const employeeId = assignment.employee_id;
+        const employeeName = assignment.employee?.name || 'Unknown';
+        const kandangId = checklist.kandang_id;
+        const kandangName = checklist.kandang?.name || 'Unknown';
+
+        if (!employeeMap.has(employeeId)) {
+          employeeMap.set(employeeId, {
+            employee_id: employeeId,
+            employee_name: employeeName,
+            kandang_id: kandangId,
+            kandang_name: kandangName,
+            completed_count: 0,
+            total_count: 0,
+            last_activity_date: null,
+          });
+        }
+
+        const empData = employeeMap.get(employeeId)!;
+        empData.total_count += 1;
+
+        if (assignment.checked) {
+          empData.completed_count += 1;
+        }
+
+        // Update last activity date
+        if (assignment.updated_at) {
+          if (
+            !empData.last_activity_date ||
+            assignment.updated_at > empData.last_activity_date
+          ) {
+            empData.last_activity_date = assignment.updated_at;
+          }
+        }
+      });
+
+      // Step 6: Convert to array and add calculated fields
+      const performanceData: EmployeePerformance[] = Array.from(
+        employeeMap.values()
+      ).map((emp) => {
+        // Use total activities in category if category is selected, otherwise use employee's assigned count
+        const totalActivities =
+          categoryFilter !== 'ALL' && totalActivitiesInCategory > 0
+            ? totalActivitiesInCategory
+            : emp.total_count;
+
+        return {
+          employee_id: emp.employee_id,
+          employee_name: emp.employee_name,
+          kandang_id: emp.kandang_id,
+          kandang_name: emp.kandang_name,
+          total_activities_in_category: totalActivities,
+          completed_activities: emp.completed_count,
+          completion_rate:
+            totalActivities > 0
+              ? Math.round((emp.completed_count / totalActivities) * 100)
+              : 0,
+          last_activity_date: emp.last_activity_date,
+          color: kandangColorMap[emp.kandang_id] || '#0069e0',
+        };
+      });
+
+      // Sort by employee name
+      performanceData.sort((a, b) =>
+        a.employee_name.localeCompare(b.employee_name)
+      );
+
+      setEmployeePerformance(performanceData);
+    } catch (error) {
+      console.error('Error fetching employee performance:', error);
+      toast.error('Terjadi kesalahan saat memuat data');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const formatDate = (dateString: string | null) => {
+    if (!dateString) return '-';
+    const date = new Date(dateString);
+    return date.toLocaleDateString('id-ID', {
+      day: '2-digit',
+      month: 'short',
+      year: 'numeric',
+    });
+  };
+
+  const hasFilters = dateFrom && dateTo;
+
+  // Prepare chart data
+  const chartData = employeePerformance.map((emp) => ({
+    name: emp.employee_name,
+    completed: emp.completed_activities,
+    remaining: emp.total_activities_in_category - emp.completed_activities,
+    total: emp.total_activities_in_category,
+    color: emp.color,
+    kandang: emp.kandang_name,
+  }));
+
+  return (
+    <div className='min-h-screen'>
+      <div className='p-6'>
+        {/* Page Title */}
+        <div className='mb-6'>
+          <h1 className='text-2xl font-semibold text-gray-900'>Dashboard</h1>
+          <p className='text-sm text-gray-600 mt-1'>
+            Performance tracking per ABK
+          </p>
+        </div>
+
+        {/* Filters Card */}
+        <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white mb-6'>
+          <CardHeader>
+            <CardTitle className='text-lg'>Filter</CardTitle>
+          </CardHeader>
+          <CardContent>
+            <div className='grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4'>
+              <div>
+                <Label>
+                  Periode Tanggal <span className='text-red-500'>*</span>
+                </Label>
+                <div className='mt-1.5'>
+                  <DateRangePicker
+                    dateFrom={dateFrom}
+                    dateTo={dateTo}
+                    onDateChange={(from, to) => {
+                      setDateFrom(from);
+                      setDateTo(to);
+                    }}
+                  />
+                </div>
+              </div>
+
+              <div>
+                <Label htmlFor='kandang-filter-dashboard'>Kandang</Label>
+                <div className='mt-1.5'>
+                  <Select
+                    value={kandangFilter}
+                    onValueChange={setKandangFilter}
+                  >
+                    <SelectTrigger
+                      id='kandang-filter-dashboard'
+                      className='border-gray-200'
+                    >
+                      <SelectValue placeholder='Semua Kandang' />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value='ALL'>Semua Kandang</SelectItem>
+                      {kandangList.map((kandang) => (
+                        <SelectItem key={kandang.id} value={kandang.id}>
+                          {kandang.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+              </div>
+
+              <div>
+                <Label htmlFor='category-filter-dashboard'>Kategori</Label>
+                <div className='mt-1.5'>
+                  <Select
+                    value={categoryFilter}
+                    onValueChange={setCategoryFilter}
+                  >
+                    <SelectTrigger
+                      id='category-filter-dashboard'
+                      className='border-gray-200'
+                    >
+                      <SelectValue placeholder='Semua Kategori' />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value='ALL'>Semua Kategori</SelectItem>
+                      {categoryList.map((category) => (
+                        <SelectItem key={category.id} value={category.id}>
+                          {category.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+              </div>
+            </div>
+          </CardContent>
+        </Card>
+
+        {/* Performance Chart Card */}
+        <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white mb-6'>
+          <CardHeader>
+            <div className='flex items-center gap-2'>
+              <CardTitle className='text-lg'>
+                Performance Overview - Aktivitas per ABK
+              </CardTitle>
+              <Info className='w-4 h-4 text-gray-400' />
+            </div>
+            <p className='text-sm text-gray-500 mt-1'>
+              Aktivitas yang telah diselesaikan vs total aktivitas di kategori
+            </p>
+          </CardHeader>
+          <CardContent>
+            {!hasFilters ? (
+              // Empty state - no filters
+              <div className='flex flex-col items-center justify-center py-16 text-center'>
+                <AlertCircle className='w-16 h-16 text-gray-300 mb-4' />
+                <h3 className='text-lg font-semibold text-gray-700 mb-2'>
+                  Pilih Filter Terlebih Dahulu
+                </h3>
+                <p className='text-sm text-gray-500 max-w-md'>
+                  Silakan pilih{' '}
+                  <span className='font-semibold'>Tanggal Dari</span> dan{' '}
+                  <span className='font-semibold'>Tanggal Sampai</span> untuk
+                  melihat performance ABK.
+                </p>
+              </div>
+            ) : loading ? (
+              <div className='text-center py-16 text-gray-500'>
+                Memuat data...
+              </div>
+            ) : employeePerformance.length === 0 ? (
+              <div className='flex flex-col items-center justify-center py-16 text-center'>
+                <Users className='w-16 h-16 text-gray-300 mb-4' />
+                <h3 className='text-lg font-semibold text-gray-700 mb-2'>
+                  Tidak Ada Data
+                </h3>
+                <p className='text-sm text-gray-500 max-w-md'>
+                  Tidak ada data aktivitas ABK pada periode yang dipilih.
+                </p>
+              </div>
+            ) : (
+              <ResponsiveContainer width='100%' height={400}>
+                <BarChart
+                  data={chartData}
+                  margin={{ top: 20, right: 30, left: 20, bottom: 80 }}
+                >
+                  <CartesianGrid strokeDasharray='3 3' stroke='#E5E7EB' />
+                  <XAxis
+                    dataKey='name'
+                    angle={-45}
+                    textAnchor='end'
+                    height={100}
+                    tick={{ fill: '#6B7280', fontSize: 12 }}
+                  />
+                  <YAxis tick={{ fill: '#6B7280', fontSize: 12 }} />
+                  <Tooltip
+                    contentStyle={{
+                      backgroundColor: '#fff',
+                      border: '1px solid #E5E7EB',
+                      borderRadius: '8px',
+                      padding: '12px',
+                    }}
+                    labelStyle={{ fontWeight: 600, marginBottom: '8px' }}
+                    formatter={(value, name) => {
+                      if (name === 'completed')
+                        return [value, 'Aktivitas Selesai'];
+                      if (name === 'remaining')
+                        return [value, 'Aktivitas Tersisa'];
+                      return [value, name];
+                    }}
+                  />
+                  <Legend
+                    wrapperStyle={{ paddingTop: '20px' }}
+                    formatter={(value: string) => {
+                      if (value === 'completed') return 'Aktivitas Selesai';
+                      if (value === 'remaining') return 'Aktivitas Tersisa';
+                      return value;
+                    }}
+                  />
+                  <Bar
+                    dataKey='completed'
+                    stackId='a'
+                    fill='#10B981'
+                    radius={[0, 0, 0, 0]}
+                  >
+                    {chartData.map((entry, index) => (
+                      <Cell
+                        key={`cell-completed-${index}`}
+                        fill={entry.color}
+                      />
+                    ))}
+                  </Bar>
+                  <Bar
+                    dataKey='remaining'
+                    stackId='a'
+                    fill='#E5E7EB'
+                    radius={[4, 4, 0, 0]}
+                  >
+                    {chartData.map((entry, index) => (
+                      <Cell
+                        key={`cell-remaining-${index}`}
+                        fill={`${entry.color}33`}
+                        opacity={0.3}
+                      />
+                    ))}
+                  </Bar>
+                </BarChart>
+              </ResponsiveContainer>
+            )}
+          </CardContent>
+        </Card>
+
+        {/* Employee Tracking Table */}
+        {hasFilters && employeePerformance.length > 0 && (
+          <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+            <CardHeader>
+              <CardTitle className='text-lg'>Tracking ABK</CardTitle>
+              <p className='text-sm text-gray-500 mt-1'>
+                Detail performance masing-masing ABK
+              </p>
+            </CardHeader>
+            <CardContent>
+              <div className='overflow-x-auto'>
+                <table className='w-full border border-gray-200 rounded-lg'>
+                  <thead>
+                    <tr className='bg-gray-50 border-b border-gray-200'>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Nama ABK
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Kandang
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Total Aktivitas
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Aktivitas Selesai
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Aktivitas Tersisa
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Completion Rate
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Last Activity
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {employeePerformance.map((emp, index) => (
+                      <tr
+                        key={emp.employee_id}
+                        className={
+                          index % 2 === 0 ? 'bg-white' : 'bg-gray-50/50'
+                        }
+                      >
+                        <td className='py-3 px-4 text-sm text-gray-900 font-medium'>
+                          {emp.employee_name}
+                        </td>
+                        <td className='py-3 px-4'>
+                          <Badge
+                            style={{
+                              backgroundColor: `${emp.color}15`,
+                              color: emp.color,
+                              borderColor: `${emp.color}30`,
+                            }}
+                            className='border'
+                          >
+                            {emp.kandang_name}
+                          </Badge>
+                        </td>
+                        <td className='py-3 px-4 text-center text-sm text-gray-900'>
+                          {emp.total_activities_in_category}
+                        </td>
+                        <td className='py-3 px-4 text-center text-sm font-semibold text-green-700'>
+                          {emp.completed_activities}
+                        </td>
+                        <td className='py-3 px-4 text-center text-sm text-gray-600'>
+                          {emp.total_activities_in_category -
+                            emp.completed_activities}
+                        </td>
+                        <td className='py-3 px-4 text-center'>
+                          <div className='flex items-center justify-center gap-2'>
+                            <div className='w-24 bg-gray-200 rounded-full h-2'>
+                              <div
+                                className='h-2 rounded-full transition-all'
+                                style={{
+                                  width: `${emp.completion_rate}%`,
+                                  backgroundColor: emp.color,
+                                }}
+                              />
+                            </div>
+                            <span className='text-sm text-gray-700 font-medium'>
+                              {emp.completion_rate}%
+                            </span>
+                          </div>
+                        </td>
+                        <td className='py-3 px-4 text-sm text-gray-600'>
+                          {formatDate(emp.last_activity_date)}
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              </div>
+            </CardContent>
+          </Card>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/figma-make/components/pages/list-daily-checklist/ListDailyChecklistContent.tsx b/src/figma-make/components/pages/list-daily-checklist/ListDailyChecklistContent.tsx
new file mode 100644
index 00000000..b0fb87e3
--- /dev/null
+++ b/src/figma-make/components/pages/list-daily-checklist/ListDailyChecklistContent.tsx
@@ -0,0 +1,938 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import { Eye, CheckCircle, XCircle, Search, Trash2 } from 'lucide-react';
+import { Card, CardContent } from '@/figma-make/components/base/card';
+import { Button } from '@/figma-make/components/base/button';
+import { Badge } from '@/figma-make/components/base/badge';
+import { Input } from '@/figma-make/components/base/input';
+import { Label } from '@/figma-make/components/base/label';
+import { Textarea } from '@/figma-make/components/base/textarea';
+import { DateRangePicker } from '@/figma-make/components/base/date-range-picker';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/figma-make/components/base/select';
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+  DialogFooter,
+} from '@/figma-make/components/base/dialog';
+import { toast } from 'sonner';
+import { supabase, isSupabaseConfigured } from '@/figma-make/lib/supabase';
+import { useRouter } from 'next/navigation';
+
+interface ChecklistItem {
+  checklist_id: string;
+  date: string;
+  kandang_name: string;
+  kandang_id: string; // ✅ Add kandang_id
+  category: string;
+  status: string;
+  progress_percent: number;
+  total_phases: number;
+  total_activities: number;
+  updated_at: string;
+}
+
+interface Kandang {
+  id: string;
+  name: string;
+}
+
+interface ChecklistQueryResult {
+  id: string;
+  date: string;
+  kandang_id: string;
+  category: string;
+  status: string;
+  updated_at: string;
+  kandang: {
+    id: string;
+    name: string;
+  } | null;
+}
+
+const STATUS_OPTIONS = [
+  { value: 'ALL', label: 'Semua Status' },
+  { value: 'DRAFT', label: 'Draft' },
+  { value: 'SUBMITTED', label: 'Submitted' },
+  { value: 'APPROVED', label: 'Approved' },
+  { value: 'REJECTED', label: 'Rejected' },
+];
+
+const CATEGORY_LABELS: { [key: string]: string } = {
+  pullet_open: 'Pullet Open',
+  pullet_close: 'Pullet Close',
+  produksi_open: 'Produksi Open',
+  produksi_close: 'Produksi Close',
+};
+
+export function ListDailyChecklistContent() {
+  const router = useRouter();
+  const [checklistList, setChecklistList] = useState<ChecklistItem[]>([]);
+  const [filteredList, setFilteredList] = useState<ChecklistItem[]>([]);
+  const [loading, setLoading] = useState(true);
+
+  // Master data
+  const [kandangList, setKandangList] = useState<Kandang[]>([]);
+
+  // Filters
+  const [statusFilter, setStatusFilter] = useState('ALL');
+  const [kandangFilter, setKandangFilter] = useState('ALL');
+  const [searchText, setSearchText] = useState('');
+  const [dateFrom, setDateFrom] = useState('');
+  const [dateTo, setDateTo] = useState('');
+
+  // Modals
+  const [showApproveModal, setShowApproveModal] = useState(false);
+  const [showRejectModal, setShowRejectModal] = useState(false);
+  const [showDeleteModal, setShowDeleteModal] = useState(false);
+  const [selectedItem, setSelectedItem] = useState<ChecklistItem | null>(null);
+  const [rejectReason, setRejectReason] = useState('');
+  const [actionLoading, setActionLoading] = useState(false);
+
+  useEffect(() => {
+    fetchKandangList();
+    fetchChecklistList();
+  }, []);
+
+  useEffect(() => {
+    applyFilters();
+  }, [
+    checklistList,
+    statusFilter,
+    kandangFilter,
+    searchText,
+    dateFrom,
+    dateTo,
+  ]);
+
+  const fetchKandangList = async () => {
+    if (!isSupabaseConfigured()) return;
+
+    try {
+      const { data, error } = await supabase
+        .from('kandang')
+        .select('id, name')
+        .order('name', { ascending: true });
+
+      if (error) {
+        console.error('Error fetching kandang:', error);
+        return;
+      }
+
+      setKandangList(data || []);
+    } catch (error) {
+      console.error('Error fetching kandang:', error);
+    }
+  };
+
+  const fetchChecklistList = async () => {
+    if (!isSupabaseConfigured()) {
+      console.warn('Supabase not configured');
+      setLoading(false);
+      return;
+    }
+
+    try {
+      setLoading(true);
+
+      // ✅ Fetch checklists with joins to get complete data
+      const { data: checklists, error } = await supabase
+        .from('daily_checklists')
+        .select(
+          `
+          id,
+          date,
+          kandang_id,
+          category,
+          status,
+          updated_at,
+          kandang:kandang_id (
+            id,
+            name
+          )
+        `
+        )
+        .order('date', { ascending: false })
+        .order('updated_at', { ascending: false });
+
+      if (error) {
+        console.error('Error fetching checklist list:', error);
+        toast.error('Gagal memuat data checklist');
+        return;
+      }
+
+      // ✅ For each checklist, fetch phases, activities, and assignments count
+      const enrichedData: ChecklistItem[] = await Promise.all(
+        ((checklists as unknown as ChecklistQueryResult[]) || [])
+          .filter((checklist) => checklist.id) // ✅ Skip checklists with null ID
+          .map(async (checklist) => {
+            // Count phases
+            const { count: phaseCount } = await supabase
+              .from('daily_checklist_phases')
+              .select('*', { count: 'exact', head: true })
+              .eq('checklist_id', checklist.id);
+
+            // Count activities (tasks)
+            const { count: activityCount } = await supabase
+              .from('daily_checklist_activity_tasks')
+              .select('*', { count: 'exact', head: true })
+              .eq('checklist_id', checklist.id);
+
+            // ✅ NEW LOGIC: Calculate progress based on phase coverage
+            // Step 1: Get total phases in master data for this category
+            const { count: totalPhasesInMaster } = await supabase
+              .from('phases')
+              .select('*', { count: 'exact', head: true })
+              .eq('category_id', checklist.category);
+
+            // Step 2: Get phases that have at least 1 CHECKED assignment
+            // First, get all tasks for this checklist
+            const { data: tasks } = await supabase
+              .from('daily_checklist_activity_tasks')
+              .select('id, phase_id')
+              .eq('checklist_id', checklist.id);
+
+            const taskIds = (tasks || []).map((t) => t.id);
+            const uniquePhasesWithChecked = new Set<string>();
+
+            if (taskIds.length > 0) {
+              // Get assignments that are CHECKED
+              const { data: checkedAssignments } = await supabase
+                .from('daily_checklist_activity_task_assignments')
+                .select('task_id')
+                .in('task_id', taskIds)
+                .eq('checked', true); // ✅ Only get checked assignments
+
+              if (checkedAssignments && checkedAssignments.length > 0) {
+                // Map task_ids back to phase_ids
+                const checkedTaskIds = new Set(
+                  checkedAssignments.map((a) => a.task_id)
+                );
+                tasks?.forEach((task) => {
+                  if (checkedTaskIds.has(task.id)) {
+                    uniquePhasesWithChecked.add(task.phase_id);
+                  }
+                });
+              }
+            }
+
+            const phasesWithCheckedCount = uniquePhasesWithChecked.size;
+
+            // Step 3: Calculate progress
+            const progressPercent =
+              totalPhasesInMaster && totalPhasesInMaster > 0
+                ? Math.round(
+                    (phasesWithCheckedCount / totalPhasesInMaster) * 100
+                  )
+                : 0;
+
+            return {
+              checklist_id: checklist.id,
+              date: checklist.date,
+              kandang_name: checklist.kandang?.name || '-',
+              kandang_id: checklist.kandang_id,
+              category: checklist.category,
+              status: checklist.status,
+              progress_percent: progressPercent,
+              total_phases: phaseCount || 0,
+              total_activities: activityCount || 0,
+              updated_at: checklist.updated_at,
+            };
+          })
+      );
+
+      setChecklistList(enrichedData);
+    } catch (error) {
+      console.error('Error fetching checklist list:', error);
+      toast.error('Terjadi kesalahan');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const applyFilters = () => {
+    let filtered = [...checklistList];
+
+    // Filter by status
+    if (statusFilter && statusFilter !== 'ALL') {
+      filtered = filtered.filter((item) => item.status === statusFilter);
+    }
+
+    // ✅ Filter by kandang - use kandang_id directly from item
+    if (kandangFilter && kandangFilter !== 'ALL') {
+      filtered = filtered.filter((item) => item.kandang_id === kandangFilter);
+    }
+
+    // Filter by search text (kandang_name or category)
+    if (searchText) {
+      const searchLower = searchText.toLowerCase();
+      filtered = filtered.filter(
+        (item) =>
+          item.kandang_name.toLowerCase().includes(searchLower) ||
+          item.category.toLowerCase().includes(searchLower) ||
+          (CATEGORY_LABELS[item.category] || '')
+            .toLowerCase()
+            .includes(searchLower)
+      );
+    }
+
+    // Filter by date range
+    if (dateFrom) {
+      filtered = filtered.filter((item) => item.date >= dateFrom);
+    }
+    if (dateTo) {
+      filtered = filtered.filter((item) => item.date <= dateTo);
+    }
+
+    setFilteredList(filtered);
+  };
+
+  const handleDetail = (item: ChecklistItem) => {
+    router.push(
+      `/daily-checklist/list-daily-checklist/detail?checklistId=${item.checklist_id}`
+    );
+  };
+
+  const handleApprove = (item: ChecklistItem) => {
+    setSelectedItem(item);
+    setShowApproveModal(true);
+  };
+
+  const handleReject = (item: ChecklistItem) => {
+    setSelectedItem(item);
+    setRejectReason('');
+    setShowRejectModal(true);
+  };
+
+  const handleDelete = (item: ChecklistItem) => {
+    // ✅ VALIDATION: Only DRAFT can be deleted
+    if (item.status !== 'DRAFT') {
+      toast.error('Hanya checklist dengan status DRAFT yang bisa dihapus', {
+        description: `Status saat ini: ${item.status}`,
+      });
+      return;
+    }
+
+    setSelectedItem(item);
+    setShowDeleteModal(true);
+  };
+
+  const confirmApprove = async () => {
+    if (!selectedItem || !isSupabaseConfigured()) return;
+
+    try {
+      setActionLoading(true);
+
+      const { error } = await supabase
+        .from('daily_checklists')
+        .update({
+          status: 'APPROVED',
+          updated_at: new Date().toISOString(),
+        })
+        .eq('id', selectedItem.checklist_id);
+
+      if (error) {
+        console.error('Error approving checklist:', error);
+        toast.error('Gagal approve checklist');
+        return;
+      }
+
+      toast.success('Checklist berhasil di-approve');
+      setShowApproveModal(false);
+      setSelectedItem(null);
+      await fetchChecklistList();
+    } catch (error) {
+      console.error('Error approving checklist:', error);
+      toast.error('Terjadi kesalahan');
+    } finally {
+      setActionLoading(false);
+    }
+  };
+
+  const confirmReject = async () => {
+    if (!selectedItem || !isSupabaseConfigured()) return;
+
+    if (!rejectReason.trim()) {
+      toast.error('Alasan reject harus diisi');
+      return;
+    }
+
+    try {
+      setActionLoading(true);
+
+      const { error } = await supabase
+        .from('daily_checklists')
+        .update({
+          status: 'REJECTED',
+          reject_reason: rejectReason,
+          updated_at: new Date().toISOString(),
+        })
+        .eq('id', selectedItem.checklist_id);
+
+      if (error) {
+        console.error('Error rejecting checklist:', error);
+        toast.error('Gagal reject checklist');
+        return;
+      }
+
+      toast.success('Checklist berhasil di-reject');
+      setShowRejectModal(false);
+      setSelectedItem(null);
+      setRejectReason('');
+      await fetchChecklistList();
+    } catch (error) {
+      console.error('Error rejecting checklist:', error);
+      toast.error('Terjadi kesalahan');
+    } finally {
+      setActionLoading(false);
+    }
+  };
+
+  const confirmDelete = async () => {
+    if (!selectedItem || !isSupabaseConfigured()) return;
+
+    try {
+      setActionLoading(true);
+
+      const { error } = await supabase
+        .from('daily_checklists')
+        .delete()
+        .eq('id', selectedItem.checklist_id);
+
+      if (error) {
+        console.error('Error deleting checklist:', error);
+        toast.error('Gagal hapus checklist');
+        return;
+      }
+
+      toast.success('Checklist berhasil dihapus');
+      setShowDeleteModal(false);
+      setSelectedItem(null);
+      await fetchChecklistList();
+    } catch (error) {
+      console.error('Error deleting checklist:', error);
+      toast.error('Terjadi kesalahan');
+    } finally {
+      setActionLoading(false);
+    }
+  };
+
+  const getStatusBadge = (status: string) => {
+    switch (status) {
+      case 'DRAFT':
+        return (
+          <Badge
+            variant='outline'
+            className='border-gray-300 text-gray-700 bg-white'
+          >
+            Draft
+          </Badge>
+        );
+      case 'SUBMITTED':
+        return (
+          <Badge
+            variant='outline'
+            className='border-orange-300 text-orange-700 bg-white'
+          >
+            Submitted
+          </Badge>
+        );
+      case 'APPROVED':
+        return (
+          <Badge
+            variant='outline'
+            className='border-green-300 text-green-700 bg-white'
+          >
+            Approved
+          </Badge>
+        );
+      case 'REJECTED':
+        return (
+          <Badge
+            variant='outline'
+            className='border-red-300 text-red-700 bg-white'
+          >
+            Rejected
+          </Badge>
+        );
+      default:
+        return (
+          <Badge
+            variant='outline'
+            className='border-gray-300 text-gray-700 bg-white'
+          >
+            {status}
+          </Badge>
+        );
+    }
+  };
+
+  const formatDate = (dateString: string) => {
+    const date = new Date(dateString);
+    return date.toLocaleDateString('id-ID', {
+      day: '2-digit',
+      month: 'short',
+      year: 'numeric',
+    });
+  };
+
+  const formatDateTime = (dateString: string) => {
+    const date = new Date(dateString);
+    return date.toLocaleString('id-ID', {
+      day: '2-digit',
+      month: 'short',
+      year: 'numeric',
+      hour: '2-digit',
+      minute: '2-digit',
+    });
+  };
+
+  return (
+    <div className='min-h-screen'>
+      <div className='p-6'>
+        {/* Page Title */}
+        <div className='mb-6'>
+          <h1 className='text-2xl font-semibold text-gray-900'>
+            List Daily Checklist
+          </h1>
+          <p className='text-sm text-gray-600 mt-1'>
+            Daftar semua checklist harian
+          </p>
+        </div>
+
+        {/* Main Card */}
+        <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+          <CardContent className='p-6'>
+            {/* Filters Section */}
+            <div className='grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-6 pb-6 border-b border-gray-200'>
+              <div>
+                <Label>Periode Tanggal</Label>
+                <div className='mt-1.5'>
+                  <DateRangePicker
+                    dateFrom={dateFrom}
+                    dateTo={dateTo}
+                    onDateChange={(from, to) => {
+                      setDateFrom(from);
+                      setDateTo(to);
+                    }}
+                  />
+                </div>
+              </div>
+
+              <div>
+                <Label htmlFor='kandang-filter'>Kandang</Label>
+                <div className='mt-1.5'>
+                  <Select
+                    value={kandangFilter}
+                    onValueChange={setKandangFilter}
+                  >
+                    <SelectTrigger
+                      id='kandang-filter'
+                      className='border-gray-200'
+                    >
+                      <SelectValue placeholder='Semua Kandang' />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value='ALL'>Semua Kandang</SelectItem>
+                      {kandangList.map((kandang) => (
+                        <SelectItem key={kandang.id} value={kandang.id}>
+                          {kandang.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+              </div>
+
+              <div>
+                <Label htmlFor='status-filter'>Status</Label>
+                <div className='mt-1.5'>
+                  <Select value={statusFilter} onValueChange={setStatusFilter}>
+                    <SelectTrigger
+                      id='status-filter'
+                      className='border-gray-200'
+                    >
+                      <SelectValue placeholder='Semua Status' />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {STATUS_OPTIONS.map((option) => (
+                        <SelectItem key={option.value} value={option.value}>
+                          {option.label}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+              </div>
+
+              <div>
+                <Label htmlFor='search-text'>Cari</Label>
+                <div className='relative mt-1.5'>
+                  <Input
+                    id='search-text'
+                    type='text'
+                    placeholder='Kandang / Kategori...'
+                    value={searchText}
+                    onChange={(e) => setSearchText(e.target.value)}
+                    className='border-gray-200 pl-9'
+                  />
+                  <Search className='absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-gray-400' />
+                </div>
+              </div>
+            </div>
+
+            {/* Table Section */}
+            {loading ? (
+              <div className='text-center py-12 text-gray-500'>
+                Memuat data...
+              </div>
+            ) : filteredList.length > 0 ? (
+              <div className='overflow-x-auto'>
+                <table className='w-full border border-gray-200 rounded-lg'>
+                  <thead>
+                    <tr className='bg-gray-50 border-b border-gray-200'>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Tanggal
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Kandang
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Kategori
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Status
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Total Phase
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Total Aktivitas
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Progress
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Updated At
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Aksi
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {filteredList.map((item, index) => (
+                      <tr
+                        key={`${item.checklist_id}-${index}`}
+                        className={
+                          index % 2 === 0 ? 'bg-white' : 'bg-gray-50/50'
+                        }
+                      >
+                        <td className='py-3 px-4 text-sm text-gray-900'>
+                          {formatDate(item.date)}
+                        </td>
+                        <td className='py-3 px-4 text-sm text-gray-900'>
+                          {item.kandang_name}
+                        </td>
+                        <td className='py-3 px-4 text-sm text-gray-900'>
+                          {CATEGORY_LABELS[item.category] || item.category}
+                        </td>
+                        <td className='py-3 px-4'>
+                          {getStatusBadge(item.status)}
+                        </td>
+                        <td className='py-3 px-4 text-center text-sm text-gray-900'>
+                          {item.total_phases}
+                        </td>
+                        <td className='py-3 px-4 text-center text-sm text-gray-900'>
+                          {item.total_activities}
+                        </td>
+                        <td className='py-3 px-4 text-center'>
+                          <div className='flex items-center justify-center gap-2'>
+                            <div className='w-24 bg-gray-200 rounded-full h-2'>
+                              <div
+                                className='bg-[#0069e0] h-2 rounded-full transition-all'
+                                style={{ width: `${item.progress_percent}%` }}
+                              />
+                            </div>
+                            <span className='text-sm text-gray-700 font-medium'>
+                              {item.progress_percent}%
+                            </span>
+                          </div>
+                        </td>
+                        <td className='py-3 px-4 text-sm text-gray-600'>
+                          {formatDateTime(item.updated_at)}
+                        </td>
+                        <td className='py-3 px-4'>
+                          <div className='flex items-center justify-center gap-2'>
+                            <Button
+                              size='sm'
+                              variant='outline'
+                              onClick={() => handleDetail(item)}
+                              className='border-gray-200 text-gray-700 hover:bg-gray-50'
+                            >
+                              <Eye className='w-4 h-4 mr-1' />
+                              Detail
+                            </Button>
+                            {item.status === 'SUBMITTED' && (
+                              <>
+                                <Button
+                                  size='sm'
+                                  onClick={() => handleApprove(item)}
+                                  className='bg-green-600 hover:bg-green-700 text-white'
+                                >
+                                  <CheckCircle className='w-4 h-4 mr-1' />
+                                  Approve
+                                </Button>
+                                <Button
+                                  size='sm'
+                                  variant='destructive'
+                                  onClick={() => handleReject(item)}
+                                  className='bg-red-600 hover:bg-red-700 text-white'
+                                >
+                                  <XCircle className='w-4 h-4 mr-1' />
+                                  Reject
+                                </Button>
+                              </>
+                            )}
+                            <Button
+                              size='sm'
+                              variant='destructive'
+                              onClick={() => handleDelete(item)}
+                              className='bg-red-600 hover:bg-red-700 text-white'
+                            >
+                              <Trash2 className='w-4 h-4 mr-1' />
+                              Hapus
+                            </Button>
+                          </div>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              </div>
+            ) : (
+              <div className='text-center py-12 text-gray-500'>
+                {searchText ||
+                dateFrom ||
+                dateTo ||
+                statusFilter !== 'ALL' ||
+                kandangFilter !== 'ALL'
+                  ? 'Tidak ada data yang sesuai dengan filter'
+                  : 'Belum ada data checklist'}
+              </div>
+            )}
+          </CardContent>
+        </Card>
+      </div>
+
+      {/* Approve Modal */}
+      <Dialog open={showApproveModal} onOpenChange={setShowApproveModal}>
+        <DialogContent className='sm:max-w-md bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle>Approve Checklist</DialogTitle>
+            <DialogDescription>
+              Apakah Anda yakin ingin approve checklist ini?
+            </DialogDescription>
+          </DialogHeader>
+
+          {selectedItem && (
+            <div className='bg-gray-50 rounded-lg p-4 space-y-2'>
+              <div className='flex justify-between text-sm'>
+                <span className='text-gray-600'>Tanggal:</span>
+                <span className='font-medium text-gray-900'>
+                  {formatDate(selectedItem.date)}
+                </span>
+              </div>
+              <div className='flex justify-between text-sm'>
+                <span className='text-gray-600'>Kandang:</span>
+                <span className='font-medium text-gray-900'>
+                  {selectedItem.kandang_name}
+                </span>
+              </div>
+              <div className='flex justify-between text-sm'>
+                <span className='text-gray-600'>Kategori:</span>
+                <span className='font-medium text-gray-900'>
+                  {CATEGORY_LABELS[selectedItem.category] ||
+                    selectedItem.category}
+                </span>
+              </div>
+              <div className='flex justify-between text-sm'>
+                <span className='text-gray-600'>Progress:</span>
+                <span className='font-medium text-gray-900'>
+                  {selectedItem.progress_percent}%
+                </span>
+              </div>
+            </div>
+          )}
+
+          <DialogFooter className='flex gap-2'>
+            <Button
+              variant='outline'
+              onClick={() => setShowApproveModal(false)}
+              disabled={actionLoading}
+              className='border-gray-200'
+            >
+              Batal
+            </Button>
+            <Button
+              onClick={confirmApprove}
+              disabled={actionLoading}
+              className='bg-green-600 hover:bg-green-700 text-white'
+            >
+              {actionLoading ? 'Memproses...' : 'Ya, Approve'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      {/* Reject Modal */}
+      <Dialog open={showRejectModal} onOpenChange={setShowRejectModal}>
+        <DialogContent className='sm:max-w-md bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle>Reject Checklist</DialogTitle>
+            <DialogDescription>
+              Berikan alasan reject untuk checklist ini
+            </DialogDescription>
+          </DialogHeader>
+
+          {selectedItem && (
+            <div className='bg-gray-50 rounded-lg p-4 space-y-2 mb-4'>
+              <div className='flex justify-between text-sm'>
+                <span className='text-gray-600'>Tanggal:</span>
+                <span className='font-medium text-gray-900'>
+                  {formatDate(selectedItem.date)}
+                </span>
+              </div>
+              <div className='flex justify-between text-sm'>
+                <span className='text-gray-600'>Kandang:</span>
+                <span className='font-medium text-gray-900'>
+                  {selectedItem.kandang_name}
+                </span>
+              </div>
+              <div className='flex justify-between text-sm'>
+                <span className='text-gray-600'>Kategori:</span>
+                <span className='font-medium text-gray-900'>
+                  {CATEGORY_LABELS[selectedItem.category] ||
+                    selectedItem.category}
+                </span>
+              </div>
+            </div>
+          )}
+
+          <div>
+            <Label htmlFor='reject-reason'>
+              Alasan Reject <span className='text-red-500'>*</span>
+            </Label>
+            <Textarea
+              id='reject-reason'
+              value={rejectReason}
+              onChange={(e) => setRejectReason(e.target.value)}
+              placeholder='Tuliskan alasan reject...'
+              className='mt-1.5 border-gray-200 min-h-[100px]'
+              disabled={actionLoading}
+            />
+          </div>
+
+          <DialogFooter className='flex gap-2'>
+            <Button
+              variant='outline'
+              onClick={() => setShowRejectModal(false)}
+              disabled={actionLoading}
+              className='border-gray-200'
+            >
+              Batal
+            </Button>
+            <Button
+              onClick={confirmReject}
+              disabled={actionLoading}
+              variant='destructive'
+              className='bg-red-600 hover:bg-red-700 text-white'
+            >
+              {actionLoading ? 'Memproses...' : 'Ya, Reject'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      {/* Delete Modal */}
+      <Dialog open={showDeleteModal} onOpenChange={setShowDeleteModal}>
+        <DialogContent className='sm:max-w-md bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle className='text-red-600'>
+              ⚠️ Hapus Checklist
+            </DialogTitle>
+            <DialogDescription>
+              Apakah Anda yakin ingin menghapus checklist ini? Data yang dihapus
+              tidak dapat dikembalikan.
+            </DialogDescription>
+          </DialogHeader>
+
+          {selectedItem && (
+            <>
+              <div className='bg-red-50 border border-red-200 rounded-lg p-4 space-y-2 mb-2'>
+                <div className='flex justify-between text-sm'>
+                  <span className='text-gray-600'>Tanggal:</span>
+                  <span className='font-medium text-gray-900'>
+                    {formatDate(selectedItem.date)}
+                  </span>
+                </div>
+                <div className='flex justify-between text-sm'>
+                  <span className='text-gray-600'>Kandang:</span>
+                  <span className='font-medium text-gray-900'>
+                    {selectedItem.kandang_name}
+                  </span>
+                </div>
+                <div className='flex justify-between text-sm'>
+                  <span className='text-gray-600'>Kategori:</span>
+                  <span className='font-medium text-gray-900'>
+                    {CATEGORY_LABELS[selectedItem.category] ||
+                      selectedItem.category}
+                  </span>
+                </div>
+                <div className='flex justify-between text-sm'>
+                  <span className='text-gray-600'>Status:</span>
+                  {getStatusBadge(selectedItem.status)}
+                </div>
+              </div>
+
+              <div className='bg-yellow-50 border border-yellow-200 rounded-lg p-3'>
+                <p className='text-xs text-yellow-800'>
+                  <strong>Peringatan:</strong> Semua data terkait (phases,
+                  activities, assignments) akan ikut terhapus secara permanen.
+                </p>
+              </div>
+            </>
+          )}
+
+          <DialogFooter className='flex gap-2'>
+            <Button
+              variant='outline'
+              onClick={() => setShowDeleteModal(false)}
+              disabled={actionLoading}
+              className='border-gray-200'
+            >
+              Batal
+            </Button>
+            <Button
+              onClick={confirmDelete}
+              disabled={actionLoading}
+              variant='destructive'
+              className='bg-red-600 hover:bg-red-700 text-white'
+            >
+              {actionLoading ? 'Memproses...' : 'Ya, Hapus'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </div>
+  );
+}
diff --git a/src/figma-make/components/pages/list-daily-checklist/detail/DetailDailyChecklistContent.tsx b/src/figma-make/components/pages/list-daily-checklist/detail/DetailDailyChecklistContent.tsx
new file mode 100644
index 00000000..4ace8209
--- /dev/null
+++ b/src/figma-make/components/pages/list-daily-checklist/detail/DetailDailyChecklistContent.tsx
@@ -0,0 +1,1040 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import * as React from 'react';
+import { ArrowLeft, CheckCircle, XCircle, AlertCircle } from 'lucide-react';
+import { Card, CardContent } from '@/figma-make/components/base/card';
+import { Button } from '@/figma-make/components/base/button';
+import { Badge } from '@/figma-make/components/base/badge';
+import { Label } from '@/figma-make/components/base/label';
+import { Textarea } from '@/figma-make/components/base/textarea';
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+  DialogFooter,
+} from '@/figma-make/components/base/dialog';
+import { toast } from 'sonner';
+import { supabase, isSupabaseConfigured } from '@/figma-make/lib/supabase';
+import { useRouter, useSearchParams } from 'next/navigation';
+
+interface ChecklistDetailRow {
+  checklist_id: string;
+  date: string;
+  kandang_name: string;
+  category: string;
+  status: string;
+  reject_reason: string | null;
+  phase_id: string;
+  phase_name: string;
+  activity_id: string;
+  activity_name: string;
+  activity_description: string | null;
+  time_type: string;
+  employee_id: string;
+  employee_name: string;
+  checked: boolean;
+  note: string | null;
+}
+
+interface ChecklistHeader {
+  date: string;
+  kandang_name: string;
+  category: string;
+  status: string;
+  reject_reason: string | null;
+  progress_percent: number;
+  total_phases: number;
+  total_activities: number;
+}
+
+interface PhaseGroup {
+  phase: {
+    id: string;
+    name: string;
+  };
+  timeGroups: {
+    [timeType: string]: {
+      activities: {
+        id: string;
+        name: string;
+        description: string | null;
+        employees: {
+          id: string;
+          name: string;
+          checked: boolean;
+          note: string | null;
+        }[];
+      }[];
+    };
+  };
+}
+
+interface ChecklistData {
+  id: number;
+  date: string;
+  kandang_id: string;
+  category: string;
+  status: string;
+  reject_reason: string | null;
+  kandang: {
+    id: number;
+    name: string;
+  };
+}
+
+interface TaskQueryResult {
+  id: number;
+  phase_id: string;
+  phase_activity_id: string;
+  time_type: string;
+  notes: string | null;
+  phases: {
+    id: number;
+    name: string;
+  } | null;
+  phase_activities: {
+    id: number;
+    name: string;
+    description: string | null;
+  } | null;
+}
+
+interface AssignmentQueryResult {
+  task_id: number;
+  employee_id: string;
+  checked: boolean;
+  note: string | null;
+  employees: {
+    id: number;
+    name: string;
+  } | null;
+}
+
+const CATEGORY_LABELS: { [key: string]: string } = {
+  pullet_open: 'Pullet Open',
+  pullet_close: 'Pullet Close',
+  produksi_open: 'Produksi Open',
+  produksi_close: 'Produksi Close',
+};
+
+const TIME_TYPE_ORDER = ['umum', 'pagi', 'siang', 'sore', 'malam'];
+const TIME_TYPE_LABELS: { [key: string]: string } = {
+  umum: 'Umum',
+  pagi: 'Pagi',
+  siang: 'Siang',
+  sore: 'Sore',
+  malam: 'Malam',
+};
+
+export function DetailDailyChecklistContent() {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const checklistId = searchParams.get('checklistId');
+
+  const [loading, setLoading] = useState(true);
+  const [header, setHeader] = useState<ChecklistHeader | null>(null);
+  const [detailRows, setDetailRows] = useState<ChecklistDetailRow[]>([]);
+  const [phaseGroups, setPhaseGroups] = useState<PhaseGroup[]>([]);
+  const [employees, setEmployees] = useState<{ id: string; name: string }[]>(
+    []
+  );
+
+  // Modals
+  const [showApproveModal, setShowApproveModal] = useState(false);
+  const [showRejectModal, setShowRejectModal] = useState(false);
+  const [rejectReason, setRejectReason] = useState('');
+  const [actionLoading, setActionLoading] = useState(false);
+
+  useEffect(() => {
+    if (checklistId) {
+      fetchChecklistDetail();
+    }
+  }, [checklistId]);
+
+  const fetchChecklistDetail = async () => {
+    if (!isSupabaseConfigured() || !checklistId) {
+      console.warn('Supabase not configured or checklistId missing');
+      setLoading(false);
+      return;
+    }
+
+    try {
+      setLoading(true);
+
+      // ✅ Fetch checklist header with kandang name
+      const { data: checklistData, error: checklistError } = await supabase
+        .from('daily_checklists')
+        .select(
+          `
+          id,
+          date,
+          kandang_id,
+          category,
+          status,
+          reject_reason,
+          kandang:kandang_id (
+            id,
+            name
+          )
+        `
+        )
+        .eq('id', checklistId)
+        .single();
+
+      if (checklistError || !checklistData) {
+        console.error('Error fetching checklist:', checklistError);
+        toast.error('Data checklist tidak ditemukan');
+        router.push('/daily-checklist/list-daily-checklist');
+        return;
+      }
+
+      // ✅ Fetch all tasks with their phase_activity details
+      const { data: tasks, error: tasksError } = await supabase
+        .from('daily_checklist_activity_tasks')
+        .select(
+          `
+          id,
+          phase_id,
+          phase_activity_id,
+          time_type,
+          notes,
+          phases:phase_id (
+            id,
+            name
+          ),
+          phase_activities:phase_activity_id (
+            id,
+            name,
+            description
+          )
+        `
+        )
+        .eq('checklist_id', checklistId);
+
+      if (tasksError) {
+        console.error('Error fetching tasks:', tasksError);
+        toast.error('Gagal memuat detail checklist');
+        router.push('/daily-checklist/list-daily-checklist');
+        return;
+      }
+
+      const castedTasks = (tasks as unknown as TaskQueryResult[]) || [];
+
+      const castedChecklistData =
+        checklistData as unknown as ChecklistData | null;
+
+      if (!castedTasks || castedTasks.length === 0) {
+        toast.info('Checklist belum memiliki aktivitas');
+        setHeader({
+          date: castedChecklistData?.date || '-',
+          kandang_name: castedChecklistData?.kandang?.name || '-',
+          category: castedChecklistData?.category || '-',
+          status: castedChecklistData?.status || '-',
+          reject_reason: castedChecklistData?.reject_reason || '-',
+          progress_percent: 0,
+          total_phases: 0,
+          total_activities: 0,
+        });
+        setLoading(false);
+        return;
+      }
+
+      // ✅ Fetch all assignments for these tasks
+      const taskIds = castedTasks.map((t) => t.id);
+      const { data: assignments, error: assignmentsError } = await supabase
+        .from('daily_checklist_activity_task_assignments')
+        .select(
+          `
+          task_id,
+          employee_id,
+          checked,
+          note,
+          employees:employee_id (
+            id,
+            name
+          )
+        `
+        )
+        .in('task_id', taskIds);
+
+      if (assignmentsError) {
+        console.error('Error fetching assignments:', assignmentsError);
+      }
+
+      const castedAssignments =
+        (assignments as unknown as AssignmentQueryResult[]) || [];
+
+      // ✅ Build detail rows from tasks and assignments
+      const detailRows: ChecklistDetailRow[] = [];
+
+      castedTasks.forEach((task) => {
+        const taskAssignments = (castedAssignments || []).filter(
+          (a) => a.task_id === task.id
+        );
+
+        taskAssignments.forEach((assignment) => {
+          detailRows.push({
+            checklist_id: checklistId,
+            date: castedChecklistData?.date || '-',
+            kandang_name: castedChecklistData?.kandang?.name || '-',
+            category: castedChecklistData?.category || '-',
+            status: castedChecklistData?.status || '-',
+            reject_reason: castedChecklistData?.reject_reason || '-',
+            phase_id: task.phase_id,
+            phase_name: task.phases?.name || '-',
+            activity_id: task.phase_activity_id,
+            activity_name: task.phase_activities?.name || '-',
+            activity_description: task.phase_activities?.description || null,
+            time_type: task.time_type,
+            employee_id: assignment.employee_id,
+            employee_name: assignment.employees?.name || '-',
+            checked: assignment.checked,
+            note: assignment.note,
+          });
+        });
+      });
+
+      if (detailRows.length === 0) {
+        toast.info('Checklist belum memiliki assignment ABK');
+        setHeader({
+          date: castedChecklistData?.date || '-',
+          kandang_name: castedChecklistData?.kandang?.name || '-',
+          category: castedChecklistData?.category || '-',
+          status: castedChecklistData?.status || '-',
+          reject_reason: castedChecklistData?.reject_reason || '-',
+          progress_percent: 0,
+          total_phases: new Set(castedTasks.map((t) => t.phase_id)).size,
+          total_activities: castedTasks.length,
+        });
+        setLoading(false);
+        return;
+      }
+
+      setDetailRows(detailRows);
+
+      // Extract unique employees
+      const uniqueEmployees = Array.from(
+        new Map(
+          detailRows.map((row) => [
+            row.employee_id,
+            { id: row.employee_id, name: row.employee_name },
+          ])
+        ).values()
+      );
+      setEmployees(uniqueEmployees);
+
+      // Group data by Phase → Time Type → Activity
+      groupDetailData(detailRows);
+
+      // Calculate progress
+      const totalCheckboxes = detailRows.length;
+      const checkedCount = detailRows.filter((row) => row.checked).length;
+      const progressPercent =
+        totalCheckboxes > 0
+          ? Math.round((checkedCount / totalCheckboxes) * 100)
+          : 0;
+
+      const uniquePhases = new Set(detailRows.map((row) => row.phase_id));
+      const uniqueActivities = new Set(
+        detailRows.map((row) => row.activity_id)
+      );
+
+      setHeader({
+        date: castedChecklistData?.date || '-',
+        kandang_name: castedChecklistData?.kandang?.name || '-',
+        category: castedChecklistData?.category || '-',
+        status: castedChecklistData?.status || '-',
+        reject_reason: castedChecklistData?.reject_reason || '-',
+        progress_percent: progressPercent,
+        total_phases: uniquePhases.size,
+        total_activities: uniqueActivities.size,
+      });
+    } catch (error) {
+      console.error('Error fetching checklist detail:', error);
+      toast.error('Terjadi kesalahan');
+      router.push('/daily-checklist/list-daily-checklist');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const groupDetailData = (rows: ChecklistDetailRow[]) => {
+    // Group by phase_id
+    const phaseMap = new Map<
+      string,
+      {
+        phase: { id: string; name: string };
+        activities: Map<
+          string,
+          {
+            id: string;
+            name: string;
+            description: string | null;
+            time_type: string;
+            employees: Map<
+              string,
+              {
+                id: string;
+                name: string;
+                checked: boolean;
+                note: string | null;
+              }
+            >;
+          }
+        >;
+      }
+    >();
+
+    rows.forEach((row) => {
+      if (!phaseMap.has(row.phase_id)) {
+        phaseMap.set(row.phase_id, {
+          phase: { id: row.phase_id, name: row.phase_name },
+          activities: new Map(),
+        });
+      }
+
+      const phaseData = phaseMap.get(row.phase_id)!;
+
+      if (!phaseData.activities.has(row.activity_id)) {
+        phaseData.activities.set(row.activity_id, {
+          id: row.activity_id,
+          name: row.activity_name,
+          description: row.activity_description,
+          time_type: row.time_type,
+          employees: new Map(),
+        });
+      }
+
+      const activityData = phaseData.activities.get(row.activity_id)!;
+      activityData.employees.set(row.employee_id, {
+        id: row.employee_id,
+        name: row.employee_name,
+        checked: row.checked,
+        note: row.note,
+      });
+    });
+
+    // Convert to array and group by time_type
+    const grouped: PhaseGroup[] = [];
+
+    phaseMap.forEach((phaseData, phaseId) => {
+      const timeGroups: {
+        [timeType: string]: {
+          activities: {
+            id: string;
+            name: string;
+            description: string | null;
+            employees: {
+              id: string;
+              name: string;
+              checked: boolean;
+              note: string | null;
+            }[];
+          }[];
+        };
+      } = {};
+
+      phaseData.activities.forEach((activityData) => {
+        const timeType = activityData.time_type || 'umum';
+
+        if (!timeGroups[timeType]) {
+          timeGroups[timeType] = { activities: [] };
+        }
+
+        timeGroups[timeType].activities.push({
+          id: activityData.id,
+          name: activityData.name,
+          description: activityData.description,
+          employees: Array.from(activityData.employees.values()),
+        });
+      });
+
+      grouped.push({
+        phase: phaseData.phase,
+        timeGroups,
+      });
+    });
+
+    setPhaseGroups(grouped);
+  };
+
+  const handleApprove = () => {
+    setShowApproveModal(true);
+  };
+
+  const handleReject = () => {
+    setRejectReason('');
+    setShowRejectModal(true);
+  };
+
+  const confirmApprove = async () => {
+    if (!checklistId || !isSupabaseConfigured()) return;
+
+    try {
+      setActionLoading(true);
+
+      const { error } = await supabase
+        .from('daily_checklists')
+        .update({
+          status: 'APPROVED',
+          updated_at: new Date().toISOString(),
+        })
+        .eq('id', checklistId);
+
+      if (error) {
+        console.error('Error approving checklist:', error);
+        toast.error('Gagal approve checklist');
+        return;
+      }
+
+      toast.success('Checklist berhasil di-approve');
+      setShowApproveModal(false);
+      await fetchChecklistDetail();
+    } catch (error) {
+      console.error('Error approving checklist:', error);
+      toast.error('Terjadi kesalahan');
+    } finally {
+      setActionLoading(false);
+    }
+  };
+
+  const confirmReject = async () => {
+    if (!checklistId || !isSupabaseConfigured()) return;
+
+    if (!rejectReason.trim()) {
+      toast.error('Alasan reject harus diisi');
+      return;
+    }
+
+    try {
+      setActionLoading(true);
+
+      const { error } = await supabase
+        .from('daily_checklists')
+        .update({
+          status: 'REJECTED',
+          reject_reason: rejectReason,
+          updated_at: new Date().toISOString(),
+        })
+        .eq('id', checklistId);
+
+      if (error) {
+        console.error('Error rejecting checklist:', error);
+        toast.error('Gagal reject checklist');
+        return;
+      }
+
+      toast.success('Checklist berhasil di-reject');
+      setShowRejectModal(false);
+      setRejectReason('');
+      await fetchChecklistDetail();
+    } catch (error) {
+      console.error('Error rejecting checklist:', error);
+      toast.error('Terjadi kesalahan');
+    } finally {
+      setActionLoading(false);
+    }
+  };
+
+  const getStatusBadge = (status: string) => {
+    switch (status) {
+      case 'DRAFT':
+        return (
+          <Badge
+            variant='outline'
+            className='border-gray-300 text-gray-700 bg-white'
+          >
+            Draft
+          </Badge>
+        );
+      case 'SUBMITTED':
+        return (
+          <Badge
+            variant='outline'
+            className='border-orange-300 text-orange-700 bg-white'
+          >
+            Submitted
+          </Badge>
+        );
+      case 'APPROVED':
+        return (
+          <Badge
+            variant='outline'
+            className='border-green-300 text-green-700 bg-white'
+          >
+            Approved
+          </Badge>
+        );
+      case 'REJECTED':
+        return (
+          <Badge
+            variant='outline'
+            className='border-red-300 text-red-700 bg-white'
+          >
+            Rejected
+          </Badge>
+        );
+      default:
+        return (
+          <Badge
+            variant='outline'
+            className='border-gray-300 text-gray-700 bg-white'
+          >
+            {status}
+          </Badge>
+        );
+    }
+  };
+
+  const formatDate = (dateString: string) => {
+    const date = new Date(dateString);
+    return date.toLocaleDateString('id-ID', {
+      day: '2-digit',
+      month: 'long',
+      year: 'numeric',
+    });
+  };
+
+  if (loading) {
+    return (
+      <div className='min-h-screen'>
+        <div className='p-6'>
+          <div className='mb-6'>
+            <h1 className='text-2xl font-semibold text-gray-900'>
+              Detail Daily Checklist
+            </h1>
+          </div>
+          <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+            <CardContent className='p-12 text-center text-gray-500'>
+              Memuat data...
+            </CardContent>
+          </Card>
+        </div>
+      </div>
+    );
+  }
+
+  if (!header) {
+    return null;
+  }
+
+  const isReadOnly =
+    header.status === 'APPROVED' || header.status === 'REJECTED';
+
+  return (
+    <div className='min-h-screen'>
+      <div className='p-6'>
+        {/* Page Title with Back Button */}
+        <div className='mb-6 flex items-center gap-4'>
+          <Button
+            variant='outline'
+            size='sm'
+            onClick={() => router.push('/daily-checklist/list-daily-checklist')}
+            className='border-gray-200'
+          >
+            <ArrowLeft className='w-4 h-4 mr-1' />
+            Kembali
+          </Button>
+          <div className='flex-1'>
+            <h1 className='text-2xl font-semibold text-gray-900'>
+              Detail Daily Checklist
+            </h1>
+            <p className='text-sm text-gray-600 mt-1'>
+              Lihat detail checklist harian
+            </p>
+          </div>
+          {header.status === 'SUBMITTED' && (
+            <div className='flex gap-2'>
+              <Button
+                onClick={handleApprove}
+                disabled={actionLoading}
+                className='bg-green-600 hover:bg-green-700 text-white'
+              >
+                <CheckCircle className='w-4 h-4 mr-2' />
+                Approve
+              </Button>
+              <Button
+                onClick={handleReject}
+                disabled={actionLoading}
+                variant='destructive'
+                className='bg-red-600 hover:bg-red-700 text-white'
+              >
+                <XCircle className='w-4 h-4 mr-2' />
+                Reject
+              </Button>
+            </div>
+          )}
+        </div>
+
+        {/* Header Info Card */}
+        <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white mb-6'>
+          <CardContent className='p-6'>
+            <div className='grid grid-cols-2 md:grid-cols-4 gap-6'>
+              <div>
+                <Label className='text-xs text-gray-500'>Tanggal</Label>
+                <p className='text-sm font-medium text-gray-900 mt-1'>
+                  {formatDate(header.date)}
+                </p>
+              </div>
+              <div>
+                <Label className='text-xs text-gray-500'>Kandang</Label>
+                <p className='text-sm font-medium text-gray-900 mt-1'>
+                  {header.kandang_name}
+                </p>
+              </div>
+              <div>
+                <Label className='text-xs text-gray-500'>Kategori</Label>
+                <p className='text-sm font-medium text-gray-900 mt-1'>
+                  {CATEGORY_LABELS[header.category] || header.category}
+                </p>
+              </div>
+              <div>
+                <Label className='text-xs text-gray-500'>Status</Label>
+                <div className='mt-1'>{getStatusBadge(header.status)}</div>
+              </div>
+              <div>
+                <Label className='text-xs text-gray-500'>Total Phase</Label>
+                <p className='text-sm font-medium text-gray-900 mt-1'>
+                  {header.total_phases} fase
+                </p>
+              </div>
+              <div>
+                <Label className='text-xs text-gray-500'>Total Aktivitas</Label>
+                <p className='text-sm font-medium text-gray-900 mt-1'>
+                  {header.total_activities} aktivitas
+                </p>
+              </div>
+              <div className='col-span-2'>
+                <Label className='text-xs text-gray-500'>Progress</Label>
+                <div className='flex items-center gap-3 mt-2'>
+                  <div className='flex-1 bg-gray-200 rounded-full h-2.5'>
+                    <div
+                      className='bg-[#0069e0] h-2.5 rounded-full transition-all'
+                      style={{
+                        width: `${header.progress_percent}%`,
+                      }}
+                    />
+                  </div>
+                  <span className='text-sm font-medium text-gray-900'>
+                    {header.progress_percent}%
+                  </span>
+                </div>
+              </div>
+            </div>
+
+            {/* Reject Reason if rejected */}
+            {header.status === 'REJECTED' && header.reject_reason && (
+              <div className='mt-6 pt-6 border-t border-gray-200'>
+                <div className='flex items-start gap-3 p-4 bg-red-50 border border-red-200 rounded-lg'>
+                  <AlertCircle className='w-5 h-5 text-red-600 mt-0.5 flex-shrink-0' />
+                  <div>
+                    <Label className='text-sm font-medium text-red-900'>
+                      Alasan Reject
+                    </Label>
+                    <p className='text-sm text-red-700 mt-1'>
+                      {header.reject_reason}
+                    </p>
+                  </div>
+                </div>
+              </div>
+            )}
+          </CardContent>
+        </Card>
+
+        {/* Activity Checklist Table */}
+        <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+          <CardContent className='p-6'>
+            <h3 className='font-semibold text-gray-900 mb-4'>
+              Checklist Aktivitas
+            </h3>
+
+            {phaseGroups.length > 0 ? (
+              <div className='overflow-x-auto'>
+                <table className='w-full border border-gray-200 rounded-lg'>
+                  <thead>
+                    <tr className='bg-gray-50 border-b border-gray-200'>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700 border-r border-gray-200 min-w-[200px]'>
+                        Aktivitas
+                      </th>
+                      {employees.map((emp) => (
+                        <th
+                          key={emp.id}
+                          className='text-center py-3 px-4 text-sm font-semibold text-gray-700 border-r border-gray-200 min-w-[100px]'
+                        >
+                          {emp.name}
+                        </th>
+                      ))}
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700 min-w-[200px]'>
+                        Catatan
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {phaseGroups.flatMap((phaseGroup) => {
+                      const timeTypes = Object.keys(phaseGroup.timeGroups).sort(
+                        (a, b) =>
+                          TIME_TYPE_ORDER.indexOf(a) -
+                          TIME_TYPE_ORDER.indexOf(b)
+                      );
+
+                      const totalActivities = timeTypes.reduce(
+                        (sum, timeType) =>
+                          sum +
+                          phaseGroup.timeGroups[timeType].activities.length,
+                        0
+                      );
+
+                      const rows = [];
+
+                      // PHASE Header - BLUE
+                      rows.push(
+                        <tr
+                          key={`phase-${phaseGroup.phase.id}`}
+                          className='bg-blue-50 border-b border-blue-200'
+                        >
+                          <td
+                            colSpan={employees.length + 2}
+                            className='py-2.5 px-4'
+                          >
+                            <div className='flex items-center gap-2'>
+                              <span className='text-sm font-semibold text-blue-900'>
+                                {phaseGroup.phase.name}
+                              </span>
+                              <Badge
+                                variant='secondary'
+                                className='text-xs bg-blue-100 text-blue-700 border-blue-200 rounded-lg'
+                              >
+                                {totalActivities} aktivitas
+                              </Badge>
+                            </div>
+                          </td>
+                        </tr>
+                      );
+
+                      // TIME_TYPE sub-headers and activities
+                      timeTypes.forEach((timeType) => {
+                        const timeGroup = phaseGroup.timeGroups[timeType];
+                        const hasMultipleTimeTypes = timeTypes.length > 1;
+
+                        // TIME Header (optional) - GRAY SOFT
+                        if (hasMultipleTimeTypes) {
+                          rows.push(
+                            <tr
+                              key={`time-${phaseGroup.phase.id}-${timeType}`}
+                              className='bg-gray-50 border-b border-gray-200'
+                            >
+                              <td
+                                colSpan={employees.length + 2}
+                                className='py-2 px-4 pl-8'
+                              >
+                                <span className='text-xs font-medium text-gray-600'>
+                                  {TIME_TYPE_LABELS[timeType]} (
+                                  {timeGroup.activities.length} aktivitas)
+                                </span>
+                              </td>
+                            </tr>
+                          );
+                        }
+
+                        // ACTIVITY rows
+                        timeGroup.activities.forEach((activity, index) => {
+                          const indentClass = hasMultipleTimeTypes
+                            ? 'pl-12'
+                            : 'pl-8';
+
+                          rows.push(
+                            <tr
+                              key={`activity-${activity.id}-${index}`}
+                              className={
+                                index % 2 === 0 ? 'bg-white' : 'bg-gray-50/50'
+                              }
+                            >
+                              <td
+                                className={`py-3 px-4 ${indentClass} border-r border-gray-200`}
+                              >
+                                <p className='text-sm text-gray-900'>
+                                  {activity.name}
+                                </p>
+                                {activity.description && (
+                                  <p className='text-xs text-gray-500 mt-0.5'>
+                                    {activity.description}
+                                  </p>
+                                )}
+                              </td>
+                              {employees.map((emp) => {
+                                const empData = activity.employees.find(
+                                  (e) => e.id === emp.id
+                                );
+                                return (
+                                  <td
+                                    key={emp.id}
+                                    className='text-center py-3 px-4 border-r border-gray-200'
+                                  >
+                                    <input
+                                      type='checkbox'
+                                      checked={empData?.checked || false}
+                                      disabled
+                                      className='checkbox-clean cursor-not-allowed'
+                                    />
+                                  </td>
+                                );
+                              })}
+                              <td className='py-3 px-4'>
+                                {activity.employees.length > 0 &&
+                                activity.employees[0].note ? (
+                                  <p className='text-sm text-gray-600'>
+                                    {activity.employees[0].note}
+                                  </p>
+                                ) : (
+                                  <p className='text-xs text-gray-400 italic'>
+                                    Tidak ada catatan
+                                  </p>
+                                )}
+                              </td>
+                            </tr>
+                          );
+                        });
+                      });
+
+                      return rows;
+                    })}
+                  </tbody>
+                </table>
+              </div>
+            ) : (
+              <div className='text-center py-12 text-gray-500'>
+                Tidak ada data aktivitas
+              </div>
+            )}
+          </CardContent>
+        </Card>
+      </div>
+
+      {/* Approve Modal */}
+      <Dialog open={showApproveModal} onOpenChange={setShowApproveModal}>
+        <DialogContent className='sm:max-w-md bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle>Approve Checklist</DialogTitle>
+            <DialogDescription>
+              Apakah Anda yakin ingin approve checklist ini?
+            </DialogDescription>
+          </DialogHeader>
+
+          <div className='bg-gray-50 rounded-lg p-4 space-y-2'>
+            <div className='flex justify-between text-sm'>
+              <span className='text-gray-600'>Tanggal:</span>
+              <span className='font-medium text-gray-900'>
+                {formatDate(header.date)}
+              </span>
+            </div>
+            <div className='flex justify-between text-sm'>
+              <span className='text-gray-600'>Kandang:</span>
+              <span className='font-medium text-gray-900'>
+                {header.kandang_name}
+              </span>
+            </div>
+            <div className='flex justify-between text-sm'>
+              <span className='text-gray-600'>Kategori:</span>
+              <span className='font-medium text-gray-900'>
+                {CATEGORY_LABELS[header.category] || header.category}
+              </span>
+            </div>
+            <div className='flex justify-between text-sm'>
+              <span className='text-gray-600'>Progress:</span>
+              <span className='font-medium text-gray-900'>
+                {header.progress_percent}%
+              </span>
+            </div>
+          </div>
+
+          <DialogFooter className='flex gap-2'>
+            <Button
+              variant='outline'
+              onClick={() => setShowApproveModal(false)}
+              disabled={actionLoading}
+              className='border-gray-200'
+            >
+              Batal
+            </Button>
+            <Button
+              onClick={confirmApprove}
+              disabled={actionLoading}
+              className='bg-green-600 hover:bg-green-700 text-white'
+            >
+              {actionLoading ? 'Memproses...' : 'Ya, Approve'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      {/* Reject Modal */}
+      <Dialog open={showRejectModal} onOpenChange={setShowRejectModal}>
+        <DialogContent className='sm:max-w-md bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle>Reject Checklist</DialogTitle>
+            <DialogDescription>
+              Berikan alasan reject untuk checklist ini
+            </DialogDescription>
+          </DialogHeader>
+
+          <div className='bg-gray-50 rounded-lg p-4 space-y-2 mb-4'>
+            <div className='flex justify-between text-sm'>
+              <span className='text-gray-600'>Tanggal:</span>
+              <span className='font-medium text-gray-900'>
+                {formatDate(header.date)}
+              </span>
+            </div>
+            <div className='flex justify-between text-sm'>
+              <span className='text-gray-600'>Kandang:</span>
+              <span className='font-medium text-gray-900'>
+                {header.kandang_name}
+              </span>
+            </div>
+            <div className='flex justify-between text-sm'>
+              <span className='text-gray-600'>Kategori:</span>
+              <span className='font-medium text-gray-900'>
+                {CATEGORY_LABELS[header.category] || header.category}
+              </span>
+            </div>
+          </div>
+
+          <div>
+            <Label htmlFor='reject-reason'>
+              Alasan Reject <span className='text-red-500'>*</span>
+            </Label>
+            <Textarea
+              id='reject-reason'
+              value={rejectReason}
+              onChange={(e) => setRejectReason(e.target.value)}
+              placeholder='Tuliskan alasan reject...'
+              className='mt-1.5 border-gray-200 min-h-[100px]'
+              disabled={actionLoading}
+            />
+          </div>
+
+          <DialogFooter className='flex gap-2'>
+            <Button
+              variant='outline'
+              onClick={() => setShowRejectModal(false)}
+              disabled={actionLoading}
+              className='border-gray-200'
+            >
+              Batal
+            </Button>
+            <Button
+              onClick={confirmReject}
+              disabled={actionLoading}
+              variant='destructive'
+              className='bg-red-600 hover:bg-red-700 text-white'
+            >
+              {actionLoading ? 'Memproses...' : 'Ya, Reject'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </div>
+  );
+}
diff --git a/src/figma-make/components/pages/master-data/activity/MasterAktivitasContent.tsx b/src/figma-make/components/pages/master-data/activity/MasterAktivitasContent.tsx
new file mode 100644
index 00000000..74926aa2
--- /dev/null
+++ b/src/figma-make/components/pages/master-data/activity/MasterAktivitasContent.tsx
@@ -0,0 +1,1002 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import { Plus, MoreVertical, Pencil, Trash2, Search } from 'lucide-react';
+import { Card, CardContent } from '@/figma-make/components/base/card';
+import { Button } from '@/figma-make/components/base/button';
+import { Label } from '@/figma-make/components/base/label';
+import { Input } from '@/figma-make/components/base/input';
+import { Textarea } from '@/figma-make/components/base/textarea';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/figma-make/components/base/select';
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+  DialogFooter,
+} from '@/figma-make/components/base/dialog';
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from '@/figma-make/components/base/alert-dialog';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/figma-make/components/base/dropdown-menu';
+import { toast } from 'sonner';
+import { supabase, isSupabaseConfigured } from '@/figma-make/lib/supabase';
+
+// Static categories - tidak bisa CRUD
+const CATEGORIES = [
+  { value: 'pullet_open', label: 'Pullet Open' },
+  { value: 'pullet_close', label: 'Pullet Close' },
+  { value: 'produksi_open', label: 'Produksi Open' },
+  { value: 'produksi_close', label: 'Produksi Close' },
+];
+
+const TIME_TYPES = [
+  { value: 'umum', label: 'Umum' },
+  { value: 'pagi', label: 'Pagi' },
+  { value: 'siang', label: 'Siang' },
+  { value: 'sore', label: 'Sore' },
+  { value: 'malam', label: 'Malam' },
+];
+
+interface Phase {
+  id: string;
+  name: string;
+  category: string;
+  activityCount?: number;
+}
+
+interface Activity {
+  id: string;
+  phase_id: string;
+  name: string;
+  description?: string;
+  time_type: string;
+}
+
+export function MasterAktivitasContent() {
+  const [selectedCategory, setSelectedCategory] = useState<string>('');
+  const [phases, setPhases] = useState<Phase[]>([]);
+  const [activities, setActivities] = useState<Activity[]>([]);
+  const [selectedPhase, setSelectedPhase] = useState<Phase | null>(null);
+
+  const [showPhaseModal, setShowPhaseModal] = useState(false);
+  const [showActivityModal, setShowActivityModal] = useState(false);
+  const [showPhaseDeleteConfirm, setShowPhaseDeleteConfirm] = useState(false);
+  const [showActivityDeleteConfirm, setShowActivityDeleteConfirm] =
+    useState(false);
+
+  const [phaseToDelete, setPhaseToDelete] = useState<string | null>(null);
+  const [activityToDelete, setActivityToDelete] = useState<string | null>(null);
+
+  const [loading, setLoading] = useState(false);
+  const [initialLoading, setInitialLoading] = useState(true);
+
+  const [phaseSearchQuery, setPhaseSearchQuery] = useState('');
+  const [phaseModalMode, setPhaseModalMode] = useState<'create' | 'edit'>(
+    'create'
+  );
+  const [activityModalMode, setActivityModalMode] = useState<'create' | 'edit'>(
+    'create'
+  );
+
+  const [phaseForm, setPhaseForm] = useState({
+    id: '',
+    name: '',
+  });
+
+  const [activityForm, setActivityForm] = useState({
+    id: '',
+    name: '',
+    description: '',
+    time_type: 'umum',
+  });
+
+  useEffect(() => {
+    setInitialLoading(false);
+  }, []);
+
+  // Fetch phases when category changes
+  useEffect(() => {
+    if (selectedCategory) {
+      fetchPhases(selectedCategory);
+    } else {
+      setPhases([]);
+      setSelectedPhase(null);
+      setActivities([]);
+    }
+  }, [selectedCategory]);
+
+  // Fetch activities when phase changes
+  useEffect(() => {
+    if (selectedPhase) {
+      fetchActivities(selectedPhase.id);
+    } else {
+      setActivities([]);
+    }
+  }, [selectedPhase]);
+
+  const fetchPhases = async (
+    category: string,
+    preserveSelectedPhaseId?: string
+  ) => {
+    if (!isSupabaseConfigured()) {
+      console.warn(
+        'Supabase not configured. Please add environment variables.'
+      );
+      return;
+    }
+
+    try {
+      const { data, error } = await supabase
+        .from('phases')
+        .select('*')
+        .eq('category', category)
+        .order('id', { ascending: true }); // ✅ Urutan berdasarkan ID (yang paling awal diinput di atas)
+
+      if (error) {
+        console.error('Error fetching phases:', error);
+        toast.error('Gagal memuat data phase');
+        return;
+      }
+
+      // Fetch activity counts for each phase
+      const phasesWithCounts = await Promise.all(
+        (data || []).map(async (phase) => {
+          const { count } = await supabase
+            .from('phase_activities')
+            .select('*', { count: 'exact', head: true })
+            .eq('phase_id', phase.id);
+
+          return { ...phase, activityCount: count || 0 };
+        })
+      );
+
+      setPhases(phasesWithCounts);
+
+      // Preserve selected phase if ID is provided
+      if (preserveSelectedPhaseId) {
+        const phaseToSelect = phasesWithCounts.find(
+          (p) => p.id === preserveSelectedPhaseId
+        );
+        if (phaseToSelect) {
+          setSelectedPhase(phaseToSelect);
+        } else if (phasesWithCounts.length > 0) {
+          setSelectedPhase(phasesWithCounts[0]);
+        } else {
+          setSelectedPhase(null);
+        }
+      } else {
+        // Select first phase by default if exists
+        if (phasesWithCounts.length > 0) {
+          setSelectedPhase(phasesWithCounts[0]);
+        } else {
+          setSelectedPhase(null);
+        }
+      }
+    } catch (error) {
+      console.error('Error fetching phases:', error);
+      toast.error('Gagal memuat data phase');
+    }
+  };
+
+  const fetchActivities = async (phaseId: string) => {
+    if (!isSupabaseConfigured()) {
+      return;
+    }
+
+    try {
+      const { data, error } = await supabase
+        .from('phase_activities')
+        .select('*')
+        .eq('phase_id', phaseId)
+        .order('id', { ascending: true }); // ✅ Urutan berdasarkan ID (yang paling awal diinput di atas)
+
+      if (error) {
+        console.error('Error fetching activities:', error);
+        toast.error('Gagal memuat data aktivitas');
+        return;
+      }
+
+      setActivities(data || []);
+    } catch (error) {
+      console.error('Error fetching activities:', error);
+      toast.error('Gagal memuat data aktivitas');
+    }
+  };
+
+  // Phase handlers
+  const handleAddPhase = () => {
+    if (!selectedCategory) {
+      toast.error('Pilih kategori terlebih dahulu');
+      return;
+    }
+    setPhaseModalMode('create');
+    setPhaseForm({ id: '', name: '' });
+    setShowPhaseModal(true);
+  };
+
+  const handleEditPhase = (phase: Phase) => {
+    setPhaseModalMode('edit');
+    setPhaseForm({
+      id: phase.id,
+      name: phase.name,
+    });
+    setShowPhaseModal(true);
+  };
+
+  const handleSavePhase = async () => {
+    if (!phaseForm.name.trim()) {
+      toast.error('Nama phase harus diisi');
+      return;
+    }
+
+    if (!selectedCategory) {
+      toast.error('Pilih kategori terlebih dahulu');
+      return;
+    }
+
+    if (!isSupabaseConfigured()) {
+      toast.error(
+        'Supabase belum dikonfigurasi. Tambahkan environment variables.'
+      );
+      return;
+    }
+
+    setLoading(true);
+
+    try {
+      if (phaseModalMode === 'create') {
+        const { error } = await supabase.from('phases').insert([
+          {
+            name: phaseForm.name.trim(),
+            category: selectedCategory,
+          },
+        ]);
+
+        if (error) {
+          console.error('Error creating phase:', error);
+          toast.error('Gagal menambahkan phase');
+          return;
+        }
+
+        toast.success('Phase berhasil ditambahkan');
+      } else {
+        const { error } = await supabase
+          .from('phases')
+          .update({
+            name: phaseForm.name.trim(),
+          })
+          .eq('id', phaseForm.id);
+
+        if (error) {
+          console.error('Error updating phase:', error);
+          toast.error('Gagal mengubah phase');
+          return;
+        }
+
+        toast.success('Phase berhasil diubah');
+      }
+
+      setShowPhaseModal(false);
+      setPhaseForm({ id: '', name: '' });
+      await fetchPhases(selectedCategory);
+    } catch (error) {
+      console.error('Error saving phase:', error);
+      toast.error('Terjadi kesalahan saat menyimpan phase');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleDeletePhaseClick = (phaseId: string) => {
+    setPhaseToDelete(phaseId);
+    setShowPhaseDeleteConfirm(true);
+  };
+
+  const handleConfirmDeletePhase = async () => {
+    if (!phaseToDelete || !selectedCategory) return;
+
+    setLoading(true);
+
+    try {
+      // First, delete all activities in this phase
+      const { error: activitiesError } = await supabase
+        .from('phase_activities')
+        .delete()
+        .eq('phase_id', phaseToDelete);
+
+      if (activitiesError) {
+        console.error('Error deleting phase activities:', activitiesError);
+        toast.error('Gagal menghapus aktivitas phase');
+        setLoading(false);
+        return;
+      }
+
+      // Then delete the phase
+      const { error: phaseError } = await supabase
+        .from('phases')
+        .delete()
+        .eq('id', phaseToDelete);
+
+      if (phaseError) {
+        console.error('Error deleting phase:', phaseError);
+        toast.error('Gagal menghapus phase');
+        setLoading(false);
+        return;
+      }
+
+      toast.success('Phase dan semua aktivitasnya berhasil dihapus');
+      setShowPhaseDeleteConfirm(false);
+      setPhaseToDelete(null);
+
+      // Clear selection if deleted phase was selected
+      if (selectedPhase?.id === phaseToDelete) {
+        setSelectedPhase(null);
+        setActivities([]);
+      }
+
+      await fetchPhases(selectedCategory);
+    } catch (error) {
+      console.error('Error deleting phase:', error);
+      toast.error('Terjadi kesalahan saat menghapus phase');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // Activity handlers
+  const handleAddActivity = () => {
+    if (!selectedPhase) {
+      toast.error('Pilih phase terlebih dahulu');
+      return;
+    }
+    setActivityModalMode('create');
+    setActivityForm({ id: '', name: '', description: '', time_type: 'umum' });
+    setShowActivityModal(true);
+  };
+
+  const handleEditActivity = (activity: Activity) => {
+    setActivityModalMode('edit');
+    setActivityForm({
+      id: activity.id,
+      name: activity.name,
+      description: activity.description || '',
+      time_type: activity.time_type,
+    });
+    setShowActivityModal(true);
+  };
+
+  const handleSaveActivity = async () => {
+    if (!activityForm.name.trim()) {
+      toast.error('Nama aktivitas harus diisi');
+      return;
+    }
+
+    if (!selectedPhase) {
+      toast.error('Pilih phase terlebih dahulu');
+      return;
+    }
+
+    if (!isSupabaseConfigured()) {
+      toast.error(
+        'Supabase belum dikonfigurasi. Tambahkan environment variables.'
+      );
+      return;
+    }
+
+    setLoading(true);
+
+    try {
+      if (activityModalMode === 'create') {
+        const { error } = await supabase.from('phase_activities').insert([
+          {
+            phase_id: selectedPhase.id,
+            name: activityForm.name.trim(),
+            description: activityForm.description.trim() || null,
+            time_type: activityForm.time_type,
+          },
+        ]);
+
+        if (error) {
+          console.error('Error creating activity:', error);
+          toast.error('Gagal menambahkan aktivitas');
+          return;
+        }
+
+        toast.success('Aktivitas berhasil ditambahkan');
+      } else {
+        const { error } = await supabase
+          .from('phase_activities')
+          .update({
+            name: activityForm.name.trim(),
+            description: activityForm.description.trim() || null,
+            time_type: activityForm.time_type,
+          })
+          .eq('id', activityForm.id);
+
+        if (error) {
+          console.error('Error updating activity:', error);
+          toast.error('Gagal mengubah aktivitas');
+          return;
+        }
+
+        toast.success('Aktivitas berhasil diubah');
+      }
+
+      setShowActivityModal(false);
+      setActivityForm({ id: '', name: '', description: '', time_type: 'umum' });
+      await fetchActivities(selectedPhase.id);
+      if (selectedCategory) {
+        await fetchPhases(selectedCategory, selectedPhase.id); // ✅ Preserve selected phase
+      }
+    } catch (error) {
+      console.error('Error saving activity:', error);
+      toast.error('Terjadi kesalahan saat menyimpan aktivitas');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleDeleteActivityClick = (activityId: string) => {
+    setActivityToDelete(activityId);
+    setShowActivityDeleteConfirm(true);
+  };
+
+  const handleConfirmDeleteActivity = async () => {
+    if (!activityToDelete || !selectedPhase || !selectedCategory) return;
+
+    setLoading(true);
+
+    try {
+      const { error } = await supabase
+        .from('phase_activities')
+        .delete()
+        .eq('id', activityToDelete);
+
+      if (error) {
+        console.error('Error deleting activity:', error);
+        toast.error('Gagal menghapus aktivitas');
+        return;
+      }
+
+      toast.success('Aktivitas berhasil dihapus');
+      setShowActivityDeleteConfirm(false);
+      setActivityToDelete(null);
+      await fetchActivities(selectedPhase.id);
+      await fetchPhases(selectedCategory, selectedPhase.id); // ✅ Preserve selected phase
+    } catch (error) {
+      console.error('Error deleting activity:', error);
+      toast.error('Terjadi kesalahan saat menghapus aktivitas');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const filteredPhases = phases.filter((phase) =>
+    phase.name.toLowerCase().includes(phaseSearchQuery.toLowerCase())
+  );
+
+  const getTimeTypeLabel = (timeType: string) => {
+    return TIME_TYPES.find((t) => t.value === timeType)?.label || timeType;
+  };
+
+  const getTimeTypeBadgeClass = (timeType: string) => {
+    switch (timeType) {
+      case 'umum':
+        return 'bg-gray-50 text-gray-700 border-gray-300';
+      case 'pagi':
+        return 'bg-orange-50 text-orange-700 border-orange-300';
+      case 'siang':
+        return 'bg-amber-50 text-amber-700 border-amber-300';
+      case 'sore':
+        return 'bg-purple-50 text-purple-700 border-purple-300';
+      case 'malam':
+        return 'bg-indigo-50 text-indigo-700 border-indigo-300';
+      default:
+        return 'bg-gray-50 text-gray-700 border-gray-300';
+    }
+  };
+
+  if (initialLoading) {
+    return (
+      <div className='min-h-screen'>
+        <div className='p-6'>
+          <div className='mb-6'>
+            <h1 className='text-2xl font-semibold text-gray-900'>
+              Master Aktivitas
+            </h1>
+            <p className='text-sm text-gray-600 mt-1'>
+              Master Data • <span className='text-[#0069e0]'>Aktivitas</span>
+            </p>
+          </div>
+          <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+            <CardContent className='p-12 text-center text-gray-500'>
+              Memuat data...
+            </CardContent>
+          </Card>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className='min-h-screen'>
+      <div className='p-6'>
+        {/* Page Title */}
+        <div className='mb-6'>
+          <h1 className='text-2xl font-semibold text-gray-900'>
+            Master Aktivitas
+          </h1>
+          <p className='text-sm text-gray-600 mt-1'>
+            Master Data • <span className='text-[#0069e0]'>Aktivitas</span>
+          </p>
+        </div>
+
+        {/* Category Selector Card */}
+        <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white mb-6'>
+          <CardContent className='p-6'>
+            <div className='max-w-md'>
+              <Label htmlFor='category'>
+                Kategori <span className='text-red-500'>*</span>
+              </Label>
+              <Select
+                value={selectedCategory}
+                onValueChange={setSelectedCategory}
+              >
+                <SelectTrigger id='category' className='mt-1.5 border-gray-200'>
+                  <SelectValue placeholder='Pilih kategori aktivitas' />
+                </SelectTrigger>
+                <SelectContent>
+                  {CATEGORIES.map((cat) => (
+                    <SelectItem key={cat.value} value={cat.value}>
+                      {cat.label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              <p className='text-xs text-gray-500 mt-2'>
+                Pilih kategori untuk melihat dan mengelola phase dan aktivitas
+              </p>
+            </div>
+          </CardContent>
+        </Card>
+
+        {selectedCategory ? (
+          <div className='grid grid-cols-1 lg:grid-cols-5 gap-6'>
+            {/* LEFT PANEL: Phase List */}
+            <div className='lg:col-span-2'>
+              <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+                <CardContent className='p-0'>
+                  {/* Phase Toolbar */}
+                  <div className='flex items-center justify-between gap-4 p-6 border-b border-gray-200/60'>
+                    <div className='relative flex-1'>
+                      <Search className='absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-4 h-4' />
+                      <Input
+                        type='text'
+                        placeholder='Cari phase...'
+                        value={phaseSearchQuery}
+                        onChange={(e) => setPhaseSearchQuery(e.target.value)}
+                        className='pl-10 border-gray-200'
+                      />
+                    </div>
+                    <Button
+                      onClick={handleAddPhase}
+                      size='sm'
+                      className='bg-[#0069e0] hover:bg-[#0052b3] text-white whitespace-nowrap'
+                    >
+                      <Plus className='w-4 h-4 mr-1' />
+                      Phase
+                    </Button>
+                  </div>
+
+                  {/* Phase List */}
+                  <div className='divide-y divide-gray-200/60'>
+                    {filteredPhases.length === 0 ? (
+                      <div className='p-8 text-center text-gray-500'>
+                        {phaseSearchQuery
+                          ? 'Tidak ada phase yang ditemukan'
+                          : 'Belum ada data phase'}
+                      </div>
+                    ) : (
+                      filteredPhases.map((phase) => (
+                        <div
+                          key={phase.id}
+                          className={`flex items-center justify-between p-4 cursor-pointer transition-colors ${
+                            selectedPhase?.id === phase.id
+                              ? 'bg-blue-50 border-l-4 border-[#0069e0]'
+                              : 'hover:bg-gray-50'
+                          }`}
+                          onClick={() => setSelectedPhase(phase)}
+                        >
+                          <div className='flex-1 min-w-0'>
+                            <p className='text-sm font-medium text-gray-900 truncate'>
+                              {phase.name}
+                            </p>
+                            <p className='text-xs text-gray-500 mt-1'>
+                              {phase.activityCount || 0} aktivitas
+                            </p>
+                          </div>
+                          <DropdownMenu>
+                            <DropdownMenuTrigger
+                              asChild
+                              onClick={(e) => e.stopPropagation()}
+                            >
+                              <Button
+                                variant='ghost'
+                                size='sm'
+                                className='h-8 w-8 p-0 hover:bg-gray-100'
+                              >
+                                <MoreVertical className='h-4 w-4 text-gray-600' />
+                              </Button>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent align='end'>
+                              <DropdownMenuItem
+                                onClick={() => handleEditPhase(phase)}
+                              >
+                                <Pencil className='mr-2 h-4 w-4' />
+                                Edit
+                              </DropdownMenuItem>
+                              <DropdownMenuItem
+                                onClick={() => handleDeletePhaseClick(phase.id)}
+                                className='text-red-600'
+                              >
+                                <Trash2 className='mr-2 h-4 w-4' />
+                                Hapus
+                              </DropdownMenuItem>
+                            </DropdownMenuContent>
+                          </DropdownMenu>
+                        </div>
+                      ))
+                    )}
+                  </div>
+                </CardContent>
+              </Card>
+            </div>
+
+            {/* RIGHT PANEL: Activity Detail */}
+            <div className='lg:col-span-3'>
+              <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+                <CardContent className='p-0'>
+                  {selectedPhase ? (
+                    <>
+                      {/* Activity Header */}
+                      <div className='flex items-center justify-between p-6 border-b border-gray-200/60'>
+                        <div>
+                          <h2 className='text-lg font-semibold text-gray-900'>
+                            Aktivitas di Phase: {selectedPhase.name}
+                          </h2>
+                          <p className='text-sm text-gray-600 mt-0.5'>
+                            {activities.length} aktivitas
+                          </p>
+                        </div>
+                        <Button
+                          onClick={handleAddActivity}
+                          className='bg-[#0069e0] hover:bg-[#0052b3] text-white'
+                        >
+                          <Plus className='w-4 h-4 mr-2' />
+                          Tambah Aktivitas
+                        </Button>
+                      </div>
+
+                      {/* Activity Table */}
+                      <div className='overflow-x-auto'>
+                        <table className='w-full'>
+                          <thead>
+                            <tr className='border-b border-gray-200/60 bg-gray-50/50'>
+                              <th className='text-left py-3.5 px-6 text-sm font-semibold text-gray-700'>
+                                Nama Aktivitas
+                              </th>
+                              <th className='text-center py-3.5 px-6 text-sm font-semibold text-gray-700 w-[80px]'>
+                                Aksi
+                              </th>
+                            </tr>
+                          </thead>
+                          <tbody className='divide-y divide-gray-200/60'>
+                            {activities.length === 0 ? (
+                              <tr>
+                                <td
+                                  colSpan={2}
+                                  className='text-center py-12 text-gray-500'
+                                >
+                                  Belum ada aktivitas di phase ini
+                                </td>
+                              </tr>
+                            ) : (
+                              activities.map((activity) => (
+                                <tr
+                                  key={activity.id}
+                                  className='hover:bg-blue-50/30 transition-colors'
+                                >
+                                  <td className='py-3.5 px-6'>
+                                    <div className='flex items-center gap-2'>
+                                      <div className='flex-1'>
+                                        <p className='text-sm text-gray-900'>
+                                          {activity.name}
+                                        </p>
+                                        {activity.description && (
+                                          <p className='text-xs text-gray-500 mt-1'>
+                                            {activity.description}
+                                          </p>
+                                        )}
+                                      </div>
+                                      <span
+                                        className={`text-xs px-2 py-0.5 rounded-full ${getTimeTypeBadgeClass(activity.time_type)}`}
+                                      >
+                                        {getTimeTypeLabel(activity.time_type)}
+                                      </span>
+                                    </div>
+                                  </td>
+                                  <td className='py-3.5 px-6 text-center'>
+                                    <DropdownMenu>
+                                      <DropdownMenuTrigger asChild>
+                                        <Button
+                                          variant='ghost'
+                                          size='sm'
+                                          className='h-8 w-8 p-0 hover:bg-gray-100'
+                                        >
+                                          <MoreVertical className='h-4 w-4 text-gray-600' />
+                                        </Button>
+                                      </DropdownMenuTrigger>
+                                      <DropdownMenuContent align='end'>
+                                        <DropdownMenuItem
+                                          onClick={() =>
+                                            handleEditActivity(activity)
+                                          }
+                                        >
+                                          <Pencil className='mr-2 h-4 w-4' />
+                                          Edit
+                                        </DropdownMenuItem>
+                                        <DropdownMenuItem
+                                          onClick={() =>
+                                            handleDeleteActivityClick(
+                                              activity.id
+                                            )
+                                          }
+                                          className='text-red-600'
+                                        >
+                                          <Trash2 className='mr-2 h-4 w-4' />
+                                          Hapus
+                                        </DropdownMenuItem>
+                                      </DropdownMenuContent>
+                                    </DropdownMenu>
+                                  </td>
+                                </tr>
+                              ))
+                            )}
+                          </tbody>
+                        </table>
+                      </div>
+                    </>
+                  ) : (
+                    <div className='p-12 text-center text-gray-500'>
+                      Pilih phase untuk melihat aktivitas
+                    </div>
+                  )}
+                </CardContent>
+              </Card>
+            </div>
+          </div>
+        ) : (
+          <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+            <CardContent className='p-12 text-center text-gray-500'>
+              Pilih kategori terlebih dahulu untuk mengelola phase dan aktivitas
+            </CardContent>
+          </Card>
+        )}
+      </div>
+
+      {/* Phase Add/Edit Modal */}
+      <Dialog open={showPhaseModal} onOpenChange={setShowPhaseModal}>
+        <DialogContent className='sm:max-w-md bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle>
+              {phaseModalMode === 'create' ? 'Tambah Phase' : 'Edit Phase'}
+            </DialogTitle>
+            <DialogDescription>
+              {phaseModalMode === 'create'
+                ? 'Masukkan detail phase baru'
+                : 'Ubah detail phase'}
+            </DialogDescription>
+          </DialogHeader>
+          <div className='space-y-4 py-4'>
+            <div>
+              <Label htmlFor='nama-phase'>
+                Nama Phase <span className='text-red-500'>*</span>
+              </Label>
+              <Input
+                id='nama-phase'
+                value={phaseForm.name}
+                onChange={(e) =>
+                  setPhaseForm({ ...phaseForm, name: e.target.value })
+                }
+                placeholder='Masukkan nama phase'
+                className='mt-1.5'
+                disabled={loading}
+              />
+            </div>
+          </div>
+          <DialogFooter>
+            <Button
+              variant='outline'
+              onClick={() => setShowPhaseModal(false)}
+              disabled={loading}
+            >
+              Batal
+            </Button>
+            <Button
+              onClick={handleSavePhase}
+              disabled={loading}
+              className='bg-[#0069e0] hover:bg-[#0052b3] text-white'
+            >
+              {loading ? 'Menyimpan...' : 'Simpan'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      {/* Activity Add/Edit Modal */}
+      <Dialog open={showActivityModal} onOpenChange={setShowActivityModal}>
+        <DialogContent className='sm:max-w-md bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle>
+              {activityModalMode === 'create'
+                ? 'Tambah Aktivitas'
+                : 'Edit Aktivitas'}
+            </DialogTitle>
+            <DialogDescription>
+              {activityModalMode === 'create'
+                ? 'Masukkan detail aktivitas baru'
+                : 'Ubah detail aktivitas'}
+            </DialogDescription>
+          </DialogHeader>
+          <div className='space-y-4 py-4'>
+            <div>
+              <Label htmlFor='nama-aktivitas'>
+                Nama Aktivitas <span className='text-red-500'>*</span>
+              </Label>
+              <Input
+                id='nama-aktivitas'
+                value={activityForm.name}
+                onChange={(e) =>
+                  setActivityForm({ ...activityForm, name: e.target.value })
+                }
+                placeholder='Masukkan nama aktivitas'
+                className='mt-1.5'
+                disabled={loading}
+              />
+            </div>
+            <div>
+              <Label htmlFor='keterangan'>Keterangan (Opsional)</Label>
+              <Textarea
+                id='keterangan'
+                value={activityForm.description}
+                onChange={(e) =>
+                  setActivityForm({
+                    ...activityForm,
+                    description: e.target.value,
+                  })
+                }
+                placeholder='Masukkan keterangan aktivitas'
+                className='mt-1.5'
+                rows={3}
+                disabled={loading}
+              />
+            </div>
+            <div>
+              <Label htmlFor='tipe-aktivitas'>
+                Tipe Aktivitas <span className='text-red-500'>*</span>
+              </Label>
+              <Select
+                value={activityForm.time_type}
+                onValueChange={(value) =>
+                  setActivityForm({ ...activityForm, time_type: value })
+                }
+                disabled={loading}
+              >
+                <SelectTrigger
+                  id='tipe-aktivitas'
+                  className='mt-1.5 border-gray-200'
+                >
+                  <SelectValue placeholder='Pilih tipe aktivitas' />
+                </SelectTrigger>
+                <SelectContent>
+                  {TIME_TYPES.map((type) => (
+                    <SelectItem key={type.value} value={type.value}>
+                      {type.label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+          </div>
+          <DialogFooter>
+            <Button
+              variant='outline'
+              onClick={() => setShowActivityModal(false)}
+              disabled={loading}
+            >
+              Batal
+            </Button>
+            <Button
+              onClick={handleSaveActivity}
+              disabled={loading}
+              className='bg-[#0069e0] hover:bg-[#0052b3] text-white'
+            >
+              {loading ? 'Menyimpan...' : 'Simpan'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      {/* Phase Delete Confirmation */}
+      <AlertDialog
+        open={showPhaseDeleteConfirm}
+        onOpenChange={setShowPhaseDeleteConfirm}
+      >
+        <AlertDialogContent className='bg-white rounded-xl shadow-lg sm:max-w-md'>
+          <AlertDialogHeader>
+            <AlertDialogTitle>Hapus Phase?</AlertDialogTitle>
+            <AlertDialogDescription>
+              Menghapus phase akan menghapus semua aktivitas di dalamnya secara
+              permanen.
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel disabled={loading}>Batal</AlertDialogCancel>
+            <AlertDialogAction
+              onClick={handleConfirmDeletePhase}
+              disabled={loading}
+              className='bg-red-600 hover:bg-red-700 text-white'
+            >
+              {loading ? 'Menghapus...' : 'Hapus'}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+
+      {/* Activity Delete Confirmation */}
+      <AlertDialog
+        open={showActivityDeleteConfirm}
+        onOpenChange={setShowActivityDeleteConfirm}
+      >
+        <AlertDialogContent className='bg-white rounded-xl shadow-lg sm:max-w-md'>
+          <AlertDialogHeader>
+            <AlertDialogTitle>Hapus Aktivitas?</AlertDialogTitle>
+            <AlertDialogDescription>
+              Hapus aktivitas ini secara permanen?
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel disabled={loading}>Batal</AlertDialogCancel>
+            <AlertDialogAction
+              onClick={handleConfirmDeleteActivity}
+              disabled={loading}
+              className='bg-red-600 hover:bg-red-700 text-white'
+            >
+              {loading ? 'Menghapus...' : 'Hapus'}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </div>
+  );
+}
diff --git a/src/figma-make/components/pages/master-data/employee/MasterEmployeeContent.tsx b/src/figma-make/components/pages/master-data/employee/MasterEmployeeContent.tsx
new file mode 100644
index 00000000..6a40547c
--- /dev/null
+++ b/src/figma-make/components/pages/master-data/employee/MasterEmployeeContent.tsx
@@ -0,0 +1,633 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import {
+  Plus,
+  Download,
+  ChevronDown,
+  MoreVertical,
+  Pencil,
+  Trash2,
+  Search,
+} from 'lucide-react';
+import { Card, CardContent } from '@/figma-make/components/base/card';
+import { Button } from '@/figma-make/components/base/button';
+import { Label } from '@/figma-make/components/base/label';
+import { Input } from '@/figma-make/components/base/input';
+import { Badge } from '@/figma-make/components/base/badge';
+import { MultiSelect } from '@/figma-make/components/base/multi-select';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/figma-make/components/base/select';
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+  DialogFooter,
+} from '@/figma-make/components/base/dialog';
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from '@/figma-make/components/base/alert-dialog';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/figma-make/components/base/dropdown-menu';
+import { toast } from 'sonner';
+import { supabase, isSupabaseConfigured } from '@/figma-make/lib/supabase';
+import useSWR from 'swr';
+import { EmployeeApi } from '@/services/api/daily-checklist/employee';
+
+interface Employee {
+  id: string;
+  name: string;
+  kandang_id: string;
+  is_active: boolean;
+  kandang?: {
+    id: string;
+    name: string;
+  };
+}
+
+interface Kandang {
+  id: string;
+  name: string;
+}
+
+export function MasterEmployeeContent() {
+  const { data: employeesTest, isLoading: isLoadingEmployees } = useSWR(
+    EmployeeApi.basePath,
+    EmployeeApi.getAllFetcher,
+    {
+      keepPreviousData: true,
+    }
+  );
+
+  const [employees, setEmployees] = useState<Employee[]>([]);
+  const [kandangList, setKandangList] = useState<Kandang[]>([]);
+  const [showModal, setShowModal] = useState(false);
+  const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
+  const [employeeToDelete, setEmployeeToDelete] = useState<string | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [initialLoading, setInitialLoading] = useState(true);
+  const [searchQuery, setSearchQuery] = useState('');
+  const [kandangFilter, setKandangFilter] = useState<string>('all');
+  const [statusFilter, setStatusFilter] = useState<string>('all');
+  const [modalMode, setModalMode] = useState<'create' | 'edit'>('create');
+  const [employeeForm, setEmployeeForm] = useState({
+    id: '',
+    name: '',
+    kandang_ids: [] as string[],
+    status: 'Active' as 'Active' | 'Non Active',
+  });
+
+  const fetchEmployees = async () => {
+    if (!isSupabaseConfigured()) {
+      console.warn(
+        'Supabase not configured. Please add environment variables.'
+      );
+      setInitialLoading(false);
+      return;
+    }
+
+    try {
+      const { data, error } = await supabase
+        .from('employees')
+        .select(
+          `
+          id,
+          name,
+          kandang_id,
+          is_active,
+          kandang:kandang_id (
+            id,
+            name
+          )
+        `
+        )
+        .order('name', { ascending: true });
+
+      if (error) {
+        console.error('Error fetching employees:', error);
+        toast.error('Gagal memuat data ABK');
+        return;
+      }
+
+      setEmployees((data as unknown as Employee[]) || []);
+    } catch (error) {
+      console.error('Error fetching employees:', error);
+      toast.error('Gagal memuat data ABK');
+    } finally {
+      setInitialLoading(false);
+    }
+  };
+
+  const fetchKandang = async () => {
+    if (!isSupabaseConfigured()) {
+      return;
+    }
+
+    try {
+      const { data, error } = await supabase
+        .from('kandang')
+        .select('id, name')
+        .order('name', { ascending: true });
+
+      if (error) {
+        console.error('Error fetching kandang:', error);
+        return;
+      }
+
+      setKandangList(data || []);
+    } catch (error) {
+      console.error('Error fetching kandang:', error);
+    }
+  };
+
+  useEffect(() => {
+    fetchEmployees();
+    fetchKandang();
+  }, []);
+
+  const handleAdd = () => {
+    setModalMode('create');
+    setEmployeeForm({ id: '', name: '', kandang_ids: [], status: 'Active' });
+    setShowModal(true);
+  };
+
+  const handleEdit = (employee: Employee) => {
+    setModalMode('edit');
+    setEmployeeForm({
+      id: employee.id,
+      name: employee.name,
+      kandang_ids: employee.kandang_id ? [employee.kandang_id] : [],
+      status: employee.is_active ? 'Active' : 'Non Active',
+    });
+    setShowModal(true);
+  };
+
+  const handleSave = async () => {
+    if (!employeeForm.name.trim() || employeeForm.kandang_ids.length === 0) {
+      toast.error('Nama ABK dan minimal satu Kandang harus diisi');
+      return;
+    }
+
+    if (!isSupabaseConfigured()) {
+      toast.error(
+        'Supabase belum dikonfigurasi. Tambahkan environment variables.'
+      );
+      return;
+    }
+
+    setLoading(true);
+
+    try {
+      // Create payload - taking the first selected kandang for now as schema supports single FK
+      // TODO: Support multiple kandangs in backend
+      const kandangIdToSave = employeeForm.kandang_ids[0];
+
+      if (modalMode === 'create') {
+        const { error } = await supabase.from('employees').insert([
+          {
+            name: employeeForm.name.trim(),
+            kandang_id: kandangIdToSave,
+            is_active: employeeForm.status === 'Active',
+          },
+        ]);
+
+        if (error) {
+          console.error('Error creating employee:', error);
+          toast.error('Gagal menambahkan ABK');
+          return;
+        }
+
+        toast.success('ABK berhasil ditambahkan');
+      } else {
+        const { error } = await supabase
+          .from('employees')
+          .update({
+            name: employeeForm.name.trim(),
+            kandang_id: kandangIdToSave,
+            is_active: employeeForm.status === 'Active',
+          })
+          .eq('id', employeeForm.id);
+
+        if (error) {
+          console.error('Error updating employee:', error);
+          toast.error('Gagal mengubah ABK');
+          return;
+        }
+
+        toast.success('ABK berhasil diubah');
+      }
+
+      setShowModal(false);
+      setEmployeeForm({ id: '', name: '', kandang_ids: [], status: 'Active' });
+      await fetchEmployees();
+    } catch (error) {
+      console.error('Error saving employee:', error);
+      toast.error('Terjadi kesalahan saat menyimpan ABK');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleDeleteClick = (employeeId: string) => {
+    setEmployeeToDelete(employeeId);
+    setShowDeleteConfirm(true);
+  };
+
+  const handleConfirmDelete = async () => {
+    if (!employeeToDelete) return;
+
+    setLoading(true);
+
+    try {
+      const { error } = await supabase
+        .from('employees')
+        .delete()
+        .eq('id', employeeToDelete);
+
+      if (error) {
+        console.error('Error deleting employee:', error);
+        toast.error('Gagal menghapus ABK');
+        return;
+      }
+
+      toast.success('ABK berhasil dihapus');
+      setShowDeleteConfirm(false);
+      setEmployeeToDelete(null);
+      await fetchEmployees();
+    } catch (error) {
+      console.error('Error deleting employee:', error);
+      toast.error('Terjadi kesalahan saat menghapus ABK');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleExport = (format: string) => {
+    toast.success(`Data berhasil diekspor ke ${format}`);
+  };
+
+  const filteredEmployees = employees.filter((emp) => {
+    const kandangName = emp.kandang?.name || '';
+    const matchesSearch =
+      emp.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
+      kandangName.toLowerCase().includes(searchQuery.toLowerCase());
+
+    const matchesKandang =
+      kandangFilter === 'all' || emp.kandang_id === kandangFilter;
+
+    const matchesStatus =
+      statusFilter === 'all' || emp.is_active === (statusFilter === 'active');
+
+    return matchesSearch && matchesKandang && matchesStatus;
+  });
+
+  if (initialLoading) {
+    return (
+      <div className='min-h-screen'>
+        <div className='p-6'>
+          <div className='mb-6'>
+            <h1 className='text-2xl font-semibold text-gray-900'>
+              Master Employee (ABK)
+            </h1>
+            <p className='text-sm text-gray-600 mt-1'>
+              Master Data •{' '}
+              <span className='text-[#0069e0]'>Employee (ABK)</span>
+            </p>
+          </div>
+          <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+            <CardContent className='p-12 text-center text-gray-500'>
+              Memuat data...
+            </CardContent>
+          </Card>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className='min-h-screen'>
+      <div className='p-6'>
+        {/* Page Title */}
+        <div className='mb-6'>
+          <h1 className='text-2xl font-semibold text-gray-900'>
+            Master Employee (ABK)
+          </h1>
+          <p className='text-sm text-gray-600 mt-1'>
+            Master Data • <span className='text-[#0069e0]'>Employee (ABK)</span>
+          </p>
+        </div>
+
+        {/* Main Card */}
+        <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+          <CardContent className='p-0'>
+            {/* Single Toolbar Row */}
+            <div className='flex items-center justify-between gap-4 p-6 border-b border-gray-200/60'>
+              {/* LEFT: Search + Filters */}
+              <div className='flex items-center gap-3'>
+                <div className='relative'>
+                  <Search className='absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400 w-4 h-4' />
+                  <Input
+                    type='text'
+                    placeholder='Cari nama ABK atau kandang...'
+                    value={searchQuery}
+                    onChange={(e) => setSearchQuery(e.target.value)}
+                    className='pl-10 w-[280px] border-gray-200'
+                  />
+                </div>
+
+                <Select value={kandangFilter} onValueChange={setKandangFilter}>
+                  <SelectTrigger className='w-[180px] border-gray-200'>
+                    <SelectValue placeholder='Semua Kandang' />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value='all'>Semua Kandang</SelectItem>
+                    {kandangList.map((kandang) => (
+                      <SelectItem key={kandang.id} value={kandang.id}>
+                        {kandang.name}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+
+                <Select value={statusFilter} onValueChange={setStatusFilter}>
+                  <SelectTrigger className='w-[160px] border-gray-200'>
+                    <SelectValue placeholder='Semua Status' />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value='all'>Semua Status</SelectItem>
+                    <SelectItem value='active'>Active</SelectItem>
+                    <SelectItem value='non_active'>Non Active</SelectItem>
+                  </SelectContent>
+                </Select>
+              </div>
+
+              {/* RIGHT: Export + Add */}
+              <div className='flex items-center gap-2'>
+                <DropdownMenu>
+                  <DropdownMenuTrigger asChild>
+                    <Button
+                      variant='outline'
+                      className='border-gray-200 text-gray-700'
+                    >
+                      <Download className='w-4 h-4 mr-2' />
+                      Export
+                      <ChevronDown className='w-4 h-4 ml-2' />
+                    </Button>
+                  </DropdownMenuTrigger>
+                  <DropdownMenuContent align='end'>
+                    <DropdownMenuItem onClick={() => handleExport('CSV')}>
+                      Export CSV
+                    </DropdownMenuItem>
+                    <DropdownMenuItem onClick={() => handleExport('Excel')}>
+                      Export Excel
+                    </DropdownMenuItem>
+                  </DropdownMenuContent>
+                </DropdownMenu>
+
+                <Button
+                  onClick={handleAdd}
+                  className='bg-[#0069e0] hover:bg-[#0052b3] text-white'
+                >
+                  <Plus className='w-4 h-4 mr-2' />
+                  Tambah ABK
+                </Button>
+              </div>
+            </div>
+
+            {/* Table */}
+            <div className='overflow-x-auto'>
+              <table className='w-full'>
+                <thead>
+                  <tr className='border-b border-gray-200/60 bg-gray-50/50'>
+                    <th className='text-left py-3.5 px-6 text-sm font-semibold text-gray-700'>
+                      Nama ABK
+                    </th>
+                    <th className='text-left py-3.5 px-6 text-sm font-semibold text-gray-700'>
+                      Kandang
+                    </th>
+                    <th className='text-left py-3.5 px-6 text-sm font-semibold text-gray-700'>
+                      Status
+                    </th>
+                    <th className='text-center py-3.5 px-6 text-sm font-semibold text-gray-700 w-[80px]'>
+                      Aksi
+                    </th>
+                  </tr>
+                </thead>
+                <tbody className='divide-y divide-gray-200/60'>
+                  {filteredEmployees.length === 0 ? (
+                    <tr>
+                      <td
+                        colSpan={4}
+                        className='text-center py-12 text-gray-500'
+                      >
+                        {searchQuery ||
+                        kandangFilter !== 'all' ||
+                        statusFilter !== 'all'
+                          ? 'Tidak ada ABK yang ditemukan'
+                          : 'Belum ada data ABK'}
+                      </td>
+                    </tr>
+                  ) : (
+                    filteredEmployees.map((employee) => (
+                      <tr
+                        key={employee.id}
+                        className='hover:bg-blue-50/30 transition-colors'
+                      >
+                        <td className='py-3.5 px-6 text-sm text-gray-900'>
+                          {employee.name}
+                        </td>
+                        <td className='py-3.5 px-6 text-sm text-gray-700'>
+                          {employee.kandang?.name || '-'}
+                        </td>
+                        <td className='py-3.5 px-6 text-sm'>
+                          <Badge
+                            variant={
+                              employee.is_active ? 'success' : 'secondary'
+                            }
+                          >
+                            {employee.is_active ? 'Active' : 'Non Active'}
+                          </Badge>
+                        </td>
+                        <td className='py-3.5 px-6 text-center'>
+                          <DropdownMenu>
+                            <DropdownMenuTrigger asChild>
+                              <Button
+                                variant='ghost'
+                                size='sm'
+                                className='h-8 w-8 p-0 hover:bg-gray-100'
+                              >
+                                <MoreVertical className='h-4 w-4 text-gray-600' />
+                              </Button>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent align='end'>
+                              <DropdownMenuItem
+                                onClick={() => handleEdit(employee)}
+                              >
+                                <Pencil className='mr-2 h-4 w-4' />
+                                Edit
+                              </DropdownMenuItem>
+                              <DropdownMenuItem
+                                onClick={() => handleDeleteClick(employee.id)}
+                                className='text-red-600'
+                              >
+                                <Trash2 className='mr-2 h-4 w-4' />
+                                Hapus
+                              </DropdownMenuItem>
+                            </DropdownMenuContent>
+                          </DropdownMenu>
+                        </td>
+                      </tr>
+                    ))
+                  )}
+                </tbody>
+              </table>
+            </div>
+          </CardContent>
+        </Card>
+      </div>
+
+      {/* Add/Edit Modal */}
+      <Dialog open={showModal} onOpenChange={setShowModal}>
+        <DialogContent className='sm:max-w-md bg-white rounded-xl shadow-lg'>
+          <DialogHeader>
+            <DialogTitle>
+              {modalMode === 'create' ? 'Tambah ABK' : 'Edit ABK'}
+            </DialogTitle>
+            <DialogDescription>
+              {modalMode === 'create'
+                ? 'Masukkan detail ABK baru'
+                : 'Ubah detail ABK'}
+            </DialogDescription>
+          </DialogHeader>
+          <div className='space-y-4 py-4'>
+            <div>
+              <Label htmlFor='nama-abk'>
+                Nama ABK <span className='text-red-500'>*</span>
+              </Label>
+              <Input
+                id='nama-abk'
+                value={employeeForm.name}
+                onChange={(e) =>
+                  setEmployeeForm({ ...employeeForm, name: e.target.value })
+                }
+                placeholder='Masukkan nama ABK'
+                className='mt-1.5'
+                disabled={loading}
+              />
+            </div>
+            <div>
+              <Label htmlFor='kandang'>
+                Kandang <span className='text-red-500'>*</span>
+              </Label>
+              <MultiSelect
+                options={kandangList.map((k) => ({
+                  value: k.id,
+                  label: k.name,
+                }))}
+                selected={employeeForm.kandang_ids}
+                onChange={(selected) =>
+                  setEmployeeForm({ ...employeeForm, kandang_ids: selected })
+                }
+                // onSearchChange={(val) =>
+                //   console.log({
+                //     test: val,
+                //   })
+                // }
+                placeholder='Pilih kandang'
+                className='mt-1.5'
+              />
+            </div>
+            <div>
+              <Label htmlFor='status'>
+                Status <span className='text-red-500'>*</span>
+              </Label>
+              <Select
+                value={employeeForm.status}
+                onValueChange={(value: 'Active' | 'Non Active') =>
+                  setEmployeeForm({ ...employeeForm, status: value })
+                }
+                disabled={loading}
+              >
+                <SelectTrigger id='status' className='mt-1.5'>
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value='Active'>
+                    <div className='flex items-center'>
+                      <Badge variant='success' className='mr-2'>
+                        Active
+                      </Badge>
+                    </div>
+                  </SelectItem>
+                  <SelectItem value='Non Active'>
+                    <div className='flex items-center'>
+                      <Badge variant='secondary' className='mr-2'>
+                        Non Active
+                      </Badge>
+                    </div>
+                  </SelectItem>
+                </SelectContent>
+              </Select>
+            </div>
+          </div>
+          <DialogFooter>
+            <Button
+              variant='outline'
+              onClick={() => setShowModal(false)}
+              disabled={loading}
+            >
+              Batal
+            </Button>
+            <Button
+              onClick={handleSave}
+              disabled={loading}
+              className='bg-[#0069e0] hover:bg-[#0052b3] text-white'
+            >
+              {loading ? 'Menyimpan...' : 'Simpan'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
+      {/* Delete Confirmation */}
+      <AlertDialog open={showDeleteConfirm} onOpenChange={setShowDeleteConfirm}>
+        <AlertDialogContent className='bg-white rounded-xl shadow-lg sm:max-w-md'>
+          <AlertDialogHeader>
+            <AlertDialogTitle>Hapus ABK?</AlertDialogTitle>
+            <AlertDialogDescription>
+              Data ABK akan dihapus secara permanen.
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel disabled={loading}>Batal</AlertDialogCancel>
+            <AlertDialogAction
+              onClick={handleConfirmDelete}
+              disabled={loading}
+              className='bg-red-600 hover:bg-red-700 text-white'
+            >
+              {loading ? 'Menghapus...' : 'Hapus'}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </div>
+  );
+}
diff --git a/src/figma-make/components/pages/reports/DailyChecklistReportsContent.tsx b/src/figma-make/components/pages/reports/DailyChecklistReportsContent.tsx
new file mode 100644
index 00000000..71156f15
--- /dev/null
+++ b/src/figma-make/components/pages/reports/DailyChecklistReportsContent.tsx
@@ -0,0 +1,589 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import { Eye, Download, Search } from 'lucide-react';
+import { Card, CardContent } from '@/figma-make/components/base/card';
+import { Button } from '@/figma-make/components/base/button';
+import { Badge } from '@/figma-make/components/base/badge';
+import { Input } from '@/figma-make/components/base/input';
+import { Label } from '@/figma-make/components/base/label';
+import { DateRangePicker } from '@/figma-make/components/base/date-range-picker';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/figma-make/components/base/select';
+import { toast } from 'sonner';
+import { supabase, isSupabaseConfigured } from '@/figma-make/lib/supabase';
+import { useRouter } from 'next/navigation';
+
+interface SubmissionReportItem {
+  checklist_id: string;
+  date: string;
+  kandang_id: string;
+  kandang_name: string;
+  category: string;
+  status: string;
+  progress_percent: number;
+  total_phases: number;
+  total_activities: number;
+  total_employees: number;
+  updated_at: string;
+}
+
+interface Kandang {
+  id: string;
+  name: string;
+}
+
+interface ReportQueryResult {
+  id: string;
+  date: string;
+  kandang_id: string;
+  category: string;
+  status: string;
+  updated_at: string;
+  kandang: {
+    id: string;
+    name: string;
+  } | null;
+}
+
+const STATUS_OPTIONS = [
+  { value: 'ALL', label: 'Semua Status' },
+  { value: 'DRAFT', label: 'Draft' },
+  { value: 'SUBMITTED', label: 'Submitted' },
+  { value: 'APPROVED', label: 'Approved' },
+  { value: 'REJECTED', label: 'Rejected' },
+];
+
+const CATEGORY_LABELS: { [key: string]: string } = {
+  pullet_open: 'Pullet Open',
+  pullet_close: 'Pullet Close',
+  produksi_open: 'Produksi Open',
+  produksi_close: 'Produksi Close',
+};
+
+export function DailyChecklistReportsContent() {
+  const router = useRouter();
+  const [loading, setLoading] = useState(true);
+
+  // Report State
+  const [reportList, setReportList] = useState<SubmissionReportItem[]>([]);
+  const [filteredReportList, setFilteredReportList] = useState<
+    SubmissionReportItem[]
+  >([]);
+
+  // Master data
+  const [kandangList, setKandangList] = useState<Kandang[]>([]);
+
+  // Filters
+  const [statusFilter, setStatusFilter] = useState('ALL');
+  const [kandangFilter, setKandangFilter] = useState('ALL');
+  const [searchText, setSearchText] = useState('');
+  const [dateFrom, setDateFrom] = useState('');
+  const [dateTo, setDateTo] = useState('');
+
+  useEffect(() => {
+    fetchKandangList();
+    fetchReports();
+  }, []);
+
+  useEffect(() => {
+    applyFilters();
+  }, [reportList, statusFilter, kandangFilter, searchText, dateFrom, dateTo]);
+
+  const fetchKandangList = async () => {
+    if (!isSupabaseConfigured()) return;
+
+    try {
+      const { data, error } = await supabase
+        .from('kandang')
+        .select('id, name')
+        .order('name', { ascending: true });
+
+      if (error) {
+        console.error('Error fetching kandang:', error);
+        return;
+      }
+
+      setKandangList(data || []);
+    } catch (error) {
+      console.error('Error fetching kandang:', error);
+    }
+  };
+
+  const fetchReports = async () => {
+    if (!isSupabaseConfigured()) {
+      console.warn('Supabase not configured');
+      setLoading(false);
+      return;
+    }
+
+    try {
+      setLoading(true);
+
+      // Fetch checklists directly from daily_checklists table
+      const { data: checklists, error } = await supabase
+        .from('daily_checklists')
+        .select(
+          `
+          id,
+          date,
+          kandang_id,
+          category,
+          status,
+          updated_at,
+          kandang:kandang_id (
+            id,
+            name
+          )
+        `
+        )
+        .order('date', { ascending: false })
+        .order('updated_at', { ascending: false });
+
+      if (error) {
+        console.error('Error fetching reports:', error);
+        toast.error('Gagal memuat data reports');
+        return;
+      }
+
+      // Enrich data with calculations
+      const enrichedData = await Promise.all(
+        ((checklists as unknown as ReportQueryResult[]) || [])
+          .filter((checklist) => checklist.id)
+          .map(async (checklist) => {
+            // Count phases
+            const { count: phaseCount } = await supabase
+              .from('daily_checklist_phases')
+              .select('*', { count: 'exact', head: true })
+              .eq('checklist_id', checklist.id);
+
+            // Count activities (tasks)
+            const { count: activityCount } = await supabase
+              .from('daily_checklist_activity_tasks')
+              .select('*', { count: 'exact', head: true })
+              .eq('checklist_id', checklist.id);
+
+            // Count unique employees
+            const { data: tasks } = await supabase
+              .from('daily_checklist_activity_tasks')
+              .select('id')
+              .eq('checklist_id', checklist.id);
+
+            const taskIds = (tasks || []).map((t) => t.id);
+            let uniqueEmployees = new Set<string>();
+
+            if (taskIds.length > 0) {
+              const { data: assignments } = await supabase
+                .from('daily_checklist_activity_task_assignments')
+                .select('employee_id')
+                .in('task_id', taskIds);
+
+              uniqueEmployees = new Set(
+                (assignments || []).map((a) => a.employee_id)
+              );
+            }
+
+            // ✅ Calculate progress based on phase coverage
+            const { count: totalPhasesInMaster } = await supabase
+              .from('phases')
+              .select('*', { count: 'exact', head: true })
+              .eq('category_id', checklist.category);
+
+            const { data: checklistTasks } = await supabase
+              .from('daily_checklist_activity_tasks')
+              .select('id, phase_id')
+              .eq('checklist_id', checklist.id);
+
+            const checklistTaskIds = (checklistTasks || []).map((t) => t.id);
+            const uniquePhasesWithChecked = new Set<string>();
+
+            if (checklistTaskIds.length > 0) {
+              const { data: checkedAssignments } = await supabase
+                .from('daily_checklist_activity_task_assignments')
+                .select('task_id')
+                .in('task_id', checklistTaskIds)
+                .eq('checked', true);
+
+              if (checkedAssignments && checkedAssignments.length > 0) {
+                const checkedTaskIds = new Set(
+                  checkedAssignments.map((a) => a.task_id)
+                );
+                checklistTasks?.forEach((task) => {
+                  if (checkedTaskIds.has(task.id)) {
+                    uniquePhasesWithChecked.add(task.phase_id);
+                  }
+                });
+              }
+            }
+
+            const phasesWithCheckedCount = uniquePhasesWithChecked.size;
+            const progressPercent =
+              totalPhasesInMaster && totalPhasesInMaster > 0
+                ? Math.round(
+                    (phasesWithCheckedCount / totalPhasesInMaster) * 100
+                  )
+                : 0;
+
+            return {
+              checklist_id: checklist.id,
+              date: checklist.date,
+              kandang_id: checklist.kandang_id,
+              kandang_name: checklist.kandang?.name || '-',
+              category: checklist.category,
+              status: checklist.status,
+              progress_percent: progressPercent,
+              total_phases: phaseCount || 0,
+              total_activities: activityCount || 0,
+              total_employees: uniqueEmployees.size,
+              updated_at: checklist.updated_at,
+            };
+          })
+      );
+
+      setReportList(enrichedData);
+    } catch (error) {
+      console.error('Error fetching reports:', error);
+      toast.error('Terjadi kesalahan');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const applyFilters = () => {
+    let filtered = [...reportList];
+
+    if (statusFilter && statusFilter !== 'ALL') {
+      filtered = filtered.filter((item) => item.status === statusFilter);
+    }
+
+    if (kandangFilter && kandangFilter !== 'ALL') {
+      filtered = filtered.filter((item) => item.kandang_id === kandangFilter);
+    }
+
+    if (searchText) {
+      filtered = filtered.filter(
+        (item) =>
+          item.kandang_name.toLowerCase().includes(searchText.toLowerCase()) ||
+          item.category.toLowerCase().includes(searchText.toLowerCase()) ||
+          (CATEGORY_LABELS[item.category] || '')
+            .toLowerCase()
+            .includes(searchText.toLowerCase())
+      );
+    }
+
+    if (dateFrom) {
+      filtered = filtered.filter(
+        (item) => new Date(item.date) >= new Date(dateFrom)
+      );
+    }
+    if (dateTo) {
+      filtered = filtered.filter(
+        (item) => new Date(item.date) <= new Date(dateTo)
+      );
+    }
+
+    setFilteredReportList(filtered);
+  };
+
+  const getStatusBadge = (status: string) => {
+    switch (status) {
+      case 'DRAFT':
+        return (
+          <Badge
+            variant='outline'
+            className='border-gray-300 text-gray-700 bg-white'
+          >
+            Draft
+          </Badge>
+        );
+      case 'SUBMITTED':
+        return (
+          <Badge
+            variant='outline'
+            className='border-orange-300 text-orange-700 bg-white'
+          >
+            Submitted
+          </Badge>
+        );
+      case 'APPROVED':
+        return (
+          <Badge
+            variant='outline'
+            className='border-green-300 text-green-700 bg-white'
+          >
+            Approved
+          </Badge>
+        );
+      case 'REJECTED':
+        return (
+          <Badge
+            variant='outline'
+            className='border-red-300 text-red-700 bg-white'
+          >
+            Rejected
+          </Badge>
+        );
+      default:
+        return (
+          <Badge
+            variant='outline'
+            className='border-gray-300 text-gray-700 bg-white'
+          >
+            {status}
+          </Badge>
+        );
+    }
+  };
+
+  const formatDate = (dateString: string) => {
+    const date = new Date(dateString);
+    return date.toLocaleDateString('id-ID', {
+      day: '2-digit',
+      month: 'short',
+      year: 'numeric',
+    });
+  };
+
+  const formatDateTime = (dateString: string) => {
+    const date = new Date(dateString);
+    return date.toLocaleString('id-ID', {
+      day: '2-digit',
+      month: 'short',
+      year: 'numeric',
+      hour: '2-digit',
+      minute: '2-digit',
+    });
+  };
+
+  const handleViewDetail = (checklistId: string) => {
+    // Navigate to detail page (same as List Daily Checklist)
+    router.push(`/list-daily-checklist/detail?checklistId=${checklistId}`);
+  };
+
+  const exportToCSV = () => {
+    toast.info('Export CSV akan segera tersedia');
+  };
+
+  return (
+    <div className='min-h-screen'>
+      <div className='p-6'>
+        {/* Page Title */}
+        <div className='mb-6 flex items-center justify-between'>
+          <div>
+            <h1 className='text-2xl font-semibold text-gray-900'>Reports</h1>
+            <p className='text-sm text-gray-600 mt-1'>
+              Laporan lengkap checklist harian
+            </p>
+          </div>
+          <Button
+            onClick={exportToCSV}
+            className='bg-[#0069e0] hover:bg-[#0058c0] text-white'
+          >
+            <Download className='w-4 h-4 mr-2' />
+            Export CSV
+          </Button>
+        </div>
+
+        {/* Main Card */}
+        <Card className='border-gray-200/60 shadow-sm rounded-xl bg-white'>
+          <CardContent className='p-6'>
+            {/* Filters Section */}
+            <div className='grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 mb-6 pb-6 border-b border-gray-200'>
+              <div>
+                <Label>Periode Tanggal</Label>
+                <div className='mt-1.5'>
+                  <DateRangePicker
+                    dateFrom={dateFrom}
+                    dateTo={dateTo}
+                    onDateChange={(from, to) => {
+                      setDateFrom(from);
+                      setDateTo(to);
+                    }}
+                  />
+                </div>
+              </div>
+
+              <div>
+                <Label htmlFor='kandang-filter-report'>Kandang</Label>
+                <Select value={kandangFilter} onValueChange={setKandangFilter}>
+                  <SelectTrigger
+                    id='kandang-filter-report'
+                    className='mt-1.5 border-gray-200'
+                  >
+                    <SelectValue placeholder='Semua Kandang' />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value='ALL'>Semua Kandang</SelectItem>
+                    {kandangList.map((kandang) => (
+                      <SelectItem key={kandang.id} value={kandang.id}>
+                        {kandang.name}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
+
+              <div>
+                <Label htmlFor='status-filter-report'>Status</Label>
+                <Select value={statusFilter} onValueChange={setStatusFilter}>
+                  <SelectTrigger
+                    id='status-filter-report'
+                    className='mt-1.5 border-gray-200'
+                  >
+                    <SelectValue placeholder='Semua Status' />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {STATUS_OPTIONS.map((option) => (
+                      <SelectItem key={option.value} value={option.value}>
+                        {option.label}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
+
+              <div>
+                <Label htmlFor='search-text-report'>Cari</Label>
+                <div className='relative mt-1.5'>
+                  <Input
+                    id='search-text-report'
+                    type='text'
+                    placeholder='Kandang / Kategori...'
+                    value={searchText}
+                    onChange={(e) => setSearchText(e.target.value)}
+                    className='border-gray-200 pl-9'
+                  />
+                  <Search className='absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-gray-400' />
+                </div>
+              </div>
+            </div>
+
+            {/* Reports Table */}
+            {loading ? (
+              <div className='text-center py-12 text-gray-500'>
+                Memuat data...
+              </div>
+            ) : filteredReportList.length > 0 ? (
+              <div className='overflow-x-auto'>
+                <table className='w-full border border-gray-200 rounded-lg'>
+                  <thead>
+                    <tr className='bg-gray-50 border-b border-gray-200'>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Tanggal
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Kandang
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Kategori
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Status
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Phase
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Aktivitas
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        ABK
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Progress
+                      </th>
+                      <th className='text-left py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Updated At
+                      </th>
+                      <th className='text-center py-3 px-4 text-sm font-semibold text-gray-700'>
+                        Aksi
+                      </th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {filteredReportList.map((item, index) => (
+                      <tr
+                        key={`${item.checklist_id}-${item.date}-${index}`}
+                        className={
+                          index % 2 === 0 ? 'bg-white' : 'bg-gray-50/50'
+                        }
+                      >
+                        <td className='py-3 px-4 text-sm text-gray-900'>
+                          {formatDate(item.date)}
+                        </td>
+                        <td className='py-3 px-4 text-sm text-gray-900'>
+                          {item.kandang_name}
+                        </td>
+                        <td className='py-3 px-4 text-sm text-gray-900'>
+                          {CATEGORY_LABELS[item.category] || item.category}
+                        </td>
+                        <td className='py-3 px-4'>
+                          {getStatusBadge(item.status)}
+                        </td>
+                        <td className='py-3 px-4 text-center text-sm text-gray-900'>
+                          {item.total_phases}
+                        </td>
+                        <td className='py-3 px-4 text-center text-sm text-gray-900'>
+                          {item.total_activities}
+                        </td>
+                        <td className='py-3 px-4 text-center text-sm text-gray-900'>
+                          {item.total_employees}
+                        </td>
+                        <td className='py-3 px-4 text-center'>
+                          <div className='flex items-center justify-center gap-2'>
+                            <div className='w-20 bg-gray-200 rounded-full h-2'>
+                              <div
+                                className='bg-[#0069e0] h-2 rounded-full transition-all'
+                                style={{ width: `${item.progress_percent}%` }}
+                              />
+                            </div>
+                            <span className='text-sm text-gray-700 font-medium'>
+                              {item.progress_percent}%
+                            </span>
+                          </div>
+                        </td>
+                        <td className='py-3 px-4 text-sm text-gray-600'>
+                          {formatDateTime(item.updated_at)}
+                        </td>
+                        <td className='py-3 px-4'>
+                          <div className='flex items-center justify-center'>
+                            <Button
+                              size='sm'
+                              variant='outline'
+                              onClick={() =>
+                                handleViewDetail(item.checklist_id)
+                              }
+                              className='border-gray-200 text-gray-700 hover:bg-gray-50'
+                            >
+                              <Eye className='w-4 h-4 mr-1' />
+                              Detail
+                            </Button>
+                          </div>
+                        </td>
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+              </div>
+            ) : (
+              <div className='text-center py-12 text-gray-500'>
+                {searchText ||
+                dateFrom ||
+                dateTo ||
+                statusFilter !== 'ALL' ||
+                kandangFilter !== 'ALL'
+                  ? 'Tidak ada data yang sesuai dengan filter'
+                  : 'Belum ada data checklist'}
+              </div>
+            )}
+          </CardContent>
+        </Card>
+      </div>
+    </div>
+  );
+}