diff options
Diffstat (limited to 'app/assets/javascripts/components/components/frontend.jsx')
-rw-r--r-- | app/assets/javascripts/components/components/frontend.jsx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/components/frontend.jsx b/app/assets/javascripts/components/components/frontend.jsx index c227bcc1f..8774d2506 100644 --- a/app/assets/javascripts/components/components/frontend.jsx +++ b/app/assets/javascripts/components/components/frontend.jsx @@ -1,8 +1,10 @@ import ColumnsArea from './columns_area'; +import Column from './column'; import Drawer from './drawer'; import ComposeFormContainer from '../containers/compose_form_container'; import FollowFormContainer from '../containers/follow_form_container'; import UploadFormContainer from '../containers/upload_form_container'; +import StatusListContainer from '../containers/status_list_container'; import PureRenderMixin from 'react-addons-pure-render-mixin'; const Frontend = React.createClass({ @@ -21,7 +23,15 @@ const Frontend = React.createClass({ <FollowFormContainer /> </Drawer> - <ColumnsArea /> + <ColumnsArea> + <Column icon='home' heading='Home'> + <StatusListContainer type='home' /> + </Column> + + <Column icon='at' heading='Mentions'> + <StatusListContainer type='mentions' /> + </Column> + </ColumnsArea> </div> ); } |