- Notifications
You must be signed in to change notification settings - Fork 0
refactor: adopt Grok-style layout with shadcn/ui sidebar#18
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
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
722c479
refactor: flatten route groups into single root layout
michellepace 2982f54
chore: add shadcn/ui sidebar component with dependencies
michellepace d9ea928
refactor: migrate sidebar to shadcn/ui with cookie persistence
michellepace 84246dc
refactor: adopt Grok-style layout with full-height sidebar
michellepace 202c77b
chore: add bundle analyser script
michellepace f702f3e
style: coderabbit | update gradient syntax to Tailwind v4 format
michellepace File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| "use client"; | ||
| import { SignedIn, UserButton } from "@clerk/nextjs"; | ||
| import Image from "next/image"; | ||
| import Link from "next/link"; | ||
| import { usePathname } from "next/navigation"; | ||
| import { ThemeLogo } from "@/components/navigation/full-logo"; | ||
| import { NAV_LINKS } from "@/components/navigation/nav-links.constants"; | ||
| import { SidebarToggleButton } from "@/components/navigation/sidebar-toggle-button"; | ||
| import { | ||
| Sidebar, | ||
| SidebarContent, | ||
| SidebarFooter, | ||
| SidebarGroup, | ||
| SidebarGroupContent, | ||
| SidebarHeader, | ||
| SidebarMenu, | ||
| SidebarMenuButton, | ||
| SidebarMenuItem, | ||
| SidebarRail, | ||
| } from "@/components/ui/sidebar"; | ||
| import { | ||
| cn, | ||
| getNavIconClasses, | ||
| isRouteActive, | ||
| NAV_LINK_ACTIVE_CLASSES, | ||
| NAV_LINK_INACTIVE_CLASSES, | ||
| } from "@/lib/utils"; | ||
| export function AppSidebar() { | ||
| const pathname = usePathname(); | ||
| return ( | ||
| <Sidebar id="app-sidebar" collapsible="icon"> | ||
| {/* Header: Logo - h-14 matches ContentTopBar height */} | ||
| <SidebarHeader className="h-14 flex-row items-center px-3"> | ||
| <Link | ||
| href="/" | ||
| aria-label="DevFlow sidebar logo" | ||
| className="flex items-center group-data-[collapsible=icon]:size-6 group-data-[collapsible=icon]:justify-center" | ||
| > | ||
| {/* Icon-only when collapsed */} | ||
| {/* biome-ignore lint/a11y/useAltText: Decorative logo, aria-label on parent link */} | ||
| {/* biome-ignore lint/performance/noImgElement: SVG logo doesn't benefit from next/image optimisation */} | ||
| <img | ||
| src="/images/site-logo.svg" | ||
| className="size-6 group-data-[collapsible=icon]:block hidden" | ||
| /> | ||
| {/* Full logo when expanded */} | ||
| <ThemeLogo className="group-data-[collapsible=icon]:hidden" /> | ||
| </Link> | ||
| </SidebarHeader> | ||
| {/* Main Navigation */} | ||
| <SidebarContent> | ||
| <SidebarGroup> | ||
| <SidebarGroupContent> | ||
| <SidebarMenu className="gap-3"> | ||
| {NAV_LINKS.map((link) => { | ||
| const isActive = isRouteActive(pathname, link.route); | ||
| return ( | ||
| <SidebarMenuItem key={link.route}> | ||
| <SidebarMenuButton | ||
| asChild | ||
| isActive={isActive} | ||
| tooltip={link.label} | ||
| className={cn( | ||
| "rounded-lg", | ||
| isActive | ||
| ? `${NAV_LINK_ACTIVE_CLASSES} hover:bg-(image:--gradient-primary) hover:text-primary-foreground` | ||
| : NAV_LINK_INACTIVE_CLASSES, | ||
| )} | ||
michellepace marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| > | ||
| <Link href={link.route}> | ||
| <Image | ||
| src={link.imgURL} | ||
| alt="" | ||
| width={20} | ||
| height={20} | ||
| className={getNavIconClasses(isActive)} | ||
| /> | ||
| <span>{link.label}</span> | ||
| </Link> | ||
| </SidebarMenuButton> | ||
| </SidebarMenuItem> | ||
| ); | ||
| })} | ||
| </SidebarMenu> | ||
| </SidebarGroupContent> | ||
| </SidebarGroup> | ||
| </SidebarContent> | ||
| {/* Footer: UserButton + Toggle */} | ||
| <SidebarFooter className="p-2"> | ||
| <div | ||
| className={cn( | ||
| "flex items-center gap-2", | ||
| // Expanded: horizontal row with space between | ||
| "justify-between", | ||
| // Collapsed (icon mode): vertical stack | ||
| "group-data-[collapsible=icon]:flex-col", | ||
| "group-data-[collapsible=icon]:justify-start", | ||
| )} | ||
| > | ||
| <SignedIn> | ||
| <UserButton /> | ||
| </SignedIn> | ||
| <SidebarToggleButton /> | ||
| </div> | ||
| </SidebarFooter> | ||
| {/* Edge-click rail to toggle */} | ||
| <SidebarRail /> | ||
| </Sidebar> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import { SignedOut, SignInButton, SignUpButton } from "@clerk/nextjs"; | ||
| import { ThemeToggle } from "@/components/navigation/theme-toggle"; | ||
| import { Button } from "@/components/ui/button"; | ||
| import { CONTENT_HORIZONTAL_PADDING, cn, HEADER_HEIGHT } from "@/lib/utils"; | ||
| export function ContentTopBar() { | ||
| return ( | ||
| <header | ||
| className={cn( | ||
| "sticky top-0 z-40 hidden items-center gap-4 border-b bg-background sm:flex", | ||
| HEADER_HEIGHT, | ||
| CONTENT_HORIZONTAL_PADDING, | ||
| )} | ||
| > | ||
| {/* Left: Search - grows and centres */} | ||
| <div className="flex flex-1 justify-center"> | ||
| <p className="text-muted-foreground">Global Search</p> | ||
michellepace marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| </div> | ||
| {/* Right: Theme + Auth - fixed width */} | ||
| <div className="flex flex-none items-center gap-2"> | ||
| <ThemeToggle /> | ||
| <SignedOut> | ||
| <SignInButton> | ||
| <Button variant="ghost">Sign in</Button> | ||
| </SignInButton> | ||
| <SignUpButton> | ||
| <Button>Sign up</Button> | ||
| </SignUpButton> | ||
| </SignedOut> | ||
michellepace marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| </div> | ||
| </header> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import Link from "next/link"; | ||
| import { MobileNav } from "@/components/navigation/mobile-nav"; | ||
| import { ThemeToggle } from "@/components/navigation/theme-toggle"; | ||
| import { cn, HEADER_HEIGHT } from "@/lib/utils"; | ||
| export function MobileHeader() { | ||
| return ( | ||
| <header | ||
| className={cn( | ||
| "fixed top-0 z-50 flex w-full items-center justify-between bg-sidebar px-4 shadow-sm sm:hidden", | ||
| HEADER_HEIGHT, | ||
| )} | ||
| > | ||
| {/* Left: Logo icon */} | ||
| <Link href="/" aria-label="DevFlow mobile logo"> | ||
| {/* biome-ignore lint/a11y/useAltText: Decorative logo, aria-label on parent link */} | ||
| {/* biome-ignore lint/performance/noImgElement: SVG logo doesn't benefit from next/image optimisation */} | ||
| <img src="/images/site-logo.svg" className="size-7" /> | ||
| </Link> | ||
| {/* Right: Theme toggle + hamburger */} | ||
| <div className="flex items-center gap-2"> | ||
| <ThemeToggle /> | ||
| <MobileNav /> | ||
| </div> | ||
| </header> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.