diff options
| author | Andrei Mihailov <and.mikhaylov@gmail.com> | 2017-02-16 12:18:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 12:18:52 +0000 |
| commit | 4aaf7e0ddbbdf9a5e03fdbb20ecabe4866de96c3 (patch) | |
| tree | 8f7dfc5545c484472d3dc5138cddf6a810fa0558 /app/containers | |
| parent | 5ba4a72e546747167e7ae815724ee2dd4b2ef8fb (diff) | |
| download | mullvadvpn-4aaf7e0ddbbdf9a5e03fdbb20ecabe4866de96c3.tar.xz mullvadvpn-4aaf7e0ddbbdf9a5e03fdbb20ecabe4866de96c3.zip | |
Feature/menubar popup window (#1)
Add menubar and tests
Diffstat (limited to 'app/containers')
| -rw-r--r-- | app/containers/ConnectPage.js | 11 | ||||
| -rw-r--r-- | app/containers/Tray.js | 14 |
2 files changed, 9 insertions, 16 deletions
diff --git a/app/containers/ConnectPage.js b/app/containers/ConnectPage.js index 9aad1f81f5..9802e8b2d8 100644 --- a/app/containers/ConnectPage.js +++ b/app/containers/ConnectPage.js @@ -1,12 +1,19 @@ import { connect } from 'react-redux'; +import { bindActionCreators } from 'redux'; import Connect from '../components/Connect'; +import userActions from '../actions/user'; const mapStateToProps = (state) => { return state; }; -const mapDispatchToProps = (dispatch) => { // eslint-disable-line no-unused-vars - return {}; +const mapDispatchToProps = (dispatch, props) => { // eslint-disable-line no-unused-vars + const user = bindActionCreators(userActions, dispatch); + return { + logout: () => { + return user.logout(props.backend); + } + }; }; export default connect(mapStateToProps, mapDispatchToProps)(Connect); diff --git a/app/containers/Tray.js b/app/containers/Tray.js deleted file mode 100644 index 3916263d0d..0000000000 --- a/app/containers/Tray.js +++ /dev/null @@ -1,14 +0,0 @@ -import { connect } from 'react-redux'; -import { bindActionCreators } from 'redux'; -import Tray from '../components/Tray'; -import userActions from '../actions/user'; - -const mapStateToProps = (state) => { - return state; -}; - -const mapDispatchToProps = (dispatch) => { - return bindActionCreators(userActions, dispatch); -}; - -export default connect(mapStateToProps, mapDispatchToProps)(Tray); |
