From b2f9fcce3e799491d3eee5f88b8a10084270f74b Mon Sep 17 00:00:00 2001
From: Akshay <akshay.ap95@gmail.com>
Date: Tue, 15 Jun 2021 11:05:35 +0200
Subject: [PATCH 1/9] Improvment: Add null check

---
 src/templates/Markdown/MarkdownList.jsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index bc4ef530..c1424ae5 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -63,11 +63,15 @@ export default function MarkdownList({ location, pageContext }) {
 
     const keys = Object.keys(nestedModules).sort()
     const children = []
-    children.push(
-      <li key={title}>
-        <b>{title}</b>
-      </li>
-    )
+    if (title) {
+      children.push(
+        <li key={title}>
+          <b>{title}</b>
+        </li>
+      )
+    }
+
+
     keys.forEach((element) => {
       children.push(
         <ul className={sidebarStyles.list}>

From 4b0d805c2a4511c2434325eb659c7361f3c15151 Mon Sep 17 00:00:00 2001
From: Akshay <akshay.ap95@gmail.com>
Date: Tue, 15 Jun 2021 11:15:22 +0200
Subject: [PATCH 2/9] Fix lint issue

---
 src/templates/Markdown/MarkdownList.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index c1424ae5..53478da5 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -71,7 +71,6 @@ export default function MarkdownList({ location, pageContext }) {
       )
     }
 
-
     keys.forEach((element) => {
       children.push(
         <ul className={sidebarStyles.list}>

From 96d459297bd726250bbaa490b673cb0b57b442a7 Mon Sep 17 00:00:00 2001
From: Akshay <akshay.ap95@gmail.com>
Date: Mon, 21 Jun 2021 22:51:52 +0200
Subject: [PATCH 3/9] Feature: Read the docs

---
 data/sidebars/references.yml            |  8 ++--
 gatsby-node.js                          | 19 ++++-----
 src/components/Sidebar.jsx              |  2 +-
 src/templates/Markdown/MarkdownList.jsx | 56 ++++++++++++++++---------
 4 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/data/sidebars/references.yml b/data/sidebars/references.yml
index d3111688..e3844b98 100644
--- a/data/sidebars/references.yml
+++ b/data/sidebars/references.yml
@@ -16,7 +16,7 @@
 - group: Aquarius Py Module
   items:
     - title: API Reference
-      link: /read-the-docs/aquarius/
+      link: /references/read-the-docs/aquarius/
 
 - group: provider REST API
   items:
@@ -26,7 +26,7 @@
 - group: Provider Py Module
   items:
     - title: API Reference
-      link: /read-the-docs/provider/
+      link: /references/read-the-docs/provider/
 
 - group: react
   items:
@@ -36,7 +36,7 @@
 - group: ocean.py
   items:
     - title: API Reference
-      link: /read-the-docs/ocean-py/
+      link: /references/read-the-docs/ocean-py/
 
 - group: Smart Contracts
   items:
@@ -51,4 +51,4 @@
 - group: Ocean Subgraph
   items:
     - title: Readme References
-      link: /read-the-docs/ocean-subgraph/
+      link: /references/read-the-docs/ocean-subgraph/
diff --git a/gatsby-node.js b/gatsby-node.js
index 3cb3300e..46ae2418 100755
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -132,13 +132,12 @@ exports.createPages = ({ graphql, actions }) => {
         await createSwaggerPages(createPage)
 
         // API: ocean.js
-        const lastRelease =
-          result.data.oceanJs.repository.releases.edges.filter(
-            ({ node }) =>
-              !node.isPrerelease &&
-              !node.isDraft &&
-              node.releaseAssets.edges.length > 0
-          )[0].node.releaseAssets.edges[0].node
+        const lastRelease = result.data.oceanJs.repository.releases.edges.filter(
+          ({ node }) =>
+            !node.isPrerelease &&
+            !node.isDraft &&
+            node.releaseAssets.edges.length > 0
+        )[0].node.releaseAssets.edges[0].node
 
         await createTypeDocPage(
           createPage,
@@ -266,13 +265,13 @@ const createReadTheDocsPage = async (createPage, name, list) => {
     './src/templates/Markdown/MarkdownList.jsx'
   )
   createPage({
-    path: `/read-the-docs/${name}`,
-    matchPath: `/read-the-docs/${name}/*`,
+    path: `/references/read-the-docs/${name}`,
+    matchPath: `/references/read-the-docs/${name}/*`,
     component: markdownListTemplate,
     context: {
       markdownList: list,
       name: name,
-      baseUrl: `/read-the-docs/${name}`
+      baseUrl: `/references/read-the-docs/${name}`
     }
   })
 }
diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx
index 5268997e..7c6cd4a8 100644
--- a/src/components/Sidebar.jsx
+++ b/src/components/Sidebar.jsx
@@ -122,7 +122,7 @@ export default class Sidebar extends Component {
         {sidebarfile.map((group, i) => (
           <div key={i}>
             {collapsed ? (
-              group.items.some((item) => item.link === location.pathname) ? (
+              group.items.some((item) => location.pathname.startsWith(item.link)) ? (
                 <SidebarGroup
                   i={i}
                   group={group}
diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index 53478da5..6b5e3899 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -1,16 +1,13 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import Layout from '../../components/Layout'
-import HeaderSection from '../../components/HeaderSection'
-import Content from '../../components/Content'
-import styles from '../../templates/Doc.module.scss'
 import MarkdownTemplate from '../MarkdownTemplate'
 import sidebarStyles from '../../components/Sidebar.module.scss'
 import moduleStyles from './Markdown.module.scss'
 import { generatedNestedObject } from './utils'
 import { navigate } from 'gatsby'
+import ContentWrapperTemplate from '../ContentWrapperTemplate'
 
-export default function MarkdownList({ location, pageContext }) {
+export default function MarkdownList({ data, location, pageContext }) {
   const flattenedModules = {}
   const nestedModules = {}
   pageContext.markdownList.map(({ node }) => {
@@ -63,13 +60,12 @@ export default function MarkdownList({ location, pageContext }) {
 
     const keys = Object.keys(nestedModules).sort()
     const children = []
-    if (title) {
+    if (title)
       children.push(
         <li key={title}>
           <b>{title}</b>
         </li>
       )
-    }
 
     keys.forEach((element) => {
       children.push(
@@ -84,19 +80,23 @@ export default function MarkdownList({ location, pageContext }) {
   const nestedSidebarList = sidebarList(null, nestedModules)
 
   return (
-    <Layout>
-      <HeaderSection title={pageContext.name} />
-      <Content>
-        <main className={styles.wrapper}>
-          <aside className={styles.sidebar}>
-            <div className={sidebarStyles.sidebar}>{nestedSidebarList}</div>
-          </aside>
-          <article className={styles.main}>
-            <MarkdownTemplate data={selectedModule} />
-          </article>
-        </main>
-      </Content>
-    </Layout>
+    <>
+      <ContentWrapperTemplate
+        data={data}
+        path={path}
+        location={location}
+        slug={pageContext.baseUrl}
+        info={{
+          title: selectedModule.frontmatter.title,
+          description: null,
+          version: selectedModule.frontmatter.version
+        }}
+        toc={nestedSidebarList}
+      >
+        <MarkdownTemplate data={selectedModule} />
+
+      </ContentWrapperTemplate>
+    </>
   )
 }
 
@@ -104,3 +104,19 @@ MarkdownList.propTypes = {
   pageContext: PropTypes.object.isRequired,
   location: PropTypes.object.isRequired
 }
+
+
+export const MarkdownListQuery = graphql`
+      query {
+        allSectionsYaml {
+        edges {
+        node {
+        title
+          description
+      link
+        }
+      }
+    }
+  }
+      `
+

From 88adc9523285f3ed1ecfdaf29890854885051f89 Mon Sep 17 00:00:00 2001
From: Akshay <akshay.ap95@gmail.com>
Date: Mon, 21 Jun 2021 23:29:14 +0200
Subject: [PATCH 4/9] Feature: Uniform style and highlight select read-the-docs
 component

---
 src/templates/Markdown/MarkdownList.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index 6b5e3899..bcbfbcb3 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import MarkdownTemplate from '../MarkdownTemplate'
 import sidebarStyles from '../../components/Sidebar.module.scss'
-import moduleStyles from './Markdown.module.scss'
+import moduleStyles from '../../components/Sidebar.module.scss'
 import { generatedNestedObject } from './utils'
 import { navigate } from 'gatsby'
 import ContentWrapperTemplate from '../ContentWrapperTemplate'

From d0b167f24dd99be145358eb48bc30f822b0629e2 Mon Sep 17 00:00:00 2001
From: Akshay <akshay.ap95@gmail.com>
Date: Mon, 21 Jun 2021 23:50:37 +0200
Subject: [PATCH 5/9] Improvement: Fix lint issues

---
 gatsby-node.js                          | 13 +++++++------
 src/components/Sidebar.jsx              |  5 ++++-
 src/templates/Markdown/MarkdownList.jsx | 23 ++++++++++-------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/gatsby-node.js b/gatsby-node.js
index 46ae2418..1a765c90 100755
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -132,12 +132,13 @@ exports.createPages = ({ graphql, actions }) => {
         await createSwaggerPages(createPage)
 
         // API: ocean.js
-        const lastRelease = result.data.oceanJs.repository.releases.edges.filter(
-          ({ node }) =>
-            !node.isPrerelease &&
-            !node.isDraft &&
-            node.releaseAssets.edges.length > 0
-        )[0].node.releaseAssets.edges[0].node
+        const lastRelease =
+          result.data.oceanJs.repository.releases.edges.filter(
+            ({ node }) =>
+              !node.isPrerelease &&
+              !node.isDraft &&
+              node.releaseAssets.edges.length > 0
+          )[0].node.releaseAssets.edges[0].node
 
         await createTypeDocPage(
           createPage,
diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx
index 7c6cd4a8..62d26cb9 100644
--- a/src/components/Sidebar.jsx
+++ b/src/components/Sidebar.jsx
@@ -122,7 +122,10 @@ export default class Sidebar extends Component {
         {sidebarfile.map((group, i) => (
           <div key={i}>
             {collapsed ? (
-              group.items.some((item) => location.pathname.startsWith(item.link)) ? (
+              group.items.some(
+                (item) =>
+                  location.pathname.substring(0, item.link.length) === item.link
+              ) ? (
                 <SidebarGroup
                   i={i}
                   group={group}
diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index bcbfbcb3..fc38785e 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -2,9 +2,8 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import MarkdownTemplate from '../MarkdownTemplate'
 import sidebarStyles from '../../components/Sidebar.module.scss'
-import moduleStyles from '../../components/Sidebar.module.scss'
 import { generatedNestedObject } from './utils'
-import { navigate } from 'gatsby'
+import { navigate, graphql } from 'gatsby'
 import ContentWrapperTemplate from '../ContentWrapperTemplate'
 
 export default function MarkdownList({ data, location, pageContext }) {
@@ -41,7 +40,7 @@ export default function MarkdownList({ data, location, pageContext }) {
 
   const generateModuleListElement = (id, label) => {
     const className =
-      selectedModule.id === id ? moduleStyles.active : moduleStyles.link
+      selectedModule.id === id ? sidebarStyles.active : sidebarStyles.link
 
     return (
       <li key={id} id={id} style={{ cursor: 'pointer' }}>
@@ -94,7 +93,6 @@ export default function MarkdownList({ data, location, pageContext }) {
         toc={nestedSidebarList}
       >
         <MarkdownTemplate data={selectedModule} />
-
       </ContentWrapperTemplate>
     </>
   )
@@ -102,21 +100,20 @@ export default function MarkdownList({ data, location, pageContext }) {
 
 MarkdownList.propTypes = {
   pageContext: PropTypes.object.isRequired,
-  location: PropTypes.object.isRequired
+  location: PropTypes.object.isRequired,
+  data: PropTypes.object
 }
 
-
 export const MarkdownListQuery = graphql`
-      query {
-        allSectionsYaml {
-        edges {
+  query {
+    allSectionsYaml {
+      edges {
         node {
-        title
+          title
           description
-      link
+          link
         }
       }
     }
   }
-      `
-
+`

From 2c6d54bef0cdadc49621377dec2b0343c46fabcc Mon Sep 17 00:00:00 2001
From: Akshay <akshay.ap95@gmail.com>
Date: Wed, 23 Jun 2021 11:03:40 +0200
Subject: [PATCH 6/9] Fix: Codeclimate issue and minor improvement

---
 src/templates/Markdown/MarkdownList.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index fc38785e..f0f00059 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -68,7 +68,7 @@ export default function MarkdownList({ data, location, pageContext }) {
 
     keys.forEach((element) => {
       children.push(
-        <ul className={sidebarStyles.list}>
+        <ul >
           {sidebarList(element, nestedModules[element])}
         </ul>
       )
@@ -76,7 +76,7 @@ export default function MarkdownList({ data, location, pageContext }) {
     return children
   }
 
-  const nestedSidebarList = sidebarList(null, nestedModules)
+  const nestedSidebarList = sidebarList("", nestedModules)
 
   return (
     <>

From 5b43862bf666ba6c8e3891b80201f9a0f87aa47d Mon Sep 17 00:00:00 2001
From: Akshay <akshay.ap95@gmail.com>
Date: Wed, 23 Jun 2021 11:06:12 +0200
Subject: [PATCH 7/9] Fix: Codeclimate issue and minor improvement

---
 src/templates/Markdown/MarkdownList.jsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index f0f00059..0e47c8d9 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -59,12 +59,12 @@ export default function MarkdownList({ data, location, pageContext }) {
 
     const keys = Object.keys(nestedModules).sort()
     const children = []
-    if (title)
-      children.push(
-        <li key={title}>
-          <b>{title}</b>
-        </li>
-      )
+
+    children.push(
+      <li key={title}>
+        <b>{title}</b>
+      </li>
+    )
 
     keys.forEach((element) => {
       children.push(

From bde5d3f3aa1a21f354c888087e693fe4bad11c72 Mon Sep 17 00:00:00 2001
From: Akshay <akshay.ap95@gmail.com>
Date: Wed, 23 Jun 2021 11:21:29 +0200
Subject: [PATCH 8/9] Fix: Codeclimate issue

---
 src/templates/ContentWrapperTemplate.jsx | 2 +-
 src/templates/Markdown/MarkdownList.jsx  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/templates/ContentWrapperTemplate.jsx b/src/templates/ContentWrapperTemplate.jsx
index c26c5bb8..854d6f13 100644
--- a/src/templates/ContentWrapperTemplate.jsx
+++ b/src/templates/ContentWrapperTemplate.jsx
@@ -15,7 +15,7 @@ export default class ContentWrapperTemplate extends Component {
     data: PropTypes.object.isRequired,
     location: PropTypes.object.isRequired,
     slug: PropTypes.string.isRequired,
-    toc: PropTypes.object.isRequired,
+    toc: PropTypes.any.isRequired,
     info: PropTypes.object.isRequired,
     children: PropTypes.any
   }
diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index 0e47c8d9..9198cd8e 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -68,7 +68,7 @@ export default function MarkdownList({ data, location, pageContext }) {
 
     keys.forEach((element) => {
       children.push(
-        <ul >
+        <ul key={element}>
           {sidebarList(element, nestedModules[element])}
         </ul>
       )
@@ -99,7 +99,11 @@ export default function MarkdownList({ data, location, pageContext }) {
 }
 
 MarkdownList.propTypes = {
-  pageContext: PropTypes.object.isRequired,
+  pageContext: PropTypes.shape({
+    name: PropTypes.string,
+    baseUrl: PropTypes.string,
+    markdownList: PropTypes.arrayOf(PropTypes.object)
+  }),
   location: PropTypes.object.isRequired,
   data: PropTypes.object
 }

From 3f22dae5ed81677da987aa6829593ee893d723e4 Mon Sep 17 00:00:00 2001
From: Akshay <akshay.ap95@gmail.com>
Date: Wed, 23 Jun 2021 11:33:47 +0200
Subject: [PATCH 9/9] Fix: Lint issues

---
 src/templates/Markdown/MarkdownList.jsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index 9198cd8e..1b330dc6 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -68,15 +68,13 @@ export default function MarkdownList({ data, location, pageContext }) {
 
     keys.forEach((element) => {
       children.push(
-        <ul key={element}>
-          {sidebarList(element, nestedModules[element])}
-        </ul>
+        <ul key={element}>{sidebarList(element, nestedModules[element])}</ul>
       )
     })
     return children
   }
 
-  const nestedSidebarList = sidebarList("", nestedModules)
+  const nestedSidebarList = sidebarList('', nestedModules)
 
   return (
     <>