[Glitch] Change order of items in navigation panel in web UI

Port 7c4393e719 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

app/javascript/flavours/glitch/features/getting_started/components/trends.jsx

@@ -1,54 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { FormattedMessage } from 'react-intl';
-
-import { Link } from 'react-router-dom';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { ImmutableHashtag as Hashtag } from 'flavours/glitch/components/hashtag';
-
-export default class Trends extends ImmutablePureComponent {
-
-  static defaultProps = {
-    loading: false,
-  };
-
-  static propTypes = {
-    trends: ImmutablePropTypes.list,
-    fetchTrends: PropTypes.func.isRequired,
-  };
-
-  componentDidMount () {
-    this.props.fetchTrends();
-    this.refreshInterval = setInterval(() => this.props.fetchTrends(), 900 * 1000);
-  }
-
-  componentWillUnmount () {
-    if (this.refreshInterval) {
-      clearInterval(this.refreshInterval);
-    }
-  }
-
-  render () {
-    const { trends } = this.props;
-
-    if (!trends || trends.isEmpty()) {
-      return null;
-    }
-
-    return (
-      <div className='getting-started__trends'>
-        <h4>
-          <Link to={'/explore/tags'}>
-            <FormattedMessage id='trends.trending_now' defaultMessage='Trending now' />
-          </Link>
-        </h4>
-
-        {trends.take(3).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
-      </div>
-    );
-  }
-
-}

app/javascript/flavours/glitch/features/getting_started/containers/trends_container.js

@@ -1,15 +0,0 @@
-import { connect } from 'react-redux';
-
-import { fetchTrendingHashtags } from 'flavours/glitch/actions/trends';
-
-import Trends from '../components/trends';
-
-const mapStateToProps = state => ({
-  trends: state.getIn(['trends', 'tags', 'items']),
-});
-
-const mapDispatchToProps = dispatch => ({
-  fetchTrends: () => dispatch(fetchTrendingHashtags()),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(Trends);

app/javascript/flavours/glitch/features/getting_started/index.jsx

@@ -38,7 +38,7 @@ import { NavigationBar } from '../compose/components/navigation_bar';
 import { ColumnLink } from '../ui/components/column_link';
 import ColumnSubheading from '../ui/components/column_subheading';
 
-import TrendsContainer from './containers/trends_container';
+import { Trends } from 'flavours/glitch/features/navigation_panel/components/trends';
 
 const messages = defineMessages({
   heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -209,7 +209,7 @@ class GettingStarted extends ImmutablePureComponent {
           <LinkFooter multiColumn />
         </div>
 
-        {(multiColumn && showTrends) && <TrendsContainer />}
+        {(multiColumn && showTrends) && <Trends />}
 
         <Helmet>
           <title>{intl.formatMessage(messages.menu)}</title>