Merge branch 'hotfix/2.0.10'

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+*2.0.10* (2018-05-07)
+  - 🐛 lint and fix infinite doc loop (6a6620c)
+
 *2.0.9* (2018-04-05)
   - 📦 fix component wrapping class pattern (cdbef50)
 

VERSION

@@ -1 +1 @@
-2.0.9
+2.0.10

build/asset-manifest.json

@@ -1,6 +1,6 @@
 {
   "main.css": "static/css/main.3c8f75da.css",
   "main.css.map": "static/css/main.3c8f75da.css.map",
-  "main.js": "static/js/main.1c3a092f.js",
-  "main.js.map": "static/js/main.1c3a092f.js.map"
+  "main.js": "static/js/main.9ae05756.js",
+  "main.js.map": "static/js/main.9ae05756.js.map"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolbox-reader",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "private": true,
   "eslintConfig": {
     "parser": "babel-eslint",

src/components/App/Theme.js

@@ -2,12 +2,12 @@ import styled from 'styled-components';
 
 const config = window.theme || {};
 const base = {
-  black: "#010a15",
-  white: "#fff",
-  primary: "#003baf",
-  secondary: "#3474a8",
-  grayLighter: "#f2f2f4",
-  alto: "#d8d8d8",
+  black: '#010a15',
+  white: '#fff',
+  primary: '#003baf',
+  secondary: '#3474a8',
+  grayLighter: '#f2f2f4',
+  alto: '#d8d8d8',
 };
 
 export const Theme = styled.div`

src/epics/atomic.js

@@ -27,9 +27,9 @@ export function getComponentsEpic(action$) {
           // Loop over each components
           // eslint-disable-next-line no-param-reassign
           payload[type] = payload[type].map((component, id) => {
-            const path = `components/${type}/${component}/`;
-            const config = yaml.load(`${path}/${component}.yml`);
-            const markup = `${path}${component}.twig`;
+            const path = `components/${type}/${component.name}/`;
+            const config = yaml.load(`${path}${component.name}.yml`);
+            const markup = `${path}${component.name}.twig`;
 
             // format related variants collection
             const variants = config && config.variants ? config.variants.map((item, i) => {
@@ -45,7 +45,7 @@ export function getComponentsEpic(action$) {
                 type,
                 parent_id: id,
                 parent: config.name,
-                markup: `${path}${(`${component}-${variant.name}`).toLowerCase()}.twig`,
+                markup: `${path}${(`${component.name}-${variant.name}`).toLowerCase()}.twig`,
               };
             }) : [];
 

src/views/Doc/Doc.js

@@ -30,11 +30,13 @@ class Doc extends Component {
   }
 
   getContent(props) {
-    const homeFile = props.docs.docs_list.f && props.docs.docs_list.f.includes('index.md') ? 'index.md' : 'index.html';
-    const slug = props.match.params.slug || homeFile;
+    if (props.docs.current_doc.content.length <= 1) {
+      const homeFile = props.docs.docs_list.f && props.docs.docs_list.f.includes('index.md') ? 'index.md' : 'index.html';
+      const slug = props.match.params.slug || homeFile;
 
-    this.setState({ homeFile });
-    props.getDocContent(slug, props.navigation.base_url);
+      this.setState({ homeFile });
+      props.getDocContent(slug, props.navigation.base_url);
+    }
   }
 
   render() {

src/views/Single/Single.js

@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 
 import './Single.css';