on master help sign in
tags: cleanup
commit080c0f644c495822da039591372c8c5ecfa9c231 authorHunter Miller <hunter@hmiller.dev> dateSat 6 Aug 2022, 17:18 (4 years ago) parent9e0c89f
2 files changed+5−5
ui/src/components/Layout.tsx+3−3 ui/src/pages/Tag.tsx+2−2
ui/src/components/Layout.tsx+3−3
@@ -7,9 +7,9 @@ import useMedia from '../logic/useMedia';
77import { BrowsingRoutes, PostingRoutes } from '../routes';
88import { Meta } from './Meta';
99
10−const DesktopNavLink = ({ to, children }: NavLinkProps) => (
10+const DesktopNavLink = ({ to, children, ...props }: NavLinkProps) => (
1111 <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}>
1313 { children }
1414 </NavLink>
1515 </li>
@@ -60,7 +60,7 @@ export const Layout = () => {
6060 ) : (
6161 <nav className='w-24 mb-10'>
6262 <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>)}
6464 </ul>
6565 <hr className='block my-4 border-mauve/60'/>
6666 <ul className='font-semibold text-sm space-y-2'>
ui/src/pages/Tag.tsx+2−2
@@ -61,7 +61,7 @@ export const Tag = () => {
6161 <div className={cn('h-[136px] overflow-y-auto', tag && 'mb-12')}>
6262 <TagCloud tags={tags} />
6363 </div>
64− <header className='flex items-center justify-between'>
64+ {tag && <header className='flex items-center justify-between'>
6565 <h1 className='text-2xl font-semibold leading-none'>{tag}</h1>
6666 <Link
6767 to={{ pathname: '/manage-listings/post', search: qs.stringify({ tags: [tag] }) }}
@@ -70,7 +70,7 @@ export const Tag = () => {
7070 <PlusSmIcon className='w-5 h-5' />
7171 <span>Add</span>
7272 </Link>
73− </header>
73+ </header>}
7474 {tag && results && <div className='flex justify-end border-t border-zinc-300'>
7575 <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />
7676 </div>}