gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge and unmerge timelines on follow/unfollow, solves #21, #22

Browse source
This commit is contained in:
Eugen Rochko 2016-09-10 18:36:48 +02:00
parent 35b6c4b36a
commit 0077fc26df
13 changed files with 133 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/components/containers/root.jsx
View file

@ -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>
);
}