diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-06-26 15:19:03 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-07-03 12:41:51 +0200 |
| commit | 1bb1bdbe31da5c23e4cb2b414a8756c645049998 (patch) | |
| tree | 5d875318d24b327b20da40762b31115c608f0652 /app/containers | |
| parent | 4e8f44c7ef6ffee09d9d3abd70bfd093f87d6b18 (diff) | |
| download | mullvadvpn-1bb1bdbe31da5c23e4cb2b414a8756c645049998.tar.xz mullvadvpn-1bb1bdbe31da5c23e4cb2b414a8756c645049998.zip | |
Moved the redux stuff into separate folder and renamed user->account and connect->connection
Diffstat (limited to 'app/containers')
| -rw-r--r-- | app/containers/AccountPage.js | 4 | ||||
| -rw-r--r-- | app/containers/ConnectPage.js | 2 | ||||
| -rw-r--r-- | app/containers/LoginPage.js | 4 | ||||
| -rw-r--r-- | app/containers/SelectLocationPage.js | 2 | ||||
| -rw-r--r-- | app/containers/SettingsPage.js | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/app/containers/AccountPage.js b/app/containers/AccountPage.js index 5e695e1d4a..5e61bdf22d 100644 --- a/app/containers/AccountPage.js +++ b/app/containers/AccountPage.js @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { push } from 'react-router-redux'; import Account from '../components/Account'; -import userActions from '../actions/user'; +import accountActions from '../redux/account/actions'; import { shell } from 'electron'; import { links } from '../config'; @@ -11,7 +11,7 @@ const mapStateToProps = (state) => { }; const mapDispatchToProps = (dispatch, props) => { - const { logout } = bindActionCreators(userActions, dispatch); + const { logout } = bindActionCreators(accountActions, dispatch); return { onLogout: () => logout(props.backend), onClose: () => dispatch(push('/settings')), diff --git a/app/containers/ConnectPage.js b/app/containers/ConnectPage.js index fdcc9463af..ab288bd0e3 100644 --- a/app/containers/ConnectPage.js +++ b/app/containers/ConnectPage.js @@ -4,7 +4,7 @@ import { push } from 'react-router-redux'; import { shell } from 'electron'; import { links } from '../config'; import Connect from '../components/Connect'; -import connectActions from '../actions/connect'; +import connectActions from '../redux/connection/actions'; const mapStateToProps = (state) => { return state; diff --git a/app/containers/LoginPage.js b/app/containers/LoginPage.js index 163e55f145..0b09e673b5 100644 --- a/app/containers/LoginPage.js +++ b/app/containers/LoginPage.js @@ -3,12 +3,12 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { push } from 'react-router-redux'; import Login from '../components/Login'; -import userActions from '../actions/user'; +import accountActions from '../redux/account/actions'; import { links } from '../config'; const mapStateToProps = (state) => state; const mapDispatchToProps = (dispatch, props) => { - const { loginChange, login } = bindActionCreators(userActions, dispatch); + const { loginChange, login } = bindActionCreators(accountActions, dispatch); const { backend } = props; return { onSettings: () => dispatch(push('/settings')), diff --git a/app/containers/SelectLocationPage.js b/app/containers/SelectLocationPage.js index 462ffd7bb4..824274c15c 100644 --- a/app/containers/SelectLocationPage.js +++ b/app/containers/SelectLocationPage.js @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { push } from 'react-router-redux'; import SelectLocation from '../components/SelectLocation'; -import settingsActions from '../actions/settings'; +import settingsActions from '../redux/settings/actions'; const mapStateToProps = (state) => state; const mapDispatchToProps = (dispatch, props) => { diff --git a/app/containers/SettingsPage.js b/app/containers/SettingsPage.js index b6807a0a22..6152774c4b 100644 --- a/app/containers/SettingsPage.js +++ b/app/containers/SettingsPage.js @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { push } from 'react-router-redux'; import Settings from '../components/Settings'; -import settingsActions from '../actions/settings'; +import settingsActions from '../redux/settings/actions'; import { remote, shell } from 'electron'; import { links } from '../config'; |
