feat: reorganize files and implement ui and sidebar

This commit is contained in:
shadcn 2023-06-11 00:23:23 +04:00
parent 2e80864b84
commit 01dc4520d6
36 changed files with 1347 additions and 462 deletions

View file

@ -1,7 +1,40 @@
'use server'
import { kv } from '@vercel/kv'
import { revalidatePath } from 'next/cache'
import { kv } from '@vercel/kv'
import { type Chat } from '@/lib/types'
export async function getChats(userId: string) {
try {
const pipeline = kv.pipeline()
const chats: string[] = await kv.zrange(`user:chat:${userId}`, 0, -1)
for (const chat of chats) {
pipeline.hgetall(chat)
}
const results = await pipeline.exec()
return results as Chat[]
} catch (error) {
return []
}
}
export async function getChat(id: string, userId: string) {
const chat = await kv.hgetall<Chat>(`chat:${id}`)
if (!chat) {
throw new Error('Not found')
}
if (userId && chat.userId !== userId) {
throw new Error('Unauthorized')
}
return chat
}
export async function removeChat({
id,

View file

@ -1,2 +1,2 @@
export { GET, POST } from '@/auth'
export const runtime = 'edge'
// export const runtime = 'edge'

View file

@ -4,7 +4,7 @@ import { nanoid } from '@/lib/utils'
import { OpenAIStream, StreamingTextResponse } from 'ai-connector'
import { Configuration, OpenAIApi } from 'openai-edge'
export const runtime = 'edge'
// export const runtime = 'edge'
const configuration = new Configuration({
apiKey: process.env.OPENAI_API_KEY

View file

@ -1,44 +0,0 @@
'use client'
import { type Message } from 'ai-connector'
import { ChatMessage } from './chat-message'
import { EmptyScreen } from './empty-screen'
export interface ChatList {
messages: Message[]
}
export function ChatList({ messages }: ChatList) {
return (
<div className="relative max-w-2xl mx-auto">
{/* <div className="sticky top-0 border-b w-full bg-black md:hidden text-white font-semibold">
<div className="px-4 py-2 flex items-center justify-between">
<div className="flex flex-row gap-2 whitespace-nowrap items-center">
<NextChatLogo className="h-6 w-6" />
<span className="select-none">Next.js Chatbot</span>
</div>
<div>
<button className="text-white p-2 rounded hover:bg-zinc-800 transition duration-100">
<Plus className="h-4 w-4" />
</button>
</div>
</div>
</div> */}
{messages.length > 0 ? (
<div className="group">
{messages.map(message => (
<ChatMessage
key={message.id || message.content}
message={message}
/>
))}
</div>
) : (
<div className="pt-10">
<EmptyScreen />
</div>
)}
</div>
)
}

View file

@ -1,113 +0,0 @@
import CodeBlock from '@/components/ui/codeblock'
import { MemoizedReactMarkdown } from '@/components/markdown'
import remarkGfm from 'remark-gfm'
import remarkMath from 'remark-math'
import { cn } from '@/lib/utils'
import { fontMessage } from '@/lib/fonts'
import { Message } from 'ai-connector'
import { User } from 'lucide-react'
import { OpenAI } from '@/components/icons'
export interface ChatMessageProps {
message: Message
}
export function ChatMessage({ message, ...props }: ChatMessageProps) {
return (
<div
className={cn(
'flex items-start space-x-4 mb-4',
fontMessage.className,
message.role === 'user' && 'mt-12 first:mt-0'
)}
{...props}
>
<div
className={cn(
'flex h-8 w-8 -ml-2 shrink-0 items-center justify-center rounded-full select-none border',
message.role === 'assistant' && 'bg-primary text-primary-foreground'
)}
>
{message.role === 'user' ? (
<User className="w-4 h-4" />
) : (
<OpenAI className="w-4 h-4" />
)}
</div>
<div
className={cn(
'border rounded-lg py-2 px-4',
message.role === 'assistant' && 'bg-muted/30'
)}
>
<MemoizedReactMarkdown
className="prose dark:prose-invert prose-sm prose-pre:rounded-md w-full flex-1 leading-6 prose-p:leading-[1.8rem] prose-pre:bg-[#282c34] max-w-full"
remarkPlugins={[remarkGfm, remarkMath]}
components={{
p({ children }) {
return (
<p
className={cn(
'mb-2 last:mb-0',
message.role === 'user' && 'font-medium'
)}
>
{children}
</p>
)
},
code({ node, inline, className, children, ...props }) {
if (children.length) {
if (children[0] == '▍') {
return (
<span className="mt-1 animate-pulse cursor-default"></span>
)
}
children[0] = (children[0] as string).replace('`▍`', '▍')
}
const match = /language-(\w+)/.exec(className || '')
return !inline ? (
<CodeBlock
key={Math.random()}
language={(match && match[1]) || ''}
value={String(children).replace(/\n$/, '')}
{...props}
/>
) : (
<code className={className} {...props}>
{children}
</code>
)
},
table({ children }) {
return (
<table className="border-collapse border border-black px-3 py-1 ">
{children}
</table>
)
},
th({ children }) {
return (
<th className="break-words border border-black bg-gray-500 px-3 py-1 text-white ">
{children}
</th>
)
},
td({ children }) {
return (
<td className="break-words border border-black px-3 py-1">
{children}
</td>
)
}
}}
>
{message.content}
</MemoizedReactMarkdown>
</div>
</div>
)
}

View file

@ -1,57 +0,0 @@
'use client'
import { useRouter } from 'next/navigation'
import { Prompt } from './prompt'
import { useChat, type Message } from 'ai-connector'
import { ChatList } from './chat-list'
import { ExternalLink } from '@/app/external-link'
export interface ChatProps {
// create?: (input: string) => Chat | undefined;
initialMessages?: Message[]
id?: string
}
export function Chat({
id,
// create,
initialMessages
}: ChatProps) {
const router = useRouter()
const { isLoading, messages, reload, append } = useChat({
initialMessages: initialMessages as any[],
id
// onCreate: (id: string) => {
// router.push(`/chat/${id}`);
// },
})
return (
<div className="h-full w-full overflow-auto pb-[200px]">
<ChatList messages={messages} />
<div className="fixed bottom-0 left-1 right-3 p-6 bg-gradient-to-b from-background/10 via-background/50 to-background/80 backdrop-blur-lg">
<div className="max-w-2xl mx-auto pl-10">
<Prompt
onSubmit={value => {
append({
content: value,
role: 'user'
})
}}
onRefresh={messages.length ? reload : undefined}
isLoading={isLoading}
/>
<p className="text-muted-foreground text-xs leading-normal text-center pt-2">
This is an open source AI chatbot app built with{' '}
<ExternalLink href="https://nextjs.org">Next.js</ExternalLink> and{' '}
<ExternalLink href="https://vercel.com/storage/kv">
Vercel KV
</ExternalLink>
.
</p>
</div>
</div>
</div>
)
}

View file

@ -1,15 +1,12 @@
import { Sidebar } from '@/app/sidebar'
import { auth } from '@/auth'
import { type Metadata } from 'next'
import { Chat } from '@/app/chat'
import { type Chat as ChatType } from '@/lib/types'
import { kv } from '@vercel/kv'
import { Message } from 'ai-connector'
import { auth } from '@/auth'
import { getChat } from '@/app/actions'
import { Chat } from '@/components/chat'
export const runtime = 'edge'
// export const runtime = 'edge'
export const preferredRegion = 'home'
export interface ChatPageProps {
params: {
id: string
@ -30,28 +27,5 @@ export default async function ChatPage({ params }: ChatPageProps) {
const session = await auth()
const chat = await getChat(params.id, session?.user?.email ?? '')
return (
<div className="relative flex h-full w-full overflow-hidden">
{/* @ts-ignore */}
<Sidebar session={session} />
<div className="flex h-full min-w-0 flex-1 flex-col">
<Chat id={chat.id} initialMessages={chat.messages as Message[]} />
</div>
</div>
)
}
ChatPage.displayName = 'ChatPage'
async function getChat(id: string, userId: string) {
const chat = await kv.hgetall<ChatType>(`chat:${id}`)
if (!chat) {
throw new Error('Not found')
}
if (userId && chat.userId !== userId) {
throw new Error('Unauthorized')
}
return chat
return <Chat id={chat.id} initialMessages={chat.messages} />
}

View file

@ -1,69 +0,0 @@
import { cn } from '@/lib/utils'
import { ExternalLink } from './external-link'
import { ArrowRight } from 'lucide-react'
import { useChatStore } from '@/hooks/use-chat-store'
import { Button } from '@/components/ui/button'
import { OpenAI } from '@/components/icons'
const exampleMessages = [
{
heading: 'Explain technical concepts',
message: `What is a "serverless function"?`
},
{
heading: 'Summarize an article',
message: 'Summarize the following article for a 2nd grader: \n'
},
{
heading: 'Draft an email',
message: `Draft an email to my boss about the following: \n`
}
]
export function EmptyScreen({ className }: React.ComponentProps<'div'>) {
const { setDefaultMessage } = useChatStore()
return (
<div className="flex items-start space-x-4 mb-4">
<div
className={cn(
'flex h-8 w-8 -ml-2 shrink-0 items-center justify-center rounded-full select-none border bg-primary text-primary-foreground'
)}
>
<OpenAI className="w-4 h-4" />
</div>
<div
className={cn(
'border rounded-lg flex-1 p-10 bg-gradient-to-b from-background via-muted/10 to-muted/50',
className
)}
>
<h1 className="font-semibold mb-2">Welcome to Next.js Chatbot!</h1>
<p className="text-muted-foreground text-sm leading-normal">
This is an open source AI chatbot app built with{' '}
<ExternalLink href="https://nextjs.org">Next.js</ExternalLink> and{' '}
<ExternalLink href="https://vercel.com/storage/kv">
Vercel KV
</ExternalLink>
.
</p>
<p className="text-muted-foreground text-sm leading-normal">
You can start a conversation here or try the following examples:
</p>
<div className="text-sm mt-4 flex flex-col items-start space-y-2">
{exampleMessages.map((message, index) => (
<Button
key={index}
variant="link"
className="p-0 h-auto"
onClick={() => setDefaultMessage(message.message)}
>
<ArrowRight className="w-4 h-4 mr-2 text-muted-foreground" />
{message.heading}
</Button>
))}
</div>
</div>
</div>
)
}

View file

@ -1,29 +0,0 @@
export function ExternalLink({
href,
children
}: {
href: string
children: React.ReactNode
}) {
return (
<a
href={href}
target="_blank"
className="inline-flex gap-1 hover:underline flex-1 justify-center leading-4"
>
<span>{children}</span>
<svg
aria-hidden="true"
height="7"
viewBox="0 0 6 6"
width="7"
className="opacity-70"
>
<path
d="M1.25215 5.54731L0.622742 4.9179L3.78169 1.75597H1.3834L1.38936 0.890915H5.27615V4.78069H4.40513L4.41109 2.38538L1.25215 5.54731Z"
fill="currentColor"
></path>
</svg>
</a>
)
}

View file

@ -1,52 +0,0 @@
import { GitHub, Vercel } from '@/components/icons'
import './globals.css'
import { Sidebar } from '@/app/sidebar'
import { buttonVariants } from '@/components/ui/button'
import { cn } from '@/lib/utils'
import { Plus } from 'lucide-react'
import Link from 'next/link'
import { UserMenu } from '@/components/user-menu'
import { auth } from '@/auth'
export async function Header() {
const session = await auth()
return (
<header className="h-16 shrink-0 z-50 bg-gradient-to-b from-background/30 to-background/50 backdrop-blur-lg px-4 flex sticky top-0 w-full items-center justify-between">
<div className="flex items-center">
{/* @ts-ignore */}
<Sidebar />
<UserMenu session={session} />
</div>
<div className="flex space-x-2 items-center">
<Link href="/" className={cn(buttonVariants({ size: 'sm' }))}>
<Plus className="h-4 w-4 mr-2" />
New Chat
</Link>
<a
href="https://github.com/vercel/nextjs-ai-chatbot/"
target="_blank"
className={cn(
buttonVariants({ size: 'sm', variant: 'outline' }),
'space-x-2'
)}
>
<Vercel className="mr-2" />
Deploy
</a>
<a
target="_blank"
href="https://github.com/vercel/nextjs-ai-chatbot/"
className={cn(
buttonVariants({ size: 'sm', variant: 'ghost' }),
'h-9 w-9 p-0'
)}
>
<GitHub className="w-5 h-5" />
<span className="sr-only">View on GitHub</span>
</a>
</div>
</header>
)
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

View file

@ -1,11 +1,11 @@
import { Metadata } from 'next'
import './globals.css'
import { TailwindIndicator } from '@/components/tailwind-indicator'
import { ThemeProvider } from '@/components/theme-provider'
import '@/app/globals.css'
import { fontMono, fontSans } from '@/lib/fonts'
import { cn } from '@/lib/utils'
import { Header } from '@/app/header'
import { TailwindIndicator } from '@/components/tailwind-indicator'
import { ThemeProvider } from '@/components/theme-provider'
import { Header } from '@/components/header'
export const metadata: Metadata = {
title: {
@ -43,7 +43,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
<div className="h-screen flex flex-col">
{/* @ts-ignore */}
<Header />
<main className="flex-1 overflow-hidden">{children}</main>
<main className="flex-1">{children}</main>
</div>
<TailwindIndicator />
</ThemeProvider>

View file

@ -1,13 +1,8 @@
import { type Message } from 'ai-connector'
import { Chat } from './chat'
import { Chat } from '@/components/chat'
export const runtime = 'edge'
// export const runtime = 'edge'
export const preferredRegion = 'home'
export default async function IndexPage() {
return (
<div className="h-full overflow-hidden">
<Chat />
</div>
)
return <Chat />
}

View file

@ -1,145 +0,0 @@
'use client'
import * as React from 'react'
import { CornerDownLeft, RefreshCcw, StopCircle } from 'lucide-react'
import { useState } from 'react'
import Textarea from 'react-textarea-autosize'
import { Button } from '@/components/ui/button'
import { fontMessage } from '@/lib/fonts'
import { useCmdEnterSubmit } from '@/lib/hooks/use-command-enter-submit'
import { cn } from '@/lib/utils'
import { useChatStore } from '@/hooks/use-chat-store'
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger
} from '@/components/ui/tooltip'
export interface PromptProps {
onSubmit: (value: string) => void
onRefresh?: () => void
onAbort?: () => void
isLoading: boolean
}
export function Prompt({
onSubmit,
onRefresh,
onAbort,
isLoading
}: PromptProps) {
const { defaultMessage } = useChatStore()
const [input, setInput] = useState(defaultMessage)
const { formRef, onKeyDown } = useCmdEnterSubmit()
const inputRef = React.useRef<HTMLTextAreaElement>(null)
React.useEffect(() => {
if (inputRef.current) {
inputRef.current.focus()
}
}, [])
React.useEffect(() => {
setInput(defaultMessage)
}, [defaultMessage])
return (
<form
onSubmit={async e => {
e.preventDefault()
setInput('')
await onSubmit(input)
}}
ref={formRef}
>
<div className="relative flex h-full flex-1 flex-row-reverse items-stretch md:flex-col">
<div>
<div className="ml-1 flex h-full justify-center gap-0 md:m-auto md:mb-2 md:w-full md:gap-2">
{onRefresh ? (
<Button
variant="ghost"
className="relative border-0 h-full md:h-auto px-3 md:border bg-white dark:bg-zinc-900 dark:border-zinc-800 dark:text-zinc-400"
onClick={onRefresh}
>
<div className="flex h-gull w-full items-center justify-center gap-2">
<RefreshCcw className="h-4 w-4 text-zinc-500 md:h-3 md:w-3" />
<span className="hidden md:block">Regenerate response</span>
</div>
</Button>
) : null}
{/* <button
id="share-button"
className="btn btn-neutral flex justify-center gap-2"
>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
strokeWidth="1.5"
stroke="currentColor"
className="h-3 w-3"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
d="M7.217 10.907a2.25 2.25 0 100 2.186m0-2.186c.18.324.283.696.283 1.093s-.103.77-.283 1.093m0-2.186l9.566-5.314m-9.566 7.5l9.566 5.314m0 0a2.25 2.25 0 103.935 2.186 2.25 2.25 0 00-3.935-2.186zm0-12.814a2.25 2.25 0 103.933-2.185 2.25 2.25 0 00-3.933 2.185z"
/>
</svg>
Share
</button> */}
</div>
</div>
<div className="relative flex w-full grow flex-col rounded-md border bg-background overflow-hidden pr-12">
<Textarea
ref={inputRef}
tabIndex={0}
onKeyDown={onKeyDown}
rows={1}
value={input}
onChange={e => setInput(e.target.value)}
placeholder="Send a message."
spellCheck={false}
className={cn(
'min-h-[60px] text-sm p-4 bg-transparent focus-within:outline-none w-full resize-none',
fontMessage.className
)}
/>
<div className="absolute top-4 right-4">
<TooltipProvider>
{isLoading ? (
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
type="button"
onClick={onAbort}
className="h-8 w-8 p-0"
>
<StopCircle className="h-4 w-4" />
</Button>
</TooltipTrigger>
<TooltipContent>Stop generating</TooltipContent>
</Tooltip>
) : (
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
type="submit"
className="h-8 w-8 p-0"
>
<CornerDownLeft className="h-4 w-4" />
</Button>
</TooltipTrigger>
<TooltipContent>Send message</TooltipContent>
</Tooltip>
)}
</TooltipProvider>
</div>
</div>
</div>
</form>
)
}

View file

@ -1,68 +0,0 @@
'use client'
import { cn } from '@/lib/utils'
import Link from 'next/link'
import { usePathname, useRouter } from 'next/navigation'
import { MessageCircleIcon, Trash2Icon, Loader2Icon } from 'lucide-react'
import { removeChat } from './actions'
import { useTransition } from 'react'
export function SidebarItem({
title,
href,
id,
userId
}: {
title: string
href: string
id: string
userId: string
}) {
const pathname = usePathname()
const router = useRouter()
const active = pathname === href
const [isPending, startTransition] = useTransition()
if (!id) return null
return (
<Link
href={href}
className={cn(
'group flex shrink-0 cursor-pointer items-center gap-2 rounded p-2 text-sm font-medium transition-colors duration-100 hover:bg-zinc-500/10 hover:dark:bg-zinc-300/20',
isPending
? 'text-zinc-400 dark:text-zinc-500'
: 'text-zinc-800 dark:text-zinc-400',
active
? 'bg-zinc-500/20 text-zinc-900 font-semibold hover:bg-zinc-500/30 dark:text-white'
: 'bg-transparent'
)}
>
<MessageCircleIcon className="h-4 w-4" />
<div
className="relative max-h-5 flex-1 overflow-hidden text-ellipsis break-all select-none"
title={title}
>
<span className="whitespace-nowrap">{title}</span>
</div>
<button
className="opacity-0 -mr-6 transition-opacity duration-0 hover:bg-zinc-400/50 group-hover:mr-0 group-hover:opacity-80 p-1 -my-1 rounded group-hover:duration-600"
disabled={isPending}
onClick={e => {
e.preventDefault()
startTransition(() => {
removeChat({ id, userId, path: href }).then(() => {
router.push('/')
})
})
}}
>
{isPending ? (
<Loader2Icon className="animate-spin h-4 w-4" />
) : (
<Trash2Icon className="h-4 w-4" />
)}
</button>
</Link>
)
}

View file

@ -1,69 +0,0 @@
import { Chat } from '@/lib/types'
import { type Session } from '@auth/nextjs/types'
import { kv } from '@vercel/kv'
import { Sidebar as SidebarIcon } from 'lucide-react'
import { SidebarItem } from './sidebar-item'
import { auth } from '@/auth'
import { NextChat } from '@/components/icons'
import { Button } from '@/components/ui/button'
import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet'
export interface SidebarProps {}
export async function Sidebar({}: SidebarProps) {
const session = await auth()
return (
<Sheet>
<SheetTrigger asChild>
<Button variant="ghost" className="w-9 h-9 p-0">
<SidebarIcon className="w-6 h-6" />
<span className="sr-only">Toggle Sidebar</span>
</Button>
</SheetTrigger>
<SheetContent
position="left"
className="w-[300px] top-2 rounded-lg left-2 bottom-2 h-auto"
>
<div className="flex items-center">
<NextChat className="mr-2 w-6 h-6 text-primary" inverted />
<span className="select-none font-bold">Chatbot</span>
</div>
{/* @ts-ignore */}
<SidebarList session={session} />
</SheetContent>
</Sheet>
)
}
async function SidebarList({ session }: { session?: Session }) {
const results: Chat[] = await getChats(session?.user?.email ?? '')
return results.map(c => (
<SidebarItem
key={c.id}
title={c.title}
userId={session?.user?.email ?? ''}
href={`/chat/${c.id}`}
id={c.id}
/>
))
}
async function getChats(userId: string) {
try {
const pipeline = kv.pipeline()
const chats: string[] = await kv.zrange(`user:chat:${userId}`, 0, -1)
for (const chat of chats) {
pipeline.hgetall(chat)
}
const results = await pipeline.exec()
return results as Chat[]
} catch (error) {
return []
}
}