From 2192a49827a5606ab6f58ab8af5bafe2ce891b14 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Tue, 2 Apr 2019 13:18:59 +0200 Subject: [PATCH 1/2] Minor fixes in the React App Tutorial --- content/tutorials/react-get-use-data-set.md | 16 +++++++--------- content/tutorials/react-publish-data-set.md | 2 ++ content/tutorials/react-setup.md | 7 ++++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/content/tutorials/react-get-use-data-set.md b/content/tutorials/react-get-use-data-set.md index a4087456..423fc7d2 100644 --- a/content/tutorials/react-get-use-data-set.md +++ b/content/tutorials/react-get-use-data-set.md @@ -3,13 +3,11 @@ title: Get & Use a Data Set description: Tutorial to get and use a data set in a basic React app. --- -**NOTICE: This section of the React App Tutorial is not currently working because it hasn't been updated to work with the latest squid-js. There is [an open issue to update it](https://github.com/oceanprotocol/docs/issues/181).** - ## Requirements -This is a continuation of the [React App Setup](/tutorials/react-setup/) and [React Publish Data-set](/tutorials/react-publish-data-set/) tutorial, so make sure you have done all the steps described in there. +This is a continuation of the React App Tutorial. Make sure you already did the [React App Setup](/tutorials/react-setup/) and the [Publish a Data Set](/tutorials/react-publish-data-set/) steps. -Open `src/App.js` in your marketplace app from previous tutorials. +Open `src/App.js` in your marketplace app. ## Retrieve Assets @@ -30,7 +28,7 @@ The last thing we need is a button to start our search inside the render functio ## Consume Assets -The retrieved assets can now be consumed so in this tutorial we consume the first one. The following code goes after `async retrieveAssets()` function. +The retrieved assets can now be consumed so in this tutorial we consume the first one. The following code goes after the `async retrieveAssets()` function. ```js async consumeAsset() { @@ -57,7 +55,7 @@ async consumeAsset() { } ``` -We still need button in render function just after `` to start consumption: +We still need a button to start consumption. In the render function, just after the `` line, add: ```jsx @@ -171,7 +169,7 @@ class App extends Component { } async retrieveAssets() { - this.dbAssets = await ocean.assets.search("10 Monkey Species Small") + this.dbAssets = await this.ocean.assets.search("10 Monkey Species Small") console.log(this.dbAssets) } @@ -183,13 +181,13 @@ class App extends Component { // get service we want to execute const service = consumeAsset.findServiceByType('Access') // order service agreement - const agreement = await ocean.assets.order( + const agreement = await this.ocean.assets.order( consumeAsset.id, service.serviceDefinitionId, accounts[0] ) // consume it - await ocean.assets.consume( + await this.ocean.assets.consume( agreement, consumeAsset.id, service.serviceDefinitionId, diff --git a/content/tutorials/react-publish-data-set.md b/content/tutorials/react-publish-data-set.md index bc9e3769..70e4b4a7 100644 --- a/content/tutorials/react-publish-data-set.md +++ b/content/tutorials/react-publish-data-set.md @@ -216,3 +216,5 @@ class App extends Component { export default App ``` + +Move on to [Get & Use a Data Set](/tutorials/react-get-use-data-set/). diff --git a/content/tutorials/react-setup.md b/content/tutorials/react-setup.md index 8bbdcaee..5a27101c 100644 --- a/content/tutorials/react-setup.md +++ b/content/tutorials/react-setup.md @@ -9,6 +9,7 @@ description: This tutorial shows how you can build a basic [React](https://react - `npm` >= 5.2 is installed. You can check using `npm -v` - Git clone the [oceanprotocol/barge](https://github.com/oceanprotocol/barge) repository, then in that directory: - (Optional) If you want to use Azure Storage or Amazon S3 storage, then go through the tutorials to set those up: [Azure](/tutorials/azure-for-brizo/) or [Amazon](/tutorials/amazon-s3-for-brizo/). Note that if you're using Azure Storage, you must edit the `barge/brizo.env` file and set all `AZURE_`... values. + - (Optional but recommended) Clean out all your old Docker stuff using `docker system prune --all --volumes` - Use Barge to run a local Spree Testnet: ```bash @@ -18,7 +19,7 @@ description: This tutorial shows how you can build a basic [React](https://react ./start_ocean.sh --latest --no-pleuston --local-spree-node ``` -- [Get some Spree Ether](/tutorials/get-ether-and-ocean-tokens/#get-ether-for-a-local-spree-testnet) in a local account managed by MetaMask. +- Once your local Spree network is running, [get some Spree Ether](/tutorials/get-ether-and-ocean-tokens/#get-ether-for-a-local-spree-testnet) in a local account managed by MetaMask. ## New Create React App @@ -77,11 +78,11 @@ After those steps you should see this, and MetaMask should have asked you to all Note: If you see an error like `inpage.js:1 MetaMask - RPC Error: Internal JSON-RPC error.` in your `console.log`, don't worry about it. It's a MetaMask thing. -## Create Ocean instance +## Create Ocean Instance Now that we are successfully connected with Web3, we can set up our Ocean instance. -At the beginning of your component, create a new Ocean instance with all configuration within the `componentDidMount` lifecycle method. All Ocean Protocol operations can be executed from this Ocean instance. +At the beginning of your component (i.e. right after the `class App extends Component {` line), create a new Ocean instance with all configuration within the `componentDidMount` lifecycle method. All Ocean Protocol operations can be executed from this Ocean instance. ```js async componentDidMount() { From 18f939e65fc6a880896829589e55adb9da744763 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Tue, 2 Apr 2019 13:58:39 +0200 Subject: [PATCH 2/2] Add some tips when clicking the app's buttons --- content/tutorials/react-get-use-data-set.md | 8 ++++++-- content/tutorials/react-publish-data-set.md | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/content/tutorials/react-get-use-data-set.md b/content/tutorials/react-get-use-data-set.md index 423fc7d2..ea2d7487 100644 --- a/content/tutorials/react-get-use-data-set.md +++ b/content/tutorials/react-get-use-data-set.md @@ -65,9 +65,13 @@ With all these buttons in place, you should see this: ![React App 05](images/react-app-05.png) -## Final Result +Tip: Before clicking the `Retrieve assets` button, it might help to reload the page. -That's it. If you have no errors in your `console.log` and can see your asset files listed, you have a working marketplace. +Go ahead and click the `Retrieve assets` button, and then the `Consume asset` button. Approve all the MetaMask dialog boxes. + +If you have no errors in your `console.log` and can see your asset files listed, you have a working marketplace. + +## Final Result Here is the full source of `src/App.js` that you should have if you followed this tutorial: diff --git a/content/tutorials/react-publish-data-set.md b/content/tutorials/react-publish-data-set.md index 70e4b4a7..2c9e1506 100644 --- a/content/tutorials/react-publish-data-set.md +++ b/content/tutorials/react-publish-data-set.md @@ -101,9 +101,13 @@ The last thing we need is a button to start our registration inside the render f ``` -## Final Result +Tip: Before clicking the `Register asset` button, it might help to reload the page. -That's it. If you have no errors in your `console.log` and you receive an alert after you click `Register asset` then you have successfully registered an asset. +When you click on the `Register asset` button, you should get four separate dialog boxes from MetaMask, in a series, i.e. the second one only appears after you accept/approve the first one, and so on. + +If you have no errors in your `console.log`, then you have successfully registered an asset. + +## Final Result Here is the full source of `src/App.js` that you should have if you followed this tutorial: