Remove some divs and so on

This commit is contained in:
Marshall Polaris 2022-08-03 02:45:38 -07:00
parent 1e3c5cb936
commit 0386fc702b
2 changed files with 40 additions and 37 deletions

View File

@ -47,14 +47,21 @@ export function Avatar(props: {
) )
} }
export function EmptyAvatar(props: { size?: number; multi?: boolean }) { export function EmptyAvatar(props: {
const { size = 8, multi } = props className?: string
size?: number
multi?: boolean
}) {
const { className, size = 8, multi } = props
const insize = size - 3 const insize = size - 3
const Icon = multi ? UsersIcon : UserIcon const Icon = multi ? UsersIcon : UserIcon
return ( return (
<div <div
className={`flex flex-shrink-0 h-${size} w-${size} items-center justify-center rounded-full bg-gray-200`} className={clsx(
`flex flex-shrink-0 h-${size} w-${size} items-center justify-center rounded-full bg-gray-200`,
className
)}
> >
<Icon className={`h-${insize} w-${insize} text-gray-500`} aria-hidden /> <Icon className={`h-${insize} w-${insize} text-gray-500`} aria-hidden />
</div> </div>

View File

@ -36,7 +36,6 @@ export function FeedBet(props: {
const isSelf = user?.id === userId const isSelf = user?.id === userId
return ( return (
<>
<Row className={'flex w-full gap-2 pt-3'}> <Row className={'flex w-full gap-2 pt-3'}>
{isSelf ? ( {isSelf ? (
<Avatar <Avatar
@ -53,21 +52,17 @@ export function FeedBet(props: {
username={bettor.username} username={bettor.username}
/> />
) : ( ) : (
<div className="relative px-1"> <EmptyAvatar className="mx-1" />
<EmptyAvatar />
</div>
)} )}
<div className={'min-w-0 flex-1 py-1.5'}>
<BetStatusText <BetStatusText
bet={bet} bet={bet}
contract={contract} contract={contract}
isSelf={isSelf} isSelf={isSelf}
bettor={bettor} bettor={bettor}
hideOutcome={hideOutcome} hideOutcome={hideOutcome}
className="min-w-0 flex-1 py-1.5"
/> />
</div>
</Row> </Row>
</>
) )
} }
@ -77,8 +72,9 @@ export function BetStatusText(props: {
isSelf: boolean isSelf: boolean
bettor?: User bettor?: User
hideOutcome?: boolean hideOutcome?: boolean
className?: string
}) { }) {
const { bet, contract, bettor, isSelf, hideOutcome } = props const { bet, contract, bettor, isSelf, hideOutcome, className } = props
const { outcomeType } = contract const { outcomeType } = contract
const isPseudoNumeric = outcomeType === 'PSEUDO_NUMERIC' const isPseudoNumeric = outcomeType === 'PSEUDO_NUMERIC'
const isFreeResponse = outcomeType === 'FREE_RESPONSE' const isFreeResponse = outcomeType === 'FREE_RESPONSE'
@ -123,7 +119,7 @@ export function BetStatusText(props: {
: formatPercent(bet.limitProb ?? bet.probAfter) : formatPercent(bet.limitProb ?? bet.probAfter)
return ( return (
<div className="text-sm text-gray-500"> <div className={clsx('text-sm text-gray-500', className)}>
{bettor ? ( {bettor ? (
<UserLink name={bettor.name} username={bettor.username} /> <UserLink name={bettor.name} username={bettor.username} />
) : ( ) : (