git.iko.soy/sphinx
on master help sign in
tags: cleanup
080c0f6Hunter Miller
ui/src/components/Layout.tsx+3−3
compare with master
unifiedsplit
@@ -7,9 +7,9 @@ import useMedia from '../logic/useMedia';
7import { BrowsingRoutes, PostingRoutes } from '../routes';
7import { BrowsingRoutes, PostingRoutes } from '../routes';
8import { Meta } from './Meta';
8import { Meta } from './Meta';
9
9
10−const DesktopNavLink = ({ to, children }: NavLinkProps) => (
10+const DesktopNavLink = ({ to, children, ...props }: NavLinkProps) => (
11 <li>
11 <li>
12− <NavLink to={to} className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')}>
12+ <NavLink to={to} className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')} {...props}>
13 { children }
13 { children }
14 </NavLink>
14 </NavLink>
15 </li>
15 </li>
@@ -60,7 +60,7 @@ export const Layout = () => {
60 ) : (
60 ) : (
61 <nav className='w-24 mb-10'>
61 <nav className='w-24 mb-10'>
62 <ul className='font-semibold text-sm space-y-2'>
62 <ul className='font-semibold text-sm space-y-2'>
63− {Object.entries(BrowsingRoutes).map(([k,v]) => <DesktopNavLink key={v} to={v}>{k}</DesktopNavLink>)}
63+ {Object.entries(BrowsingRoutes).map(([k,v]) => <DesktopNavLink key={v} to={v} end={k === 'tags'}>{k}</DesktopNavLink>)}
64 </ul>
64 </ul>
65 <hr className='block my-4 border-mauve/60'/>
65 <hr className='block my-4 border-mauve/60'/>
66 <ul className='font-semibold text-sm space-y-2'>
66 <ul className='font-semibold text-sm space-y-2'>
ui/src/pages/Tag.tsx+2−2
@@ -61,7 +61,7 @@ export const Tag = () => {
61 <div className={cn('h-[136px] overflow-y-auto', tag && 'mb-12')}>
61 <div className={cn('h-[136px] overflow-y-auto', tag && 'mb-12')}>
62 <TagCloud tags={tags} />
62 <TagCloud tags={tags} />
63 </div>
63 </div>
64− <header className='flex items-center justify-between'>
64+ {tag && <header className='flex items-center justify-between'>
65 <h1 className='text-2xl font-semibold leading-none'>{tag}</h1>
65 <h1 className='text-2xl font-semibold leading-none'>{tag}</h1>
66 <Link
66 <Link
67 to={{ pathname: '/manage-listings/post', search: qs.stringify({ tags: [tag] }) }}
67 to={{ pathname: '/manage-listings/post', search: qs.stringify({ tags: [tag] }) }}
@@ -70,7 +70,7 @@ export const Tag = () => {
70 <PlusSmIcon className='w-5 h-5' />
70 <PlusSmIcon className='w-5 h-5' />
71 <span>Add</span>
71 <span>Add</span>
72 </Link>
72 </Link>
73− </header>
73+ </header>}
74 {tag && results && <div className='flex justify-end border-t border-zinc-300'>
74 {tag && results && <div className='flex justify-end border-t border-zinc-300'>
75 <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />
75 <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />
76 </div>}
76 </div>}