Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add header to trends section and change refresh rate to 15 minutes #11641

Merged
merged 1 commit into from
Aug 23, 2019
Merged

Add header to trends section and change refresh rate to 15 minutes #11641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/javascript/mastodon/features/getting_started/components/trends.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import Hashtag from 'mastodon/components/hashtag';
import { FormattedMessage } from 'react-intl';

export default class Trends extends ImmutablePureComponent {

Expand All @@ -17,7 +18,7 @@ export default class Trends extends ImmutablePureComponent {

componentDidMount () {
this.props.fetchTrends();
this.refreshInterval = setInterval(() => this.props.fetchTrends(), 3600000);
this.refreshInterval = setInterval(() => this.props.fetchTrends(), 900 * 1000);
}

componentWillUnmount () {
Expand All @@ -35,6 +36,8 @@ export default class Trends extends ImmutablePureComponent {

return (
<div className='getting-started__trends'>
<h4><FormattedMessage id='trends.trending_now' defaultMessage='Trending now' /></h4>

{trends.take(3).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
</div>
);
Expand Down
9 changes: 9 additions & 0 deletions app/javascript/styles/mastodon/components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2765,6 +2765,15 @@ a.account__display-name {
animation: fade 150ms linear;
margin-top: 10px;

h4 {
font-size: 12px;
text-transform: uppercase;
color: $darker-text-color;
padding: 10px;
font-weight: 500;
border-bottom: 1px solid lighten($ui-base-color, 8%);
}

@media screen and (max-height: 810px) {
.trends__item:nth-child(3) {
display: none;
Expand Down