From 080c0f644c495822da039591372c8c5ecfa9c231 Mon Sep 17 00:00:00 2001
From: Hunter Miller <hunter@hmiller.dev>
Date: Sat, 6 Aug 2022 17:18:00 -0500
Subject: [PATCH] tags: cleanup

---
 ui/src/components/Layout.tsx | 6 +++---
 ui/src/pages/Tag.tsx         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/Layout.tsx b/ui/src/components/Layout.tsx
index c111dc0..7eaff13 100644
--- a/ui/src/components/Layout.tsx
+++ b/ui/src/components/Layout.tsx
@@ -7,9 +7,9 @@ import useMedia from '../logic/useMedia';
 import { BrowsingRoutes, PostingRoutes } from '../routes';
 import { Meta } from './Meta';
 
-const DesktopNavLink = ({ to, children }: NavLinkProps) => (
+const DesktopNavLink = ({ to, children, ...props }: NavLinkProps) => (
   <li>
-    <NavLink to={to} className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')}>
+    <NavLink to={to} className={({ isActive }) => cn('hover:text-rosy transition-colors', isActive && 'underline')} {...props}>
       { children }
     </NavLink>
   </li>
@@ -60,7 +60,7 @@ export const Layout = () => {
         ) : (
           <nav className='w-24 mb-10'>
             <ul className='font-semibold text-sm space-y-2'>
-              {Object.entries(BrowsingRoutes).map(([k,v]) => <DesktopNavLink key={v} to={v}>{k}</DesktopNavLink>)}
+              {Object.entries(BrowsingRoutes).map(([k,v]) => <DesktopNavLink key={v} to={v} end={k === 'tags'}>{k}</DesktopNavLink>)}
             </ul>
             <hr className='block my-4 border-mauve/60'/>
             <ul className='font-semibold text-sm space-y-2'>
diff --git a/ui/src/pages/Tag.tsx b/ui/src/pages/Tag.tsx
index 6f7dc97..0ea068f 100644
--- a/ui/src/pages/Tag.tsx
+++ b/ui/src/pages/Tag.tsx
@@ -61,7 +61,7 @@ export const Tag = () => {
       <div className={cn('h-[136px] overflow-y-auto', tag && 'mb-12')}>
         <TagCloud tags={tags} />
       </div>
-      <header className='flex items-center justify-between'>
+      {tag && <header className='flex items-center justify-between'>
         <h1 className='text-2xl font-semibold leading-none'>{tag}</h1>
         <Link 
           to={{ pathname: '/manage-listings/post', search: qs.stringify({ tags: [tag] }) }}
@@ -70,7 +70,7 @@ export const Tag = () => {
           <PlusSmIcon className='w-5 h-5' />
           <span>Add</span>
         </Link>
-      </header>
+      </header>}
       {tag && results && <div className='flex justify-end border-t border-zinc-300'>
         <Paginator pages={pages} currentPage={pageInt} linkBuilder={linkBuild} />
       </div>}