From 45bad1219e5d1257d744997c7b619ba584fe1dc6 Mon Sep 17 00:00:00 2001
From: rleed <101502594+rleed@users.noreply.github.com>
Date: Tue, 15 Aug 2023 13:54:24 -0400
Subject: [PATCH] Fix link to profile matching current URL, not profile (#395)

* break out profile menu and remove top-level href

* group the bio hint with the menu

* rebase/merge

---------

Co-authored-by: rleed <rleed1@pm.me>
---
 components/header.js         | 99 +++++++++++++++++++-----------------
 components/header.module.css |  4 ++
 2 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/components/header.js b/components/header.js
index a3f673a2..3f1f4de0 100644
--- a/components/header.js
+++ b/components/header.js
@@ -1,3 +1,4 @@
+import Dropdown from 'react-bootstrap/Dropdown'
 import Navbar from 'react-bootstrap/Navbar'
 import Nav from 'react-bootstrap/Nav'
 import Link from 'next/link'
@@ -5,7 +6,6 @@ import styles from './header.module.css'
 import { useRouter } from 'next/router'
 import Button from 'react-bootstrap/Button'
 import Container from 'react-bootstrap/Container'
-import NavDropdown from 'react-bootstrap/NavDropdown'
 import Price from './price'
 import { useMe } from './me'
 import Head from 'next/head'
@@ -73,58 +73,63 @@ function NotificationBell () {
   )
 }
 
+function NavProfileMenu ({ me, dropNavKey }) {
+  return (
+    <div className='position-relative'>
+      <Dropdown className={styles.dropdown} align='end'>
+        <Dropdown.Toggle className='nav-link nav-item' id='profile' variant='custom'>
+          <Nav.Link eventKey={me.name} as='span' className='p-0'>
+            {`@${me.name}`}<Hat user={me} />
+          </Nav.Link>
+        </Dropdown.Toggle>
+        <Dropdown.Menu>
+          <Link href={'/' + me.name} passHref legacyBehavior>
+            <Dropdown.Item active={me.name === dropNavKey}>
+              profile
+              {me && !me.bioId &&
+                <div className='p-1 d-inline-block bg-secondary ms-1'>
+                  <span className='invisible'>{' '}</span>
+                </div>}
+            </Dropdown.Item>
+          </Link>
+          <Link href={'/' + me.name + '/bookmarks'} passHref legacyBehavior>
+            <Dropdown.Item active={me.name + '/bookmarks' === dropNavKey}>bookmarks</Dropdown.Item>
+          </Link>
+          <Link href='/wallet' passHref legacyBehavior>
+            <Dropdown.Item eventKey='wallet'>wallet</Dropdown.Item>
+          </Link>
+          <Link href='/satistics?inc=invoice,withdrawal,stacked,spent' passHref legacyBehavior>
+            <Dropdown.Item eventKey='satistics'>satistics</Dropdown.Item>
+          </Link>
+          <Dropdown.Divider />
+          <Link href='/referrals/month' passHref legacyBehavior>
+            <Dropdown.Item eventKey='referrals'>referrals</Dropdown.Item>
+          </Link>
+          <Dropdown.Divider />
+          <div className='d-flex align-items-center'>
+            <Link href='/settings' passHref legacyBehavior>
+              <Dropdown.Item eventKey='settings'>settings</Dropdown.Item>
+            </Link>
+          </div>
+          <Dropdown.Divider />
+          <Dropdown.Item onClick={() => signOut({ callbackUrl: '/' })}>logout</Dropdown.Item>
+        </Dropdown.Menu>
+      </Dropdown>
+      {!me.bioId &&
+        <span className='position-absolute p-1 bg-secondary' style={{ top: '5px', right: '0px' }}>
+          <span className='invisible'>{' '}</span>
+        </span>}
+    </div>
+  )
+}
+
 function StackerCorner ({ dropNavKey }) {
   const me = useMe()
 
   return (
     <div className='d-flex ms-auto'>
       <NotificationBell />
-      <div className='position-relative'>
-        <NavDropdown
-          className={styles.dropdown}
-          title={
-            <Nav.Link eventKey={me.name} as='span' className='p-0' onClick={e => e.preventDefault()}>
-              {`@${me.name}`}<Hat user={me} />
-            </Nav.Link>
-          }
-          align='end'
-        >
-          <Link href={'/' + me.name} passHref legacyBehavior>
-            <NavDropdown.Item active={me.name === dropNavKey}>
-              profile
-              {me && !me.bioId &&
-                <div className='p-1 d-inline-block bg-secondary ms-1'>
-                  <span className='invisible'>{' '}</span>
-                </div>}
-            </NavDropdown.Item>
-          </Link>
-          <Link href={'/' + me.name + '/bookmarks'} passHref legacyBehavior>
-            <NavDropdown.Item active={me.name + '/bookmarks' === dropNavKey}>bookmarks</NavDropdown.Item>
-          </Link>
-          <Link href='/wallet' passHref legacyBehavior>
-            <NavDropdown.Item eventKey='wallet'>wallet</NavDropdown.Item>
-          </Link>
-          <Link href='/satistics?inc=invoice,withdrawal,stacked,spent' passHref legacyBehavior>
-            <NavDropdown.Item eventKey='satistics'>satistics</NavDropdown.Item>
-          </Link>
-          <NavDropdown.Divider />
-          <Link href='/referrals/month' passHref legacyBehavior>
-            <NavDropdown.Item eventKey='referrals'>referrals</NavDropdown.Item>
-          </Link>
-          <NavDropdown.Divider />
-          <div className='d-flex align-items-center'>
-            <Link href='/settings' passHref legacyBehavior>
-              <NavDropdown.Item eventKey='settings'>settings</NavDropdown.Item>
-            </Link>
-          </div>
-          <NavDropdown.Divider />
-          <NavDropdown.Item onClick={() => signOut({ callbackUrl: '/' })}>logout</NavDropdown.Item>
-        </NavDropdown>
-        {!me.bioId &&
-          <span className='position-absolute p-1 bg-secondary' style={{ top: '5px', right: '0px' }}>
-            <span className='invisible'>{' '}</span>
-          </span>}
-      </div>
+      <NavProfileMenu me={me} dropNavKey={dropNavKey} />
       <Nav.Item>
         <Link href='/wallet' passHref legacyBehavior>
           <Nav.Link eventKey='wallet' className='text-success px-0 text-nowrap'><WalletSummary me={me} /></Nav.Link>
diff --git a/components/header.module.css b/components/header.module.css
index 6abd5e10..a650a66e 100644
--- a/components/header.module.css
+++ b/components/header.module.css
@@ -91,4 +91,8 @@
 
 .dropdown>a {
     padding-left: 0 !important;
+}
+
+.dropdown>button {
+    padding-left: 0 !important;
 }
\ No newline at end of file