diff options
| author | Matthew Shao <me@matshao.com> | 2017-07-01 08:46:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-01 08:46:04 -0500 |
| commit | f3231ed758324a7de465ee5a377f9c40b0a8df34 (patch) | |
| tree | 3979c67de95b398e8d0c89034feee60a0d0a3bb6 /web/src/js/components/ProxyApp.jsx | |
| parent | 321352ef0bc1911d49c8b6f8537674b03fa92f70 (diff) | |
| parent | aad0b95cbe65e97574d49f3933002d347470d1ef (diff) | |
| download | mitmproxy-f3231ed758324a7de465ee5a377f9c40b0a8df34.tar.gz mitmproxy-f3231ed758324a7de465ee5a377f9c40b0a8df34.tar.bz2 mitmproxy-f3231ed758324a7de465ee5a377f9c40b0a8df34.zip | |
Merge pull request #2416 from MatthewShao/mitmweb-options
[WIP] [web] Mitmweb options editor UI
Diffstat (limited to 'web/src/js/components/ProxyApp.jsx')
| -rw-r--r-- | web/src/js/components/ProxyApp.jsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/web/src/js/components/ProxyApp.jsx b/web/src/js/components/ProxyApp.jsx index af5b3caa..8c3970bc 100644 --- a/web/src/js/components/ProxyApp.jsx +++ b/web/src/js/components/ProxyApp.jsx @@ -7,6 +7,7 @@ import MainView from './MainView' import Header from './Header' import EventLog from './EventLog' import Footer from './Footer' +import Modal from './Modal/Modal' class ProxyAppMain extends Component { @@ -28,6 +29,7 @@ class ProxyAppMain extends Component { <EventLog key="eventlog"/> )} <Footer /> + <Modal/> </div> ) } |