Merge branch 'master' into feature/api-docs

config.js

@@ -18,5 +18,19 @@ module.exports = {
     githubContentPath:
         'https://github.com/oceanprotocol/docs/blob/master/content',
     githubDevOceanPath:
-        'https://github.com/oceanprotocol/dev-ocean/blob/master/doc'
+        'https://github.com/oceanprotocol/dev-ocean/blob/master/doc',
+    redirects: [
+        {
+            from: '/concepts/',
+            to: '/concepts/introduction/'
+        },
+        {
+            from: '/setup/',
+            to: '/setup/quickstart/'
+        },
+        {
+            from: '/tutorials/',
+            to: '/tutorials/introduction/'
+        }
+    ]
 }

content/concepts/terminology.md

@@ -23,7 +23,7 @@ Note: Initially, most publishers will also be the owners of the data assets they
 
 Someone who wants assets. An example is a data scientist working at an economic think tank.
 
-## Marketplace or Tribe
+## Marketplace
 
 A service where publishers can list what assets they have, and consumers can see what's available then buy it (or get it for free). The Ocean network supports many marketplaces/tribes.
 

content/setup/marketplace.md

@@ -8,7 +8,9 @@ If you want to set up and run a marketplace in the Ocean network, then at a tech
 1. Develop a marketplace application (app).
 2. Run your marketplace app in production.
 
-**Note: In the early days of the Ocean network, there won't be many marketplaces or publishers, so marketplaces will often also act as publishers.**
+**Note 1: At the time of writing (late November 2018), it was _possible_ to start developing a marketplace, but very challenging. We anticipate that it will become much easier in December 2018, especially once the docker-images scripts and Docker Compose files are refactored.**
+
+**Note 2: In the early days of the Ocean network, there won't be many marketplaces or publishers, so marketplaces will often also act as publishers.**
 
 ## Develop a Marketplace App
 
@@ -39,16 +41,11 @@ Of course, you could always write your own Squid library in the language of your
 
 ## Run Your Marketplace App in Production
 
-Before running your marketplace app in production on the Ocean Mainnet, you may want to test it on the Ocean Testnet.
-The Ocean Testnet is similar to the Ocean Mainnet.
-The main difference is that there is less risk on the Ocean Testnet.
+Before running your marketplace app in production with the Ocean Mainnet, you may want to test it with an Ocean Testnet.
+The Ocean Testnets are similar to the Ocean Mainnet.
+The main difference is that there is less risk on the Ocean Testnets.
 
-**Note: At the time of writing, the Ocean Mainnet hadn't gone live yet, but the Trilobite Testnet was about to go live.**
-
-Some technical differences between local testing and connecting to a live external test/mainnet are:
-
-- Local Keeper nodes (Parity user nodes) must connect to the live network of Keepers.
-- Your Aquarius and Brizo instances must connect to the live Ocean Secret Store network.
+**Note: At the time of writing, the Ocean Mainnet hadn't gone live yet, but the testnets were about to go live. See [the page about testnets](/concepts/testnets/).**
 
 Of course, there are many other things that must be handled for live production apps:
 

gatsby-config.js

@@ -128,7 +128,12 @@ module.exports = {
         },
         'gatsby-plugin-catch-links',
         'gatsby-plugin-react-helmet',
-        'gatsby-plugin-sitemap',
+        {
+            resolve: 'gatsby-plugin-sitemap',
+            options: {
+                exclude: ['/test/']
+            }
+        },
         {
             resolve: 'gatsby-plugin-manifest',
             options: {

gatsby-node.js

@@ -3,6 +3,7 @@
 const path = require('path')
 const { createFilePath } = require('gatsby-source-filesystem')
 const Swagger = require('swagger-client')
+const { redirects } = require('./config')
 
 exports.onCreateNode = ({ node, getNode, actions }) => {
     const { createNodeField } = actions
@@ -57,7 +58,7 @@ const getSpec = async () => {
 }
 
 exports.createPages = ({ graphql, actions }) => {
-    const { createPage } = actions
+    const { createPage, createRedirect } = actions
 
     return new Promise((resolve, reject) => {
         resolve(
@@ -194,6 +195,18 @@ exports.createPages = ({ graphql, actions }) => {
                         slug: brizoSlug,
                         api: brizoSpecs
                     }
+                
+                //
+                // create redirects
+                //
+                redirects.forEach(({ from, to }) => {
+                    createRedirect({
+                        fromPath: from,
+                        redirectInBrowser: true,
+                        toPath: to
+                    })
+
+                    console.log('Create redirect: ' + from + ' --> ' + to)
                 })
 
                 resolve()

scripts/deploy.sh

@@ -51,9 +51,9 @@ elif [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] |
 
   # ping search engines
   # returns: HTTP_STATUSCODE URL
-  # curl -sL -w "%{http_code} %{url_effective}\\n" \
-  #   "http://www.google.com/webmasters/tools/ping?sitemap=$SITEMAP_URL" -o /dev/null \
-  #   "http://www.bing.com/webmaster/ping.aspx?siteMap=$SITEMAP_URL" -o /dev/null
+  curl -sL -w "%{http_code} %{url_effective}\\n" \
+    "http://www.google.com/webmasters/tools/ping?sitemap=$SITEMAP_URL" -o /dev/null \
+    "http://www.bing.com/webmaster/ping.aspx?siteMap=$SITEMAP_URL" -o /dev/null
 
   echo "---------------------------------------------"
   echo "         ✓ done deployment "

src/components/Seo.jsx

@@ -83,8 +83,6 @@ const MetaTags = ({
 
         {title && <title>{title}</title>}
 
-        <meta name="robots" content="noindex, nofollow" />
-
         {/* General tags */}
         <meta name="description" content={description} />
         <meta name="image" content={image} />