techhub/mastodon
2
0
Fork 0
Code Activity

Replacing follow requests in the settings area with in-UI column

Browse Source
This commit is contained in:
Eugen Rochko
2016-12-26 21:33:51 +01:00
parent 004382e4d0
commit 3689c119f0
17 changed files with 334 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/components/features/getting_started/index.jsx
View File

@@ -7,7 +7,8 @@ import { connect } from 'react-redux';
const messages = defineMessages({
heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Public timeline' },
settings: { id: 'navigation_bar.settings', defaultMessage: 'Settings' }
settings: { id: 'navigation_bar.settings', defaultMessage: 'Settings' },
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }
});
const mapStateToProps = state => ({
@@ -32,6 +33,7 @@ const GettingStarted = ({ intl, me }) => {
<div style={hamburgerStyle}><i className='fa fa-bars' /></div>
<ColumnLink icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />
<ColumnLink icon='cog' text={intl.formatMessage(messages.settings)} href='/settings/profile' />
<ColumnLink icon='users' text={intl.formatMessage(messages.follow_requests)} to='/follow_requests' />
</div>
<div className='static-content'>
@@ -43,4 +45,9 @@ const GettingStarted = ({ intl, me }) => {
);
};
GettingStarted.propTypes = {
intl: React.PropTypes.object.isRequired,
me: React.PropTypes.number
};
export default connect(mapStateToProps)(injectIntl(GettingStarted));