An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
feat: implement sidebar with Shadcn UI components
Yoshiki Miurac247350d1ace
diff --git a/app/globals.css b/app/globals.cssindex e5167bb7..6c096542 100644--- a/app/globals.css+++ b/app/globals.css@@ -47,6 +47,14 @@--accent-blue: 210 100% 97%;--accent-blue-foreground: 210 100% 50%;--accent-blue-border: 210 100% 90%;+ --sidebar-background: 0 0% 98%;+ --sidebar-foreground: 240 5.3% 26.1%;+ --sidebar-primary: 240 5.9% 10%;+ --sidebar-primary-foreground: 0 0% 98%;+ --sidebar-accent: 240 4.8% 95.9%;+ --sidebar-accent-foreground: 240 5.9% 10%;+ --sidebar-border: 220 13% 91%;+ --sidebar-ring: 217.2 91.2% 59.8%;}.dark {@@ -86,6 +94,14 @@--accent-blue: 210 100% 10%;--accent-blue-foreground: 210 100% 80%;--accent-blue-border: 210 100% 25%;+ --sidebar-background: 240 5.9% 10%;+ --sidebar-foreground: 240 4.8% 95.9%;+ --sidebar-primary: 224.3 76.3% 48%;+ --sidebar-primary-foreground: 0 0% 100%;+ --sidebar-accent: 240 3.7% 15.9%;+ --sidebar-accent-foreground: 240 4.8% 95.9%;+ --sidebar-border: 240 3.7% 15.9%;+ --sidebar-ring: 217.2 91.2% 59.8%;}}diff --git a/app/layout.tsx b/app/layout.tsxindex bac1d673..dae2a778 100644--- a/app/layout.tsx+++ b/app/layout.tsx@@ -1,7 +1,9 @@+import AppSidebar from '@/components/app-sidebar'import ArtifactRoot from '@/components/artifact/artifact-root'import Footer from '@/components/footer'import Header from '@/components/header'import { ThemeProvider } from '@/components/theme-provider'+import { SidebarProvider } from '@/components/ui/sidebar'import { Toaster } from '@/components/ui/sonner'import { cn } from '@/lib/utils'import type { Metadata, Viewport } from 'next'@@ -59,13 +61,16 @@ export default function RootLayout({enableSystemdisableTransitionOnChange>- <div className="flex flex-col flex-1">- <Header />- <main className="flex flex-1 min-h-0">- <ArtifactRoot>{children}</ArtifactRoot>- </main>- <Footer />- </div>+ <SidebarProvider defaultOpen>+ <AppSidebar />+ <div className="flex flex-col flex-1">+ <Header />+ <main className="flex flex-1 min-h-0">+ <ArtifactRoot>{children}</ArtifactRoot>+ </main>+ <Footer />+ </div>+ </SidebarProvider><Toaster /></ThemeProvider></body>diff --git a/bun.lockb b/bun.lockbindex 9d238b44..ffc7223a 100755Binary files a/bun.lockb and b/bun.lockb differdiff --git a/components/app-sidebar.tsx b/components/app-sidebar.tsxnew file mode 100644index 00000000..01085a9e--- /dev/null+++ b/components/app-sidebar.tsx@@ -0,0 +1,79 @@+import {+ Sidebar,+ SidebarContent,+ SidebarHeader,+ SidebarMenu,+ SidebarMenuButton,+ SidebarMenuItem,+ SidebarMenuSkeleton,+ SidebarTrigger+} from '@/components/ui/sidebar'+import { getChats } from '@/lib/actions/chat'+import { cn } from '@/lib/utils'+import { Plus } from 'lucide-react'+import Link from 'next/link'+import { Suspense } from 'react'+import { IconLogo } from './ui/icons'++export default function AppSidebar() {+ return (+ <Sidebar side="left" variant="sidebar" collapsible="offcanvas">+ <SidebarHeader className="flex flex-row justify-between items-center">+ <Link href="/" className="flex items-center gap-2 px-2 py-3">+ <IconLogo className={cn('size-5')} />+ <span className="font-semibold text-sm">Morphic</span>+ </Link>+ <SidebarTrigger />+ </SidebarHeader>+ <SidebarContent className="flex flex-col px-2 py-4 h-full">+ <SidebarMenu>+ <SidebarMenuItem>+ <SidebarMenuButton asChild>+ <Link href="/?new=true" className="flex items-center gap-2">+ <Plus className="size-4" />+ <span>New</span>+ </Link>+ </SidebarMenuButton>+ </SidebarMenuItem>+ </SidebarMenu>+ <div className="mt-6 flex-1 overflow-y-auto">+ <Suspense fallback={<NavChatsSkeleton />}>+ <ChatHistorySection />+ </Suspense>+ </div>+ </SidebarContent>+ </Sidebar>+ )+}++function NavChatsSkeleton() {+ return (+ <SidebarMenu>+ {Array.from({ length: 5 }).map((_, idx) => (+ <SidebarMenuItem key={idx}>+ <SidebarMenuSkeleton showIcon />+ </SidebarMenuItem>+ ))}+ </SidebarMenu>+ )+}++async function ChatHistorySection() {+ const chats = await getChats()+ return (+ <SidebarMenu>+ {chats.map(chat => (+ <SidebarMenuItem key={chat.id}>+ <SidebarMenuButton asChild>+ <Link+ href={`/chat?chatId=${chat.id}`}+ className="flex items-center gap-2 truncate"+ >+ <span>{chat.title}</span>+ </Link>+ </SidebarMenuButton>+ </SidebarMenuItem>+ ))}+ </SidebarMenu>+ )+}diff --git a/components/artifact/chat-artifact-container.tsx b/components/artifact/chat-artifact-container.tsxindex afa8f83d..f5811648 100644--- a/components/artifact/chat-artifact-container.tsx+++ b/components/artifact/chat-artifact-container.tsx@@ -7,11 +7,11 @@ import {ResizablePanel,ResizablePanelGroup} from '@/components/ui/resizable'+import { SidebarTrigger, useSidebar } from '@/components/ui/sidebar'import { useMediaQuery } from '@/lib/hooks/use-media-query'import { cn } from '@/lib/utils'import React, { useEffect, useState } from 'react'import { useArtifact } from './artifact-context'-export function ChatArtifactContainer({children}: {@@ -20,6 +20,7 @@ export function ChatArtifactContainer({const { state } = useArtifact()const isMobile = useMediaQuery('(max-width: 767px)') // Below md breakpointconst [renderPanel, setRenderPanel] = useState(state.isOpen)+ const { open, openMobile, isMobile: isMobileSidebar } = useSidebar()useEffect(() => {if (state.isOpen) {@@ -31,6 +32,11 @@ export function ChatArtifactContainer({return (<div className="flex-1 min-h-0 h-screen flex">+ <div className="absolute p-4 z-50 transition-opacity duration-1000">+ {(!open || isMobileSidebar) && (+ <SidebarTrigger className="animate-fade-in" />+ )}+ </div>{/* Desktop: Resizable panels (Do not render on mobile) */}{!isMobile && (<ResizablePanelGroupdiff --git a/components/header.tsx b/components/header.tsxindex 8dbb2145..e986687b 100644--- a/components/header.tsx+++ b/components/header.tsx@@ -1,21 +1,11 @@-import { cn } from '@/lib/utils'import React from 'react'-import HistoryContainer from './history-container'import { ModeToggle } from './mode-toggle'-import { IconLogo } from './ui/icons'export const Header: React.FC = async () => {return (- <header className="fixed w-full p-2 flex justify-between items-center z-10 backdrop-blur lg:backdrop-blur-none bg-background/80 lg:bg-transparent">- <div>- <a href="/">- <IconLogo className={cn('w-5 h-5')} />- <span className="sr-only">Morphic</span>- </a>- </div>+ <header className="absolute right-0 p-2 items-center z-10 backdrop-blur lg:backdrop-blur-none bg-background/80 lg:bg-transparent"><div className="flex gap-0.5"><ModeToggle />- <HistoryContainer /></div></header>)diff --git a/components/ui/button.tsx b/components/ui/button.tsxindex 22d68deb..72889051 100644--- a/components/ui/button.tsx+++ b/components/ui/button.tsx@@ -2,7 +2,7 @@ import * as React from 'react'import { Slot } from '@radix-ui/react-slot'import { cva, type VariantProps } from 'class-variance-authority'-import { cn } from '@/lib/utils'+import { cn } from '@/lib/utils/index'const buttonVariants = cva('inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',diff --git a/components/ui/input.tsx b/components/ui/input.tsxindex d52138b9..d2511deb 100644--- a/components/ui/input.tsx+++ b/components/ui/input.tsx@@ -1,6 +1,6 @@import * as React from 'react'-import { cn } from '@/lib/utils'+import { cn } from '@/lib/utils/index'export interface InputPropsextends React.InputHTMLAttributes<HTMLInputElement> {}diff --git a/components/ui/separator.tsx b/components/ui/separator.tsxindex 6c55e0b2..beb7809d 100644--- a/components/ui/separator.tsx+++ b/components/ui/separator.tsx@@ -3,7 +3,7 @@import * as React from 'react'import * as SeparatorPrimitive from '@radix-ui/react-separator'-import { cn } from '@/lib/utils'+import { cn } from '@/lib/utils/index'const Separator = React.forwardRef<React.ElementRef<typeof SeparatorPrimitive.Root>,diff --git a/components/ui/sheet.tsx b/components/ui/sheet.tsxindex 82810327..2bacf2de 100644--- a/components/ui/sheet.tsx+++ b/components/ui/sheet.tsx@@ -5,7 +5,7 @@ import * as SheetPrimitive from '@radix-ui/react-dialog'import { cva, type VariantProps } from 'class-variance-authority'import { X } from 'lucide-react'-import { cn } from '@/lib/utils'+import { cn } from '@/lib/utils/index'const Sheet = SheetPrimitive.Rootdiff --git a/components/ui/sidebar.tsx b/components/ui/sidebar.tsxnew file mode 100644index 00000000..e6bb0bb0--- /dev/null+++ b/components/ui/sidebar.tsx@@ -0,0 +1,773 @@+"use client"++import * as React from "react"+import { Slot } from "@radix-ui/react-slot"+import { VariantProps, cva } from "class-variance-authority"+import { PanelLeft } from "lucide-react"++import { useIsMobile } from "@/hooks/use-mobile"+import { cn } from "@/lib/utils/index"+import { Button } from "@/components/ui/button"+import { Input } from "@/components/ui/input"+import { Separator } from "@/components/ui/separator"+import {+ Sheet,+ SheetContent,+ SheetDescription,+ SheetHeader,+ SheetTitle,+} from "@/components/ui/sheet"+import { Skeleton } from "@/components/ui/skeleton"+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@/components/ui/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+}++const SidebarProvider = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div"> & {+ defaultOpen?: boolean+ open?: boolean+ onOpenChange?: (open: boolean) => void+ }+>(+ (+ {+ defaultOpen = true,+ open: openProp,+ onOpenChange: setOpenProp,+ className,+ style,+ children,+ ...props+ },+ ref+ ) => {+ 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+ style={+ {+ "--sidebar-width": SIDEBAR_WIDTH,+ "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,+ ...style,+ } as React.CSSProperties+ }+ className={cn(+ "group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar",+ className+ )}+ ref={ref}+ {...props}+ >+ {children}+ </div>+ </TooltipProvider>+ </SidebarContext.Provider>+ )+ }+)+SidebarProvider.displayName = "SidebarProvider"++const Sidebar = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div"> & {+ side?: "left" | "right"+ variant?: "sidebar" | "floating" | "inset"+ collapsible?: "offcanvas" | "icon" | "none"+ }+>(+ (+ {+ side = "left",+ variant = "sidebar",+ collapsible = "offcanvas",+ className,+ children,+ ...props+ },+ ref+ ) => {+ const { isMobile, state, openMobile, setOpenMobile } = useSidebar()++ if (collapsible === "none") {+ return (+ <div+ className={cn(+ "flex h-full w-[--sidebar-width] flex-col bg-sidebar text-sidebar-foreground",+ className+ )}+ ref={ref}+ {...props}+ >+ {children}+ </div>+ )+ }++ if (isMobile) {+ return (+ <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>+ <SheetContent+ data-sidebar="sidebar"+ data-mobile="true"+ className="w-[--sidebar-width] bg-sidebar p-0 text-sidebar-foreground [&>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+ ref={ref}+ className="group peer hidden text-sidebar-foreground md:block"+ data-state={state}+ data-collapsible={state === "collapsed" ? collapsible : ""}+ data-variant={variant}+ data-side={side}+ >+ {/* This is what handles the sidebar gap on desktop */}+ <div+ 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)_+_theme(spacing.4))]"+ : "group-data-[collapsible=icon]:w-[--sidebar-width-icon]"+ )}+ />+ <div+ 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)_+_theme(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"+ className="flex h-full w-full flex-col bg-sidebar group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-sidebar-border group-data-[variant=floating]:shadow"+ >+ {children}+ </div>+ </div>+ </div>+ )+ }+)+Sidebar.displayName = "Sidebar"++const SidebarTrigger = React.forwardRef<+ React.ElementRef<typeof Button>,+ React.ComponentProps<typeof Button>+>(({ className, onClick, ...props }, ref) => {+ const { toggleSidebar } = useSidebar()++ return (+ <Button+ ref={ref}+ data-sidebar="trigger"+ variant="ghost"+ size="icon"+ className={cn("h-7 w-7", className)}+ onClick={(event) => {+ onClick?.(event)+ toggleSidebar()+ }}+ {...props}+ >+ <PanelLeft />+ <span className="sr-only">Toggle Sidebar</span>+ </Button>+ )+})+SidebarTrigger.displayName = "SidebarTrigger"++const SidebarRail = React.forwardRef<+ HTMLButtonElement,+ React.ComponentProps<"button">+>(({ className, ...props }, ref) => {+ const { toggleSidebar } = useSidebar()++ return (+ <button+ ref={ref}+ data-sidebar="rail"+ aria-label="Toggle Sidebar"+ tabIndex={-1}+ onClick={toggleSidebar}+ title="Toggle Sidebar"+ className={cn(+ "absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] hover:after:bg-sidebar-border group-data-[side=left]:-right-4 group-data-[side=right]:left-0 sm:flex",+ "[[data-side=left]_&]:cursor-w-resize [[data-side=right]_&]:cursor-e-resize",+ "[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",+ "group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full group-data-[collapsible=offcanvas]:hover:bg-sidebar",+ "[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",+ "[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",+ className+ )}+ {...props}+ />+ )+})+SidebarRail.displayName = "SidebarRail"++const SidebarInset = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"main">+>(({ className, ...props }, ref) => {+ return (+ <main+ ref={ref}+ className={cn(+ "relative flex w-full flex-1 flex-col bg-background",+ "md:peer-data-[variant=inset]:m-2 md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow",+ className+ )}+ {...props}+ />+ )+})+SidebarInset.displayName = "SidebarInset"++const SidebarInput = React.forwardRef<+ React.ElementRef<typeof Input>,+ React.ComponentProps<typeof Input>+>(({ className, ...props }, ref) => {+ return (+ <Input+ ref={ref}+ data-sidebar="input"+ className={cn(+ "h-8 w-full bg-background shadow-none focus-visible:ring-2 focus-visible:ring-sidebar-ring",+ className+ )}+ {...props}+ />+ )+})+SidebarInput.displayName = "SidebarInput"++const SidebarHeader = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div">+>(({ className, ...props }, ref) => {+ return (+ <div+ ref={ref}+ data-sidebar="header"+ className={cn("flex flex-col gap-2 p-2", className)}+ {...props}+ />+ )+})+SidebarHeader.displayName = "SidebarHeader"++const SidebarFooter = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div">+>(({ className, ...props }, ref) => {+ return (+ <div+ ref={ref}+ data-sidebar="footer"+ className={cn("flex flex-col gap-2 p-2", className)}+ {...props}+ />+ )+})+SidebarFooter.displayName = "SidebarFooter"++const SidebarSeparator = React.forwardRef<+ React.ElementRef<typeof Separator>,+ React.ComponentProps<typeof Separator>+>(({ className, ...props }, ref) => {+ return (+ <Separator+ ref={ref}+ data-sidebar="separator"+ className={cn("mx-2 w-auto bg-sidebar-border", className)}+ {...props}+ />+ )+})+SidebarSeparator.displayName = "SidebarSeparator"++const SidebarContent = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div">+>(({ className, ...props }, ref) => {+ return (+ <div+ ref={ref}+ 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}+ />+ )+})+SidebarContent.displayName = "SidebarContent"++const SidebarGroup = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div">+>(({ className, ...props }, ref) => {+ return (+ <div+ ref={ref}+ data-sidebar="group"+ className={cn("relative flex w-full min-w-0 flex-col p-2", className)}+ {...props}+ />+ )+})+SidebarGroup.displayName = "SidebarGroup"++const SidebarGroupLabel = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div"> & { asChild?: boolean }+>(({ className, asChild = false, ...props }, ref) => {+ const Comp = asChild ? Slot : "div"++ return (+ <Comp+ ref={ref}+ data-sidebar="group-label"+ className={cn(+ "flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium text-sidebar-foreground/70 outline-none ring-sidebar-ring 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}+ />+ )+})+SidebarGroupLabel.displayName = "SidebarGroupLabel"++const SidebarGroupAction = React.forwardRef<+ HTMLButtonElement,+ React.ComponentProps<"button"> & { asChild?: boolean }+>(({ className, asChild = false, ...props }, ref) => {+ const Comp = asChild ? Slot : "button"++ return (+ <Comp+ ref={ref}+ data-sidebar="group-action"+ className={cn(+ "absolute right-3 top-3.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",+ // Increases the hit area of the button on mobile.+ "after:absolute after:-inset-2 after:md:hidden",+ "group-data-[collapsible=icon]:hidden",+ className+ )}+ {...props}+ />+ )+})+SidebarGroupAction.displayName = "SidebarGroupAction"++const SidebarGroupContent = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div">+>(({ className, ...props }, ref) => (+ <div+ ref={ref}+ data-sidebar="group-content"+ className={cn("w-full text-sm", className)}+ {...props}+ />+))+SidebarGroupContent.displayName = "SidebarGroupContent"++const SidebarMenu = React.forwardRef<+ HTMLUListElement,+ React.ComponentProps<"ul">+>(({ className, ...props }, ref) => (+ <ul+ ref={ref}+ data-sidebar="menu"+ className={cn("flex w-full min-w-0 flex-col gap-1", className)}+ {...props}+ />+))+SidebarMenu.displayName = "SidebarMenu"++const SidebarMenuItem = React.forwardRef<+ HTMLLIElement,+ React.ComponentProps<"li">+>(({ className, ...props }, ref) => (+ <li+ ref={ref}+ data-sidebar="menu-item"+ className={cn("group/menu-item relative", className)}+ {...props}+ />+))+SidebarMenuItem.displayName = "SidebarMenuItem"++const sidebarMenuButtonVariants = cva(+ "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none 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",+ },+ }+)++const SidebarMenuButton = React.forwardRef<+ HTMLButtonElement,+ React.ComponentProps<"button"> & {+ asChild?: boolean+ isActive?: boolean+ tooltip?: string | React.ComponentProps<typeof TooltipContent>+ } & VariantProps<typeof sidebarMenuButtonVariants>+>(+ (+ {+ asChild = false,+ isActive = false,+ variant = "default",+ size = "default",+ tooltip,+ className,+ ...props+ },+ ref+ ) => {+ const Comp = asChild ? Slot : "button"+ const { isMobile, state } = useSidebar()++ const button = (+ <Comp+ ref={ref}+ 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>+ )+ }+)+SidebarMenuButton.displayName = "SidebarMenuButton"++const SidebarMenuAction = React.forwardRef<+ HTMLButtonElement,+ React.ComponentProps<"button"> & {+ asChild?: boolean+ showOnHover?: boolean+ }+>(({ className, asChild = false, showOnHover = false, ...props }, ref) => {+ const Comp = asChild ? Slot : "button"++ return (+ <Comp+ ref={ref}+ data-sidebar="menu-action"+ className={cn(+ "absolute right-1 top-1.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 peer-hover/menu-button:text-sidebar-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",+ // Increases the hit area of the button on mobile.+ "after:absolute after:-inset-2 after:md: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 &&+ "group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 peer-data-[active=true]/menu-button:text-sidebar-accent-foreground md:opacity-0",+ className+ )}+ {...props}+ />+ )+})+SidebarMenuAction.displayName = "SidebarMenuAction"++const SidebarMenuBadge = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div">+>(({ className, ...props }, ref) => (+ <div+ ref={ref}+ data-sidebar="menu-badge"+ className={cn(+ "pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums text-sidebar-foreground",+ "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}+ />+))+SidebarMenuBadge.displayName = "SidebarMenuBadge"++const SidebarMenuSkeleton = React.forwardRef<+ HTMLDivElement,+ React.ComponentProps<"div"> & {+ showIcon?: boolean+ }+>(({ className, showIcon = false, ...props }, ref) => {+ // Random width between 50 to 90%.+ const width = React.useMemo(() => {+ return `${Math.floor(Math.random() * 40) + 50}%`+ }, [])++ return (+ <div+ ref={ref}+ 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>+ )+})+SidebarMenuSkeleton.displayName = "SidebarMenuSkeleton"++const SidebarMenuSub = React.forwardRef<+ HTMLUListElement,+ React.ComponentProps<"ul">+>(({ className, ...props }, ref) => (+ <ul+ ref={ref}+ data-sidebar="menu-sub"+ className={cn(+ "mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l border-sidebar-border px-2.5 py-0.5",+ "group-data-[collapsible=icon]:hidden",+ className+ )}+ {...props}+ />+))+SidebarMenuSub.displayName = "SidebarMenuSub"++const SidebarMenuSubItem = React.forwardRef<+ HTMLLIElement,+ React.ComponentProps<"li">+>(({ ...props }, ref) => <li ref={ref} {...props} />)+SidebarMenuSubItem.displayName = "SidebarMenuSubItem"++const SidebarMenuSubButton = React.forwardRef<+ HTMLAnchorElement,+ React.ComponentProps<"a"> & {+ asChild?: boolean+ size?: "sm" | "md"+ isActive?: boolean+ }+>(({ asChild = false, size = "md", isActive, className, ...props }, ref) => {+ const Comp = asChild ? Slot : "a"++ return (+ <Comp+ ref={ref}+ data-sidebar="menu-sub-button"+ data-size={size}+ data-active={isActive}+ className={cn(+ "flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground outline-none ring-sidebar-ring 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 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground",+ "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}+ />+ )+})+SidebarMenuSubButton.displayName = "SidebarMenuSubButton"++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/components/ui/skeleton.tsx b/components/ui/skeleton.tsxindex c23a30d9..f3e0d2e8 100644--- a/components/ui/skeleton.tsx+++ b/components/ui/skeleton.tsx@@ -1,4 +1,4 @@-import { cn } from '@/lib/utils'+import { cn } from '@/lib/utils/index'function Skeleton({className,diff --git a/components/ui/tooltip.tsx b/components/ui/tooltip.tsxindex 30fc44d9..c8cfaf1a 100644--- a/components/ui/tooltip.tsx+++ b/components/ui/tooltip.tsx@@ -3,7 +3,7 @@import * as React from "react"import * as TooltipPrimitive from "@radix-ui/react-tooltip"-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils/index"const TooltipProvider = TooltipPrimitive.Providerdiff --git a/hooks/use-mobile.tsx b/hooks/use-mobile.tsxnew file mode 100644index 00000000..2b0fe1df--- /dev/null+++ b/hooks/use-mobile.tsx@@ -0,0 +1,19 @@+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/package.json b/package.jsonindex 0f1eb747..2425ff16 100644--- a/package.json+++ b/package.json@@ -27,23 +27,23 @@"@radix-ui/react-label": "^2.0.2","@radix-ui/react-popover": "^1.1.5","@radix-ui/react-select": "^2.1.2",- "@radix-ui/react-separator": "^1.0.3",+ "@radix-ui/react-separator": "^1.1.4","@radix-ui/react-slider": "^1.1.2",- "@radix-ui/react-slot": "^1.0.2",+ "@radix-ui/react-slot": "^1.2.0","@radix-ui/react-switch": "^1.0.3","@radix-ui/react-toggle": "^1.1.1",- "@radix-ui/react-tooltip": "^1.0.7",+ "@radix-ui/react-tooltip": "^1.2.4","@tailwindcss/typography": "^0.5.12","@upstash/redis": "^1.34.0","ai": "^4.3.6",- "class-variance-authority": "^0.7.0",+ "class-variance-authority": "^0.7.1","clsx": "^2.1.0","cmdk": "1.0.0","embla-carousel-react": "^8.0.0","exa-js": "^1.0.12","jsdom": "^22.1.0","katex": "^0.16.10",- "lucide-react": "^0.474.0",+ "lucide-react": "^0.507.0","next": "^15.2.3","next-themes": "^0.3.0","node-html-parser": "^6.1.13",diff --git a/tailwind.config.ts b/tailwind.config.tsindex 6e203e70..3d330ebb 100644--- a/tailwind.config.ts+++ b/tailwind.config.ts@@ -11,118 +11,149 @@ const config = {],prefix: '',theme: {- container: {- center: true,- padding: '2rem',- screens: {- '2xl': '1400px'- }- },- extend: {- colors: {- border: 'hsl(var(--border))',- input: 'hsl(var(--input))',- ring: 'hsl(var(--ring))',- background: 'hsl(var(--background))',- foreground: 'hsl(var(--foreground))',- primary: {- DEFAULT: 'hsl(var(--primary))',- foreground: 'hsl(var(--primary-foreground))'- },- secondary: {- DEFAULT: 'hsl(var(--secondary))',- foreground: 'hsl(var(--secondary-foreground))'- },- destructive: {- DEFAULT: 'hsl(var(--destructive))',- foreground: 'hsl(var(--destructive-foreground))'- },- muted: {- DEFAULT: 'hsl(var(--muted))',- foreground: 'hsl(var(--muted-foreground))'- },- accent: {- DEFAULT: 'hsl(var(--accent))',- foreground: 'hsl(var(--accent-foreground))',- blue: {- DEFAULT: 'hsl(var(--accent-blue))',- foreground: 'hsl(var(--accent-blue-foreground))',- border: 'hsl(var(--accent-blue-border))'- }- },- popover: {- DEFAULT: 'hsl(var(--popover))',- foreground: 'hsl(var(--popover-foreground))'- },- card: {- DEFAULT: 'hsl(var(--card))',- foreground: 'hsl(var(--card-foreground))'- },- chart: {- '1': 'hsl(var(--chart-1))',- '2': 'hsl(var(--chart-2))',- '3': 'hsl(var(--chart-3))',- '4': 'hsl(var(--chart-4))',- '5': 'hsl(var(--chart-5))'- }- },- borderRadius: {- lg: 'var(--radius)',- md: 'calc(var(--radius) - 2px)',- sm: 'calc(var(--radius) - 4px)'- },- keyframes: {- 'accordion-down': {- from: {- height: '0'- },- to: {- height: 'var(--radix-accordion-content-height)'- }- },- 'accordion-up': {- from: {- height: 'var(--radix-accordion-content-height)'- },- to: {- height: '0'- }- },- 'collapse-down': {- from: { height: '0', opacity: '0' },- to: {- height: 'var(--radix-collapsible-content-height)',- opacity: '1'- }- },- 'collapse-up': {- from: {- height: 'var(--radix-collapsible-content-height)',- opacity: '1'- },- to: { height: '0', opacity: '0' }- },- 'slide-in-right': {- from: { transform: 'translateX(100%)', opacity: '0' },- to: { transform: 'translateX(0)', opacity: '1' }- },- 'slide-out-right': {- from: { transform: 'translateX(0)', opacity: '1' },- to: { transform: 'translateX(100%)', opacity: '0' }- }- },- animation: {- 'accordion-down': 'accordion-down 0.2s ease-out',- 'accordion-up': 'accordion-up 0.2s ease-out',- 'collapse-down': 'collapse-down 0.1s ease-in-out',- 'collapse-up': 'collapse-up 0.1s ease-in-out',- 'slide-in-right': 'slide-in-right 0.2s ease-out',- 'slide-out-right': 'slide-out-right 0.2s ease-out'- },- fontFamily: {- sans: ['var(--font-sans)', ...fontFamily.sans]- }- }+ container: {+ center: true,+ padding: '2rem',+ screens: {+ '2xl': '1400px'+ }+ },+ extend: {+ colors: {+ border: 'hsl(var(--border))',+ input: 'hsl(var(--input))',+ ring: 'hsl(var(--ring))',+ background: 'hsl(var(--background))',+ foreground: 'hsl(var(--foreground))',+ primary: {+ DEFAULT: 'hsl(var(--primary))',+ foreground: 'hsl(var(--primary-foreground))'+ },+ secondary: {+ DEFAULT: 'hsl(var(--secondary))',+ foreground: 'hsl(var(--secondary-foreground))'+ },+ destructive: {+ DEFAULT: 'hsl(var(--destructive))',+ foreground: 'hsl(var(--destructive-foreground))'+ },+ muted: {+ DEFAULT: 'hsl(var(--muted))',+ foreground: 'hsl(var(--muted-foreground))'+ },+ accent: {+ DEFAULT: 'hsl(var(--accent))',+ foreground: 'hsl(var(--accent-foreground))',+ blue: {+ DEFAULT: 'hsl(var(--accent-blue))',+ foreground: 'hsl(var(--accent-blue-foreground))',+ border: 'hsl(var(--accent-blue-border))'+ }+ },+ popover: {+ DEFAULT: 'hsl(var(--popover))',+ foreground: 'hsl(var(--popover-foreground))'+ },+ card: {+ DEFAULT: 'hsl(var(--card))',+ foreground: 'hsl(var(--card-foreground))'+ },+ chart: {+ '1': 'hsl(var(--chart-1))',+ '2': 'hsl(var(--chart-2))',+ '3': 'hsl(var(--chart-3))',+ '4': 'hsl(var(--chart-4))',+ '5': 'hsl(var(--chart-5))'+ },+ sidebar: {+ DEFAULT: 'hsl(var(--sidebar-background))',+ foreground: 'hsl(var(--sidebar-foreground))',+ primary: 'hsl(var(--sidebar-primary))',+ 'primary-foreground': 'hsl(var(--sidebar-primary-foreground))',+ accent: 'hsl(var(--sidebar-accent))',+ 'accent-foreground': 'hsl(var(--sidebar-accent-foreground))',+ border: 'hsl(var(--sidebar-border))',+ ring: 'hsl(var(--sidebar-ring))'+ }+ },+ borderRadius: {+ lg: 'var(--radius)',+ md: 'calc(var(--radius) - 2px)',+ sm: 'calc(var(--radius) - 4px)'+ },+ keyframes: {+ 'accordion-down': {+ from: {+ height: '0'+ },+ to: {+ height: 'var(--radix-accordion-content-height)'+ }+ },+ 'accordion-up': {+ from: {+ height: 'var(--radix-accordion-content-height)'+ },+ to: {+ height: '0'+ }+ },+ 'collapse-down': {+ from: {+ height: '0',+ opacity: '0'+ },+ to: {+ height: 'var(--radix-collapsible-content-height)',+ opacity: '1'+ }+ },+ 'collapse-up': {+ from: {+ height: 'var(--radix-collapsible-content-height)',+ opacity: '1'+ },+ to: {+ height: '0',+ opacity: '0'+ }+ },+ 'slide-in-right': {+ from: {+ transform: 'translateX(100%)',+ opacity: '0'+ },+ to: {+ transform: 'translateX(0)',+ opacity: '1'+ }+ },+ 'slide-out-right': {+ from: {+ transform: 'translateX(0)',+ opacity: '1'+ },+ to: {+ transform: 'translateX(100%)',+ opacity: '0'+ }+ }+ },+ animation: {+ 'accordion-down': 'accordion-down 0.2s ease-out',+ 'accordion-up': 'accordion-up 0.2s ease-out',+ 'collapse-down': 'collapse-down 0.1s ease-in-out',+ 'collapse-up': 'collapse-up 0.1s ease-in-out',+ 'slide-in-right': 'slide-in-right 0.2s ease-out',+ 'slide-out-right': 'slide-out-right 0.2s ease-out'+ },+ fontFamily: {+ sans: [+ 'var(--font-sans)',+ ...fontFamily.sans+ ]+ }+ }},plugins: [require('tailwindcss-animate'), require('@tailwindcss/typography')]} satisfies Config