diff --git a/app/javascript/mastodon/features/getting_started/components/trends.js b/app/javascript/mastodon/features/getting_started/components/trends.js
index 5d6b7ed8cd..96a646bea3 100644
--- a/app/javascript/mastodon/features/getting_started/components/trends.js
+++ b/app/javascript/mastodon/features/getting_started/components/trends.js
@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { FormattedMessage, defineMessages } from 'react-intl';
import Hashtag from '../../../components/hashtag';
+import { Link } from 'react-router-dom';
const messages = defineMessages({
refresh_trends: { id: 'trends.refresh', defaultMessage: 'Refresh' },
@@ -19,6 +20,9 @@ export default class Trends extends ImmutablePureComponent {
static propTypes = {
trends: ImmutablePropTypes.list,
loading: PropTypes.bool.isRequired,
+ showTrends: PropTypes.bool.isRequired,
+ fetchTrends: PropTypes.func.isRequired,
+ toggleTrends: PropTypes.func.isRequired,
};
componentDidMount () {
@@ -29,8 +33,12 @@ export default class Trends extends ImmutablePureComponent {
this.props.fetchTrends();
}
+ handleToggle = () => {
+ this.props.toggleTrends(!this.props.showTrends);
+ }
+
render () {
- const { intl, trends, loading } = this.props;
+ const { intl, trends, loading, showTrends } = this.props;
if (!trends || trends.size < 1) {
return null;
@@ -44,13 +52,18 @@ export default class Trends extends ImmutablePureComponent {
+
+
{!multiColumn && }
{navItems}
diff --git a/app/javascript/mastodon/features/trends/index.js b/app/javascript/mastodon/features/trends/index.js
new file mode 100644
index 0000000000..f33af3e2e3
--- /dev/null
+++ b/app/javascript/mastodon/features/trends/index.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { connect } from 'react-redux';
+import { injectIntl, defineMessages } from 'react-intl';
+import Column from '../ui/components/column';
+import ColumnHeader from '../../components/column_header';
+import Hashtag from '../../components/hashtag';
+import classNames from 'classnames';
+import { fetchTrends } from '../../actions/trends';
+
+const messages = defineMessages({
+ title: { id: 'trends.header', defaultMessage: 'Trending now' },
+ refreshTrends: { id: 'trends.refresh', defaultMessage: 'Refresh trends' },
+});
+
+const mapStateToProps = state => ({
+ trends: state.getIn(['trends', 'items']),
+ loading: state.getIn(['trends', 'isLoading']),
+});
+
+const mapDispatchToProps = dispatch => ({
+ fetchTrends: () => dispatch(fetchTrends()),
+});
+
+@connect(mapStateToProps, mapDispatchToProps)
+@injectIntl
+export default class Trends extends ImmutablePureComponent {
+
+ static propTypes = {
+ intl: PropTypes.object.isRequired,
+ trends: ImmutablePropTypes.list,
+ fetchTrends: PropTypes.func.isRequired,
+ loading: PropTypes.bool,
+ };
+
+ componentDidMount () {
+ this.props.fetchTrends();
+ }
+
+ handleRefresh = () => {
+ this.props.fetchTrends();
+ }
+
+ render () {
+ const { trends, loading, intl } = this.props;
+
+ return (
+
+
+ )}
+ />
+
+
+ {trends && trends.map(hashtag => )}
+
+
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index f1409b9467..bfed02f98a 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -42,6 +42,7 @@ import {
Mutes,
PinnedStatuses,
Lists,
+ Trends,
} from './util/async-components';
import { HotKeys } from 'react-hotkeys';
import { me } from '../../initial_state';
@@ -154,6 +155,7 @@ class SwitchingColumnsArea extends React.PureComponent {
+
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 8cf2a6e7d7..dfc796a098 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -129,3 +129,7 @@ export function EmbedModal () {
export function ListEditor () {
return import(/* webpackChunkName: "features/list_editor" */'../../list_editor');
}
+
+export function Trends () {
+ return import(/* webpackChunkName: "features/trends" */'../../trends');
+}
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index de8865e433..0a034d739a 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -64,6 +64,10 @@ const initialState = ImmutableMap({
body: '',
}),
}),
+
+ trends: ImmutableMap({
+ show: true,
+ }),
});
const defaultColumns = fromJS([
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 124998a488..39eaf50619 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2178,8 +2178,7 @@ a.account__display-name {
}
.getting-started__wrapper {
- position: relative;
- overflow-y: auto;
+ flex: 0 0 auto;
}
.flex-spacer {
@@ -2187,7 +2186,6 @@ a.account__display-name {
}
.getting-started {
- flex: 1 0 auto;
color: $dark-text-color;
p {
@@ -2228,7 +2226,23 @@ a.account__display-name {
&__trends {
background: $ui-base-color;
- flex: 1 1 auto;
+ flex: 0 1 auto;
+
+ @media screen and (max-height: 810px) {
+ .trends__item:nth-child(3) {
+ display: none;
+ }
+ }
+
+ @media screen and (max-height: 720px) {
+ .trends__item:nth-child(2) {
+ display: none;
+ }
+ }
+
+ @media screen and (max-height: 670px) {
+ display: none;
+ }
}
&__scrollable {
@@ -2460,8 +2474,10 @@ a.status-card {
line-height: inherit;
margin: 0;
padding: 15px;
+ box-sizing: border-box;
width: 100%;
clear: both;
+ text-decoration: none;
&:hover {
background: lighten($ui-base-color, 2%);