1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00

put back price conversion component

This commit is contained in:
Matthias Kretschmann 2020-07-13 23:45:20 +02:00
parent 81950413ad
commit e06e743320
Signed by: m
GPG Key ID: 606EEEF3C479A91F
10 changed files with 99 additions and 20 deletions

15
package-lock.json generated
View File

@ -31934,6 +31934,21 @@
} }
} }
}, },
"swr": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/swr/-/swr-0.2.3.tgz",
"integrity": "sha512-JhuuD5ojqgjAQpZAhoPBd8Di0Mr1+ykByVKuRJdtKaxkUX/y8kMACWKkLgLQc8pcDOKEAnbIreNjU7HfqI9nHQ==",
"requires": {
"fast-deep-equal": "2.0.1"
},
"dependencies": {
"fast-deep-equal": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
}
}
},
"symbol-observable": { "symbol-observable": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",

View File

@ -68,6 +68,7 @@
"react-toastify": "^6.0.8", "react-toastify": "^6.0.8",
"shortid": "^2.2.15", "shortid": "^2.2.15",
"slugify": "^1.4.4", "slugify": "^1.4.4",
"swr": "^0.2.3",
"web3connect": "^1.0.0-beta.33", "web3connect": "^1.0.0-beta.33",
"yup": "^0.29.1" "yup": "^0.29.1"
}, },

View File

@ -0,0 +1,6 @@
.conversion {
display: inline-block;
font-size: var(--font-size-mini);
margin-left: calc(var(--spacer) / 6);
color: var(--color-secondary);
}

View File

@ -0,0 +1,49 @@
import React, { useEffect, useState, ReactElement } from 'react'
import useSWR from 'swr'
import { fetchData, isBrowser } from '../../../utils'
import styles from './Conversion.module.css'
const currencies = 'EUR' // comma-separated list
const url = `https://api.coingecko.com/api/v3/simple/price?ids=ocean-protocol&vs_currencies=${currencies}&include_24hr_change=true`
export default function Conversion({
price,
update = true
}: {
price: string // expects price in OCEAN, not wei
update?: boolean
}): ReactElement {
const [priceEur, setPriceEur] = useState('0.00')
const onSuccess = async (data: { 'ocean-protocol': { eur: number } }) => {
if (!data) return
if (!price || price === '' || price === '0') {
setPriceEur('0.00')
return
}
const { eur } = data['ocean-protocol']
const converted = eur * Number(price)
setPriceEur(`${converted.toFixed(2)}`)
}
useEffect(() => {
async function getData() {
const data = await fetchData(url)
await onSuccess(data)
}
if (isBrowser && price !== '0') {
getData()
}
}, [price])
if (update) {
// Fetch new prices periodically with swr
useSWR(url, fetchData, {
refreshInterval: 30000, // 30 sec.
onSuccess
})
}
return <span className={styles.conversion}> EUR {priceEur}</span>
}

View File

@ -4,13 +4,14 @@
color: var(--brand-grey-dark); color: var(--brand-grey-dark);
} }
.price span { .price span:first-child {
font-weight: var(--font-weight-base); font-weight: var(--font-weight-base);
color: var(--color-secondary); color: var(--color-secondary);
font-size: var(--font-size-base); font-size: var(--font-size-base);
} }
.small { .small {
/* lazy making-conversion-smaller-with-same-markup */
transform: scale(0.7); transform: scale(0.7);
transform-origin: left 80%; transform-origin: left 80%;
} }

View File

@ -1,8 +1,10 @@
import React from 'react' import React from 'react'
import Price from './Price' import Price from '.'
export default { export default {
title: 'Atoms/Price' title: 'Atoms/Price'
} }
export const Normal = () => <Price price="126479107489300000000" /> export const Normal = () => <Price price="126479107489300000000" />
export const Small = () => <Price price="126479107489300000000" small />

View File

@ -1,7 +1,8 @@
import React, { ReactElement } from 'react' import React, { ReactElement } from 'react'
import Web3 from 'web3' import { fromWei } from 'web3-utils'
import classNames from 'classnames/bind' import classNames from 'classnames/bind'
import styles from './Price.module.css' import PriceConversion from './Conversion'
import styles from './index.module.css'
const cx = classNames.bind(styles) const cx = classNames.bind(styles)
@ -26,7 +27,8 @@ export default function Price({
'Free' 'Free'
) : ( ) : (
<> <>
<span>OCEAN</span> {Web3.utils.fromWei(price)} <span>OCEAN</span> {fromWei(price)}
<PriceConversion price={fromWei(price)} />
</> </>
) )

View File

@ -20,6 +20,7 @@
width: 4rem; width: 4rem;
height: 4rem; height: 4rem;
margin-left: -0.5rem; margin-left: -0.5rem;
margin-right: 0.5rem;
} }
.logoUnit path { .logoUnit path {
@ -39,17 +40,7 @@
margin: 0; margin: 0;
display: block; display: block;
color: var(--color-secondary); color: var(--color-secondary);
font-size: var(--font-size-base); font-size: var(--font-size-h4);
}
.logoUnit svg {
margin-top: -0.4rem;
}
}
@media screen and (min-width: 60rem) {
.title {
font-size: var(--font-size-large);
} }
} }
@ -77,7 +68,7 @@
text-transform: uppercase; text-transform: uppercase;
color: var(--brand-grey); color: var(--brand-grey);
font-weight: var(--font-weight-bold); font-weight: var(--font-weight-bold);
font-size: var(--font-size-small); font-size: var(--font-size-base);
position: relative; position: relative;
z-index: 1; z-index: 1;
} }

View File

@ -1,4 +1,4 @@
import React, { useEffect, useState, ReactElement } from 'react' import React, { useState, ReactElement } from 'react'
import Loader from '../atoms/Loader' import Loader from '../atoms/Loader'
import { import {
useOcean, useOcean,
@ -16,8 +16,6 @@ import DateCell from '../atoms/Table/DateCell'
import DdoLinkCell from '../atoms/Table/DdoLinkCell' import DdoLinkCell from '../atoms/Table/DdoLinkCell'
import shortid from 'shortid' import shortid from 'shortid'
import ActionsCell from '../atoms/Table/ActionsCell' import ActionsCell from '../atoms/Table/ActionsCell'
import Tooltip from '../atoms/Tooltip'
import Tippy from '@tippyjs/react'
import JobDetailsDialog from '../molecules/JobDetailsDialog' import JobDetailsDialog from '../molecules/JobDetailsDialog'
const columns = [ const columns = [

View File

@ -72,6 +72,20 @@ export async function getFileInfo(url: string): Promise<File> {
} }
} }
export async function fetchData(url: string): Promise<any> {
try {
const response = await axios(url)
if (response.status !== 200) {
return console.error('Non-200 response: ' + response.status)
}
return response.data
} catch (error) {
console.error('Error parsing json: ' + error.message)
}
}
export function isDid(did: string | undefined): boolean { export function isDid(did: string | undefined): boolean {
const didMatch = (did as string).match(/^did:op:([a-f0-9]{64})$/i) const didMatch = (did as string).match(/^did:op:([a-f0-9]{64})$/i)
return !!didMatch return !!didMatch