@@ -328,7 +350,10 @@ function LogoutObstacle ({ onClose }) {
removeLocalWallets()
- await signOut({ callbackUrl: '/' })
+ await signOut({ callbackUrl: '/', redirect: !customDomain })
+ if (customDomain) {
+ router.push('/') // next auth redirect only supports the main domain
+ }
}}
>
logout
diff --git a/components/nav/desktop/second-bar.js b/components/nav/desktop/second-bar.js
index 4120c3065..c6f30a368 100644
--- a/components/nav/desktop/second-bar.js
+++ b/components/nav/desktop/second-bar.js
@@ -3,7 +3,7 @@ import { NavSelect, PostItem, Sorts, hasNavSelect } from '../common'
import styles from '../../header.module.css'
export default function SecondBar (props) {
- const { prefix, topNavKey, sub } = props
+ const { prefix, topNavKey, customDomain, sub } = props
if (!hasNavSelect(props)) return null
return (
@@ -11,8 +11,10 @@ export default function SecondBar (props) {
className={styles.navbarNav}
activeKey={topNavKey}
>
-
-
+ {!customDomain && }
+
+
+
diff --git a/components/nav/index.js b/components/nav/index.js
index beacbd6fc..d58138b21 100644
--- a/components/nav/index.js
+++ b/components/nav/index.js
@@ -3,16 +3,24 @@ import DesktopHeader from './desktop/header'
import MobileHeader from './mobile/header'
import StickyBar from './sticky-bar'
import { PriceCarouselProvider } from './price-carousel'
+import { useDomain } from '@/components/territory-domains'
export default function Navigation ({ sub }) {
const router = useRouter()
+ const { customDomain } = useDomain()
+
const path = router.asPath.split('?')[0]
const props = {
prefix: sub ? `/~${sub}` : '',
path,
pathname: router.pathname,
- topNavKey: path.split('/')[sub ? 2 : 1] ?? '',
- dropNavKey: path.split('/').slice(sub ? 2 : 1).join('/'),
+ topNavKey: customDomain
+ ? path.split('/')[1] ?? ''
+ : path.split('/')[sub ? 2 : 1] ?? '',
+ dropNavKey: customDomain
+ ? path.split('/').slice(1).join('/')
+ : path.split('/').slice(sub ? 2 : 1).join('/'),
+ customDomain,
sub
}
diff --git a/components/nav/mobile/top-bar.js b/components/nav/mobile/top-bar.js
index 7cb13191d..e496858b9 100644
--- a/components/nav/mobile/top-bar.js
+++ b/components/nav/mobile/top-bar.js
@@ -3,8 +3,9 @@ import styles from '../../header.module.css'
import { Back, NavPrice, NavSelect, NavWalletSummary, SignUpButton, hasNavSelect } from '../common'
import { useMe } from '@/components/me'
-export default function TopBar ({ prefix, sub, path, pathname, topNavKey, dropNavKey }) {
+export default function TopBar ({ prefix, sub, path, pathname, topNavKey, dropNavKey, customDomain }) {
const { me } = useMe()
+ if (hasNavSelect({ path, pathname }) && customDomain) return null
return (
}
+ body={
+