Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/app-sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function AppSidebar({ user }: { user: User | undefined }) {
<SidebarContent>
<SidebarHistory user={user} />
</SidebarContent>
<SidebarFooter>{user && <SidebarUserNav user={user} />}</SidebarFooter>
<SidebarFooter>{user && <SidebarUserNav />}</SidebarFooter>
</Sidebar>
);
}
3 changes: 3 additions & 0 deletions components/appkit-account-button.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function AppkitAccountButton() {
return <appkit-account-button balance="hide" />;
}
3 changes: 3 additions & 0 deletions components/appkit-button.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function AppkitButton() {
return <appkit-button />;
}
25 changes: 13 additions & 12 deletions components/chat-header.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
"use client";
'use client';

import { useRouter } from "next/navigation";
import { useWindowSize } from "usehooks-ts";
import { useRouter } from 'next/navigation';
import { memo } from 'react';
import { useWindowSize } from 'usehooks-ts';

import { SidebarToggle } from "@/components/sidebar-toggle";
import { Button } from "@/components/ui/button";
import { PlusIcon } from "./icons";
import { useSidebar } from "./ui/sidebar";
import { memo } from "react";
import { Tooltip, TooltipContent, TooltipTrigger } from "./ui/tooltip";
import ConnectButton from "./connect-button";
import { SidebarToggle } from '@/components/sidebar-toggle';
import { Button } from '@/components/ui/button';

import AppkitButton from './appkit-button';
import { PlusIcon } from './icons';
import { useSidebar } from './ui/sidebar';
import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';

function PureChatHeader() {
const router = useRouter();
Expand All @@ -28,7 +29,7 @@ function PureChatHeader() {
variant="outline"
className="order-2 md:order-1 md:px-2 px-2 md:h-fit ml-auto md:ml-0"
onClick={() => {
router.push("/");
router.push('/');
router.refresh();
}}
>
Expand All @@ -41,7 +42,7 @@ function PureChatHeader() {
)}

<div className="order-4 m-4 md:ml-auto">
<ConnectButton />
<AppkitButton />
</div>
</header>
);
Expand Down
3 changes: 0 additions & 3 deletions components/connect-button.tsx

This file was deleted.

57 changes: 6 additions & 51 deletions components/sidebar-user-nav.tsx
Original file line number Diff line number Diff line change
@@ -1,68 +1,23 @@
'use client';
import { ChevronUp } from 'lucide-react';
import Image from 'next/image';
import type { User } from 'next-auth';
import { signOut } from 'next-auth/react';
import { useTheme } from 'next-themes';

import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import {
SidebarMenu,
SidebarMenuButton,
SidebarMenuItem,
} from '@/components/ui/sidebar';
import { SidebarMenu, SidebarMenuItem } from '@/components/ui/sidebar';

export function SidebarUserNav({ user }: { user: User }) {
const { setTheme, theme } = useTheme();
import AppkitAccountButton from './appkit-account-button';

export function SidebarUserNav() {
return (
<SidebarMenu>
<SidebarMenuItem>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<SidebarMenuButton className="data-[state=open]:bg-sidebar-accent bg-background data-[state=open]:text-sidebar-accent-foreground h-10">
<Image
src={`https://avatar.vercel.sh/${user.email}`}
alt={user.email ?? 'User Avatar'}
width={24}
height={24}
className="rounded-full"
/>
<span className="truncate">{user?.email}</span>
<ChevronUp className="ml-auto" />
</SidebarMenuButton>
<div className="flex justify-center w-full p-1">
<AppkitAccountButton />
</div>
</DropdownMenuTrigger>
<DropdownMenuContent
side="top"
className="w-[--radix-popper-anchor-width]"
>
<DropdownMenuItem
className="cursor-pointer"
onSelect={() => setTheme(theme === 'dark' ? 'light' : 'dark')}
>
{`Toggle ${theme === 'light' ? 'dark' : 'light'} mode`}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem asChild>
<button
type="button"
className="w-full cursor-pointer"
onClick={() => {
signOut({
redirectTo: '/',
});
}}
>
Sign out
</button>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</SidebarMenuItem>
</SidebarMenu>
Expand Down