Organize markets by creator!! (#14)

This commit is contained in:
James Grugett 2021-12-30 14:03:32 -06:00 committed by GitHub
parent 527a8a8b09
commit f78920c912
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 97 additions and 25 deletions

View File

@ -14,6 +14,8 @@ import { formatMoney } from '../lib/util/format'
import { User } from '../lib/firebase/users'
import { UserLink } from './user-page'
import { Linkify } from './linkify'
import { Col } from './layout/col'
import { SiteLink } from './link'
export function ContractDetails(props: { contract: Contract }) {
const { contract } = props
@ -110,16 +112,63 @@ function ContractsGrid(props: { contracts: Contract[] }) {
)
}
export function CreatorContractsGrid(props: { contracts: Contract[] }) {
const { contracts } = props
const byCreator = _.groupBy(contracts, (contract) => contract.creatorId)
const creatorIds = _.sortBy(Object.keys(byCreator), (creatorId) =>
_.sumBy(byCreator[creatorId], (contract) => -1 * compute(contract).truePool)
)
return (
<Col className="gap-6">
{creatorIds.map((creatorId) => {
const { creatorUsername, creatorName } = byCreator[creatorId][0]
return (
<Col className="gap-6">
<SiteLink href={`/${creatorUsername}`}>{creatorName}</SiteLink>
<ul role="list" className="grid grid-cols-1 gap-6 lg:grid-cols-2">
{byCreator[creatorId].slice(0, 6).map((contract) => (
<ContractCard contract={contract} key={contract.id} />
))}
</ul>
{byCreator[creatorId].length > 6 ? (
<Link href={`/${creatorUsername}`}>
<a
className={clsx(
'self-end hover:underline hover:decoration-indigo-400 hover:decoration-2'
)}
onClick={(e) => e.stopPropagation()}
>
See all
</a>
</Link>
) : (
<div />
)}
</Col>
)
})}
</Col>
)
}
const MAX_CONTRACTS_DISPLAYED = 99
type Sort = 'createdTime' | 'pool' | 'resolved' | 'all'
type Sort = 'creator' | 'createdTime' | 'pool' | 'resolved' | 'all'
export function SearchableGrid(props: {
contracts: Contract[]
defaultSort?: Sort
byOneCreator?: boolean
}) {
const { contracts, defaultSort } = props
const { contracts, defaultSort, byOneCreator } = props
const [query, setQuery] = useState('')
const [sort, setSort] = useState(defaultSort || 'pool')
const [sort, setSort] = useState(
defaultSort || (byOneCreator ? 'pool' : 'creator')
)
function check(corpus: String) {
return corpus.toLowerCase().includes(query.toLowerCase())
@ -134,7 +183,7 @@ export function SearchableGrid(props: {
if (sort === 'createdTime' || sort === 'resolved' || sort === 'all') {
matches.sort((a, b) => b.createdTime - a.createdTime)
} else if (sort === 'pool') {
} else if (sort === 'pool' || sort === 'creator') {
matches.sort((a, b) => compute(b).truePool - compute(a).truePool)
}
@ -164,19 +213,27 @@ export function SearchableGrid(props: {
value={sort}
onChange={(e) => setSort(e.target.value as Sort)}
>
{byOneCreator ? (
<option value="all">All markets</option>
) : (
<option value="creator">By creator</option>
)}
<option value="pool">Most traded</option>
<option value="createdTime">Newest first</option>
<option value="resolved">Resolved</option>
<option value="all">All markets</option>
</select>
</div>
{!byOneCreator && (sort === 'creator' || sort === 'resolved') ? (
<CreatorContractsGrid contracts={matches} />
) : (
<ContractsGrid contracts={matches} />
)}
</div>
)
}
export function ContractsList(props: { creator: User }) {
export function CreatorContractsList(props: { creator: User }) {
const { creator } = props
const [contracts, setContracts] = useState<Contract[] | 'loading'>('loading')
@ -189,5 +246,5 @@ export function ContractsList(props: { creator: User }) {
if (contracts === 'loading') return <></>
return <SearchableGrid contracts={contracts} defaultSort="all" />
return <SearchableGrid contracts={contracts} byOneCreator defaultSort="all" />
}

24
web/components/link.tsx Normal file
View File

@ -0,0 +1,24 @@
import clsx from 'clsx'
import Link from 'next/link'
export const SiteLink = (props: {
href: string
children: any
className?: string
}) => {
const { href, children, className } = props
return (
<Link href={href}>
<a
className={clsx(
'hover:underline hover:decoration-indigo-400 hover:decoration-2',
className
)}
onClick={(e) => e.stopPropagation()}
>
{children}
</a>
</Link>
)
}

View File

@ -1,28 +1,19 @@
import { firebaseLogout, User } from '../lib/firebase/users'
import { ContractsList } from './contracts-list'
import { CreatorContractsList } from './contracts-list'
import { Title } from './title'
import { Row } from './layout/row'
import { formatMoney } from '../lib/util/format'
import Link from 'next/link'
import clsx from 'clsx'
import { SEO } from './SEO'
import { Page } from './page'
import { SiteLink } from './link'
export function UserLink(props: { username: string; className?: string }) {
const { username, className } = props
return (
<Link href={`/${username}`}>
<a
className={clsx(
'hover:underline hover:decoration-indigo-400 hover:decoration-2',
className
)}
onClick={(e) => e.stopPropagation()}
>
<SiteLink href={`/${username}`} className={className}>
@{username}
</a>
</Link>
</SiteLink>
)
}
@ -81,7 +72,7 @@ export function UserPage(props: { user: User; currentUser?: User }) {
<Title text={possesive + 'markets'} />
<ContractsList creator={user} />
<CreatorContractsList creator={user} />
</Page>
)
}

View File

@ -1,7 +1,7 @@
import router from 'next/router'
import { useEffect, useState } from 'react'
import { ContractsList } from '../components/contracts-list'
import { CreatorContractsList } from '../components/contracts-list'
import { Spacer } from '../components/layout/spacer'
import { Title } from '../components/title'
import { useUser } from '../hooks/use-user'
@ -119,7 +119,7 @@ export default function NewContract() {
<Title text="Your markets" />
{creator && <ContractsList creator={creator} />}
{creator && <CreatorContractsList creator={creator} />}
</Page>
)
}