Add a "Posts" sidebar item to groups

This commit is contained in:
Pico2x 2022-09-20 15:57:56 +01:00
parent 6c3338f5d7
commit d99849f4d8
9 changed files with 110 additions and 8 deletions

View File

@ -10,6 +10,7 @@ export type Group = {
totalContracts: number totalContracts: number
totalMembers: number totalMembers: number
aboutPostId?: string aboutPostId?: string
postIds: string[]
chatDisabled?: boolean chatDisabled?: boolean
mostRecentContractAddedTime?: number mostRecentContractAddedTime?: number
cachedLeaderboard?: { cachedLeaderboard?: {

View File

@ -61,6 +61,7 @@ export const creategroup = newEndpoint({}, async (req, auth) => {
anyoneCanJoin, anyoneCanJoin,
totalContracts: 0, totalContracts: 0,
totalMembers: memberIds.length, totalMembers: memberIds.length,
postIds: [],
} }
await groupRef.create(group) await groupRef.create(group)

View File

@ -41,6 +41,7 @@ const createGroup = async (
anyoneCanJoin: true, anyoneCanJoin: true,
totalContracts: contracts.length, totalContracts: contracts.length,
totalMembers: 1, totalMembers: 1,
postIds: [],
} }
await groupRef.create(group) await groupRef.create(group)
// create a GroupMemberDoc for the creator // create a GroupMemberDoc for the creator

View File

@ -1,5 +1,4 @@
import * as admin from 'firebase-admin' import * as admin from 'firebase-admin'
import fetch from 'node-fetch'
import { chunk } from 'lodash' import { chunk } from 'lodash'
import { Contract } from '../../common/contract' import { Contract } from '../../common/contract'

View File

@ -1,4 +1,4 @@
import { ClipboardIcon, HomeIcon } from '@heroicons/react/outline' import { ChatAlt2Icon, ClipboardIcon, HomeIcon } from '@heroicons/react/outline'
import clsx from 'clsx' import clsx from 'clsx'
import { useUser } from 'web/hooks/use-user' import { useUser } from 'web/hooks/use-user'
import { ManifoldLogo } from './manifold-logo' import { ManifoldLogo } from './manifold-logo'
@ -17,6 +17,7 @@ const groupNavigation = [
{ name: 'Markets', key: 'markets', icon: HomeIcon }, { name: 'Markets', key: 'markets', icon: HomeIcon },
{ name: 'About', key: 'about', icon: ClipboardIcon }, { name: 'About', key: 'about', icon: ClipboardIcon },
{ name: 'Leaderboard', key: 'leaderboards', icon: TrophyIcon }, { name: 'Leaderboard', key: 'leaderboards', icon: TrophyIcon },
{ name: 'Posts', key: 'posts', icon: ChatAlt2Icon },
] ]
const generalNavigation = (user?: User | null) => const generalNavigation = (user?: User | null) =>

View File

@ -11,3 +11,19 @@ export const usePost = (postId: string | undefined) => {
return post return post
} }
export const usePosts = (postIds: string[]) => {
const [posts, setPosts] = useState<Post[]>([])
useEffect(() => {
if (postIds.length === 0) return
postIds.map((postId) =>
listenForPost(postId, (post) => {
if (post) setPosts((posts) => [...posts, post])
})
)
}, [postIds])
return posts
}

View File

@ -43,6 +43,7 @@ export function groupPath(
| 'about' | 'about'
| typeof GROUP_CHAT_SLUG | typeof GROUP_CHAT_SLUG
| 'leaderboards' | 'leaderboards'
| 'posts'
) { ) {
return `/group/${groupSlug}${subpath ? `/${subpath}` : ''}` return `/group/${groupSlug}${subpath ? `/${subpath}` : ''}`
} }

View File

@ -39,3 +39,8 @@ export function listenForPost(
) { ) {
return listenForValue(doc(posts, postId), setPost) return listenForValue(doc(posts, postId), setPost)
} }
export async function listPosts(postIds?: string[]) {
if (postIds === undefined) return []
return Promise.all(postIds.map(getPost))
}

View File

@ -16,7 +16,7 @@ import {
import { Row } from 'web/components/layout/row' import { Row } from 'web/components/layout/row'
import { firebaseLogin, getUser, User } from 'web/lib/firebase/users' import { firebaseLogin, getUser, User } from 'web/lib/firebase/users'
import { Col } from 'web/components/layout/col' import { Col } from 'web/components/layout/col'
import { useUser } from 'web/hooks/use-user' import { useUser, useUserById } from 'web/hooks/use-user'
import { import {
useGroup, useGroup,
useGroupContractIds, useGroupContractIds,
@ -42,10 +42,10 @@ import { GroupComment } from 'common/comment'
import { REFERRAL_AMOUNT } from 'common/economy' import { REFERRAL_AMOUNT } from 'common/economy'
import { UserLink } from 'web/components/user-link' import { UserLink } from 'web/components/user-link'
import { GroupAboutPost } from 'web/components/groups/group-about-post' import { GroupAboutPost } from 'web/components/groups/group-about-post'
import { getPost } from 'web/lib/firebase/posts' import { getPost, listPosts, postPath } from 'web/lib/firebase/posts'
import { Post } from 'common/post' import { Post } from 'common/post'
import { Spacer } from 'web/components/layout/spacer' import { Spacer } from 'web/components/layout/spacer'
import { usePost } from 'web/hooks/use-post' import { usePost, usePosts } from 'web/hooks/use-post'
import { useAdmin } from 'web/hooks/use-admin' import { useAdmin } from 'web/hooks/use-admin'
import { track } from '@amplitude/analytics-browser' import { track } from '@amplitude/analytics-browser'
import { GroupNavBar } from 'web/components/nav/group-nav-bar' import { GroupNavBar } from 'web/components/nav/group-nav-bar'
@ -53,6 +53,9 @@ import { ArrowLeftIcon } from '@heroicons/react/solid'
import { GroupSidebar } from 'web/components/nav/group-sidebar' import { GroupSidebar } from 'web/components/nav/group-sidebar'
import { SelectMarketsModal } from 'web/components/contract-select-modal' import { SelectMarketsModal } from 'web/components/contract-select-modal'
import { BETTORS } from 'common/user' import { BETTORS } from 'common/user'
import { Avatar } from 'web/components/avatar'
import { Title } from 'web/components/title'
import { fromNow } from 'web/lib/util/time'
export const getStaticProps = fromPropz(getStaticPropz) export const getStaticProps = fromPropz(getStaticPropz)
export async function getStaticPropz(props: { params: { slugs: string[] } }) { export async function getStaticPropz(props: { params: { slugs: string[] } }) {
@ -70,7 +73,8 @@ export async function getStaticPropz(props: { params: { slugs: string[] } }) {
? 'all' ? 'all'
: 'open' : 'open'
const aboutPost = const aboutPost =
group && group.aboutPostId != null && (await getPost(group.aboutPostId)) group && group.aboutPostId != null ? await getPost(group.aboutPostId) : null
const messages = group && (await listAllCommentsOnGroup(group.id)) const messages = group && (await listAllCommentsOnGroup(group.id))
const cachedTopTraderIds = const cachedTopTraderIds =
@ -83,6 +87,9 @@ export async function getStaticPropz(props: { params: { slugs: string[] } }) {
const creator = await creatorPromise const creator = await creatorPromise
const posts = ((group && (await listPosts(group.postIds))) ?? []).filter(
(p) => p != null
) as Post[]
return { return {
props: { props: {
group, group,
@ -93,6 +100,7 @@ export async function getStaticPropz(props: { params: { slugs: string[] } }) {
messages, messages,
aboutPost, aboutPost,
suggestedFilter, suggestedFilter,
posts,
}, },
revalidate: 60, // regenerate after a minute revalidate: 60, // regenerate after a minute
@ -107,6 +115,7 @@ const groupSubpages = [
'markets', 'markets',
'leaderboards', 'leaderboards',
'about', 'about',
'posts',
] as const ] as const
export default function GroupPage(props: { export default function GroupPage(props: {
@ -118,6 +127,7 @@ export default function GroupPage(props: {
messages: GroupComment[] messages: GroupComment[]
aboutPost: Post aboutPost: Post
suggestedFilter: 'open' | 'all' suggestedFilter: 'open' | 'all'
posts: Post[]
}) { }) {
props = usePropz(props, getStaticPropz) ?? { props = usePropz(props, getStaticPropz) ?? {
group: null, group: null,
@ -127,8 +137,9 @@ export default function GroupPage(props: {
topCreators: [], topCreators: [],
messages: [], messages: [],
suggestedFilter: 'open', suggestedFilter: 'open',
posts: [],
} }
const { creator, topTraders, topCreators, suggestedFilter } = props const { creator, topTraders, topCreators, suggestedFilter, posts } = props
const router = useRouter() const router = useRouter()
const { slugs } = router.query as { slugs: string[] } const { slugs } = router.query as { slugs: string[] }
@ -136,13 +147,14 @@ export default function GroupPage(props: {
const group = useGroup(props.group?.id) ?? props.group const group = useGroup(props.group?.id) ?? props.group
const aboutPost = usePost(props.aboutPost?.id) ?? props.aboutPost const aboutPost = usePost(props.aboutPost?.id) ?? props.aboutPost
const groupPosts = [...(usePosts(group?.postIds ?? []) ?? posts), aboutPost]
const user = useUser() const user = useUser()
const isAdmin = useAdmin() const isAdmin = useAdmin()
const memberIds = useMemberIds(group?.id ?? null) ?? props.memberIds const memberIds = useMemberIds(group?.id ?? null) ?? props.memberIds
// Note: Keep in sync with sidebarPages // Note: Keep in sync with sidebarPages
const [sidebarIndex, setSidebarIndex] = useState( const [sidebarIndex, setSidebarIndex] = useState(
['markets', 'leaderboards', 'about'].indexOf(page ?? 'markets') ['markets', 'leaderboards', 'about', 'posts'].indexOf(page ?? 'markets')
) )
useSaveReferral(user, { useSaveReferral(user, {
@ -176,6 +188,14 @@ export default function GroupPage(props: {
</Col> </Col>
) )
const postsPage = (
<Col>
<div className="mt-4 flex flex-col gap-8 px-4 md:flex-row">
{posts && <GroupPosts posts={groupPosts} />}
</div>
</Col>
)
const aboutPage = ( const aboutPage = (
<Col> <Col>
{(group.aboutPostId != null || isCreator || isAdmin) && ( {(group.aboutPostId != null || isCreator || isAdmin) && (
@ -238,6 +258,12 @@ export default function GroupPage(props: {
href: groupPath(group.slug, 'about'), href: groupPath(group.slug, 'about'),
key: 'about', key: 'about',
}, },
{
title: 'Posts',
content: postsPage,
href: groupPath(group.slug, 'posts'),
key: 'posts',
},
] ]
const pageContent = sidebarPages[sidebarIndex].content const pageContent = sidebarPages[sidebarIndex].content
@ -461,6 +487,57 @@ function GroupLeaderboard(props: {
) )
} }
function GroupPosts(props: { posts: Post[] }) {
const { posts } = props
return (
<div className="grid grid-cols-1 gap-2">
<Title text={'Posts'} className="!mt-0" />
<div className="mt-2">
{posts.map((post) => (
<PostCard post={post} />
))}
</div>
</div>
)
}
function PostCard(props: { post: Post }) {
const { post } = props
const creatorId = post.creatorId
const user = useUserById(creatorId)
if (!user) return <> </>
return (
<div>
<Link href={postPath(post.slug)}>
<Row
className={
'relative gap-3 rounded-lg bg-white p-2 shadow-md hover:cursor-pointer hover:bg-gray-100'
}
>
<div className="flex-shrink-0">
<Avatar className="h-12 w-12" username={user?.username} />
</div>
<div className="">
<div className="text-sm text-gray-500">
<UserLink
className="text-neutral"
name={user?.name}
username={user?.username}
/>
<span className="mx-1"></span>
<span className="text-gray-500">{fromNow(post.createdTime)}</span>
</div>
<div className="text-lg font-medium text-gray-900">
{post.title}
</div>
</div>
</Row>
</Link>
</div>
)
}
function AddContractButton(props: { group: Group; user: User }) { function AddContractButton(props: { group: Group; user: User }) {
const { group, user } = props const { group, user } = props
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)