bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use baseURL for /invites

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2021-10-28 19:58:18 +02:00
parent 916bf7a634
commit fe4c4d93c9
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/soapbox/components/primary_navigation.js
View file

@ -11,20 +11,22 @@ import IconWithCounter from 'soapbox/components/icon_with_counter';
import classNames from 'classnames'; import classNames from 'classnames';
import { getFeatures } from 'soapbox/utils/features'; import { getFeatures } from 'soapbox/utils/features';
import { getSoapboxConfig } from 'soapbox/actions/soapbox'; import { getSoapboxConfig } from 'soapbox/actions/soapbox';
import { isStaff } from 'soapbox/utils/accounts'; import { isStaff, getBaseURL } from 'soapbox/utils/accounts';
const mapStateToProps = state => { const mapStateToProps = state => {
const me = state.get('me'); const me = state.get('me');
const account = state.getIn(['accounts', me]);
const reportsCount = state.getIn(['admin', 'openReports']).count(); const reportsCount = state.getIn(['admin', 'openReports']).count();
const approvalCount = state.getIn(['admin', 'awaitingApproval']).count(); const approvalCount = state.getIn(['admin', 'awaitingApproval']).count();
const instance = state.get('instance'); const instance = state.get('instance');
return { return {
account: state.getIn(['accounts', me]), account,
logo: getSoapboxConfig(state).get('logo'), logo: getSoapboxConfig(state).get('logo'),
notificationCount: state.getIn(['notifications', 'unread']), notificationCount: state.getIn(['notifications', 'unread']),
chatsCount: state.get('chats').reduce((acc, curr) => acc + Math.min(curr.get('unread', 0), 1), 0), chatsCount: state.get('chats').reduce((acc, curr) => acc + Math.min(curr.get('unread', 0), 1), 0),
dashboardCount: reportsCount + approvalCount, dashboardCount: reportsCount + approvalCount,
baseURL: getBaseURL(account),
features: getFeatures(instance), features: getFeatures(instance),
instance, instance,
}; };
@ -44,13 +46,14 @@ class PrimaryNavigation extends React.PureComponent {
dashboardCount: PropTypes.number, dashboardCount: PropTypes.number,
notificationCount: PropTypes.number, notificationCount: PropTypes.number,
chatsCount: PropTypes.number, chatsCount: PropTypes.number,
baseURL: PropTypes.string,
features: PropTypes.object.isRequired, features: PropTypes.object.isRequired,
location: PropTypes.object, location: PropTypes.object,
instance: ImmutablePropTypes.map.isRequired, instance: ImmutablePropTypes.map.isRequired,
}; };
render() { render() {
const { account, features, notificationCount, chatsCount, dashboardCount, location, instance } = this.props; const { account, features, notificationCount, chatsCount, dashboardCount, location, instance, baseURL } = this.props;
return ( return (
<div className='column-header__wrapper primary-navigation__wrapper'> <div className='column-header__wrapper primary-navigation__wrapper'>
@ -118,7 +121,7 @@ class PrimaryNavigation extends React.PureComponent {
)} )}
{(account && instance.get('invites_enabled')) && ( {(account && instance.get('invites_enabled')) && (
<a href='/invites' className='btn grouped'> <a href={`${baseURL}/invites`} className='btn grouped'>
<Icon src={require('@tabler/icons/icons/mailbox.svg')} className='primary-navigation__icon' /> <Icon src={require('@tabler/icons/icons/mailbox.svg')} className='primary-navigation__icon' />
<FormattedMessage id='navigation.invites' defaultMessage='Invites' /> <FormattedMessage id='navigation.invites' defaultMessage='Invites' />
</a> </a>