Merge branch 'react-pr' into dashboard-link

src/components/UnpublishedListing.css

@@ -4,6 +4,9 @@
   vertical-align: top;
   text-align: center;
   width: 28%;
+  & h2 {
+    font-size: 16px;
+  }
 }
 
 .column:not(:last-child) {

src/components/UnpublishedListing.js

@@ -2,7 +2,7 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import moment from 'moment';
 import { Card } from './UI';
-import { Link } from 'react-router'
+import { Link } from 'react-router';
 import { statusDescriptions } from '../constants/publishModes';
 import styles from './UnpublishedListing.css';
 
@@ -13,7 +13,7 @@ export default class UnpublishedListing extends React.Component {
     if (!column) {
       return entries.entrySeq().map(([currColumn, currEntries]) => (
         <div key={currColumn} className={styles.column}>
-          <h3>{statusDescriptions.get(currColumn)}</h3>
+          <h2>{statusDescriptions.get(currColumn)}</h2>
           {this.renderColumns(currEntries, currColumn)}
         </div>
       ));
@@ -22,7 +22,7 @@ export default class UnpublishedListing extends React.Component {
         {entries.map(entry => {
           // Look for an "author" field. Fallback to username on backend implementation;
           const author = entry.getIn(['data', 'author'], entry.getIn(['metaData', 'user']));
-          const timeStamp = moment(entry.getIn(['metaData', 'timeStamp'])).formate('llll');
+          const timeStamp = moment(entry.getIn(['metaData', 'timeStamp'])).format('llll');
           const link = `/editorialworkflow/${entry.getIn(['metaData', 'collection'])}/${entry.getIn(['metaData', 'status'])}/${entry.get('slug')}`;
           return (
             <Card key={entry.get('slug')} className={styles.card}>
@@ -41,6 +41,7 @@ export default class UnpublishedListing extends React.Component {
 
     return (
       <div>
+        <h1>Editorial Workflow</h1>
         {columns}
       </div>
     );

src/containers/editorialWorkflow/CollectionPageHOC.js

@@ -6,6 +6,7 @@ import { selectUnpublishedEntries } from '../../reducers';
 import { EDITORIAL_WORKFLOW, status } from '../../constants/publishModes';
 import UnpublishedListing from '../../components/UnpublishedListing';
 import { connect } from 'react-redux';
+import styles from '../CollectionPage.css';
 
 export default function CollectionPageHOC(CollectionPage) {
   class CollectionPageHOC extends CollectionPage {
@@ -23,7 +24,7 @@ export default function CollectionPageHOC(CollectionPage) {
       if (!isEditorialWorkflow) return super.render();
 
       return (
-        <div>
+        <div className={styles.alignable}>
           <UnpublishedListing entries={unpublishedEntries}/>
           {super.render()}
         </div>

src/index.css

@@ -3,8 +3,9 @@ html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
   margin: 0;
-  font-family: Roboto,"Helvetica Neue",HelveticaNeue,Helvetica,Arial,sans-serif;
+  font-family: Roboto, "Helvetica Neue", HelveticaNeue, Helvetica, Arial, sans-serif;
 }
+
 *, *:before, *:after {
   box-sizing: inherit;
 }
@@ -13,7 +14,7 @@ body {
   font-family: 'Roboto', sans-serif;
   height: 100%;
   background-color: #f2f5f4;
-  color:#7c8382;
+  color: #7c8382;
   margin: 0;
 }
 
@@ -25,23 +26,24 @@ h1, h2, h3, h4, h5, h6, p {
   margin: 0;
 }
 
-h1{
-    color: #3ab7a5;
-    border-bottom: 1px solid #3ab7a5;
-    margin: 30px auto 25px;
-    padding-bottom: 15px;
-    font-size: 25px;
+h1 {
+  color: #3ab7a5;
+  border-bottom: 1px solid #3ab7a5;
+  margin: 30px auto 25px;
+  padding-bottom: 15px;
+  font-size: 25px;
 }
 
-header input{
-  margin-bottom:0;
+header input {
+  margin-bottom: 0;
 }
-button{
+
+button {
   border: 1px solid #3ab7a5;
   padding: 3px 20px;
   font-size: 12px;
   line-height: 18px;
-  background-color:#fff;
+  background-color: #fff;
   cursor: pointer;
 }
 
@@ -110,7 +112,7 @@ button{
     margin-top: 1px;
     z-index: 99999 !important;
     background: #fff;
-    box-shadow: 0 1px 3px rgba(0,0,0,.1);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, .1);
     border: 1px solid #f9f9f9;
   }
   & .rdtOpen .rdtPicker {
@@ -207,10 +209,10 @@ button{
   & .rdtNext span {
     display: block;
     -webkit-touch-callout: none; /* iOS Safari */
-    -webkit-user-select: none;   /* Chrome/Safari/Opera */
-    -khtml-user-select: none;    /* Konqueror */
-    -moz-user-select: none;      /* Firefox */
-    -ms-user-select: none;       /* Internet Explorer/Edge */
+    -webkit-user-select: none; /* Chrome/Safari/Opera */
+    -khtml-user-select: none; /* Konqueror */
+    -moz-user-select: none; /* Firefox */
+    -ms-user-select: none; /* Internet Explorer/Edge */
     user-select: none;
   }
 
@@ -283,10 +285,10 @@ button{
     display: block;
 
     -webkit-touch-callout: none; /* iOS Safari */
-    -webkit-user-select: none;   /* Chrome/Safari/Opera */
-    -khtml-user-select: none;    /* Konqueror */
-    -moz-user-select: none;      /* Firefox */
-    -ms-user-select: none;       /* Internet Explorer/Edge */
+    -webkit-user-select: none; /* Chrome/Safari/Opera */
+    -khtml-user-select: none; /* Konqueror */
+    -moz-user-select: none; /* Firefox */
+    -ms-user-select: none; /* Internet Explorer/Edge */
     user-select: none;
   }
   & .rdtCounter .rdtBtn:hover {

src/index.js

@@ -1,31 +1,33 @@
 import React from 'react';
 import { render } from 'react-dom';
-import { Provider } from 'react-redux';
-import { Router } from 'react-router';
+import { AppContainer } from 'react-hot-loader'
+import Root from './root'
 import registry from './lib/registry';
-import configureStore from './store/configureStore';
-import routes from './routing/routes';
-import history, { syncHistory } from './routing/history';
 import 'file?name=index.html!../example/index.html';
 import './index.css';
 
-const store = configureStore();
-
-// Create an enhanced history that syncs navigation events with the store
-syncHistory(store);
-
+// Create mount element dynamically
 const el = document.createElement('div');
 el.id = 'root';
 document.body.appendChild(el);
 
 render((
-  <Provider store={store}>
-    <Router history={history}>
-      {routes}
-    </Router>
-  </Provider>
+  <AppContainer>
+    <Root />
+  </AppContainer>
 ), el);
 
+if (module.hot) {
+  module.hot.accept('./root', () => {
+    const NextRoot = require('./root').default;
+    render((
+      <AppContainer>
+        <NextRoot />
+      </AppContainer>
+    ), el);
+  });
+}
+
 window.CMS = {};
 console.log('reg: ', registry);
 for (const method in registry) {

src/reducers/combinedReducer.js

@@ -0,0 +1,8 @@
+import { combineReducers } from 'redux';
+import { routerReducer } from 'react-router-redux';
+import reducers from '.';
+
+export default combineReducers({
+  ...reducers,
+  routing: routerReducer
+});

src/root.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { Router } from 'react-router';
+import routes from './routing/routes';
+import history, { syncHistory } from './routing/history';
+import configureStore from './store/configureStore';
+
+const store = configureStore();
+
+// Create an enhanced history that syncs navigation events with the store
+syncHistory(store);
+
+const Root = () => (
+  <Provider store={store}>
+    <Router history={history}>
+      {routes}
+    </Router>
+  </Provider>
+);
+
+export default Root;

src/store/configureStore.js

@@ -1,18 +1,20 @@
-import { createStore, applyMiddleware, combineReducers, compose } from 'redux';
+import { createStore, applyMiddleware, compose } from 'redux';
 import thunkMiddleware from 'redux-thunk';
-import { routerReducer } from 'react-router-redux';
-import reducers from '../reducers';
+import reducer from '../reducers/combinedReducer';
 
-const reducer = combineReducers({
-  ...reducers,
-  routing: routerReducer
-});
+export default function configureStore(initialState) {
+  const store = createStore(reducer, initialState, compose(
+    applyMiddleware(thunkMiddleware),
+    window.devToolsExtension ? window.devToolsExtension() : f => f
+  ));
 
-const createStoreWithMiddleware = compose(
-  applyMiddleware(thunkMiddleware),
-  window.devToolsExtension ? window.devToolsExtension() : (f) => f
-)(createStore);
+  if (module.hot) {
+    // Enable Webpack hot module replacement for reducers
+    module.hot.accept('../reducers/combinedReducer', () => {
+      const nextReducer = require('../reducers/combinedReducer') // eslint-disable-line
+      store.replaceReducer(nextReducer);
+    });
+  }
 
-export default (initialState) => (
-  createStoreWithMiddleware(reducer, initialState)
-);
+  return store;
+}