diff options
Diffstat (limited to 'app/assets/javascripts/components/components/frontend.jsx')
-rw-r--r-- | app/assets/javascripts/components/components/frontend.jsx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/javascripts/components/components/frontend.jsx b/app/assets/javascripts/components/components/frontend.jsx index 90ad02dd5..3532b6674 100644 --- a/app/assets/javascripts/components/components/frontend.jsx +++ b/app/assets/javascripts/components/components/frontend.jsx @@ -1,6 +1,8 @@ -import ColumnsArea from './columns_area'; -import ComposerDrawerContainer from '../containers/composer_drawer_container'; -import PureRenderMixin from 'react-addons-pure-render-mixin'; +import ColumnsArea from './columns_area'; +import Drawer from './drawer'; +import ComposeFormContainer from '../containers/compose_form_container'; +import FollowFormContainer from '../containers/follow_form_container'; +import PureRenderMixin from 'react-addons-pure-render-mixin'; const Frontend = React.createClass({ @@ -9,7 +11,14 @@ const Frontend = React.createClass({ render () { return ( <div style={{ flex: '0 0 auto', display: 'flex', width: '100%', height: '100%', background: '#1a1c23' }}> - <ComposerDrawerContainer /> + <Drawer> + <div style={{ flex: '1 1 auto' }}> + <ComposeFormContainer /> + </div> + + <FollowFormContainer /> + </Drawer> + <ColumnsArea /> </div> ); |