{name ? #{name} : }
- {typeof people !== 'undefined' ?
:
}
+ {description ? (
+
{description}
+ ) : (
+ typeof people !== 'undefined' ?
:
+ )}
-
-
- 0)}>
-
-
-
-
+ {typeof uses !== 'undefined' && (
+
+
+
+ )}
+
+ {withGraph && (
+
+
+ 0)}>
+
+
+
+
+ )}
);
@@ -90,9 +102,15 @@ Hashtag.propTypes = {
href: PropTypes.string,
to: PropTypes.string,
people: PropTypes.number,
+ description: PropTypes.node,
uses: PropTypes.number,
history: PropTypes.arrayOf(PropTypes.number),
className: PropTypes.string,
+ withGraph: PropTypes.bool,
+};
+
+Hashtag.defaultProps = {
+ withGraph: true,
};
export default Hashtag;
diff --git a/app/javascript/mastodon/components/navigation_portal.js b/app/javascript/mastodon/components/navigation_portal.js
new file mode 100644
index 0000000000..b2d054a3b6
--- /dev/null
+++ b/app/javascript/mastodon/components/navigation_portal.js
@@ -0,0 +1,30 @@
+import React from 'react';
+import { Switch, Route, withRouter } from 'react-router-dom';
+import { showTrends } from 'mastodon/initial_state';
+import Trends from 'mastodon/features/getting_started/containers/trends_container';
+import AccountNavigation from 'mastodon/features/account/navigation';
+
+const DefaultNavigation = () => (
+ <>
+ {showTrends && (
+ <>
+
-
-
-
{intl.formatMessage(messages.hashtag_all)}
- {!suspended && featuredTags.map(featuredTag => {
- const name = featuredTag.get('name');
- const url = featuredTag.get('url');
- const to = `/@${account.get('acct')}/tagged/${name}`;
- const desc = intl.formatMessage(messages.hashtag_select_description, { name });
- const count = featuredTag.get('statuses_count');
+
+
}} />
- return (
-
- #{name} ({})
-
- );
- })}
-
-
+ {featuredTags.map(featuredTag => (
+
0) ? intl.formatMessage(messages.lastStatusAt, { date: intl.formatDate(featuredTag.get('last_status_at'), { month: 'short', day: '2-digit' }) }) : intl.formatMessage(messages.empty)}
+ />
+ ))}
);
}
diff --git a/app/javascript/mastodon/features/account/containers/featured_tags_container.js b/app/javascript/mastodon/features/account/containers/featured_tags_container.js
new file mode 100644
index 0000000000..7e206567fb
--- /dev/null
+++ b/app/javascript/mastodon/features/account/containers/featured_tags_container.js
@@ -0,0 +1,15 @@
+import { connect } from 'react-redux';
+import FeaturedTags from '../components/featured_tags';
+import { makeGetAccount } from 'mastodon/selectors';
+import { List as ImmutableList } from 'immutable';
+
+const mapStateToProps = () => {
+ const getAccount = makeGetAccount();
+
+ return (state, { accountId }) => ({
+ account: getAccount(state, accountId),
+ featuredTags: state.getIn(['user_lists', 'featured_tags', accountId, 'items'], ImmutableList()),
+ });
+};
+
+export default connect(mapStateToProps)(FeaturedTags);
diff --git a/app/javascript/mastodon/features/account/navigation.js b/app/javascript/mastodon/features/account/navigation.js
new file mode 100644
index 0000000000..1226741395
--- /dev/null
+++ b/app/javascript/mastodon/features/account/navigation.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import FeaturedTags from 'mastodon/features/account/containers/featured_tags_container';
+
+const mapStateToProps = (state, { match: { params: { acct } } }) => {
+ const accountId = state.getIn(['accounts_map', acct]);
+
+ if (!accountId) {
+ return {
+ isLoading: true,
+ };
+ }
+
+ return {
+ accountId,
+ isLoading: false,
+ };
+};
+
+export default @connect(mapStateToProps)
+class AccountNavigation extends React.PureComponent {
+
+ static propTypes = {
+ match: PropTypes.shape({
+ params: PropTypes.shape({
+ acct: PropTypes.string,
+ tagged: PropTypes.string,
+ }).isRequired,
+ }).isRequired,
+
+ accountId: PropTypes.string,
+ isLoading: PropTypes.bool,
+ };
+
+ render () {
+ const { accountId, isLoading, match: { params: { tagged } } } = this.props;
+
+ if (isLoading) {
+ return null;
+ }
+
+ return (
+ <>
+
+
+
+ );
+ }
+
+}
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index ea34a934a7..f31848f412 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -1,8 +1,7 @@
-import React, { Fragment } from 'react';
+import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import InnerHeader from '../../account/components/header';
-import FeaturedTags from '../../account/components/featured_tags';
import ImmutablePureComponent from 'react-immutable-pure-component';
import MovedNote from './moved_note';
import { FormattedMessage } from 'react-intl';
@@ -28,7 +27,6 @@ export default class Header extends ImmutablePureComponent {
hideTabs: PropTypes.bool,
domain: PropTypes.string.isRequired,
hidden: PropTypes.bool,
- tagged: PropTypes.string,
};
static contextTypes = {
@@ -104,7 +102,7 @@ export default class Header extends ImmutablePureComponent {
}
render () {
- const { account, hidden, hideTabs, tagged } = this.props;
+ const { account, hidden, hideTabs } = this.props;
if (account === null) {
return null;
@@ -136,15 +134,11 @@ export default class Header extends ImmutablePureComponent {
/>
{!(hideTabs || hidden) && (
-
-
-
-
-
-
-
-
-
+
+
+
+
+
)}