aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/app.js
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-02-28 22:35:08 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-02-28 22:35:08 +0100
commitcbb068edaaa4a91297cc8c6416dcbc274b3e1317 (patch)
tree74a21b74a402295c3e5f687babda30b4682e37de /web/src/js/app.js
parentade5078ebde142a83692bd5e940f6463e6ee52c7 (diff)
downloadmitmproxy-cbb068edaaa4a91297cc8c6416dcbc274b3e1317.tar.gz
mitmproxy-cbb068edaaa4a91297cc8c6416dcbc274b3e1317.tar.bz2
mitmproxy-cbb068edaaa4a91297cc8c6416dcbc274b3e1317.zip
fix up web stuff
Diffstat (limited to 'web/src/js/app.js')
-rw-r--r--web/src/js/app.js16
1 files changed, 7 insertions, 9 deletions
diff --git a/web/src/js/app.js b/web/src/js/app.js
index 9fb868b8..e21fa499 100644
--- a/web/src/js/app.js
+++ b/web/src/js/app.js
@@ -1,9 +1,9 @@
-var React = require("react");
-var ReactRouter = require("react-router");
-var $ = require("jquery");
-var Connection = require("./connection");
-var proxyapp = require("./components/proxyapp.js");
-var EventLogActions = require("./actions.js").EventLogActions;
+import React from "react"
+import { render } from 'react-dom'
+import $ from "jquery"
+import Connection from "./connection"
+import {app} from "./components/proxyapp.js"
+import { EventLogActions } from "./actions.js"
$(function () {
window.ws = new Connection("/updates");
@@ -12,8 +12,6 @@ $(function () {
EventLogActions.add_event(msg);
};
- ReactRouter.run(proxyapp.routes, function (Handler, state) {
- React.render(<Handler/>, document.body);
- });
+ render(app, document.getElementById("mitmproxy"));
});