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

Conflicts:
	js/third_party/notifications.js

js/actions/application_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import ApplicationFetcher from '../fetchers/application_fetcher';
 
 

js/actions/coa_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import CoaFetcher from '../fetchers/coa_fetcher';
 
 import Q from 'q';

js/actions/contract_agreement_list_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import OwnershipFetcher from '../fetchers/ownership_fetcher';

js/actions/contract_list_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import OwnershipFetcher from '../fetchers/ownership_fetcher';
 import Q from 'q';
 

js/actions/edition_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import EditionFetcher from '../fetchers/edition_fetcher';
 
 

js/actions/edition_list_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import EditionListFetcher from '../fetchers/edition_list_fetcher.js';

js/actions/event_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 
 
 class EventActions {
@@ -16,4 +16,4 @@ class EventActions {
     }
 }
 
-export default alt.createActions(EventActions);
+export default altThirdParty.createActions(EventActions);

js/actions/global_notification_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 
 
 class GlobalNotificationActions {

js/actions/license_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import LicenseFetcher from '../fetchers/license_fetcher';
 
 

js/actions/notification_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import NotificationFetcher from '../fetchers/notification_fetcher';

js/actions/ownership_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import OwnershipFetcher from '../fetchers/ownership_fetcher';
 
 

js/actions/piece_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import PieceFetcher from '../fetchers/piece_fetcher';
 
 

js/actions/piece_list_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import PieceListFetcher from '../fetchers/piece_list_fetcher';

js/actions/prize_list_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import Q from 'q';
 
 import PrizeListFetcher from '../fetchers/prize_list_fetcher';

js/actions/user_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import UserFetcher from '../fetchers/user_fetcher';
 
 

js/actions/wallet_settings_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import WalletSettingsFetcher from '../fetchers/wallet_settings_fetcher';
 
 

js/actions/whitelabel_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import WhitelabelFetcher from '../fetchers/whitelabel_fetcher';
 
 

js/alt.js

@@ -2,4 +2,5 @@
 
 import Alt from 'alt';
 
-export default new Alt();
+export let alt = new Alt();
+export let altThirdParty = new Alt();

js/components/logout_container.js

@@ -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 } from '../alt';
 
 import AppConstants from '../constants/application_constants';
 let baseUrl = AppConstants.baseUrl;

js/components/whitelabel/prize/actions/prize_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 import Q from 'q';
 
 import PrizeFetcher from '../fetchers/prize_fetcher';

js/components/whitelabel/prize/actions/prize_jury_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 import Q from 'q';
 
 import PrizeJuryFetcher from '../fetchers/prize_jury_fetcher';

js/components/whitelabel/prize/actions/prize_rating_actions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 import Q from 'q';
 
 import PrizeRatingFetcher from '../fetchers/prize_rating_fetcher';

js/components/whitelabel/prize/stores/prize_jury_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 
 import PrizeJuryActions from '../actions/prize_jury_actions';
 

js/components/whitelabel/prize/stores/prize_rating_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 
 import PrizeRatingActions from '../actions/prize_rating_actions';
 

js/components/whitelabel/prize/stores/prize_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../../../../alt';
+import { alt } from '../../../../alt';
 
 import PrizeActions from '../actions/prize_actions';
 

js/stores/application_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import ApplicationActions from '../actions/application_actions';
 
 

js/stores/coa_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import CoaActions from '../actions/coa_actions';
 
 

js/stores/contract_agreement_list_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import ContractAgreementListActions from '../actions/contract_agreement_list_actions';
 
 

js/stores/contract_list_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import ContractListActions from '../actions/contract_list_actions';
 
 

js/stores/edition_list_store.js

@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import EditionsListActions from '../actions/edition_list_actions';
 
 class EditionListStore {

js/stores/edition_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import EditionActions from '../actions/edition_actions';
 
 

js/stores/global_notification_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 
 import GlobalNotificationActions from '../actions/global_notification_actions';
 

js/stores/license_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import LicenseActions from '../actions/license_actions';
 
 

js/stores/notification_store.js

@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import alt from '../alt';
+import { alt } from '../alt';
 
 import NotificationActions from '../actions/notification_actions';
 

js/stores/ownership_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import OwnershipActions from '../actions/ownership_actions';
 
 

js/stores/piece_list_store.js

@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import alt from '../alt';
+import { alt } from '../alt';
 
 import PieceListActions from '../actions/piece_list_actions';
 

js/stores/piece_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import PieceActions from '../actions/piece_actions';
 
 

js/stores/prize_list_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 
 import PrizeListActions from '../actions/prize_list_actions';
 

js/stores/user_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import UserActions from '../actions/user_actions';
 
 

js/stores/wallet_settings_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import WalletSettingsActions from '../actions/wallet_settings_actions';
 
 

js/stores/whitelabel_store.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { alt } from '../alt';
 import WhitelabelActions from '../actions/whitelabel_actions';
 
 

js/third_party/debug.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 
@@ -27,4 +27,4 @@ class DebugHandler {
     }
 }
 
-export default alt.createStore(DebugHandler, 'DebugHandler');
+export default altThirdParty.createStore(DebugHandler, 'DebugHandler');

js/third_party/ga.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 class GoogleAnalyticsHandler {
@@ -23,4 +23,4 @@ class GoogleAnalyticsHandler {
 
 }
 
-export default alt.createStore(GoogleAnalyticsHandler, 'GoogleAnalyticsHandler');
+export default altThirdParty.createStore(GoogleAnalyticsHandler, 'GoogleAnalyticsHandler');

js/third_party/intercom.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 import { getSubdomain } from '../utils/general_utils';
@@ -33,4 +33,4 @@ class IntercomHandler {
 
 }
 
-export default alt.createStore(IntercomHandler, 'IntercomHandler');
+export default altThirdParty.createStore(IntercomHandler, 'IntercomHandler');

js/third_party/notifications.js

@@ -1,7 +1,9 @@
 'use strict';
 
 import history from '../history';
-import alt from '../alt';
+import { altThirdParty } from '../alt';
+
+
 import EventActions from '../actions/event_actions';
 
 import NotificationActions from '../actions/notification_actions';
@@ -36,4 +38,4 @@ class NotificationsHandler {
     }
 }
 
-export default alt.createStore(NotificationsHandler, 'NotificationsHandler');
+export default altThirdParty.createStore(NotificationsHandler, 'NotificationsHandler');

js/third_party/raven.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import alt from '../alt';
+import { altThirdParty } from '../alt';
 import EventActions from '../actions/event_actions';
 
 import Raven from 'raven-js';
@@ -25,4 +25,4 @@ class RavenHandler {
     }
 }
 
-export default alt.createStore(RavenHandler, 'RavenHandler');
+export default altThirdParty.createStore(RavenHandler, 'RavenHandler');