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.

Sign up for GitHub

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

Jump to bottom

feat: reorganize navigation menu for mobile view #298

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

feat: reorganize navigation menu for mobile view #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b7c24d
feat: reorganize navigation menu for mobile view
AnoukRImola Oct 30, 2024
9132214
UI: add sideBar style
AnoukRImola Oct 31, 2024
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
3 changes: 2 additions & 1 deletion apps/masterbots.ai/components/auth/user-login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { UserMenu } from '@/components/layout/header/user-menu'
import { Button } from '@/components/ui/button'
import Link from 'next/link'
import { isTokenExpired } from 'mb-lib'
import { ProfileSidebar } from '@/components/layout/sidebar/profile-sidebar'

export function UserLogin() {
const { data: session, status } = useSession()
Expand All @@ -25,7 +26,7 @@ export function UserLogin() {
return <LoginButton />
}

return <UserMenu user={session.user} />
return <ProfileSidebar user={session.user} />
}

return <LoginButton />
Expand Down
23 changes: 13 additions & 10 deletions apps/masterbots.ai/components/layout/header/header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,19 @@ export function Header() {
<SidebarToggle />
</React.Suspense>
<HeaderLink href="/" text="MB" />
<IconSeparator className="size-6 text-muted-foreground/50" />
<HeaderLink href="/c" text="Chat" />
<HeaderLink href="/" text="Browse" />

{appConfig.devMode && (
<>
<HeaderLink href="/wordware" text="Ww" />
<HeaderLink href="/c/p" text="Pro" />
</>
)}

{/* Navigation links - Hidden on mobile */}
<div className="hidden lg:flex lg:items-center">
<IconSeparator className="size-6 text-muted-foreground/50" />
<HeaderLink href="/c" text="Chat" />

{appConfig.devMode && (
<>
<HeaderLink href="/c/p" text="Pro" />
<HeaderLink href="/wordware" text="Ww" />
</>
)}
</div>
</div>
<div className="flex items-center justify-end space-x-2 gap-2">
<ThemeToggle />
Expand Down
143 changes: 143 additions & 0 deletions apps/masterbots.ai/components/layout/sidebar/profile-sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
'use client'

import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet'
import { Button } from '@/components/ui/button'
import { signOut } from 'next-auth/react'
import Image from 'next/image'
import { appConfig } from 'mb-env'
import type { Session } from 'next-auth'
import { useState, useCallback } from 'react'
import { useRouter } from 'next/navigation'

interface ProfileSidebarProps {
user: Session['user'] & {
hasuraJwt?: string
}
}

function getUserInitials(name: string) {
const [firstName, lastName] = name.split(' ')
return lastName ? `${firstName[0]}${lastName[0]}` : firstName.slice(0, 2)
}

export function ProfileSidebar({ user }: ProfileSidebarProps) {
const [isOpen, setIsOpen] = useState(false)
const router = useRouter()

const handleNavigation = (path: string) => {
setIsOpen(false)
router.push(path)
}

const handleLogout = useCallback(async () => {
try {
setIsOpen(false)
await new Promise(resolve => setTimeout(resolve, 100))
await signOut({ callbackUrl: '/' })
} catch (error) {
console.error('Logout error:', error)
window.location.href = '/'
}
}, [])

return (
<Sheet open={isOpen} onOpenChange={setIsOpen}>
<SheetTrigger asChild>
<Button variant="ghost" className="pl-0 rounded-full">
{user?.image ? (
<Image
className="transition-opacity duration-300 rounded-full select-none size-8 bg-foreground/10 ring-1 ring-zinc-100/10 hover:opacity-80"
src={user?.image ? user.image : ''}
alt={user.name ?? 'Avatar'}
height={32}
width={32}
priority
/>
) : (
<div className="flex items-center justify-center text-xs font-medium uppercase rounded-full select-none size-7 shrink-0 bg-muted/50 text-muted-foreground">
{user?.name ? getUserInitials(user?.name) : null}
</div>
)}
<span className="ml-2 hidden md:inline-block">{user?.name}</span>
</Button>
</SheetTrigger>
<SheetContent side="right" className="w-[300px] sm:w-[400px] p-0">
<div className="flex flex-col h-full">
{/* Profile Header */}
<div className="p-4 border-b">
<div className="flex items-center space-x-3">
{user?.image ? (
<Image
className="rounded-full size-10"
src={user.image}
alt={user.name ?? 'Avatar'}
height={40}
width={40}
priority
/>
) : (
<div className="flex items-center justify-center text-sm font-medium uppercase rounded-full size-10 bg-muted/50">
{user?.name ? getUserInitials(user?.name) : null}
</div>
)}
<div className="space-y-1">
<p className="text-sm font-medium">{user?.name}</p>
<p className="text-xs text-muted-foreground">{user?.email}</p>
</div>
</div>
</div>

{/* Navigation Links - Only visible on mobile */}
<nav className="flex flex-col p-4 lg:hidden">
<Button
variant="ghost"
className="w-full justify-start text-sm"
onClick={() => handleNavigation('/c')}
>
Chat
</Button>

{appConfig.devMode && (
<Button
variant="ghost"
className="w-full justify-start text-sm"
onClick={() => handleNavigation('/c/p')}
>
Pro
</Button>
)}

<Button
variant="ghost"
className="w-full justify-start text-sm"
onClick={() => handleNavigation('/')}
>
Browse
</Button>

{appConfig.devMode && (
<Button
variant="ghost"
className="w-full justify-start text-sm"
onClick={() => handleNavigation('/wordware')}
>
Ww
</Button>
)}
</nav>

{/* Logout Button */}
<div className="mt-auto p-4 border-t">
<Button
variant="ghost"
className="w-full justify-start text-sm"
onClick={handleLogout}
>
Log Out
</Button>
</div>
</div>
</SheetContent>
</Sheet>
)
}
4 changes: 2 additions & 2 deletions apps/masterbots.ai/components/ui/dropdown-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const DropdownMenuSubContent = React.forwardRef<
<DropdownMenuPrimitive.SubContent
ref={ref}
className={cn(
'z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md animate-in data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1',
'z-50 min-w-32 overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md animate-in data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1',
className
)}
{...props}
Expand All @@ -42,7 +42,7 @@ const DropdownMenuContent = React.forwardRef<
ref={ref}
sideOffset={sideOffset}
className={cn(
'z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow animate-in data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
'z-50 min-w-32 overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow animate-in data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
className
)}
{...props}
Expand Down