From 29e79f770f3388a1d2d0e169da9fec31467c77c9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 9 Oct 2016 20:18:54 +0200
Subject: Making AccountTimeline into a sub-route

---
 app/assets/javascripts/components/containers/mastodon.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/assets/javascripts/components/containers')

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>
-- 
cgit