]> cat aescling's git repositories - mastodon.git/commitdiff
[Glitch] Add header to trends section and change refresh rate to 15 minutes
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 23 Aug 2019 03:05:21 +0000 (05:05 +0200)
committerThibG <thib@sitedethib.com>
Mon, 2 Sep 2019 08:57:44 +0000 (10:57 +0200)
Port 4ef8d8b77c596680be13b26400bc2a09038928de to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
app/javascript/flavours/glitch/features/getting_started/components/trends.js
app/javascript/flavours/glitch/styles/components/index.scss

index 8a34633d93191618b1cd50f8d74a13819f410052..0734ec72b968a6500627a04f6e01e3a7576a1fd3 100644 (file)
@@ -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>
     );
index 5667a4511dfe091f5d9d36a485484d8efd59f2b0..3e224ac63d448c895a40cf9cdf1f23256d94f50f 100644 (file)
     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;