From ce182efd6832884c59c792d427aa49d3d05f4d44 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 23 Aug 2019 05:05:21 +0200
Subject: [Glitch] Add header to trends section and change refresh rate to 15
minutes
Port 4ef8d8b77c596680be13b26400bc2a09038928de to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
---
.../glitch/features/getting_started/components/trends.js | 5 ++++-
app/javascript/flavours/glitch/styles/components/index.scss | 9 +++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
(limited to 'app')
diff --git a/app/javascript/flavours/glitch/features/getting_started/components/trends.js b/app/javascript/flavours/glitch/features/getting_started/components/trends.js
index 8a34633d9..0734ec72b 100644
--- a/app/javascript/flavours/glitch/features/getting_started/components/trends.js
+++ b/app/javascript/flavours/glitch/features/getting_started/components/trends.js
@@ -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 'flavours/glitch/components/hashtag';
+import { FormattedMessage } from 'react-intl';
export default class Trends extends ImmutablePureComponent {
@@ -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 () {
@@ -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>
);
diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss
index 5667a4511..3e224ac63 100644
--- a/app/javascript/flavours/glitch/styles/components/index.scss
+++ b/app/javascript/flavours/glitch/styles/components/index.scss
@@ -915,6 +915,15 @@
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;
--
cgit