From bc8687deb5f0f9273fc771e79b070f3b49e39fed Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 30 Dec 2014 21:51:07 +1300
Subject: Basic conversion: browserified web app now works.

---
 web/src/js/components/proxyapp.jsx.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'web/src/js/components/proxyapp.jsx.js')

diff --git a/web/src/js/components/proxyapp.jsx.js b/web/src/js/components/proxyapp.jsx.js
index 92fc0e49..2431ad46 100644
--- a/web/src/js/components/proxyapp.jsx.js
+++ b/web/src/js/components/proxyapp.jsx.js
@@ -1,3 +1,14 @@
+var React = require("react");
+var ReactRouter = require("react-router");
+var _ = require("lodash");
+
+var utils = require("./utils.jsx.js");
+var MainView = require("./mainview.jsx.js");
+var Footer = require("./footer.jsx.js");
+var header = require("./header.jsx.js");
+var store = require("../store/store.js");
+
+
 //TODO: Move out of here, just a stub.
 var Reports = React.createClass({
     render: function () {
@@ -7,11 +18,11 @@ var Reports = React.createClass({
 
 
 var ProxyAppMain = React.createClass({
-    mixins: [State],
+    mixins: [utils.State],
     getInitialState: function () {
-        var eventStore = new EventLogStore();
-        var flowStore = new FlowStore();
-        var settings = new SettingsStore();
+        var eventStore = new store.EventLogStore();
+        var flowStore = new store.FlowStore();
+        var settings = new store.SettingsStore();
 
         // Default Settings before fetch
         _.extend(settings.dict,{
@@ -48,7 +59,7 @@ var ProxyAppMain = React.createClass({
 
         return (
             <div id="container">
-                <Header settings={this.state.settings.dict}/>
+                <header.Header settings={this.state.settings.dict}/>
                 <RouteHandler settings={this.state.settings.dict} flowStore={this.state.flowStore}/>
                 {eventlog}
                 <Footer settings={this.state.settings.dict}/>
@@ -72,4 +83,9 @@ var routes = (
         <Route name="reports" handler={Reports}/>
         <Redirect path="/" to="flows" />
     </Route>
-);
\ No newline at end of file
+);
+
+module.exports = {
+    routes: routes
+};
+
-- 
cgit v1.2.3