diff --git a/examples/vercel-ai-sdk-chat-app/components.json b/examples/vercel-ai-sdk-chat-app/components.json index 0b03196d..eaf9959b 100644 --- a/examples/vercel-ai-sdk-chat-app/components.json +++ b/examples/vercel-ai-sdk-chat-app/components.json @@ -12,9 +12,9 @@ }, "aliases": { "components": "@/components", - "utils": "@/lib/utils", + "utils": "@/libs/utils", "ui": "@/components/ui", - "lib": "@/lib", + "lib": "@/libs", "hooks": "@/hooks" } } \ No newline at end of file diff --git a/examples/vercel-ai-sdk-chat-app/src/components/memories.tsx b/examples/vercel-ai-sdk-chat-app/src/components/memories.tsx index 20a2f22e..02887457 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/memories.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/components/memories.tsx @@ -4,7 +4,7 @@ import { ScrollArea } from "@radix-ui/react-scroll-area"; import { Memory } from "../types"; import GlobalContext from "@/contexts/GlobalContext"; import { useContext, useEffect, useState } from "react"; -import { AnimatePresence, motion } from "framer-motion"; +import { motion } from "framer-motion"; // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -73,9 +73,8 @@ const Memories = (props: { isMemoriesExpanded: boolean }) => { - + {/* */} {memories.map((memory: Memory, index: number) => ( { index={index} /> ))} - + {/* */} diff --git a/examples/vercel-ai-sdk-chat-app/src/components/ui/avatar.tsx b/examples/vercel-ai-sdk-chat-app/src/components/ui/avatar.tsx index 51e507ba..9065241a 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/ui/avatar.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/components/ui/avatar.tsx @@ -3,7 +3,7 @@ import * as React from "react" import * as AvatarPrimitive from "@radix-ui/react-avatar" -import { cn } from "@/lib/utils" +import { cn } from "@/libs/utils" const Avatar = React.forwardRef< React.ElementRef, diff --git a/examples/vercel-ai-sdk-chat-app/src/components/ui/badge.tsx b/examples/vercel-ai-sdk-chat-app/src/components/ui/badge.tsx index e87d62bf..060b2f11 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/ui/badge.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/components/ui/badge.tsx @@ -1,7 +1,7 @@ import * as React from "react" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@/lib/utils" +import { cn } from "@/libs/utils" const badgeVariants = cva( "inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2", diff --git a/examples/vercel-ai-sdk-chat-app/src/components/ui/button.tsx b/examples/vercel-ai-sdk-chat-app/src/components/ui/button.tsx index 65d4fcd9..3e85ff7a 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/ui/button.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/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 "@/libs/utils" const buttonVariants = cva( "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", diff --git a/examples/vercel-ai-sdk-chat-app/src/components/ui/card.tsx b/examples/vercel-ai-sdk-chat-app/src/components/ui/card.tsx index 77e9fb78..e90617d5 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/ui/card.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/components/ui/card.tsx @@ -1,6 +1,6 @@ import * as React from "react" -import { cn } from "@/lib/utils" +import { cn } from "@/libs/utils" const Card = React.forwardRef< HTMLDivElement, diff --git a/examples/vercel-ai-sdk-chat-app/src/components/ui/dialog.tsx b/examples/vercel-ai-sdk-chat-app/src/components/ui/dialog.tsx index 5d16351f..1796099a 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/ui/dialog.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/components/ui/dialog.tsx @@ -2,7 +2,7 @@ import * as React from "react" import * as DialogPrimitive from "@radix-ui/react-dialog" import { Cross2Icon } from "@radix-ui/react-icons" -import { cn } from "@/lib/utils" +import { cn } from "@/libs/utils" const Dialog = DialogPrimitive.Root diff --git a/examples/vercel-ai-sdk-chat-app/src/components/ui/input.tsx b/examples/vercel-ai-sdk-chat-app/src/components/ui/input.tsx index 5af26b2c..d2bdc607 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/ui/input.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/components/ui/input.tsx @@ -1,6 +1,6 @@ import * as React from "react" -import { cn } from "@/lib/utils" +import { cn } from "@/libs/utils" export interface InputProps extends React.InputHTMLAttributes {} diff --git a/examples/vercel-ai-sdk-chat-app/src/components/ui/label.tsx b/examples/vercel-ai-sdk-chat-app/src/components/ui/label.tsx index 683faa79..4a31cf96 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/ui/label.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/components/ui/label.tsx @@ -2,7 +2,7 @@ import * as React from "react" import * as LabelPrimitive from "@radix-ui/react-label" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@/lib/utils" +import { cn } from "@/libs/utils" const labelVariants = cva( "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" diff --git a/examples/vercel-ai-sdk-chat-app/src/components/ui/scroll-area.tsx b/examples/vercel-ai-sdk-chat-app/src/components/ui/scroll-area.tsx index cf253cf1..94e4b135 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/ui/scroll-area.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/components/ui/scroll-area.tsx @@ -1,7 +1,7 @@ import * as React from "react" import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area" -import { cn } from "@/lib/utils" +import { cn } from "@/libs/utils" const ScrollArea = React.forwardRef< React.ElementRef, diff --git a/examples/vercel-ai-sdk-chat-app/src/components/ui/select.tsx b/examples/vercel-ai-sdk-chat-app/src/components/ui/select.tsx index ac2a8f2b..cdf9257b 100644 --- a/examples/vercel-ai-sdk-chat-app/src/components/ui/select.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/components/ui/select.tsx @@ -9,7 +9,7 @@ import { } from "@radix-ui/react-icons" import * as SelectPrimitive from "@radix-ui/react-select" -import { cn } from "@/lib/utils" +import { cn } from "@/libs/utils" const Select = SelectPrimitive.Root diff --git a/examples/vercel-ai-sdk-chat-app/src/contexts/GlobalContext.tsx b/examples/vercel-ai-sdk-chat-app/src/contexts/GlobalContext.tsx index 10f1b683..4f959b56 100644 --- a/examples/vercel-ai-sdk-chat-app/src/contexts/GlobalContext.tsx +++ b/examples/vercel-ai-sdk-chat-app/src/contexts/GlobalContext.tsx @@ -119,7 +119,7 @@ const GlobalState = (props: any) => { try { const smemories = await searchMemories(messages, { user_id: selectedUser || "", - mem0ApiKey: import.meta.env.VITE_MEM0_API_KEY, + mem0ApiKey: selectedMem0Key, }); const newMemories = smemories.map((memory: any) => ({ diff --git a/examples/vercel-ai-sdk-chat-app/src/libs/utils.ts b/examples/vercel-ai-sdk-chat-app/src/libs/utils.ts new file mode 100644 index 00000000..bd0c391d --- /dev/null +++ b/examples/vercel-ai-sdk-chat-app/src/libs/utils.ts @@ -0,0 +1,6 @@ +import { clsx, type ClassValue } from "clsx" +import { twMerge } from "tailwind-merge" + +export function cn(...inputs: ClassValue[]) { + return twMerge(clsx(inputs)) +}