about summary refs log tree commit diff
path: root/app/assets/javascripts/components/reducers/index.jsx
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-19 23:25:59 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-19 23:26:21 +0200
commit337462aa5e68014aa15788e4513e190b2e434d7e (patch)
treea760e80e2bc9b1fef55f118ddeb8603b20155a61 /app/assets/javascripts/components/reducers/index.jsx
parentf820edb463109e313e836d8e2f210927a0eba7d1 (diff)
Re-organizing components to be more modular, adding loading bars
Diffstat (limited to 'app/assets/javascripts/components/reducers/index.jsx')
-rw-r--r--app/assets/javascripts/components/reducers/index.jsx16
1 files changed, 9 insertions, 7 deletions
diff --git a/app/assets/javascripts/components/reducers/index.jsx b/app/assets/javascripts/components/reducers/index.jsx
index 6d275654a..da9ab1a21 100644
--- a/app/assets/javascripts/components/reducers/index.jsx
+++ b/app/assets/javascripts/components/reducers/index.jsx
@@ -1,14 +1,16 @@
-import { combineReducers } from 'redux-immutable';
-import timelines           from './timelines';
-import meta                from './meta';
-import compose             from './compose';
-import follow              from './follow';
-import notifications       from './notifications';
+import { combineReducers }   from 'redux-immutable';
+import timelines             from './timelines';
+import meta                  from './meta';
+import compose               from './compose';
+import follow                from './follow';
+import notifications         from './notifications';
+import { loadingBarReducer } from 'react-redux-loading-bar';
 
 export default combineReducers({
   timelines,
   meta,
   compose,
   follow,
-  notifications
+  notifications,
+  loadingBar: loadingBarReducer,
 });