From a04b2553e5774326849a2edcfa872fe75e4e65c5 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Mon, 8 Apr 2019 10:44:03 +0200 Subject: [PATCH] web3message fixes, formatting fixes --- client/package-lock.json | 12 +-- client/src/App.tsx | 2 +- .../src/components/organisms/AssetsUser.tsx | 85 +++++++++---------- .../src/components/organisms/Web3message.tsx | 11 ++- client/src/config/config.ts | 23 +++-- client/src/routes/Details/AssetFile.tsx | 22 +++-- .../src/routes/Details/AssetFilesDetails.tsx | 4 +- client/src/routes/Faucet.tsx | 21 ++--- client/src/routes/Publish/Step.tsx | 14 +-- server/src/routes/UrlCheckRouter.ts | 5 +- 10 files changed, 102 insertions(+), 97 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index f213b7f..ac655e8 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1026,14 +1026,14 @@ "integrity": "sha512-p2n505t2K0zD1ZvGPhI6EsSviEVLCB7BYowhf/ONmVaWED138PaG4Z9nY6YuHU383uOoIWT+Lq3dLkFzDzstXw==" }, "@oceanprotocol/keeper-contracts": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.9.0.tgz", - "integrity": "sha512-QrTCQNiQa9KszH6/dTAS0a8AoW/SIEkZazXTwA2aoePBS0X8fNpsKvT3N2OuR1YPAjCU3rGWzYdV4TNnMNbsSw==" + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@oceanprotocol/keeper-contracts/-/keeper-contracts-0.9.1.tgz", + "integrity": "sha512-c1LvaH+e1tzow0gZLwSWe19ap+DrZuNmZfxBdwEVEPQXarI0jTXa5qVDoiBow8kBWaqSIUgFAzQOJW8rKdlS1A==" }, "@oceanprotocol/squid": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-0.5.0.tgz", - "integrity": "sha512-yGu121WJ9XEX1U4ql/p7ISV36fqNydxGBYgXHbOjeXS/kvNFx3hP2emBf4QA12PjPZcmuLz0wE+7GBL4H/v+eA==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@oceanprotocol/squid/-/squid-0.5.1.tgz", + "integrity": "sha512-YJewmMIpHG5cjsOsgOynky7z+5YT7l5+niW9AqCMOoMGy76VEe1+6nmAhZ/PB9BtIpYCGWOl1Y68I32qhX9IWQ==", "requires": { "@oceanprotocol/keeper-contracts": "^0.9.0", "bignumber.js": "^8.0.1", diff --git a/client/src/App.tsx b/client/src/App.tsx index f1e2e1f..600465c 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -150,7 +150,7 @@ class App extends Component<{}, AppState> { balance, network, account: accounts[0].getId(), - isLoading: false, + isLoading: false }) } else { this.setState({ diff --git a/client/src/components/organisms/AssetsUser.tsx b/client/src/components/organisms/AssetsUser.tsx index bf868a8..1382f22 100644 --- a/client/src/components/organisms/AssetsUser.tsx +++ b/client/src/components/organisms/AssetsUser.tsx @@ -48,51 +48,48 @@ export default class AssetsUser extends PureComponent< } public render() { - return ( - this.context.isNile && - this.context.account ? ( -
- {this.props.recent && ( -

- Your Latest Published Data Sets -

- )} + return this.context.isNile && this.context.account ? ( +
+ {this.props.recent && ( +

+ Your Latest Published Data Sets +

+ )} - {this.state.isLoading ? ( - - ) : this.state.results.length ? ( - <> - {this.state.results - .slice( - 0, - this.props.recent - ? this.props.recent - : undefined - ) - .filter(asset => !!asset) - .map((asset: any) => ( - - ))} - {this.props.recent && ( - - All Data Sets - - )} - - ) : ( -
-

No Data Sets Yet.

- + Publish A Data Set -
- )} -
- ) : ( - - ) + {this.state.isLoading ? ( + + ) : this.state.results.length ? ( + <> + {this.state.results + .slice( + 0, + this.props.recent + ? this.props.recent + : undefined + ) + .filter(asset => !!asset) + .map((asset: any) => ( + + ))} + {this.props.recent && ( + + All Data Sets + + )} + + ) : ( +
+

No Data Sets Yet.

+ + Publish A Data Set +
+ )} +
+ ) : ( + ) } } diff --git a/client/src/components/organisms/Web3message.tsx b/client/src/components/organisms/Web3message.tsx index 74ed53c..6813960 100644 --- a/client/src/components/organisms/Web3message.tsx +++ b/client/src/components/organisms/Web3message.tsx @@ -26,9 +26,12 @@ export default class Web3message extends PureComponent { public noWeb3() { return (
- Not a Web3 Browser. For - publishing or consuming an asset you need to{' '} - + Not a Web3 Browser. + For publishing or consuming an asset you need to{' '} + setup MetaMask {' '} or use any other Web3-capable plugin or browser. @@ -40,7 +43,7 @@ export default class Web3message extends PureComponent { return (
Account locked. For - publishing an asset you need to unlock your Web3 account. + publishing an asset you need to unlock your Web3 account.{' '} diff --git a/client/src/config/config.ts b/client/src/config/config.ts index c372f4a..41bb2d2 100644 --- a/client/src/config/config.ts +++ b/client/src/config/config.ts @@ -13,24 +13,32 @@ export const nodeHost = process.env.REACT_APP_NODE_HOST || 'nile.dev-ocean.com' export const nodePort = process.env.REACT_APP_NODE_PORT || 443 export const aquariusScheme = process.env.REACT_APP_AQUARIUS_SCHEME || 'https' -export const aquariusHost = process.env.REACT_APP_AQUARIUS_HOST || 'nginx-aquarius.dev-ocean.com' +export const aquariusHost = + process.env.REACT_APP_AQUARIUS_HOST || 'nginx-aquarius.dev-ocean.com' export const aquariusPort = process.env.REACT_APP_AQUARIUS_PORT || 443 export const brizoScheme = process.env.REACT_APP_BRIZO_SCHEME || 'https' -export const brizoHost = process.env.REACT_APP_BRIZO_HOST || 'nginx-brizo.dev-ocean.com' +export const brizoHost = + process.env.REACT_APP_BRIZO_HOST || 'nginx-brizo.dev-ocean.com' export const brizoPort = process.env.REACT_APP_BRIZO_PORT || 443 -export const brizoAddress = process.env.REACT_APP_BRIZO_ADDRESS || '0x376817c638d2a04f475a73af37f7b51a2862d567' +export const brizoAddress = + process.env.REACT_APP_BRIZO_ADDRESS || + '0x376817c638d2a04f475a73af37f7b51a2862d567' export const parityScheme = process.env.REACT_APP_PARITY_SCHEME || 'https' -export const parityHost = process.env.REACT_APP_PARITY_HOST || 'nile.dev-ocean.com' +export const parityHost = + process.env.REACT_APP_PARITY_HOST || 'nile.dev-ocean.com' export const parityPort = process.env.REACT_APP_PARITY_PORT || 443 -export const secretStoreScheme = process.env.REACT_APP_SECRET_STORE_SCHEME || 'https' -export const secretStoreHost = process.env.REACT_APP_SECRET_STORE_HOST || 'secret-store.dev-ocean.com' +export const secretStoreScheme = + process.env.REACT_APP_SECRET_STORE_SCHEME || 'https' +export const secretStoreHost = + process.env.REACT_APP_SECRET_STORE_HOST || 'secret-store.dev-ocean.com' export const secretStorePort = process.env.REACT_APP_SECRET_STORE_PORT || 443 export const faucetScheme = process.env.REACT_APP_FAUCET_SCHEME || 'https' -export const faucetHost = process.env.REACT_APP_FAUCET_HOST || 'faucet.nile.dev-ocean.com' +export const faucetHost = + process.env.REACT_APP_FAUCET_HOST || 'faucet.nile.dev-ocean.com' export const faucetPort = process.env.REACT_APP_FAUCET_PORT || 443 // @@ -65,4 +73,3 @@ export const faucetPort = process.env.REACT_APP_FAUCET_PORT || 443 // export const faucetPort = 3001 export const verbose = true - diff --git a/client/src/routes/Details/AssetFile.tsx b/client/src/routes/Details/AssetFile.tsx index 1eeb011..5fb75a2 100644 --- a/client/src/routes/Details/AssetFile.tsx +++ b/client/src/routes/Details/AssetFile.tsx @@ -85,18 +85,22 @@ export default class AssetFile extends PureComponent< - ) : - states.isWeb3 && ( - + ) : ( + states.isWeb3 && ( + + ) ) } diff --git a/client/src/routes/Details/AssetFilesDetails.tsx b/client/src/routes/Details/AssetFilesDetails.tsx index d646d77..9497920 100644 --- a/client/src/routes/Details/AssetFilesDetails.tsx +++ b/client/src/routes/Details/AssetFilesDetails.tsx @@ -20,9 +20,7 @@ export default class AssetFilesDetails extends PureComponent<{
{states => - (!states.isNile || !states.isLogged) && ( - - ) + (!states.isNile || !states.isLogged) && } diff --git a/client/src/routes/Faucet.tsx b/client/src/routes/Faucet.tsx index d7d6c96..7b4fff9 100644 --- a/client/src/routes/Faucet.tsx +++ b/client/src/routes/Faucet.tsx @@ -10,15 +10,13 @@ interface FaucetState { isLoading: boolean success?: string error?: string - eth?: string } export default class Faucet extends PureComponent<{}, FaucetState> { public state = { isLoading: false, success: undefined, - error: undefined, - eth: 'xx' + error: undefined } private getTokens = async (requestFromFaucet: () => any) => { @@ -55,15 +53,10 @@ export default class Faucet extends PureComponent<{}, FaucetState> { > Request Ether - ) : - states.isWeb3 ? ( - + ) : states.isWeb3 ? ( + ) : ( - + ) } @@ -105,11 +98,7 @@ export default class Faucet extends PureComponent<{}, FaucetState> { description="Shower yourself with some Ether for the Ocean POA network." > - {states => - !states.isNile && ( - - ) - } + {states => !states.isNile && } diff --git a/client/src/routes/Publish/Step.tsx b/client/src/routes/Publish/Step.tsx index 42a5022..afaf7de 100644 --- a/client/src/routes/Publish/Step.tsx +++ b/client/src/routes/Publish/Step.tsx @@ -158,16 +158,20 @@ export default class Step extends PureComponent { {states => states.isLogged ? ( - ) : - states.isWeb3 ? ( + ) : states.isWeb3 ? ( ) : ( - ) diff --git a/server/src/routes/UrlCheckRouter.ts b/server/src/routes/UrlCheckRouter.ts index 3d8d12c..403610e 100644 --- a/server/src/routes/UrlCheckRouter.ts +++ b/server/src/routes/UrlCheckRouter.ts @@ -22,7 +22,10 @@ export class UrlCheckRouter { headers: { Range: 'bytes=0-' } }, (error, response) => { - if (response && response.statusCode.toString().startsWith('2')) { + if ( + response && + response.statusCode.toString().startsWith('2') + ) { const result: any = {} result.found = true