oceanprotocol/commons
1
0
Fork 0
mirror of https://github.com/oceanprotocol/commons.git synced 2023-03-15 18:03:00 +01:00
Code Releases Activity

fetch market network, use it in some places to switch copy, fix faucet button

Browse Source
This commit is contained in:
Matthias Kretschmann 2019-07-10 13:40:19 +02:00
parent 84c0877c43
commit ac2cd2eb70
Signed by: m
GPG Key ID: 606EEEF3C479A91F
5 changed files with 90 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/organisms/Web3message.module.scss
View File

@ -9,6 +9,10 @@
padding-top: $spacer / 2;
padding-bottom: $spacer / 2;
text-align: left;
> div:first-child {
margin-bottom: $spacer / 2;
}
}
.text {

18
client/src/context/MarketProvider.tsx
View File

@ -16,6 +16,7 @@ interface MarketProviderProps {
interface MarketProviderState {
totalAssets: number
categories: string[]
network: string
}
export default class MarketProvider extends PureComponent<
@ -24,7 +25,8 @@ export default class MarketProvider extends PureComponent<
> {
public state = {
totalAssets: 0,
categories
categories,
network: 'Pacific'
}
public async componentDidMount() {}
@ -34,6 +36,7 @@ export default class MarketProvider extends PureComponent<
// Cause there is no `prevContext`.
if (prevProps.ocean !== this.props.ocean) {
await this.getTotalAssets()
await this.getMarketNetwork()
}
}
@ -56,6 +59,19 @@ export default class MarketProvider extends PureComponent<
}
}
private getMarketNetwork = async () => {
try {
const { ocean } = this.props
// Set desired network to whatever Brizo is running in
const brizo = await ocean.brizo.getVersionInfo()
const network =
brizo.network.charAt(0).toUpperCase() + brizo.network.slice(1)
this.setState({ network })
} catch (error) {
Logger.error('Error', error.message)
}
}
public render() {
return (
<Market.Provider value={this.state}>

6
client/src/context/index.tsx
View File

@ -25,4 +25,8 @@ export const User = React.createContext({
message: ''
})
export const Market = React.createContext({ totalAssets: 0, categories: [''] })
export const Market = React.createContext({
totalAssets: 0,
categories: [''],
network: ''
})

46
client/src/routes/Faucet.tsx
View File

@ -3,7 +3,7 @@ import { FaucetResponse } from '../ocean'
import Route from '../components/templates/Route'
import Button from '../components/atoms/Button'
import Spinner from '../components/atoms/Spinner'
import { User } from '../context'
import { User, Market } from '../context'
import Web3message from '../components/organisms/Web3message'
import styles from './Faucet.module.scss'
import Content from '../components/atoms/Content'
@ -112,30 +112,34 @@ export default class Faucet extends PureComponent<{}, FaucetState> {
)
public render() {
const { isWeb3 } = this.context
const { isLogged } = this.context
const { isLoading, error, success } = this.state
return (
<Route
title="Faucet"
description="Shower yourself with some Ether for Ocean's Pacific network."
>
<Content>
<Web3message />
<Market.Consumer>
{market => (
<Route
title="Faucet"
description={`Shower yourself with some Ether for Ocean's ${market.network} network.`}
>
<Content>
<Web3message />
<div className={styles.action}>
{isLoading ? (
<Spinner message="Getting Ether..." />
) : error ? (
<this.Error />
) : success ? (
<this.Success />
) : (
isWeb3 && <this.Action />
)}
</div>
</Content>
</Route>
<div className={styles.action}>
{isLoading ? (
<Spinner message="Getting Ether..." />
) : error ? (
<this.Error />
) : success ? (
<this.Success />
) : (
isLogged && <this.Action />
)}
</div>
</Content>
</Route>
)}
</Market.Consumer>
)
}
}

72
client/src/routes/Publish/index.tsx
View File

@ -3,7 +3,7 @@ import { Logger } from '@oceanprotocol/squid'
import Route from '../../components/templates/Route'
import Form from '../../components/atoms/Form/Form'
import AssetModel from '../../models/AssetModel'
import { User } from '../../context'
import { User, Market } from '../../context'
import Web3message from '../../components/organisms/Web3message'
import Step from './Step'
import Progress from './Progress'
@ -319,41 +319,47 @@ export default class Publish extends Component<{}, PublishState> {
public render() {
return (
<Route
title="Publish"
description="Publish a new data set into the Ocean Protocol Network."
>
<Content>
{(!this.context.isLogged ||
!this.context.isOceanNetwork) && <Web3message />}
<Market.Consumer>
{market => (
<Route
title="Publish"
description={`Publish a new data set into the Ocean Protocol ${market.network} Network.`}
>
<Content>
{(!this.context.isLogged ||
!this.context.isOceanNetwork) && (
<Web3message />
)}
<Progress
steps={steps}
currentStep={this.state.currentStep}
/>
<Form onSubmit={this.registerAsset}>
{steps.map((step: any, index: number) => (
<Step
key={index}
index={index}
title={step.title}
description={step.description}
<Progress
steps={steps}
currentStep={this.state.currentStep}
fields={step.fields}
inputChange={this.inputChange}
state={this.state}
next={this.next}
prev={this.prev}
totalSteps={steps.length}
tryAgain={this.tryAgain}
toStart={this.toStart}
content={step.content}
/>
))}
</Form>
</Content>
</Route>
<Form onSubmit={this.registerAsset}>
{steps.map((step: any, index: number) => (
<Step
key={index}
index={index}
title={step.title}
description={step.description}
currentStep={this.state.currentStep}
fields={step.fields}
inputChange={this.inputChange}
state={this.state}
next={this.next}
prev={this.prev}
totalSteps={steps.length}
tryAgain={this.tryAgain}
toStart={this.toStart}
content={step.content}
/>
))}
</Form>
</Content>
</Route>
)}
</Market.Consumer>
)
}
}