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

merge issue

Browse Source
This commit is contained in:
mantikoros 2022-08-04 22:06:30 -07:00
parent f6b9f74328
commit 935ded939a
1 changed files with 84 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/pages/challenges/index.tsx
View File

@ -27,11 +27,8 @@ import { Button } from 'web/components/button'
import { ClipboardCopyIcon, QrcodeIcon } from '@heroicons/react/outline' import { ClipboardCopyIcon, QrcodeIcon } from '@heroicons/react/outline'
import { copyToClipboard } from 'web/lib/util/copy' import { copyToClipboard } from 'web/lib/util/copy'
import toast from 'react-hot-toast' import toast from 'react-hot-toast'
<<<<<<< HEAD
=======
import { Modal } from 'web/components/layout/modal' import { Modal } from 'web/components/layout/modal'
import { QRCode } from 'web/components/qr-code' import { QRCode } from 'web/components/qr-code'
>>>>>>> 798253f8 (Challenge Bets (#679))
dayjs.extend(customParseFormat) dayjs.extend(customParseFormat)
const columnClass = 'sm:px-5 px-2 py-3.5 max-w-[100px] truncate' const columnClass = 'sm:px-5 px-2 py-3.5 max-w-[100px] truncate'
@ -116,16 +113,13 @@ function YourChallengesTable(props: { links: Challenge[] }) {
function YourLinkSummaryRow(props: { challenge: Challenge }) { function YourLinkSummaryRow(props: { challenge: Challenge }) {
const { challenge } = props const { challenge } = props
const { acceptances } = challenge const { acceptances } = challenge
<<<<<<< HEAD
=======
const [open, setOpen] = React.useState(false) const [open, setOpen] = React.useState(false)
>>>>>>> 798253f8 (Challenge Bets (#679))
const className = clsx( const className = clsx(
'whitespace-nowrap text-sm hover:cursor-pointer text-gray-500 hover:bg-sky-50 bg-white' 'whitespace-nowrap text-sm hover:cursor-pointer text-gray-500 hover:bg-sky-50 bg-white'
) )
return ( return (
<<<<<<< HEAD <>
<tr id={challenge.slug} key={challenge.slug} className={className}> <tr id={challenge.slug} key={challenge.slug} className={className}>
<td className={amountClass}> <td className={amountClass}>
<SiteLink href={getChallengeUrl(challenge)}> <SiteLink href={getChallengeUrl(challenge)}>
@ -194,7 +188,6 @@ function YourLinkSummaryRow(props: { challenge: Challenge }) {
</Row> </Row>
</td> </td>
</tr> </tr>
=======
<> <>
<Modal open={open} setOpen={setOpen} size={'sm'}> <Modal open={open} setOpen={setOpen} size={'sm'}>
<Col <Col
@ -274,7 +267,7 @@ function YourLinkSummaryRow(props: { challenge: Challenge }) {
</td> </td>
</tr> </tr>
</> </>
>>>>>>> 798253f8 (Challenge Bets (#679)) </>
) )
} }