Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: chat navigation #110

Merged
merged 2 commits into from
Apr 8, 2024
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
4 changes: 2 additions & 2 deletions apps/masterbots.ai/app/c/[chatbot]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ export default async function BotThreadsPage({

return (
<>
<ThreadPanel
{/* <ThreadPanel
chatbot={chatbot.name}
search={searchParams}
threads={threads}
/>{' '}
/>{' '} */}
<ChatChatbot chatbot={chatbot} initialMessages={initialMessages} />
</>
)
Expand Down
2 changes: 1 addition & 1 deletion apps/masterbots.ai/app/c/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default async function ChatLayout({ children }: ChatLayoutProps) {
return (
<main className="relative flex flex-col h-[calc(100vh_-_theme(spacing.16))] overflow-hidden">
<ResponsiveSidebar />
{/* <ChatLayoutSection>{children}</ChatLayoutSection> */}
<ChatLayoutSection>{children}</ChatLayoutSection>
<div className="block lg:hidden">
<FooterCT />
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/masterbots.ai/components/layout/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export async function Header() {

return (
<header className="sticky top-0 z-50 w-full border-b shrink-0 bg-gradient-to-b from-background/10 via-background/50 to-background/80 backdrop-blur-xl">
<div className="container flex items-center justify-between px-4 h-16">
<div className="flex items-center justify-between px-4 h-16">
<div className="flex items-center ">
<SidebarToggle />
<HeaderLink href="/" text="Masterbots" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export default function SidebarLink({ category }: { category: Category }) {
'flex items-center pr-5 py-3 cursor-pointer relative origin-left transition-all ease-in-out duration-300',
isChatbotOfThisCategory ? 'text-xs opacity-50' : 'grow pl-5'
)}
href="/"
href="/c"
onClick={handleClickCategory}
shallow
>
Expand Down Expand Up @@ -243,7 +243,7 @@ function ChatbotComponent({
chatbot?.chatbotId === activeChatbot?.chatbotId &&
'dark:bg-slate-800 dark-slate-400'
)}
href={`/${chatbot.name.toLowerCase()}`}
href={`/c/${chatbot.name.toLowerCase()}`}
key={chatbot.chatbotId}
ref={chatbotRef}
>
Expand Down
3 changes: 2 additions & 1 deletion apps/masterbots.ai/components/shared/account-avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export function AccountAvatar({ href, alt, src, size = 32 }: MbAvatarProp) {
)}
href={href}
title={alt}
shallow={true}
>
{src ? (
<Image
Expand All @@ -21,7 +22,7 @@ export function AccountAvatar({ href, alt, src, size = 32 }: MbAvatarProp) {
height={size}
/>
) : (
<IconUser width={32} height={32} />
<IconUser width={size} height={size} />
)}
</Link>
)
Expand Down
Binary file modified bun.lockb
Binary file not shown.
Loading