Merge branch 'master' into feat_rc_server_rendering

Author: RyanCCollins

README.md

@@ -22,10 +22,13 @@ If this is confusing, don't fret, we've set you up with a few examples and code
 Below are a few example apps that have been built with this project
 - React Weekly 
     - [See the Code](https://github.com/RyanCCollins/react-weekly) 
-    - [See the App](http://www.reactweekly.co/)
+    - [See the Live App](http://www.reactweekly.co/)
 - Restaurant Reviewer 
     - [See the Code](https://github.com/RyanCCollins/restaurant-reviewer) 
-    - [See the Working App](http://restaurant-reviewer-client.herokuapp.com/)
+    - [See the Live App](http://restaurant-reviewer-client.herokuapp.com/)
+- Corporate Dashboard
+    - [See the Code](https://github.com/RyanCCollins/corporate-dashboard)
+    - [See the Live App](https://corporate-dashboard-client.herokuapp.com/)
 
 ## Experimental Features
 ### Server Rendering
@@ -242,7 +245,7 @@ which will pick up any file with the .test.js postfix and run it through Karma /
 * [x] Add Webpack stats plugin
 * [x] Dogfood the project and iterate on suggestions
 * [x] Setup production server configuration
-* [ ] Add Jest as testing utility
+* [x] Add Jest as testing utility
 * [ ] Create Docker container & automation scripts
 * [ ] Write wiki / other documentation
 

app/src/components/Navbar/index.js

@@ -1,9 +1,9 @@
 import React from 'react';
-import Header from 'grommet/components/Header';
-import Title from 'grommet/components/Title';
-import Menu from 'grommet/components/Menu';
-import Anchor from 'grommet/components/Anchor';
-import Search from 'grommet/components/Search';
+import Header from 'grommet-udacity/components/Header';
+import Title from 'grommet-udacity/components/Title';
+import Menu from 'grommet-udacity/components/Menu';
+import Anchor from 'grommet-udacity/components/Anchor';
+import Search from 'grommet-udacity/components/Search';
 import LogoImage from './logo.png';
 
 import styles from './index.module.scss';

app/src/components/Navbar/tests/__snapshots__/index.test.js.snap

@@ -11,8 +11,7 @@ exports[`<Navbar /> should render with default props 1`] = `
         "vertical": "none"
       }
     }
-    responsive={false}
-    tag="header">
+    responsive={false}>
     <Title
       responsive={true}>
       <img

app/src/containers/FeatureFirstContainer/index.js

@@ -57,7 +57,7 @@ FeatureFirstContainer.propTypes = {
 
 // mapStateToProps :: {State} -> {Action}
 const mapStateToProps = (state) => ({
-  isLoading: state.isLoading,
+  isLoading: state.featureComponent.isLoading,
 });
 
 // mapDispatchToProps :: Dispatch Func -> {Actions}

app/src/containers/FeatureFirstContainer/tests/__snapshots__/index.test.js.snap

@@ -8,12 +8,14 @@ exports[`<FeatureFirstContainer /> renders with default props 1`] = `
       "loadDataSuccess": [Function anonymous]
     }
   }
+  isLoading={false}
   store={
     Object {
       "clearActions": [Function clearActions],
       "dispatch": [Function anonymous],
       "getActions": [Function getActions],
       "getState": [Function getState],
+      "replaceReducer": [Function replaceReducer],
       "subscribe": [Function subscribe]
     }
   } />