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-10-09 20:18:54 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-10-09 20:18:54 +0200
commit29e79f770f3388a1d2d0e169da9fec31467c77c9 (patch)
treee4e6dd3d45b91e9920dd616a9310db79df9d0b0b /app/assets/javascripts/components/containers
parent427ba276413a268939d8e93337168cdb02b2f684 (diff)
Making AccountTimeline into a sub-route
Diffstat (limited to 'app/assets/javascripts/components/containers')
-rw-r--r--app/assets/javascripts/components/containers/mastodon.jsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index 24db6424a..90fb46908 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -20,6 +20,7 @@ import Status             from '../features/status';
 import GettingStarted     from '../features/getting_started';
 import PublicTimeline     from '../features/public_timeline';
 import UI                 from '../features/ui';
+import AccountTimeline    from '../features/account_timeline';
 
 const store = configureStore();
 
@@ -78,7 +79,9 @@ const Mastodon = React.createClass({
             <IndexRoute component={GettingStarted} />
             <Route path='/statuses/all' component={PublicTimeline} />
             <Route path='/statuses/:statusId' component={Status} />
-            <Route path='/accounts/:accountId' component={Account} />
+            <Route path='/accounts/:accountId' component={Account}>
+              <IndexRoute component={AccountTimeline} />
+            </Route>
           </Route>
         </Router>
       </Provider>