Serve a favicon

DarkBlaez · Dec 7, 2015 · 8ed0d81 · 8ed0d81
1 parent a0cafca
commit 8ed0d81
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/images/favicon.gif b/images/favicon.gif
diff --git a/images/favicon.ico b/images/favicon.ico
diff --git a/server.js b/server.js
@@ -34,6 +34,8 @@ app.post('/api/0/events', api.addEvent);
 app.post('/api/0/events/:id', api.editEvent);
 app.delete('/api/0/events/:id', api.deleteEvent);
 
+app.get('/favicon.ico', (req, res) => res.sendFile(path.join(__dirname, 'images', 'favicon.ico')));
+
 /**
  * Universal Application endpoint
  */

diff --git a/server/app.js b/server/app.js
@@ -33,7 +33,7 @@ export function handleRender(req, res) {
     )(createStore)(reducers, initialState);
 
     // Wire up routing based upon routes
-    store.dispatch(match(req.url, (error, redirectLocation) => {
+    store.dispatch(match(req.url, (error, redirectLocation, renderProps) => {
       if (error)  {
         console.log('Error', error);
         res.status(400);
@@ -46,11 +46,13 @@ export function handleRender(req, res) {
         return;
       }
 
+
+
       // Render the component to a string
       const html = ReactDOMServer.renderToString(
         <div>
           <Provider store={store}>
-            <ReduxRouter />
+            <ReduxRouter {...renderProps} />
           </Provider>
         </div>
       );