rename

codeBelt · codeBelt · commit e999212055a2 · 2017-08-04T00:30:47.000-05:00
diff --git a/src/RouterWrapper.jsx b/src/RouterWrapper.jsx
@@ -5,10 +5,10 @@ import {StaticRouter} from 'react-router';
 import About from "./views/About";
 import Home from "./views/Home";
 import Contact from "./views/Contact";
-import Footer from "./views/Footer";
-import Header from "./views/Header";
+import Footer from "./views/landmarks/Footer";
+import Header from "./views/landmarks/Header";
 
-const ProviderWrapper = (props) => {
+const RouterWrapper = (props) => {
     const Router = props.isServerSide ? StaticRouter : BrowserRouter;
 
     return (
@@ -41,4 +41,4 @@ const ProviderWrapper = (props) => {
     );
 };
 
-export default ProviderWrapper;
+export default RouterWrapper;
diff --git a/src/client.js b/src/client.js
@@ -5,7 +5,7 @@ import ReactDOM from 'react-dom';
 import 'bootstrap/dist/css/bootstrap.css';
 import './assets/styles/styles.css';
 
-import ProviderWrapper from './ProviderWrapper';
+import RouterWrapper from './RouterWrapper';
 import ProviderService from './services/ProviderService';
 
 const rootEl = document.getElementById('root');
@@ -22,8 +22,8 @@ const render = (Component) =>
         rootEl
     );
 
-render(ProviderWrapper);
+render(RouterWrapper);
 
 if (module.hot) {
-    module.hot.accept('./ProviderWrapper', () => render(ProviderWrapper));
+    module.hot.accept('./RouterWrapper', () => render(RouterWrapper));
 }
diff --git a/src/index.html b/src/index.html
@@ -3,6 +3,7 @@
     <head>
         <meta charset="utf-8" />
         <title>{title}</title>
+        <meta name="description" content="{description}">
         <link
             href="assets/media/favicon.ico"
             rel="icon"
diff --git a/src/server-side/controllers/ReactController.jsx b/src/server-side/controllers/ReactController.jsx
@@ -2,7 +2,7 @@ import {renderToString, renderToStaticMarkup} from 'react-dom/server';
 import path from 'path';
 import * as fse from 'fs-extra';
 import * as React from 'react';
-import ProviderWrapper from '../../ProviderWrapper';
+import RouterWrapper from '../../RouterWrapper';
 import ProviderService from '../../services/ProviderService';
 import rootSaga from '../../store/rootSaga';
 
@@ -16,7 +16,7 @@ class ReactController {
                 const store = ProviderService.createProviderStore({}, true);
                 const context = {};
                 const app = (
-                    <ProviderWrapper
+                    <RouterWrapper
                         store={store}
                         location={request.path}
                         context={context}
@@ -26,10 +26,12 @@ class ReactController {
 
                 store.runSaga(rootSaga).done.then(async () => {
                     const renderedHtml = renderToString(app);
-                    const stateStringified = JSON.stringify(store.getState());
+                    const state = store.getState();
+                    const stateStringified = JSON.stringify(state);
 
                     let html = await fse.readFile(path.resolve(__dirname, '../../public/index.html'), 'utf8');
-                    html = html.replace('{title}', 'Test Title');
+                    // html = html.replace('{title}', state.metaReducer.title);
+                    // html = html.replace('{description}', state.metaReducer.description);
                     html = html.replace('{content}', renderedHtml);
                     html = html.replace('{state}',  stateStringified);
 
diff --git a/src/store/loading/LoadingReducer.js b/src/store/loading/LoadingReducer.js
@@ -8,17 +8,17 @@ class LoadingReducer {
 
     static reduce(state = LoadingReducer._initialState, action) {
         switch (action.type) {
-            case LoadingAction.LOAD_USER_SUCCESS:
-                return LoadingReducer._loadLoading(state, action);
+            case LoadingAction.SET_LOADING:
+                return LoadingReducer._setLoading(state, action);
             default:
                 return state;
         }
     }
 
-    static _loadLoading(state, action) {
+    static _setLoading(state, action) {
         return {
             ...state,
-            ...action.payload,
+            isLoading: action.payload,
         };
     }
 
diff --git a/src/views/landmarks/Footer.jsx b/src/views/landmarks/Footer.jsx
diff --git a/src/views/landmarks/Header.jsx b/src/views/landmarks/Header.jsx

Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,17 @@ class LoadingReducer {`
`8`	`8`
`9`	`9`	`static reduce(state = LoadingReducer._initialState, action) {`
`10`	`10`	`switch (action.type) {`
`11`		`- case LoadingAction.LOAD_USER_SUCCESS:`
`12`		`- return LoadingReducer._loadLoading(state, action);`
	`11`	`+ case LoadingAction.SET_LOADING:`
	`12`	`+ return LoadingReducer._setLoading(state, action);`
`13`	`13`	`default:`
`14`	`14`	`return state;`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`- static _loadLoading(state, action) {`
	`18`	`+ static _setLoading(state, action) {`
`19`	`19`	`return {`
`20`	`20`	`...state,`
`21`		`- ...action.payload,`
	`21`	`+ isLoading: action.payload,`
`22`	`22`	`};`
`23`	`23`	`}`
`24`	`24`