don't show territory selector; don't redirect to main domain

Author: Soxasora

components/nav/desktop/second-bar.js

@@ -3,16 +3,18 @@ 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, isCustomDomain, sub } = props
   if (!hasNavSelect(props)) return null
   return (
     <Navbar className='pt-0 pb-2'>
       <Nav
         className={styles.navbarNav}
         activeKey={topNavKey}
       >
-        <NavSelect sub={sub} size='medium' className='me-1' />
-        <div className='ms-2 d-flex'><Sorts {...props} className='ms-1' /></div>
+        {!isCustomDomain && <NavSelect sub={sub} size='medium' className='me-1' />}
+        <div className={`${!isCustomDomain ? 'ms-2' : ''} d-flex`}>
+          <Sorts {...props} className={`${!isCustomDomain ? 'ms-1' : ''}`} />
+        </div>
         <PostItem className='ms-auto me-0 d-none d-md-flex' prefix={prefix} />
       </Nav>
     </Navbar>

components/nav/index.js

@@ -19,6 +19,7 @@ export default function Navigation ({ sub }) {
     dropNavKey: isCustomDomain
       ? path.split('/').slice(1).join('/')
       : path.split('/').slice(sub ? 2 : 1).join('/'),
+    isCustomDomain,
     sub
   }
 

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, isCustomDomain }) {
   const { me } = useMe()
+  if (hasNavSelect({ path, pathname }) && isCustomDomain) return null
   return (
     <Navbar>
       <Nav

middleware.js

@@ -70,45 +70,38 @@ export async function customDomainMiddleware (request, referrerResp) {
     return NextResponse.redirect(new URL(cleanPath + url.search, url.origin))
   }
 
-  // if territory path, retain custom domain
-  if (pathname === '/' || TERRITORY_PATHS.some(p => pathname.startsWith(p))) {
-    // if coming from main domain, handle auth automatically
-    if (referer && referer === mainDomain) {
-      const authResp = customDomainAuthMiddleware(request, url)
-      if (authResp && authResp.status !== 200) {
-        // copy referrer cookies to auth redirect
-        console.log('referrerResp', referrerResp)
-        for (const cookie of referrerResp.cookies.getAll()) {
-          authResp.cookies.set(
-            cookie.name,
-            cookie.value,
-            {
-              maxAge: cookie.maxAge,
-              expires: cookie.expires,
-              path: cookie.path
-            }
-          )
-        }
-        return authResp
+  // if coming from main domain, handle auth automatically
+  if (referer && referer === mainDomain) {
+    const authResp = customDomainAuthMiddleware(request, url)
+    if (authResp && authResp.status !== 200) {
+      // copy referrer cookies to auth redirect
+      console.log('referrerResp', referrerResp)
+      for (const cookie of referrerResp.cookies.getAll()) {
+        authResp.cookies.set(
+          cookie.name,
+          cookie.value,
+          {
+            maxAge: cookie.maxAge,
+            expires: cookie.expires,
+            path: cookie.path
+          }
+        )
       }
+      return authResp
     }
+  }
 
-    // TODO: preserve referrer cookies in a DRY way
-
-    const internalUrl = new URL(url)
+  const internalUrl = new URL(url)
 
-    // rewrite to the territory path if we're at the root
+  // rewrite to the territory path if we're at the root
+  if (pathname === '/' || TERRITORY_PATHS.some(p => pathname.startsWith(p))) {
     internalUrl.pathname = `/~${domainInfo.subName}${pathname === '/' ? '' : pathname}`
-    console.log('Rewrite to:', internalUrl.pathname)
-
-    // rewrite to the territory path
-    return NextResponse.rewrite(internalUrl)
   }
+  console.log('Rewrite to:', internalUrl.pathname)
 
-  // redirect to main domain for non-territory paths
-  // create redirect response but preserve referrer cookies
-  const redirectResp = NextResponse.redirect(new URL(pathname, mainDomain))
-
+  // rewrite to the territory path
+  const redirectResp = NextResponse.rewrite(internalUrl)
+  // TODO: preserve referrer cookies in a DRY way
   for (const cookie of referrerResp.cookies.getAll()) {
     redirectResp.cookies.set(
       cookie.name,

pages/~/index.js

@@ -21,9 +21,13 @@ export default function Sub ({ ssrData }) {
   if (!data && !ssrData) return <PageLoading />
   const { sub } = data || ssrData
 
+  const path = router.asPath.split('?')[0]
+  // TODO: this works but it can be better
+  const isCustomDomain = sub && !path.includes(`/~${sub?.name}`)
+
   return (
     <Layout sub={sub?.name}>
-      {sub
+      {sub && !isCustomDomain
         ? <TerritoryHeader sub={sub} />
         : (
           <>