From 022caa4407c9e36b1b0e70a7f179cc0adbe68156 Mon Sep 17 00:00:00 2001
From: Austin Chen <akrolsmir@gmail.com>
Date: Fri, 17 Dec 2021 10:55:18 -0800
Subject: [PATCH] Revert to URLs without `@`

---
 web/components/user-page.tsx   | 3 +--
 web/lib/firebase/contracts.ts  | 2 +-
 web/pages/[username]/index.tsx | 5 +----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index 833b7364..484fa0b9 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -12,11 +12,10 @@ import { SEO } from './SEO'
 
 export function UserLink(props: { displayName: string; className?: string }) {
   const { displayName, className } = props
-  // Fix this when users can change their own names
   const username = displayName.replace(/\s+/g, '')
 
   return (
-    <Link href={`/@${username}`}>
+    <Link href={`/${username}`}>
       <a
         className={clsx(
           'hover:underline hover:decoration-indigo-400 hover:decoration-2',
diff --git a/web/lib/firebase/contracts.ts b/web/lib/firebase/contracts.ts
index 51af4d6c..0d96091e 100644
--- a/web/lib/firebase/contracts.ts
+++ b/web/lib/firebase/contracts.ts
@@ -41,7 +41,7 @@ export function path(contract: Contract) {
   // For now, derive username from creatorName
   // Fix this when users can change their own names
   const username = contract.creatorName.replace(/\s+/g, '')
-  return `/@${username}/${contract.id}`
+  return `/${username}/${contract.id}`
 }
 
 export function compute(contract: Contract) {
diff --git a/web/pages/[username]/index.tsx b/web/pages/[username]/index.tsx
index 2fd0d529..8ff821f4 100644
--- a/web/pages/[username]/index.tsx
+++ b/web/pages/[username]/index.tsx
@@ -8,11 +8,8 @@ import { useUser } from '../../hooks/use-user'
 
 export default function UserProfile() {
   const router = useRouter()
-  const atUsername = router.query.username as string | undefined
-  const username = atUsername?.substring(1) || '' // Remove the initial @
-
   const [user, setUser] = useState<User | null | 'loading'>('loading')
-
+  const { username } = router.query as { username: string }
   useEffect(() => {
     if (username) {
       getUserByUsername(username).then(setUser)