post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

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

17
app/assets/javascripts/components/components/column.jsx
View file

@ -1,11 +1,10 @@
import StatusListContainer from '../containers/status_list_container';
import ColumnHeader from './column_header';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import ColumnHeader from './column_header';
import PureRenderMixin from 'react-addons-pure-render-mixin';
const Column = React.createClass({
propTypes: {
type: React.PropTypes.string,
heading: React.PropTypes.string,
icon: React.PropTypes.string
},
@ -17,10 +16,16 @@ const Column = React.createClass({
},
render () {
let header = '';
if (this.props.heading) {
header = <ColumnHeader icon={this.props.icon} type={this.props.heading} onClick={this.handleHeaderClick} />;
}
return (
<div style={{ width: '380px', flex: '0 0 auto', background: '#282c37', margin: '10px', marginRight: '0', display: 'flex', flexDirection: 'column' }}>
<ColumnHeader icon={this.props.icon} type={this.props.type} onClick={this.handleHeaderClick} />
<StatusListContainer type={this.props.type} />
{header}
{this.props.children}
</div>
);
}

4
app/assets/javascripts/components/components/columns_area.jsx
View file

@ -1,4 +1,3 @@
import Column from './column';
import PureRenderMixin from 'react-addons-pure-render-mixin';
const ColumnsArea = React.createClass({
@ -8,8 +7,7 @@ const ColumnsArea = React.createClass({
render () {
return (
<div style={{ display: 'flex', flexDirection: 'row', flex: '1' }}>
<Column icon='home' type='home' />
<Column icon='at' type='mentions' />
{this.props.children}
</div>
);
}

12
app/assets/javascripts/components/components/frontend.jsx
View file

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