diff --git a/src/newsreader/js/pages/homepage/components/feedlist/PostItem.js b/src/newsreader/js/pages/homepage/components/feedlist/PostItem.js index d281570..3848ef8 100644 --- a/src/newsreader/js/pages/homepage/components/feedlist/PostItem.js +++ b/src/newsreader/js/pages/homepage/components/feedlist/PostItem.js @@ -1,8 +1,8 @@ import React from 'react'; import { connect } from 'react-redux'; +import { CATEGORY_TYPE, RULE_TYPE } from '../../constants.js'; import { selectPost } from '../../actions/posts.js'; - import { formatDatetime } from '../../../../utils.js'; class PostItem extends React.Component { @@ -28,6 +28,9 @@ class PostItem extends React.Component { {publicationDate} {post.author && `By ${post.author}`} + {this.props.selected.type == CATEGORY_TYPE && ( + {this.props.rule.name} + )} ({ + selected: state.selected.item, +}); + const mapDispatchToProps = dispatch => ({ selectPost: post => dispatch(selectPost(post)), }); -export default connect(null, mapDispatchToProps)(PostItem); +export default connect(mapStateToProps, mapDispatchToProps)(PostItem); diff --git a/src/newsreader/js/pages/homepage/components/feedlist/RuleItem.js b/src/newsreader/js/pages/homepage/components/feedlist/RuleItem.js index 608e8a1..0b08bda 100644 --- a/src/newsreader/js/pages/homepage/components/feedlist/RuleItem.js +++ b/src/newsreader/js/pages/homepage/components/feedlist/RuleItem.js @@ -9,12 +9,11 @@ class RuleItem extends React.Component { }); const postItems = posts.map(post => { - return ; + return ; }); return (
-

{this.props.rule.name}

    {postItems}
); diff --git a/src/newsreader/scss/components/posts/_posts.scss b/src/newsreader/scss/components/posts/_posts.scss index 706c520..f988f29 100644 --- a/src/newsreader/scss/components/posts/_posts.scss +++ b/src/newsreader/scss/components/posts/_posts.scss @@ -12,6 +12,10 @@ padding: 10px; + &:first-child { + padding: 0 10px 10px 10px; + } + &:hover { cursor: pointer; background-color: $gainsboro;