add react router error handling and redirecting logic

src/routes.js

@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import { IndexRoute, Route } from 'react-router';
+import { IndexRoute, Route, Redirect } from 'react-router';
 import fetch from './core/fetch';
 import App from './components/App';
 import ContentPage from './components/ContentPage';
@@ -26,6 +26,7 @@ async function getContextComponent(location, callback) {
 
 export default (
   <Route>
+    <Redirect from="/company" to="/about" />
     <Route path="/" component={App}>
       <IndexRoute getComponent={getContextComponent} />
       <Route path="contact" component={ContactPage} />

src/server.js

@@ -37,6 +37,14 @@ server.use('/api/content', require('./api/content').default);
 server.get('*', async (req, res, next) => {
   try {
     match({ routes, location: req.url }, (error, redirectLocation, renderProps) => {
+      if (error) {
+        throw error;
+      }
+      if (redirectLocation) {
+        let redirectPath = `${ redirectLocation.pathname }${ redirectLocation.search }`;
+        res.redirect(302, redirectPath);
+        return
+      }
       let statusCode = 200;
       const data = { title: '', description: '', css: '', body: '', entry: assets.main.js };
       const css = [];