diff --git a/config.js b/config.js index 469a07bb..61d93973 100644 --- a/config.js +++ b/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/' + } + ] } diff --git a/content/concepts/terminology.md b/content/concepts/terminology.md index 61dcf15e..194077b8 100644 --- a/content/concepts/terminology.md +++ b/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. diff --git a/content/setup/marketplace.md b/content/setup/marketplace.md index ade6ca6c..592fe3c1 100644 --- a/content/setup/marketplace.md +++ b/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: diff --git a/gatsby-config.js b/gatsby-config.js index 6464be02..05268c46 100755 --- a/gatsby-config.js +++ b/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: { diff --git a/gatsby-node.js b/gatsby-node.js index 4f04616b..e5b4e4a9 100755 --- a/gatsby-node.js +++ b/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() diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 1f668938..e67584fa 100755 --- a/scripts/deploy.sh +++ b/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 " diff --git a/src/components/Seo.jsx b/src/components/Seo.jsx index f39a235f..883468f8 100644 --- a/src/components/Seo.jsx +++ b/src/components/Seo.jsx @@ -83,8 +83,6 @@ const MetaTags = ({ {title && {title}} - - {/* General tags */}