moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sidebar-invites' into 'develop' 

SidebarMenu: add invites button

See merge request soapbox-pub/soapbox-fe!846
This commit is contained in:
Alex Gleason 2021-11-02 17:06:07 +00:00
parent 0990bbb6cf 84074fc1b4
commit 6aa3a31d0e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/soapbox/components/sidebar_menu.js
View File

@ -26,6 +26,7 @@ const messages = defineMessages({
followers: { id: 'account.followers', defaultMessage: 'Followers' }, followers: { id: 'account.followers', defaultMessage: 'Followers' },
follows: { id: 'account.follows', defaultMessage: 'Follows' }, follows: { id: 'account.follows', defaultMessage: 'Follows' },
profile: { id: 'account.profile', defaultMessage: 'Profile' }, profile: { id: 'account.profile', defaultMessage: 'Profile' },
invites: { id: 'navigation_bar.invites', defaultMessage: 'Invites' },
preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' }, blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
@ -69,6 +70,7 @@ const makeMapStateToProps = () => {
hasCrypto: typeof soapbox.getIn(['cryptoAddresses', 0, 'ticker']) === 'string', hasCrypto: typeof soapbox.getIn(['cryptoAddresses', 0, 'ticker']) === 'string',
otherAccounts: getOtherAccounts(state), otherAccounts: getOtherAccounts(state),
features, features,
instance,
settings: getSettings(state), settings: getSettings(state),
siteTitle: instance.get('title'), siteTitle: instance.get('title'),
baseURL: getBaseURL(account), baseURL: getBaseURL(account),
@ -106,6 +108,7 @@ class SidebarMenu extends ImmutablePureComponent {
onClose: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired,
settings: PropTypes.object.isRequired, settings: PropTypes.object.isRequired,
features: PropTypes.object.isRequired, features: PropTypes.object.isRequired,
instance: ImmutablePropTypes.map.isRequired,
baseURL: PropTypes.string, baseURL: PropTypes.string,
}; };
@ -163,7 +166,7 @@ class SidebarMenu extends ImmutablePureComponent {
} }
render() { render() {
const { sidebarOpen, intl, account, onClickLogOut, donateUrl, otherAccounts, hasCrypto, settings, features, siteTitle, baseURL } = this.props; const { sidebarOpen, intl, account, onClickLogOut, donateUrl, otherAccounts, hasCrypto, settings, features, instance, siteTitle, baseURL } = this.props;
const { switcher } = this.state; const { switcher } = this.state;
if (!account) return null; if (!account) return null;
const acct = account.get('acct'); const acct = account.get('acct');
@ -230,6 +233,10 @@ class SidebarMenu extends ImmutablePureComponent {
<Icon src={require('@tabler/icons/icons/user.svg')} /> <Icon src={require('@tabler/icons/icons/user.svg')} />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.profile)}</span> <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.profile)}</span>
</NavLink> </NavLink>
{instance.get('invites_enabled') && <a className='sidebar-menu-item' href={`${baseURL}/invites`} onClick={this.handleClose}>
<Icon src={require('@tabler/icons/icons/mailbox.svg')} />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.invites)}</span>
</a>}
{donateUrl && <a className='sidebar-menu-item' href={donateUrl} onClick={this.handleClose}> {donateUrl && <a className='sidebar-menu-item' href={donateUrl} onClick={this.handleClose}>
<Icon src={require('@tabler/icons/icons/coin.svg')} /> <Icon src={require('@tabler/icons/icons/coin.svg')} />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.donate)}</span> <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.donate)}</span>