change dir-files structure

Author: MacKentoch

docs/public/assets/app.bundle.js

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-immutable-webpack-ssr-starter",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "React + React-Router + Redux + ImmutableJS + Bootstrap with with Server side rendering, Hot Reload and redux-devtools STARTER",
   "main": "src/index.js",
   "engines": {

package.json

@@ -3,18 +3,19 @@
 import React        from 'react';
 import PropTypes    from 'prop-types';
 
-const UpIcon = ({color}) => {
-  return (
-    <svg
-      width="24px"
-      height="24px"
-      viewBox="0 0 512 512"
-      fill={`${color}`} >
-      <path d="M256,213.7L256,213.7L256,213.7l174.2,167.2c4.3,4.2,11.4,4.1,15.8-0.2l30.6-29.9c4.4-4.3,4.5-11.3,0.2-15.5L264.1,131.1
-      c-2.2-2.2-5.2-3.2-8.1-3c-3-0.1-5.9,0.9-8.1,3L35.2,335.3c-4.3,4.2-4.2,11.2,0.2,15.5L66,380.7c4.4,4.3,11.5,4.4,15.8,0.2L256,213.7z" />
-    </svg>
-  );
-};
+const UpIcon = ({
+  color
+}) => (
+  <svg
+    width="24px"
+    height="24px"
+    viewBox="0 0 512 512"
+    fill={`${color}`} >
+    <path d="M256,213.7L256,213.7L256,213.7l174.2,167.2c4.3,4.2,11.4,4.1,15.8-0.2l30.6-29.9c4.4-4.3,4.5-11.3,0.2-15.5L264.1,131.1
+    c-2.2-2.2-5.2-3.2-8.1-3c-3-0.1-5.9,0.9-8.1,3L35.2,335.3c-4.3,4.2-4.2,11.2,0.2,15.5L66,380.7c4.4,4.3,11.5,4.4,15.8,0.2L256,213.7z" />
+  </svg>
+);
+
 
 UpIcon.propTypes = {
   color: PropTypes.string

src/app/components/backToTop/backToTopButton/UpIcon.js

@@ -1,13 +1,5 @@
 // @flow weak
 
-import Jumbotron          from './jumbotron/Jumbotron';
-import NavigationBar      from './navigation/NavigationBar';
-import BackToTop          from './backToTop/BackToTop';
-import AnimatedView       from './animatedView/AnimatedView';
-
-export {
-  AnimatedView,
-  Jumbotron,
-  NavigationBar,
-  BackToTop
-};
+export { default as Jumbotron }         from './jumbotron/Jumbotron';
+export { default as NavigationBar }     from './navigation/NavigationBar';
+export { default as BackToTop }         from './backToTop/BackToTop';

src/app/components/index.js

@@ -3,9 +3,11 @@
 import React        from 'react';
 import PropTypes    from 'prop-types';
 
-const Jumbotron = (props) => (
+const Jumbotron = ({
+  children
+}) => (
   <div className="jumbotron">
-    {props.children}
+    { children }
   </div>
 );
 

src/app/components/jumbotron/Jumbotron.js

@@ -8,9 +8,6 @@ import {
   BackToTop
 }                             from '../../components';
 import navigationModel        from '../../models/navigation.json';
-import { bindActionCreators } from 'redux';
-import { connect }            from 'react-redux';
-import * as viewsActions      from '../../redux/modules/views';
 import { fromJS }             from 'immutable';
 import MainRoutes             from '../../routes/MainRoutes';
 import { withRouter }         from 'react-router';
@@ -51,25 +48,4 @@ class App extends PureComponent {
   }
 }
 
-const mapStateToProps = (state) => {
-  return {
-    currentView: state.getIn(['views', 'currentView'])
-  };
-};
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    actions : bindActionCreators(
-      {
-        ...viewsActions
-      },
-      dispatch)
-  };
-};
-
-export default withRouter(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-  )(App)
-);
+export default withRouter(App);

src/app/components/animatedView/AnimatedView.js renamed to src/app/containers/animatedView/AnimatedView.js

@@ -0,0 +1,27 @@
+// @flow weak
+
+import { connect }            from 'react-redux';
+import { bindActionCreators } from 'redux';
+import * as viewsActions      from '../../redux/modules/views';
+import App                    from './App';
+
+const mapStateToProps = (state) => {
+  return {
+    currentView: state.getIn(['views', 'currentView'])
+  };
+};
+
+const mapDispatchToProps = (dispatch) => {
+  return {
+    actions : bindActionCreators(
+      {
+        ...viewsActions
+      },
+      dispatch)
+  };
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(App);

src/app/containers/app/App.js

@@ -1,11 +1,4 @@
 // @flow weak
 
-import App                  from './app/App';
-import ConnectedHome        from './home/Home';
-import ConnectedAbout       from './about/About';
-
-export {
-  App,
-  ConnectedHome,
-  ConnectedAbout
-};
+export { default as App }           from './app/App';
+export { default as AnimatedView }  from './animatedView/AnimatedView';

src/app/containers/app/index.js

@@ -1,5 +1,5 @@
 {
-  "brand":      "React Redux Immutable Starter",
+  "brand":      "React Redux Immutable webpack ssr Starter",
   "leftLinks":  [],
   "rightLinks": [
     {