Merge pull request #38 from CQCL/sidebar-story

package.json

@@ -121,7 +121,7 @@
     "cmdk": "^0.2.0",
     "date-fns": "^3.6.0",
     "input-otp": "^1.4.1",
-    "lucide-react": "^0.298.0",
+    "lucide-react": "^0.468.0",
     "react-day-picker": "^8.10.0",
     "react-icons": "^5.3.0",
     "react-resizable-panels": "^1.0.5",

src/index.ts

@@ -33,6 +33,7 @@ export * from "./shadcn/ui/scroll-area";
 export * from "./shadcn/ui/select";
 export * from "./shadcn/ui/separator";
 export * from "./shadcn/ui/sheet";
+export * from './shadcn/ui/sidebar';
 export * from "./shadcn/ui/skeleton";
 export * from "./shadcn/ui/slider";
 export * from "./shadcn/ui/switch";

src/shadcn/ui/button.tsx

@@ -1,11 +1,11 @@
 import * as React from "react"
 import { Slot } from "@radix-ui/react-slot"
 import { cva, type VariantProps } from "class-variance-authority"
-
-import { cn } from "src/utils"
-
+ 
+import { cn } from "src"
+ 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
+  "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
   {
     variants: {
       variant: {
@@ -33,13 +33,13 @@ const buttonVariants = cva(
     },
   }
 )
-
+ 
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
   asChild?: boolean
 }
-
+ 
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
   ({ className, variant, size, asChild = false, ...props }, ref) => {
     const Comp = asChild ? Slot : "button"
@@ -53,5 +53,5 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
   }
 )
 Button.displayName = "Button"
-
+ 
 export { Button, buttonVariants }