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

added total orders to asset details (#1556)

Browse Source 
* added total orders to asset details

* bump ocean.js to v1.1.5, bump web3 packages

* move component, rename copy

* center asset stats for now, cleanup

* tweak no sales condition style

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
This commit is contained in:
EnzoVezzaro 2022-06-30 14:58:24 +02:00 committed by GitHub
parent daf15a698f
commit 00576b8acf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 88 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package-lock.json generated
View File

@ -13,7 +13,7 @@
"@coingecko/cryptoformat": "^0.5.4",
"@loadable/component": "^5.15.2",
"@oceanprotocol/art": "^3.2.0",
"@oceanprotocol/lib": "^1.1.3",
"@oceanprotocol/lib": "^1.1.5",
"@oceanprotocol/typographies": "^0.1.0",
"@tippyjs/react": "^4.2.6",
"@urql/exchange-refocus": "^0.2.5",
@ -55,8 +55,8 @@
"swr": "^1.3.0",
"urql": "^2.2.1",
"use-dark-mode": "^2.3.1",
"web3": "^1.7.3",
"web3modal": "^1.9.7",
"web3": "^1.7.4",
"web3modal": "^1.9.8",
"yup": "^0.32.11"
},
"devDependencies": {
@ -4598,9 +4598,9 @@
"integrity": "sha512-rDCIooe1WHipLejuGhx2Wv/88SB7bWrN3+XHCWxXyPKTmmSQsgxKZPPzbIVBQ0ESChQZqGSBBJyqErqwwW4eBw=="
},
"node_modules/@oceanprotocol/lib": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.1.3.tgz",
"integrity": "sha512-+lTu3RoveuVWAYHfg5r+t3RAD4cfA0hFIc52kvCHMtbOj6RlwV6We0uq2hyv9WKqonL4z3l42cAegaxeP+FJVg==",
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.1.5.tgz",
"integrity": "sha512-quc2SGAr8G1v664ll3eOystA2v94OQleW6KGKhVWEPXDldnNAAhlG/QTi86XWRU9HmncGE7OghC5am+9DRGWcQ==",
"dependencies": {
"@oceanprotocol/contracts": "^1.0.0",
"bignumber.js": "^9.0.2",
@ -40866,9 +40866,9 @@
}
},
"node_modules/web3modal": {
"version": "1.9.7",
"resolved": "https://registry.npmjs.org/web3modal/-/web3modal-1.9.7.tgz",
"integrity": "sha512-z3XfY7cV8GwGvHP3WvrSxPU6/7ocwVyiU77U/Lxoa53AUSsOKl01V8ErZ8CkJSH41C3YgzwBaOETj0rC9uFBKg==",
"version": "1.9.8",
"resolved": "https://registry.npmjs.org/web3modal/-/web3modal-1.9.8.tgz",
"integrity": "sha512-ruYsh4TV1SUAljBW/Pd4itW2idKlo9xr/g2dKhBDdaafWNCVdpaK92cQ7EM53rg2KQHWJhqj1IThbv7cPV7ayA==",
"dependencies": {
"detect-browser": "^5.1.0",
"prop-types": "^15.7.2",
@ -44931,15 +44931,16 @@
"integrity": "sha512-rDCIooe1WHipLejuGhx2Wv/88SB7bWrN3+XHCWxXyPKTmmSQsgxKZPPzbIVBQ0ESChQZqGSBBJyqErqwwW4eBw=="
},
"@oceanprotocol/lib": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.1.3.tgz",
"integrity": "sha512-+lTu3RoveuVWAYHfg5r+t3RAD4cfA0hFIc52kvCHMtbOj6RlwV6We0uq2hyv9WKqonL4z3l42cAegaxeP+FJVg==",
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-1.1.5.tgz",
"integrity": "sha512-quc2SGAr8G1v664ll3eOystA2v94OQleW6KGKhVWEPXDldnNAAhlG/QTi86XWRU9HmncGE7OghC5am+9DRGWcQ==",
"requires": {
"@oceanprotocol/contracts": "^1.0.0",
"bignumber.js": "^9.0.2",
"cross-fetch": "^3.1.5",
"crypto-js": "^4.1.1",
"decimal.js": "^10.3.1",
"web3": "^1.7.4",
"web3-core": "^1.7.1",
"web3-eth-contract": "^1.7.1"
}
@ -44991,6 +44992,7 @@
"integrity": "sha512-rmVKYEsKzurfRU0xJz+iHelbi1LGlihIWZ7Qvmb/CBz1EkhL7nOkW4SVXmG2dA5Ce0si2gr88i6q4eBOMRNJ1w==",
"dev": true,
"requires": {
"@oclif/config": "^1.18.2",
"@oclif/errors": "^1.3.5",
"@oclif/help": "^1.0.1",
"@oclif/parser": "^3.8.6",
@ -73328,9 +73330,9 @@
}
},
"web3modal": {
"version": "1.9.7",
"resolved": "https://registry.npmjs.org/web3modal/-/web3modal-1.9.7.tgz",
"integrity": "sha512-z3XfY7cV8GwGvHP3WvrSxPU6/7ocwVyiU77U/Lxoa53AUSsOKl01V8ErZ8CkJSH41C3YgzwBaOETj0rC9uFBKg==",
"version": "1.9.8",
"resolved": "https://registry.npmjs.org/web3modal/-/web3modal-1.9.8.tgz",
"integrity": "sha512-ruYsh4TV1SUAljBW/Pd4itW2idKlo9xr/g2dKhBDdaafWNCVdpaK92cQ7EM53rg2KQHWJhqj1IThbv7cPV7ayA==",
"requires": {
"detect-browser": "^5.1.0",
"prop-types": "^15.7.2",

6
package.json
View File

@ -25,7 +25,7 @@
"@coingecko/cryptoformat": "^0.5.4",
"@loadable/component": "^5.15.2",
"@oceanprotocol/art": "^3.2.0",
"@oceanprotocol/lib": "^1.1.3",
"@oceanprotocol/lib": "^1.1.5",
"@oceanprotocol/typographies": "^0.1.0",
"@tippyjs/react": "^4.2.6",
"@urql/exchange-refocus": "^0.2.5",
@ -67,8 +67,8 @@
"swr": "^1.3.0",
"urql": "^2.2.1",
"use-dark-mode": "^2.3.1",
"web3": "^1.7.3",
"web3modal": "^1.9.7",
"web3": "^1.7.4",
"web3modal": "^1.9.8",
"yup": "^0.32.11"
},
"devDependencies": {

2
src/components/@shared/atoms/Tabs/index.tsx
View File

@ -1,4 +1,4 @@
import React, { ReactElement, ReactNode, useState } from 'react'
import React, { ReactElement, ReactNode } from 'react'
import { Tab, Tabs as ReactTabs, TabList, TabPanel } from 'react-tabs'
import styles from './index.module.css'
import InputRadio from '@shared/FormInput/InputRadio'

26
src/components/Asset/AssetActions/AssetStats/index.module.css Normal file
View File

@ -0,0 +1,26 @@
.stats {
border-top: 1px solid var(--border-color);
margin: calc(var(--spacer) / 2) calc(var(--spacer) / -2)
calc(var(--spacer) / -5) calc(var(--spacer) / -2);
margin-top: calc(var(--spacer) / 2);
padding: calc(var(--spacer) / 3);
padding-bottom: 0;
font-size: var(--font-size-small);
color: var(--color-secondary);
text-align: center;
}
@media (min-width: 40rem) {
.stats {
margin-bottom: calc(var(--spacer) / -1.5);
margin-left: calc(var(--spacer) / -1);
margin-right: calc(var(--spacer) / -1);
padding-left: var(--spacer);
padding-right: var(--spacer);
}
}
.number {
font-weight: var(--font-weight-bold);
color: var(--font-color-heading);
}

20
src/components/Asset/AssetActions/AssetStats/index.tsx Normal file
View File

@ -0,0 +1,20 @@
import { useAsset } from '@context/Asset'
import React from 'react'
import styles from './index.module.css'
export default function AssetStats() {
const { asset } = useAsset()
return (
<footer className={styles.stats}>
{asset.stats.orders === 0 ? (
'No sales yet'
) : (
<>
<span className={styles.number}>{asset.stats.orders}</span> sale
{asset.stats.orders === 1 ? '' : 's'}
</>
)}
</footer>
)
}

36
src/components/Asset/AssetActions/index.tsx
View File

@ -18,6 +18,7 @@ import { useFormikContext } from 'formik'
import { FormPublishData } from 'src/components/Publish/_types'
import { AssetExtended } from 'src/@types/AssetExtended'
import PoolProvider from '@context/Pool'
import AssetStats from './AssetStats'
export default function AssetActions({
asset
@ -111,21 +112,26 @@ export default function AssetActions({
}
}, [balance, accountId, asset?.accessDetails, dtBalance])
const UseContent = isCompute ? (
<Compute
asset={asset}
dtBalance={dtBalance}
file={fileMetadata}
fileIsLoading={fileIsLoading}
/>
) : (
<Consume
asset={asset}
dtBalance={dtBalance}
isBalanceSufficient={isBalanceSufficient}
file={fileMetadata}
fileIsLoading={fileIsLoading}
/>
const UseContent = (
<>
{isCompute ? (
<Compute
asset={asset}
dtBalance={dtBalance}
file={fileMetadata}
fileIsLoading={fileIsLoading}
/>
) : (
<Consume
asset={asset}
dtBalance={dtBalance}
isBalanceSufficient={isBalanceSufficient}
file={fileMetadata}
fileIsLoading={fileIsLoading}
/>
)}
<AssetStats />
</>
)
const tabs: TabsItem[] = [{ title: 'Use', content: UseContent }]