Edit home is its own page

web/components/arrange-home.tsx

@@ -30,7 +30,6 @@ export function ArrangeHome(props: {
   return (
     <DragDropContext
       onDragEnd={(e) => {
-        console.log('drag end', e)
         const { destination, source, draggableId } = e
         if (!destination) return
 

web/pages/experimental/home/edit.tsx

@@ -0,0 +1,60 @@
+import clsx from 'clsx'
+import { useState } from 'react'
+import { ArrangeHome } from 'web/components/arrange-home'
+import { Button } from 'web/components/button'
+import { Col } from 'web/components/layout/col'
+import { Row } from 'web/components/layout/row'
+import { Page } from 'web/components/page'
+import { SiteLink } from 'web/components/site-link'
+import { Title } from 'web/components/title'
+import { useTracking } from 'web/hooks/use-tracking'
+import { useUser } from 'web/hooks/use-user'
+import { updateUser } from 'web/lib/firebase/users'
+
+export default function Home() {
+  const user = useUser()
+
+  useTracking('edit home')
+
+  const [homeSections, setHomeSections] = useState(
+    user?.homeSections ?? { visible: [], hidden: [] }
+  )
+
+  const updateHomeSections = (newHomeSections: {
+    visible: string[]
+    hidden: string[]
+  }) => {
+    if (!user) return
+    updateUser(user.id, { homeSections: newHomeSections })
+    setHomeSections(newHomeSections)
+  }
+
+  return (
+    <Page>
+      <Col className="pm:mx-10 gap-4 px-4 pb-12">
+        <Row className={'w-full items-center justify-between'}>
+          <Title text="Edit your home page" />
+          <DoneButton />
+        </Row>
+
+        <ArrangeHome
+          user={user}
+          homeSections={homeSections}
+          setHomeSections={updateHomeSections}
+        />
+      </Col>
+    </Page>
+  )
+}
+
+function DoneButton(props: { className?: string }) {
+  const { className } = props
+
+  return (
+    <SiteLink href="/experimental/home">
+      <Button size="lg" color="blue" className={clsx(className, 'flex')}>
+        Done
+      </Button>
+    </SiteLink>
+  )
+}

web/pages/experimental/home/index.tsx

@@ -11,7 +11,6 @@ import { Page } from 'web/components/page'
 import { Col } from 'web/components/layout/col'
 import { ContractSearch, SORTS } from 'web/components/contract-search'
 import { User } from 'common/user'
-import { updateUser } from 'web/lib/firebase/users'
 import { useTracking } from 'web/hooks/use-tracking'
 import { track } from 'web/lib/service/analytics'
 import { useSaveReferral } from 'web/hooks/use-save-referral'
@@ -21,7 +20,7 @@ import { SiteLink } from 'web/components/site-link'
 import { useUser } from 'web/hooks/use-user'
 import { useMemberGroups } from 'web/hooks/use-group'
 import { Button } from 'web/components/button'
-import { ArrangeHome, getHomeItems } from '../../../components/arrange-home'
+import { getHomeItems } from '../../../components/arrange-home'
 import { Title } from 'web/components/title'
 import { Row } from 'web/components/layout/row'
 import { ProbChangeTable } from 'web/components/contract/prob-change-table'
@@ -36,76 +35,52 @@ const Home = () => {
 
   const groups = useMemberGroups(user?.id) ?? []
 
-  const [homeSections, setHomeSections] = useState(
+  const [homeSections] = useState(
     user?.homeSections ?? { visible: [], hidden: [] }
   )
   const { visibleItems } = getHomeItems(groups, homeSections)
 
-  const updateHomeSections = (newHomeSections: {
-    visible: string[]
-    hidden: string[]
-  }) => {
-    if (!user) return
-    updateUser(user.id, { homeSections: newHomeSections })
-    setHomeSections(newHomeSections)
-  }
-
-  const [isEditing, setIsEditing] = useState(false)
-
   return (
     <Page>
       <Col className="pm:mx-10 gap-4 px-4 pb-12">
         <Row className={'w-full items-center justify-between'}>
-          <Title text={isEditing ? 'Edit your home page' : 'Home'} />
+          <Title text="Home" />
 
-          <EditDoneButton isEditing={isEditing} setIsEditing={setIsEditing} />
+          <EditButton />
         </Row>
 
-        {isEditing ? (
+        <div className="text-xl text-gray-800">Daily movers</div>
-          <>
+        <ProbChangeTable userId={user?.id} />
-            <ArrangeHome
-              user={user}
-              homeSections={homeSections}
-              setHomeSections={updateHomeSections}
-            />
-          </>
-        ) : (
-          <>
-            <div className="text-xl text-gray-800">Daily movers</div>
-            <ProbChangeTable userId={user?.id} />
 
-            {visibleItems.map((item) => {
+        {visibleItems.map((item) => {
-              const { id } = item
+          const { id } = item
-              if (id === 'your-bets') {
+          if (id === 'your-bets') {
-                return (
+            return (
-                  <SearchSection
+              <SearchSection
-                    key={id}
+                key={id}
-                    label={'Your bets'}
+                label={'Your bets'}
-                    sort={'prob-change-day'}
+                sort={'prob-change-day'}
-                    user={user}
+                user={user}
-                    yourBets
+                yourBets
-                  />
+              />
-                )
+            )
-              }
+          }
-              const sort = SORTS.find((sort) => sort.value === id)
+          const sort = SORTS.find((sort) => sort.value === id)
-              if (sort)
+          if (sort)
-                return (
+            return (
-                  <SearchSection
+              <SearchSection
-                    key={id}
+                key={id}
-                    label={sort.label}
+                label={sort.label}
-                    sort={sort.value}
+                sort={sort.value}
-                    user={user}
+                user={user}
-                  />
+              />
-                )
+            )
 
-              const group = groups.find((g) => g.id === id)
+          const group = groups.find((g) => g.id === id)
-              if (group)
+          if (group) return <GroupSection key={id} group={group} user={user} />
-                return <GroupSection key={id} group={group} user={user} />
 
-              return null
+          return null
-            })}
+        })}
-          </>
-        )}
       </Col>
       <button
         type="button"
@@ -175,27 +150,16 @@ function GroupSection(props: { group: Group; user: User | null | undefined }) {
   )
 }
 
-function EditDoneButton(props: {
+function EditButton(props: { className?: string }) {
-  isEditing: boolean
+  const { className } = props
-  setIsEditing: (isEditing: boolean) => void
-  className?: string
-}) {
-  const { isEditing, setIsEditing, className } = props
 
   return (
-    <Button
+    <SiteLink href="/experimental/home/edit">
-      size="lg"
+      <Button size="lg" color="gray-white" className={clsx(className, 'flex')}>
-      color={isEditing ? 'blue' : 'gray-white'}
+        <PencilIcon className={clsx('mr-2 h-[24px] w-5')} aria-hidden="true" />{' '}
-      className={clsx(className, 'flex')}
+        Edit
-      onClick={() => {
+      </Button>
-        setIsEditing(!isEditing)
+    </SiteLink>
-      }}
-    >
-      {!isEditing && (
-        <PencilIcon className={clsx('mr-2 h-[24px] w-5')} aria-hidden="true" />
-      )}
-      {isEditing ? 'Done' : 'Edit'}
-    </Button>
   )
 }