WIP - got comments on the user page

web/components/feed/feed-items.tsx

@@ -50,6 +50,7 @@ import { trackClick } from '../../lib/firebase/tracking'
 import { firebaseLogin } from '../../lib/firebase/users'
 import { DAY_MS } from '../../../common/util/time'
 import NewContractBadge from '../new-contract-badge'
+import { RelativeTimestamp } from '../relative-timestamp'
 
 export function FeedItems(props: {
   contract: Contract
@@ -180,17 +181,6 @@ export function FeedComment(props: {
   )
 }
 
-function RelativeTimestamp(props: { time: number }) {
-  const { time } = props
-  return (
-    <DateTimeTooltip time={time}>
-      <span className="ml-1 whitespace-nowrap text-gray-400">
-        {fromNow(time)}
-      </span>
-    </DateTimeTooltip>
-  )
-}
-
 export function CommentInput(props: { contract: Contract }) {
   // see if we can comment input on any bet:
   const { contract } = props

web/components/relative-timestamp.tsx

@@ -0,0 +1,14 @@
+import { DateTimeTooltip } from './datetime-tooltip'
+import { fromNow } from '../lib/util/time'
+import React from 'react'
+
+export function RelativeTimestamp(props: { time: number }) {
+  const { time } = props
+  return (
+    <DateTimeTooltip time={time}>
+      <span className="ml-1 whitespace-nowrap text-gray-400">
+        {fromNow(time)}
+      </span>
+    </DateTimeTooltip>
+  )
+}

web/components/user-page.tsx

@@ -12,6 +12,13 @@ import { Row } from './layout/row'
 import { LinkIcon } from '@heroicons/react/solid'
 import { genHash } from '../../common/util/random'
 import { PencilIcon } from '@heroicons/react/outline'
+import { Tabs } from './layout/tabs'
+import React, { useEffect, useState } from 'react'
+import { Comment } from '../../common/comment'
+import { getUsersComments } from '../lib/firebase/comments'
+import { Bet } from '../../common/bet'
+import { formatMoney } from '../../common/util/format'
+import { RelativeTimestamp } from './relative-timestamp'
 
 export function UserLink(props: {
   name: string
@@ -33,7 +40,20 @@ export function UserPage(props: { user: User; currentUser?: User }) {
   const { user, currentUser } = props
   const isCurrentUser = user.id === currentUser?.id
   const bannerUrl = user.bannerUrl ?? defaultBannerUrl(user.id)
+  const [comments, setComments] = useState<Comment[]>([] as Comment[])
 
+  useEffect(() => {
+    if (user) {
+      getUsersComments(user.id).then(setComments)
+    }
+  }, [user])
+
+  const items = comments
+    .sort((a, b) => b.createdTime - a.createdTime)
+    .map((comment) => ({
+      comment,
+      bet: undefined,
+    }))
   return (
     <Page>
       <SEO
@@ -138,8 +158,28 @@ export function UserPage(props: { user: User; currentUser?: User }) {
         </Col>
 
         <Spacer h={10} />
-
+        <Tabs
-        <CreatorContractsList creator={user} />
+          tabs={[
+            {
+              title: 'Markets',
+              content: <CreatorContractsList creator={user} />,
+            },
+            {
+              title: 'Comments',
+              content: (
+                <>
+                  {items.map((item, activityItemIdx) => (
+                    <div key={item.comment.id} className={'relative pb-6'}>
+                      <div className="relative flex items-start space-x-3">
+                        <ProfileComment comment={item.comment} bet={item.bet} />
+                      </div>
+                    </div>
+                  ))}
+                </>
+              ),
+            },
+          ]}
+        />
       </Col>
     </Page>
   )
@@ -157,3 +197,35 @@ export function defaultBannerUrl(userId: string) {
   ]
   return defaultBanner[genHash(userId)() % defaultBanner.length]
 }
+
+function ProfileComment(props: { comment: Comment; bet: Bet | undefined }) {
+  const { comment, bet } = props
+  let money: string | undefined
+  let outcome: string | undefined
+  let bought: string | undefined
+  if (bet) {
+    outcome = bet.outcome
+    bought = bet.amount >= 0 ? 'bought' : 'sold'
+    money = formatMoney(Math.abs(bet.amount))
+  }
+  const { text, userUsername, userName, userAvatarUrl, createdTime } = comment
+
+  return (
+    <>
+      <Avatar username={userUsername} avatarUrl={userAvatarUrl} />
+      <div className="min-w-0 flex-1">
+        <div>
+          <p className="mt-0.5 text-sm text-gray-500">
+            <UserLink
+              className="text-gray-500"
+              username={userUsername}
+              name={userName}
+            />{' '}
+            <RelativeTimestamp time={createdTime} />
+          </p>
+        </div>
+        {text}
+      </div>
+    </>
+  )
+}

web/lib/firebase/comments.ts

@@ -121,3 +121,11 @@ export async function getDailyComments(
 
   return commentsByDay
 }
+
+// TODO: add firebase index for comments - userid
+export async function getUsersComments(userId: string) {
+  const getUsersCommentsQuery = (userId: string) =>
+    query(collectionGroup(db, 'comments'), where('userId', '==', userId))
+  const comments = await getValues<Comment>(getUsersCommentsQuery(userId))
+  return comments
+}