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
244 changes: 0 additions & 244 deletions src/components/nav/menus.tsx

This file was deleted.

43 changes: 34 additions & 9 deletions src/components/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import Link from 'next/link'
import * as React from 'react'
import { Logo } from './logo'
import { copy } from './nav/copy'
import { CommunityMenu, NavMenuGroup, TrainMenu } from './nav/menus'
import { MobileMenu } from './nav/mobile-menu'
import {
StatusCluster,
Expand All @@ -25,11 +24,22 @@ import {
} from './nav/status-cluster'
import { Button } from './ui/button'

function NavLink({ href, label }: { href: string; label: string }) {
function NavLink({
href,
label,
className,
}: {
href: string
label: string
className?: string
}) {
return (
<Link
href={href}
className='text-muted-foreground hover:text-ink hidden px-3 py-2 text-sm font-medium transition-colors duration-200 lg:inline-flex'
className={cn(
'text-muted-foreground hover:text-ink hidden px-3 py-2 text-sm font-medium transition-colors duration-200 lg:inline-flex',
className,
)}
>
<span className='link-underline'>{label}</span>
</Link>
Expand Down Expand Up @@ -80,7 +90,7 @@ export function Navbar() {
>
<div
className={cn(
'rounded-2xl border transition-all duration-300',
'rounded-lg border transition-all duration-300',
scrolled || menuOpen
? 'border-border bg-background/90 shadow-soft backdrop-blur'
: 'border-transparent bg-transparent',
Expand All @@ -95,11 +105,26 @@ export function Navbar() {
<div className='flex items-center gap-5'>
<Logo size='lg' />
<span aria-hidden className='bg-border hidden h-5 w-px lg:block' />
<nav className='hidden items-center gap-1 lg:flex'>
<NavMenuGroup>
<TrainMenu loggedIn={!loading && !!user} />
<CommunityMenu />
</NavMenuGroup>
{/* Flat links: every destination visible at a glance — the
hover dropdowns hid them and read as confusing. */}
<nav className='hidden items-center gap-0.5 lg:flex'>
<NavLink
href={!loading && user ? '/challenge' : '/onboarding'}
label={t.trackCode}
/>
<NavLink
href={!loading && user ? '/design' : '/onboarding'}
label='Design'
/>
<NavLink href='/challenges' label={t.library} />
<NavLink href='/ranking' label={t.ranking} />
{!loading && user && (
<NavLink
href='/solutions'
label={t.solutionsTitle}
className='lg:hidden xl:inline-flex'
/>
)}
</nav>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/features/dashboard/components/dashboard-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export function DashboardView({ user }: { user: User }) {
transition={{ duration: 0.6, ease: EASE }}
className='relative mb-12 overflow-hidden rounded-lg bg-pastel-greige/60 px-6 py-10 sm:px-10 lg:px-12 lg:py-12'
>
<div className='pointer-events-none absolute inset-y-0 right-0 hidden w-[44%] opacity-20 mix-blend-multiply sm:block dark:mix-blend-screen'>
<div className='pointer-events-none absolute -top-2 right-0 hidden h-[58%] w-[44%] opacity-20 mix-blend-multiply sm:block dark:mix-blend-screen'>
<Halftone
draw={glyph('>_', 1.5)}
ambient
Expand Down
Loading