redoing navbar in react

1 files changed, 15 insertions, 11 deletions

diff --git a/src/web/js/components/MainApp.react.js b/src/web/js/components/MainApp.react.js
index b448f808..cbdc5833 100644
--- a/src/web/js/components/MainApp.react.js
+++ b/src/web/js/components/MainApp.react.js
@@ -1,7 +1,8 @@
 var React = require('react');
-var Col = require('react-bootstrap/Col');
-var Grid = require('react-bootstrap/Grid');
+var Col = require('react-bootstrap/lib/Col');
+var Grid = require('react-bootstrap/lib/Grid');
 
+var JarrNavBar = require('./Navbar.react');
 var Menu = require('./Menu.react');
 var MiddlePanel = require('./MiddlePanel.react');
 var RightPanel = require('./RightPanel.react');
@@ -9,15 +10,18 @@ var RightPanel = require('./RightPanel.react');
 
 var MainApp = React.createClass({
     render: function() {
-        return (<Grid fluid id="jarr-container">
-                    <Menu />
-                    <Col id="middle-panel" mdOffset={3} lgOffset={2}
-                                           xs={2} sm={2} md={4} lg={4}>
-                        <MiddlePanel.MiddlePanelFilter />
-                        <MiddlePanel.MiddlePanel />
-                    </Col>
-                    <RightPanel />
-                </Grid>
+        return (<div>
+                    <JarrNavBar />
+                    <Grid fluid id="jarr-container">
+                        <Menu />
+                        <Col id="middle-panel" mdOffset={3} lgOffset={2}
+                                            xs={4} sm={4} md={4} lg={4}>
+                            <MiddlePanel.MiddlePanelFilter />
+                            <MiddlePanel.MiddlePanel />
+                        </Col>
+                        <RightPanel />
+                    </Grid>
+                </div>
        );
     },
 });