ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 08:37:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-10-07 09:31:49 +02:00
commit 471d95977e
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/actions/user_actions.js
View File

@ -1,6 +1,6 @@
'use strict';
import { alt } from '../alt';
import { altUser } from '../alt';
import UserFetcher from '../fetchers/user_fetcher';
@ -34,4 +34,4 @@ class UserActions {
}
}
export default alt.createActions(UserActions);
export default altUser.createActions(UserActions);

4
js/actions/whitelabel_actions.js
View File

@ -1,6 +1,6 @@
'use strict';
import { alt } from '../alt';
import { altWhitelabel } from '../alt';
import WhitelabelFetcher from '../fetchers/whitelabel_fetcher';
@ -26,4 +26,4 @@ class WhitelabelActions {
}
}
export default alt.createActions(WhitelabelActions);
export default altWhitelabel.createActions(WhitelabelActions);

2
js/alt.js
View File

@ -4,3 +4,5 @@ import Alt from 'alt';
export let alt = new Alt();
export let altThirdParty = new Alt();
export let altUser = new Alt();
export let altWhitelabel = new Alt();

7
js/components/logout_container.js
View File

@ -4,7 +4,7 @@ import React from 'react';
import { History } from 'react-router';
import UserActions from '../actions/user_actions';
import { alt } from '../alt';
import { alt, altWhitelabel, altUser, altThirdParty } from '../alt';
import AppConstants from '../constants/application_constants';
let baseUrl = AppConstants.baseUrl;
@ -16,7 +16,10 @@ let LogoutContainer = React.createClass({
componentDidMount() {
UserActions.logoutCurrentUser()
.then(() => {
Alt.flush();
alt.flush();
altWhitelabel.flush();
altUser.flush();
altThirdParty.flush();
// kill intercom (with fire)
window.Intercom('shutdown');
this.history.replaceState(null, baseUrl);

4
js/stores/user_store.js
View File

@ -1,6 +1,6 @@
'use strict';
import { alt } from '../alt';
import { altUser } from '../alt';
import UserActions from '../actions/user_actions';
@ -18,4 +18,4 @@ class UserStore {
}
}
export default alt.createStore(UserStore, 'UserStore');
export default altUser.createStore(UserStore, 'UserStore');

4
js/stores/whitelabel_store.js
View File

@ -1,6 +1,6 @@
'use strict';
import { alt } from '../alt';
import { altWhitelabel } from '../alt';
import WhitelabelActions from '../actions/whitelabel_actions';
@ -15,4 +15,4 @@ class WhitelabelStore {
}
}
export default alt.createStore(WhitelabelStore, 'WhitelabelStore');
export default altWhitelabel.createStore(WhitelabelStore, 'WhitelabelStore');