chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 14 Wiki Activity

Improve glow

Browse source
This commit is contained in:
Eugen Rochko 2017-02-23 02:14:35 +01:00
commit 9d4cad6307
8 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/components/features/community_timeline/index.jsx
View file

@ -16,6 +16,7 @@ const messages = defineMessages({
});
const mapStateToProps = state => ({
hasUnread: state.getIn(['timelines', 'public', 'unread']) > 0,
accessToken: state.getIn(['meta', 'access_token'])
});
@ -24,7 +25,8 @@ const CommunityTimeline = React.createClass({
propTypes: {
dispatch: React.PropTypes.func.isRequired,
intl: React.PropTypes.object.isRequired,
accessToken: React.PropTypes.string.isRequired
accessToken: React.PropTypes.string.isRequired,
hasUnread: React.PropTypes.bool
},
mixins: [PureRenderMixin],
@ -58,10 +60,10 @@ const CommunityTimeline = React.createClass({
},
render () {
const { intl } = this.props;
const { intl, hasUnread } = this.props;
return (
<Column icon='users' heading={intl.formatMessage(messages.title)}>
<Column icon='users' active={hasUnread} heading={intl.formatMessage(messages.title)}>
<ColumnBackButtonSlim />
<StatusListContainer type='community' emptyMessage={<FormattedMessage id='empty_column.community' defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!' />} />
</Column>

8
app/assets/javascripts/components/features/hashtag_timeline/index.jsx
View file

@ -12,6 +12,7 @@ import { FormattedMessage } from 'react-intl';
import createStream from '../../stream';
const mapStateToProps = state => ({
hasUnread: state.getIn(['timelines', 'tag', 'unread']) > 0,
accessToken: state.getIn(['meta', 'access_token'])
});
@ -20,7 +21,8 @@ const HashtagTimeline = React.createClass({
propTypes: {
params: React.PropTypes.object.isRequired,
dispatch: React.PropTypes.func.isRequired,
accessToken: React.PropTypes.string.isRequired
accessToken: React.PropTypes.string.isRequired,
hasUnread: React.PropTypes.bool
},
mixins: [PureRenderMixin],
@ -72,10 +74,10 @@ const HashtagTimeline = React.createClass({
},
render () {
const { id } = this.props.params;
const { id, hasUnread } = this.props.params;
return (
<Column icon='hashtag' heading={id}>
<Column icon='hashtag' active={hasUnread} heading={id}>
<ColumnBackButtonSlim />
<StatusListContainer type='tag' id={id} emptyMessage={<FormattedMessage id='empty_column.hashtag' defaultMessage='There is nothing in this hashtag yet.' />} />
</Column>

14
app/assets/javascripts/components/features/home_timeline/index.jsx
View file

@ -1,3 +1,4 @@
import { connect } from 'react-redux';
import PureRenderMixin from 'react-addons-pure-render-mixin';
import StatusListContainer from '../ui/containers/status_list_container';
import Column from '../ui/components/column';
@ -9,19 +10,24 @@ const messages = defineMessages({
title: { id: 'column.home', defaultMessage: 'Home' }
});
const mapStateToProps = state => ({
hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0
});
const HomeTimeline = React.createClass({
propTypes: {
intl: React.PropTypes.object.isRequired
intl: React.PropTypes.object.isRequired,
hasUnread: React.PropTypes.bool
},
mixins: [PureRenderMixin],
render () {
const { intl } = this.props;
const { intl, hasUnread } = this.props;
return (
<Column icon='home' heading={intl.formatMessage(messages.title)}>
<Column icon='home' active={hasUnread} heading={intl.formatMessage(messages.title)}>
<ColumnSettingsContainer />
<StatusListContainer {...this.props} type='home' emptyMessage={<FormattedMessage id='empty_column.home' defaultMessage="You aren't following anyone yet. Visit {public} or use search to get started and meet other users." values={{ public: <Link to='/timelines/public'><FormattedMessage id='empty_column.home.public_timeline' defaultMessage='the public timeline' /></Link> }} />} />
</Column>
@ -30,4 +36,4 @@ const HomeTimeline = React.createClass({
});
export default injectIntl(HomeTimeline);
export default connect(mapStateToProps)(injectIntl(HomeTimeline));

8
app/assets/javascripts/components/features/public_timeline/index.jsx
View file

@ -16,6 +16,7 @@ const messages = defineMessages({
});
const mapStateToProps = state => ({
hasUnread: state.getIn(['timelines', 'public', 'unread']) > 0,
accessToken: state.getIn(['meta', 'access_token'])
});
@ -24,7 +25,8 @@ const PublicTimeline = React.createClass({
propTypes: {
dispatch: React.PropTypes.func.isRequired,
intl: React.PropTypes.object.isRequired,
accessToken: React.PropTypes.string.isRequired
accessToken: React.PropTypes.string.isRequired,
hasUnread: React.PropTypes.bool
},
mixins: [PureRenderMixin],
@ -58,10 +60,10 @@ const PublicTimeline = React.createClass({
},
render () {
const { intl } = this.props;
const { intl, hasUnread } = this.props;
return (
<Column icon='globe' heading={intl.formatMessage(messages.title)}>
<Column icon='globe' active={hasUnread} heading={intl.formatMessage(messages.title)}>
<ColumnBackButtonSlim />
<StatusListContainer type='public' emptyMessage={<FormattedMessage id='empty_column.public' defaultMessage='There is nothing here! Write something publicly, or manually follow users from other instances to fill it up' />} />
</Column>