Fix lib/utils issue (#2151)

This commit is contained in:
Saket Aryan
2025-01-15 23:19:38 +05:30
committed by GitHub
parent 205a03a5f2
commit ee2b5adfc0
13 changed files with 21 additions and 16 deletions

View File

@@ -12,9 +12,9 @@
}, },
"aliases": { "aliases": {
"components": "@/components", "components": "@/components",
"utils": "@/lib/utils", "utils": "@/libs/utils",
"ui": "@/components/ui", "ui": "@/components/ui",
"lib": "@/lib", "lib": "@/libs",
"hooks": "@/hooks" "hooks": "@/hooks"
} }
} }

View File

@@ -4,7 +4,7 @@ import { ScrollArea } from "@radix-ui/react-scroll-area";
import { Memory } from "../types"; import { Memory } from "../types";
import GlobalContext from "@/contexts/GlobalContext"; import GlobalContext from "@/contexts/GlobalContext";
import { useContext, useEffect, useState } from "react"; 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 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -73,9 +73,8 @@ const Memories = (props: { isMemoriesExpanded: boolean }) => {
<ScrollArea className="flex-1 p-4"> <ScrollArea className="flex-1 p-4">
<motion.div <motion.div
className="space-y-4" className="space-y-4"
layout
> >
<AnimatePresence mode="popLayout"> {/* <AnimatePresence mode="popLayout"> */}
{memories.map((memory: Memory, index: number) => ( {memories.map((memory: Memory, index: number) => (
<MemoryItem <MemoryItem
key={memory.id} key={memory.id}
@@ -83,7 +82,7 @@ const Memories = (props: { isMemoriesExpanded: boolean }) => {
index={index} index={index}
/> />
))} ))}
</AnimatePresence> {/* </AnimatePresence> */}
</motion.div> </motion.div>
</ScrollArea> </ScrollArea>
</Card> </Card>

View File

@@ -3,7 +3,7 @@
import * as React from "react" import * as React from "react"
import * as AvatarPrimitive from "@radix-ui/react-avatar" import * as AvatarPrimitive from "@radix-ui/react-avatar"
import { cn } from "@/lib/utils" import { cn } from "@/libs/utils"
const Avatar = React.forwardRef< const Avatar = React.forwardRef<
React.ElementRef<typeof AvatarPrimitive.Root>, React.ElementRef<typeof AvatarPrimitive.Root>,

View File

@@ -1,7 +1,7 @@
import * as React from "react" import * as React from "react"
import { cva, type VariantProps } from "class-variance-authority" import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils" import { cn } from "@/libs/utils"
const badgeVariants = cva( 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", "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",

View File

@@ -2,7 +2,7 @@ import * as React from "react"
import { Slot } from "@radix-ui/react-slot" import { Slot } from "@radix-ui/react-slot"
import { cva, type VariantProps } from "class-variance-authority" import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils" import { cn } from "@/libs/utils"
const buttonVariants = cva( 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", "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",

View File

@@ -1,6 +1,6 @@
import * as React from "react" import * as React from "react"
import { cn } from "@/lib/utils" import { cn } from "@/libs/utils"
const Card = React.forwardRef< const Card = React.forwardRef<
HTMLDivElement, HTMLDivElement,

View File

@@ -2,7 +2,7 @@ import * as React from "react"
import * as DialogPrimitive from "@radix-ui/react-dialog" import * as DialogPrimitive from "@radix-ui/react-dialog"
import { Cross2Icon } from "@radix-ui/react-icons" import { Cross2Icon } from "@radix-ui/react-icons"
import { cn } from "@/lib/utils" import { cn } from "@/libs/utils"
const Dialog = DialogPrimitive.Root const Dialog = DialogPrimitive.Root

View File

@@ -1,6 +1,6 @@
import * as React from "react" import * as React from "react"
import { cn } from "@/lib/utils" import { cn } from "@/libs/utils"
export interface InputProps export interface InputProps
extends React.InputHTMLAttributes<HTMLInputElement> {} extends React.InputHTMLAttributes<HTMLInputElement> {}

View File

@@ -2,7 +2,7 @@ import * as React from "react"
import * as LabelPrimitive from "@radix-ui/react-label" import * as LabelPrimitive from "@radix-ui/react-label"
import { cva, type VariantProps } from "class-variance-authority" import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils" import { cn } from "@/libs/utils"
const labelVariants = cva( const labelVariants = cva(
"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"

View File

@@ -1,7 +1,7 @@
import * as React from "react" import * as React from "react"
import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area" import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
import { cn } from "@/lib/utils" import { cn } from "@/libs/utils"
const ScrollArea = React.forwardRef< const ScrollArea = React.forwardRef<
React.ElementRef<typeof ScrollAreaPrimitive.Root>, React.ElementRef<typeof ScrollAreaPrimitive.Root>,

View File

@@ -9,7 +9,7 @@ import {
} from "@radix-ui/react-icons" } from "@radix-ui/react-icons"
import * as SelectPrimitive from "@radix-ui/react-select" import * as SelectPrimitive from "@radix-ui/react-select"
import { cn } from "@/lib/utils" import { cn } from "@/libs/utils"
const Select = SelectPrimitive.Root const Select = SelectPrimitive.Root

View File

@@ -119,7 +119,7 @@ const GlobalState = (props: any) => {
try { try {
const smemories = await searchMemories(messages, { const smemories = await searchMemories(messages, {
user_id: selectedUser || "", user_id: selectedUser || "",
mem0ApiKey: import.meta.env.VITE_MEM0_API_KEY, mem0ApiKey: selectedMem0Key,
}); });
const newMemories = smemories.map((memory: any) => ({ const newMemories = smemories.map((memory: any) => ({

View File

@@ -0,0 +1,6 @@
import { clsx, type ClassValue } from "clsx"
import { twMerge } from "tailwind-merge"
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
}