--- /dev/null
+import React from 'react';
+import { Sparklines, SparklinesCurve } from 'react-sparklines';
+import { Link } from 'react-router-dom';
+import { FormattedMessage, FormattedNumber } from 'react-intl';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
+const shortNumberFormat = number => {
+ if (number < 1000) {
+ return <FormattedNumber value={number} />;
+ } else {
+ return <React.Fragment><FormattedNumber value={number / 1000} maximumFractionDigits={1} />K</React.Fragment>;
+ }
+};
+
+const Hashtag = ({ hashtag }) => (
+ <div className='trends__item'>
+ <div className='trends__item__name'>
+ <Link to={`/timelines/tag/${hashtag.get('name')}`}>
+ #<span>{hashtag.get('name')}</span>
+ </Link>
+
+ <FormattedMessage id='trends.count_by_accounts' defaultMessage='{count} {rawCount, plural, one {person} other {people}} talking' values={{ rawCount: hashtag.getIn(['history', 0, 'accounts']), count: <strong>{shortNumberFormat(hashtag.getIn(['history', 0, 'accounts']))}</strong> }} />
+ </div>
+
+ <div className='trends__item__current'>
+ {shortNumberFormat(hashtag.getIn(['history', 0, 'uses']))}
+ </div>
+
+ <div className='trends__item__sparkline'>
+ <Sparklines width={50} height={28} data={hashtag.get('history').reverse().map(day => day.get('uses')).toArray()}>
+ <SparklinesCurve style={{ fill: 'none' }} />
+ </Sparklines>
+ </div>
+ </div>
+);
+
+Hashtag.propTypes = {
+ hashtag: ImmutablePropTypes.map.isRequired,
+};
+
+export default Hashtag;
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' },
showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
+ pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
+ preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
+ follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
+ favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
+ lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
+ blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
+ domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
+ mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
});
@injectIntl
let menu = [];
let extraInfo = '';
- menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.props.onMention });
- menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.props.onDirect });
+ if (account.get('id') !== me) {
+ menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.props.onMention });
+ menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.props.onDirect });
+ menu.push(null);
+ }
if ('share' in navigator) {
menu.push({ text: intl.formatMessage(messages.share, { name: account.get('username') }), action: this.handleShare });
+ menu.push(null);
}
- menu.push(null);
-
if (account.get('id') === me) {
menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
+ menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
+ menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
+ menu.push(null);
+ menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
+ menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
+ menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
+ menu.push(null);
+ menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
+ menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
+ menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
} else {
if (account.getIn(['relationship', 'following'])) {
if (account.getIn(['relationship', 'showing_reblogs'])) {
follow: { id: 'account.follow', defaultMessage: 'Follow' },
requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
+ edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
});
class Avatar extends ImmutablePureComponent {
intl: PropTypes.object.isRequired,
};
+ openEditProfile = () => {
+ window.open('/settings/profile', '_blank');
+ }
+
render () {
const { account, intl } = this.props;
</div>
);
}
+ } else {
+ actionBtn = (
+ <div className='account--action-button'>
+ <IconButton size={26} icon='pencil' title={intl.formatMessage(messages.edit_profile)} onClick={this.openEditProfile} />
+ </div>
+ );
}
if (account.get('moved') && !account.getIn(['relationship', 'following'])) {
import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage, FormattedNumber } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
import AccountContainer from '../../../containers/account_container';
import StatusContainer from '../../../containers/status_container';
-import { Link } from 'react-router-dom';
import ImmutablePureComponent from 'react-immutable-pure-component';
-import { Sparklines, SparklinesCurve } from 'react-sparklines';
-
-const shortNumberFormat = number => {
- if (number < 1000) {
- return <FormattedNumber value={number} />;
- } else {
- return <React.Fragment><FormattedNumber value={number / 1000} maximumFractionDigits={1} />K</React.Fragment>;
- }
-};
-
-const renderHashtag = hashtag => (
- <div className='trends__item' key={hashtag.get('name')}>
- <div className='trends__item__name'>
- <Link to={`/timelines/tag/${hashtag.get('name')}`}>
- #<span>{hashtag.get('name')}</span>
- </Link>
-
- <FormattedMessage id='trends.count_by_accounts' defaultMessage='{count} {rawCount, plural, one {person} other {people}} talking' values={{ rawCount: hashtag.getIn(['history', 0, 'accounts']), count: <strong>{shortNumberFormat(hashtag.getIn(['history', 0, 'accounts']))}</strong> }} />
- </div>
-
- <div className='trends__item__current'>
- {shortNumberFormat(hashtag.getIn(['history', 0, 'uses']))}
- </div>
-
- <div className='trends__item__sparkline'>
- <Sparklines width={50} height={28} data={hashtag.get('history').reverse().map(day => day.get('uses')).toArray()}>
- <SparklinesCurve style={{ fill: 'none' }} />
- </Sparklines>
- </div>
- </div>
-);
+import Hashtag from '../../../components/hashtag';
export default class SearchResults extends ImmutablePureComponent {
<FormattedMessage id='trends.header' defaultMessage='Trending now' />
</div>
- {trends && trends.map(hashtag => renderHashtag(hashtag))}
+ {trends && trends.map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
</div>
</div>
);
<div className='search-results__section'>
<h5><i className='fa fa-fw fa-hashtag' /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></h5>
- {results.get('hashtags').map(hashtag => renderHashtag(hashtag))}
+ {results.get('hashtags').map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
</div>
);
}
const { columns } = this.props;
header = (
<nav className='drawer__header'>
- <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)} aria-label={intl.formatMessage(messages.start)}><i role='img' className='fa fa-fw fa-asterisk' /></Link>
+ <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)} aria-label={intl.formatMessage(messages.start)}><i role='img' className='fa fa-fw fa-bars' /></Link>
{!columns.some(column => column.get('id') === 'HOME') && (
<Link to='/timelines/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)} aria-label={intl.formatMessage(messages.home_timeline)}><i role='img' className='fa fa-fw fa-home' /></Link>
)}
static propTypes = {
params: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired,
- domains: ImmutablePropTypes.list,
+ domains: ImmutablePropTypes.orderedSet,
intl: PropTypes.object.isRequired,
};
import { me } from '../../initial_state';
import { fetchFollowRequests } from '../../actions/accounts';
import { List as ImmutableList } from 'immutable';
+import { Link } from 'react-router-dom';
+import { fetchTrends } from '../../actions/trends';
+import Hashtag from '../../components/hashtag';
+import NavigationBar from '../compose/components/navigation_bar';
const messages = defineMessages({
- heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
- navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation' },
settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
- sign_out: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
- info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' },
pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
- keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' },
+ refresh_trends: { id: 'trends.refresh', defaultMessage: 'Refresh' },
+ discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
+ personal: { id: 'navigation_bar.personal', defaultMessage: 'Personal' },
+ security: { id: 'navigation_bar.security', defaultMessage: 'Security' },
});
const mapStateToProps = state => ({
myAccount: state.getIn(['accounts', me]),
- columns: state.getIn(['settings', 'columns']),
unreadFollowRequests: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
- unreadNotifications: state.getIn(['notifications', 'unread']),
+ trends: state.get('trends'),
});
const mapDispatchToProps = dispatch => ({
fetchFollowRequests: () => dispatch(fetchFollowRequests()),
+ fetchTrends: () => dispatch(fetchTrends()),
});
const badgeDisplay = (number, limit) => {
fetchFollowRequests: PropTypes.func.isRequired,
unreadFollowRequests: PropTypes.number,
unreadNotifications: PropTypes.number,
+ trends: ImmutablePropTypes.list,
};
componentDidMount () {
if (myAccount.get('locked')) {
fetchFollowRequests();
}
+
+ setTimeout(() => this.props.fetchTrends(), 5000);
}
render () {
- const { intl, myAccount, columns, multiColumn, unreadFollowRequests, unreadNotifications } = this.props;
+ const { intl, myAccount, multiColumn, unreadFollowRequests, trends } = this.props;
const navItems = [];
if (multiColumn) {
- if (!columns.find(item => item.get('id') === 'HOME')) {
- navItems.push(<ColumnLink key='0' icon='home' text={intl.formatMessage(messages.home_timeline)} to='/timelines/home' />);
- }
-
- if (!columns.find(item => item.get('id') === 'NOTIFICATIONS')) {
- navItems.push(<ColumnLink key='1' icon='bell' text={intl.formatMessage(messages.notifications)} badge={badgeDisplay(unreadNotifications)} to='/notifications' />);
- }
-
- if (!columns.find(item => item.get('id') === 'COMMUNITY')) {
- navItems.push(<ColumnLink key='2' icon='users' text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />);
- }
-
- if (!columns.find(item => item.get('id') === 'PUBLIC')) {
- navItems.push(<ColumnLink key='3' icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />);
- }
- }
-
- if (!multiColumn || !columns.find(item => item.get('id') === 'DIRECT')) {
- navItems.push(<ColumnLink key='4' icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />);
+ navItems.push(
+ <ColumnSubheading key='1' text={intl.formatMessage(messages.discover)} />,
+ <ColumnLink key='2' icon='users' text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />,
+ <ColumnLink key='3' icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />,
+ <ColumnSubheading key='8' text={intl.formatMessage(messages.personal)} />
+ );
}
navItems.push(
+ <ColumnLink key='4' icon='envelope' text={intl.formatMessage(messages.direct)} to='/timelines/direct' />,
<ColumnLink key='5' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
<ColumnLink key='6' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />
);
navItems.push(<ColumnLink key='7' icon='users' text={intl.formatMessage(messages.follow_requests)} badge={badgeDisplay(unreadFollowRequests, 40)} to='/follow_requests' />);
}
- if (multiColumn) {
- navItems.push(<ColumnLink key='8' icon='question' text={intl.formatMessage(messages.keyboard_shortcuts)} to='/keyboard-shortcuts' />);
+ if (!multiColumn) {
+ navItems.push(
+ <ColumnSubheading key='9' text={intl.formatMessage(messages.settings_subheading)} />,
+ <ColumnLink key='6' icon='gears' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />,
+ <ColumnLink key='6' icon='lock' text={intl.formatMessage(messages.security)} href='/auth/edit' />
+ );
}
- navItems.push(<ColumnLink key='9' icon='book' text={intl.formatMessage(messages.info)} href='/about/more' />);
-
return (
- <Column icon='asterisk' heading={intl.formatMessage(messages.heading)} hideHeadingOnMobile>
+ <Column>
+ {multiColumn && <div className='column-header__wrapper'>
+ <h1 className='column-header'>
+ <button>
+ <i className='fa fa-bars fa-fw column-header__icon' />
+ <FormattedMessage id='getting_started.heading' defaultMessage='Getting started' />
+ </button>
+ </h1>
+ </div>}
+
<div className='getting-started__wrapper'>
- <ColumnSubheading text={intl.formatMessage(messages.navigation_subheading)} />
+ {!multiColumn && <NavigationBar account={myAccount} />}
{navItems}
- <ColumnSubheading text={intl.formatMessage(messages.settings_subheading)} />
- <ColumnLink icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' />
- <ColumnLink icon='volume-off' text={intl.formatMessage(messages.mutes)} to='/mutes' />
- <ColumnLink icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' />
- <ColumnLink icon='minus-circle' text={intl.formatMessage(messages.domain_blocks)} to='/domain_blocks' />
- <ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />
- <ColumnLink icon='sign-out' text={intl.formatMessage(messages.sign_out)} href='/auth/sign_out' method='delete' />
</div>
- <div className='static-content getting-started'>
- <p>
- <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.faq' defaultMessage='FAQ' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' /></a>
- </p>
+ {multiColumn && trends && <div className='getting-started__trends'>
+ <div className='column-header__wrapper'>
+ <h1 className='column-header'>
+ <button>
+ <i className='fa fa-fire fa-fw' />
+ <FormattedMessage id='trends.header' defaultMessage='Trending now' />
+ </button>
+ <div className='column-header__buttons'>
+ <button className='column-header__button' title={intl.formatMessage(messages.refresh_trends)} aria-label={intl.formatMessage(messages.refresh_trends)}><i className='fa fa-refresh' /></button>
+ </div>
+ </h1>
+ </div>
+
+ <div className='getting-started__scrollable'>{trends.take(3).map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}</div>
+ </div>}
+
+ {!multiColumn && <div className='flex-spacer' />}
+
+ <div className='getting-started getting-started__footer'>
+ <ul>
+ {multiColumn && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>}
+ <li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this instance' /></a> · </li>
+ <li><a href='/terms' target='_blank'><FormattedMessage id='getting_started.terms' defaultMessage='Terms of service' /></a> · </li>
+ <li><a href='https://github.com/tootsuite/documentation#documentation' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
+ <li><a href='/auth/sign_out' data-method='delete'><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
+ </ul>
+
<p>
<FormattedMessage
id='getting_started.open_source_notice'
"navigation_bar.favourites": "Favourites",
"navigation_bar.follow_requests": "Follow requests",
"navigation_bar.info": "About this instance",
- "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
+ "navigation_bar.keyboard_shortcuts": "Hotkeys",
"navigation_bar.lists": "Lists",
"navigation_bar.logout": "Logout",
"navigation_bar.mutes": "Muted users",
vertical-align: middle;
}
-.static-content {
- padding: 10px;
- padding-top: 20px;
- color: $dark-text-color;
-
- h1 {
- font-size: 16px;
- font-weight: 500;
- margin-bottom: 40px;
- text-align: center;
- }
-
- p {
- font-size: 13px;
- margin-bottom: 20px;
- }
-}
-
.columns-area {
display: flex;
flex: 1 1 auto;
margin-bottom: 0;
}
+ .getting-started__wrapper,
+ .getting-started__trends,
.search {
margin-bottom: 10px;
}
}
.getting-started__wrapper,
-.getting_started {
+.getting-started,
+.flex-spacer {
background: $ui-base-color;
}
overflow-y: auto;
}
+.flex-spacer {
+ flex: 1 1 auto;
+}
+
.getting-started {
- background: $ui-base-color;
flex: 1 0 auto;
+ color: $dark-text-color;
p {
- color: $secondary-text-color;
+ color: $dark-text-color;
+ font-size: 13px;
+ margin-bottom: 20px;
+
+ a {
+ color: $dark-text-color;
+ text-decoration: underline;
+ }
}
a {
- color: $dark-text-color;
+ text-decoration: none;
+ color: $darker-text-color;
+
+ &:hover,
+ &:focus,
+ &:active {
+ text-decoration: underline;
+ }
+ }
+
+ &__footer {
+ flex: 0 0 auto;
+ padding: 10px;
+ padding-top: 20px;
+
+ ul {
+ margin-bottom: 10px;
+ }
+
+ ul li {
+ display: inline;
+ }
+ }
+
+ &__trends {
+ background: $ui-base-color;
+ flex: 1 1 auto;
+ }
+
+ &__scrollable {
+ max-height: 100%;
+ overflow-y: auto;
}
}
cat aescling's git repositories / mastodon.git / commitdiff