diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-08-28 15:44:44 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-08-28 17:23:55 +0200 |
| commit | 9b0f8925ddb258dc35a737239d1daaab08e384e8 (patch) | |
| tree | 408a071d968027bcb0d6d42c38580812c5fe7ee8 | |
| parent | 44af788041d69d660e55aeb5c403323700e88777 (diff) | |
| download | mullvadvpn-9b0f8925ddb258dc35a737239d1daaab08e384e8.tar.xz mullvadvpn-9b0f8925ddb258dc35a737239d1daaab08e384e8.zip | |
Convert renderer/index.js from using ReactXP
| -rw-r--r-- | gui/assets/css/global.css | 2 | ||||
| -rw-r--r-- | gui/src/renderer/index.html | 2 | ||||
| -rw-r--r-- | gui/src/renderer/index.ts | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/gui/assets/css/global.css b/gui/assets/css/global.css index 213e965086..06f8838934 100644 --- a/gui/assets/css/global.css +++ b/gui/assets/css/global.css @@ -25,7 +25,7 @@ body { display: flex; } -.app-container { +#app { height: 100%; width: 100%; display: flex; diff --git a/gui/src/renderer/index.html b/gui/src/renderer/index.html index d757d23bdd..3f2da3d633 100644 --- a/gui/src/renderer/index.html +++ b/gui/src/renderer/index.html @@ -6,7 +6,7 @@ <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'"> </head> <body> - <div class="app-container"></div> + <div id="app"></div> <script>var exports = {};</script> <script src="./index.js"></script> </body> diff --git a/gui/src/renderer/index.ts b/gui/src/renderer/index.ts index aada6fd97b..906be20bfa 100644 --- a/gui/src/renderer/index.ts +++ b/gui/src/renderer/index.ts @@ -1,9 +1,6 @@ -import * as RX from 'reactxp'; +import ReactDOM from 'react-dom'; import App from './app'; const app = new App(); -const view = app.renderView(); - -RX.App.initialize(true, true); -RX.UserInterface.setMainView(view); -RX.UserInterface.useCustomScrollbars(true); +const container = document.getElementById('app'); +ReactDOM.render(app.renderView(), container); |