From 0077fc26df2982720e5fb278af6540a47859386f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 10 Sep 2016 18:36:48 +0200
Subject: Merge and unmerge timelines on follow/unfollow, solves #21, #22

---
 app/assets/javascripts/components/containers/root.jsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/app/assets/javascripts/components/containers/root.jsx b/app/assets/javascripts/components/containers/root.jsx
index ed53aee80..eb031bdd4 100644
--- a/app/assets/javascripts/components/containers/root.jsx
+++ b/app/assets/javascripts/components/containers/root.jsx
@@ -4,8 +4,12 @@ import Frontend                                             from '../components/
 import { setTimeline, updateTimeline, deleteFromTimelines } from '../actions/timelines';
 import { setAccessToken }                                   from '../actions/meta';
 import PureRenderMixin                                      from 'react-addons-pure-render-mixin';
+import { Router, Route, createMemoryHistory }               from 'react-router';
+import AccountRoute                                         from '../routes/account_route';
+import StatusRoute                                          from '../routes/status_route';
 
-const store = configureStore();
+const store   = configureStore();
+const history = createMemoryHistory();
 
 const Root = React.createClass({
 
@@ -45,7 +49,12 @@ const Root = React.createClass({
   render () {
     return (
       <Provider store={store}>
-        <Frontend />
+        <Router history={history}>
+          <Route path="/" component={Frontend}>
+            <Route path="/accounts/:account_id" component={AccountRoute} />
+            <Route path="/statuses/:status_id" component={StatusRoute} />
+          </Route>
+        </Router>
       </Provider>
     );
   }
-- 
cgit