about summary refs log tree commit diff
path: root/app/assets/javascripts/components/containers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-16 00:21:51 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-16 00:21:51 +0200
commit5b0cef9781af519a0a6ace1f429162ae05863bde (patch)
treec7429316fa50f003451f2999ff30cc90c6506021 /app/assets/javascripts/components/containers
parent2e7aac793ace0e938e45cb54ff601afa5d872214 (diff)
Setting up preliminary "detailed" routes in the UI, new API end-point for fetching status context
Diffstat (limited to 'app/assets/javascripts/components/containers')
-rw-r--r--app/assets/javascripts/components/containers/root.jsx12
1 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/components/containers/root.jsx b/app/assets/javascripts/components/containers/root.jsx
index 1ded95d3c..e30330beb 100644
--- a/app/assets/javascripts/components/containers/root.jsx
+++ b/app/assets/javascripts/components/containers/root.jsx
@@ -6,6 +6,10 @@ import { setAccessToken }                                                    fro
 import { setAccountSelf }                                                    from '../actions/accounts';
 import PureRenderMixin                                                       from 'react-addons-pure-render-mixin';
 import { Router, Route, hashHistory }                                        from 'react-router';
+import Account                                                               from '../features/account';
+import Settings                                                              from '../features/settings';
+import Status                                                                from '../features/status';
+import Subscriptions                                                         from '../features/subscriptions';
 
 const store = configureStore();
 
@@ -55,10 +59,10 @@ const Root = React.createClass({
       <Provider store={store}>
         <Router history={hashHistory}>
           <Route path='/' component={Frontend}>
-            <Route path='/settings' component={null} />
-            <Route path='/subscriptions' component={null} />
-            <Route path='/statuses/:statusId' component={null} />
-            <Route path='/accounts/:accountId' component={null} />
+            <Route path='/settings' component={Settings} />
+            <Route path='/subscriptions' component={Subscriptions} />
+            <Route path='/statuses/:statusId' component={Status} />
+            <Route path='/accounts/:accountId' component={Account} />
           </Route>
         </Router>
       </Provider>