From 224d057b9a816cf0b94c190addc5f1a85e29bfb8 Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Wed, 21 Feb 2018 13:42:41 -0800
Subject: [PATCH] switched "render" to "hydrate"

---
 helpers/handleRender.jsx  | 5 +++--
 helpers/renderFullPage.js | 2 +-
 react/client.js           | 4 ++--
 routes/page-routes.js     | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/helpers/handleRender.jsx b/helpers/handleRender.jsx
index ee5a4388..ebf59983 100644
--- a/helpers/handleRender.jsx
+++ b/helpers/handleRender.jsx
@@ -1,11 +1,12 @@
+import React from 'react';
 import { renderToString } from 'react-dom/server';
 import { createStore } from 'redux';
 import Reducer from '../react/reducers';
-import renderFullPage from './renderFullPage.js';
-
+import { Provider } from 'react-redux';
 import StaticRouter from 'react-router-dom/StaticRouter';
 import GAListener from '../react/components/GAListener';
 import App from '../react/app';
+import renderFullPage from './renderFullPage.js';
 
 module.exports = (req, res) => {
   let context = {};
diff --git a/helpers/renderFullPage.js b/helpers/renderFullPage.js
index 986c3c28..d3feedb0 100644
--- a/helpers/renderFullPage.js
+++ b/helpers/renderFullPage.js
@@ -14,7 +14,7 @@ module.exports = (html, preloadedState) => {
             <script>
                 window.__PRELOADED_STATE__ = ${JSON.stringify(preloadedState).replace(/</g, '\\\u003c')}
             </script>
-            <script src="/static/bundle.js"></script>
+            <script src="/bundle/bundle.js"></script>
         </body>
     </html>
   `;
diff --git a/react/client.js b/react/client.js
index da8deec1..9fe9f16a 100644
--- a/react/client.js
+++ b/react/client.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from 'react-dom';
+import { hydrate } from 'react-dom';
 import { Provider } from 'react-redux';
 import { createStore, applyMiddleware, compose } from 'redux';
 import { BrowserRouter } from 'react-router-dom';
@@ -35,7 +35,7 @@ if (preloadedState) {
 sagaMiddleware.run(rootSaga);
 
 // render the app
-render(
+hydrate(
   <Provider store={store}>
     <BrowserRouter>
       <GAListener>
diff --git a/routes/page-routes.js b/routes/page-routes.js
index afc00b18..9cf4ae93 100644
--- a/routes/page-routes.js
+++ b/routes/page-routes.js
@@ -1,10 +1,10 @@
 const { site } = require('../config/speechConfig.js');
-// const handleRender = require('../helpers/handleRender.jsx');
+const handleRender = require('../helpers/handleRender.jsx');
 
 module.exports = (app) => {
   // route for the home page
   app.get('/', (req, res) => {
-    res.status(200).render('index');
+    handleRender(req, res);
   });
   // route to display login page
   app.get('/login', (req, res) => {