Merge branch 'feature/categories'

close #22
close #23

1 files changed, 29 insertions, 0 deletions

diff --git a/src/web/js/components/MainApp.react.js b/src/web/js/components/MainApp.react.js
new file mode 100644
index 00000000..cbdc5833
--- /dev/null
+++ b/src/web/js/components/MainApp.react.js
@@ -0,0 +1,29 @@
+var React = require('react');
+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');
+
+
+var MainApp = React.createClass({
+    render: function() {
+        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>
+       );
+    },
+});
+
+module.exports = MainApp;