open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
mantikoros 2022-08-04 21:37:58 -07:00
parent 277352a64e
commit 8f17284707
1 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
web/components/contract/contract-overview.tsx
View File

@ -1,11 +1,9 @@
<<<<<<< HEAD
import React from 'react' import React from 'react'
import clsx from 'clsx' import clsx from 'clsx'
import toast from 'react-hot-toast'
import { LinkIcon } from '@heroicons/react/outline'
import { tradingAllowed } from 'web/lib/firebase/contracts'
=======
import { contractUrl, tradingAllowed } from 'web/lib/firebase/contracts' import { contractUrl, tradingAllowed } from 'web/lib/firebase/contracts'
>>>>>>> 798253f8 (Challenge Bets (#679))
import { Col } from '../layout/col' import { Col } from '../layout/col'
import { Spacer } from '../layout/spacer' import { Spacer } from '../layout/spacer'
import { ContractProbGraph } from './contract-prob-graph' import { ContractProbGraph } from './contract-prob-graph'
@ -25,16 +23,10 @@ import { Contract, CPMMBinaryContract } from 'common/contract'
import { ContractDescription } from './contract-description' import { ContractDescription } from './contract-description'
import { ContractDetails } from './contract-details' import { ContractDetails } from './contract-details'
import { NumericGraph } from './numeric-graph' import { NumericGraph } from './numeric-graph'
<<<<<<< HEAD
import { ShareRow } from './share-row' import { ShareRow } from './share-row'
=======
import { CreateChallengeButton } from 'web/components/challenges/create-challenge-button' import { CreateChallengeButton } from 'web/components/challenges/create-challenge-button'
import React from 'react'
import { copyToClipboard } from 'web/lib/util/copy' import { copyToClipboard } from 'web/lib/util/copy'
import toast from 'react-hot-toast'
import { LinkIcon } from '@heroicons/react/outline'
import { CHALLENGES_ENABLED } from 'common/challenge' import { CHALLENGES_ENABLED } from 'common/challenge'
>>>>>>> 798253f8 (Challenge Bets (#679))
export const ContractOverview = (props: { export const ContractOverview = (props: {
contract: Contract contract: Contract
@ -132,51 +124,12 @@ export const ContractOverview = (props: {
<AnswersGraph contract={contract} bets={bets} /> <AnswersGraph contract={contract} bets={bets} />
)} )}
{outcomeType === 'NUMERIC' && <NumericGraph contract={contract} />} {outcomeType === 'NUMERIC' && <NumericGraph contract={contract} />}
<<<<<<< HEAD
<ShareRow user={user} contract={contract} /> <ShareRow user={user} contract={contract} />
=======
{/* {(contract.description || isCreator) && <Spacer h={6} />} */}
>>>>>>> 798253f8 (Challenge Bets (#679))
<ContractDescription <ContractDescription
className="px-2" className="px-2"
contract={contract} contract={contract}
isCreator={isCreator} isCreator={isCreator}
/> />
{/*<Row className="mx-4 mt-4 hidden justify-around sm:block">*/}
{/* {showChallenge && (*/}
{/* <Col className="gap-3">*/}
{/* <div className="text-lg">⚔️ Challenge a friend ⚔️</div>*/}
{/* <CreateChallengeButton user={user} contract={contract} />*/}
{/* </Col>*/}
{/* )}*/}
{/* {isCreator && (*/}
{/* <Col className="gap-3">*/}
{/* <div className="text-lg">Share your market</div>*/}
{/* <ShareMarketButton contract={contract} />*/}
{/* </Col>*/}
{/* )}*/}
{/*</Row>*/}
<Row className="mx-4 mt-6 block justify-around">
{showChallenge && (
<Col className="gap-3">
<CreateChallengeButton user={user} contract={contract} />
</Col>
)}
{isCreator && (
<Col className="gap-3">
<button
onClick={() => {
copyToClipboard(contractUrl(contract))
toast('Link copied to clipboard!')
}}
className={'btn btn-outline mb-4 whitespace-nowrap normal-case'}
>
<LinkIcon className={'mr-2 h-5 w-5'} />
Share market
</button>
</Col>
)}
</Row>
</Col> </Col>
) )
} }