4691b0068c
* Remove the search button from UI header when logged out (#25631) * Change account search to match by text when opted-in (#25599) Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> * Fix ResolveURLService not resolving local URLs for remote content (#25637) * Remove `pkg-config` gem dependency (#25615) * Update Crowdin configuration file * Fix onboarding prompt being displayed because of disconnection gaps (#25617) * Use an Immutable Record as the root state (#25584) * Add index to backups on `user_id` column (#25647) * Fix rails `rewhere` deprecation warning in directories api controller (#25625) * Remove unused routes (#25578) * Fixing an issue with a missing argument (#2261) undefined * Update uri to version 0.12.2 (CVE fix) (#25657) * Change local and federated timelines to be in a single firehose column (#25641) * Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595) * Rails 7 update (#24241) * Change dropdown icon above compose form from ellipsis to bars in web UI (#25661) * Prevent duplicate concurrent calls of `/api/*/instance` in web UI (#25663) * Revert "Rails 7 update" (#25667) * [Glitch] Remove the search button from UI header when logged out Port285a691936
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Fix onboarding prompt being displayed because of disconnection gaps Port9934949fc4
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Use an Immutable Record as the root state Port78ba12f0bf
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Change local and federated timelines to be in a single firehose column Portcea9db5a0b
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI Port0512537eb6
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI Port5b46345459
to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * Show local-only posts in “All” by default, and add back option to toggle it * Fix showing local only toots in "All" (#2265) * Fix warnings about missing dependency in hooks Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add `allowLocalOnly` to timelineId Without this local-only toots will never be loaded. feedType is checked to be public to not show local-only toots in the "Remote" tab. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add regex filter back to firehose (#2266) * Add regex filter back to firehose The regex filter will apply to all tabs and not be automatically applied when pinned. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Keep regex when pinned Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: jsgoldstein <jakegoldstein95@gmail.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Renaud Chaput <renchap@gmail.com> Co-authored-by: Matt Jankowski <matt@jankowski.online> Co-authored-by: Vivianne <puttabutta@gmail.com> Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com> Co-authored-by: mogaminsk <mgmnjp@icloud.com> Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
117 lines
3.4 KiB
JavaScript
117 lines
3.4 KiB
JavaScript
import PropTypes from 'prop-types';
|
|
import { PureComponent } from 'react';
|
|
|
|
import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
|
|
|
|
import { Link, withRouter } from 'react-router-dom';
|
|
|
|
import { connect } from 'react-redux';
|
|
|
|
import { openModal } from 'mastodon/actions/modal';
|
|
import { fetchServer } from 'mastodon/actions/server';
|
|
import { Avatar } from 'mastodon/components/avatar';
|
|
import { Icon } from 'mastodon/components/icon';
|
|
import { WordmarkLogo, SymbolLogo } from 'mastodon/components/logo';
|
|
import { registrationsOpen, me } from 'mastodon/initial_state';
|
|
|
|
const Account = connect(state => ({
|
|
account: state.getIn(['accounts', me]),
|
|
}))(({ account }) => (
|
|
<Link to={`/@${account.get('acct')}`} title={account.get('acct')}>
|
|
<Avatar account={account} size={35} />
|
|
</Link>
|
|
));
|
|
|
|
const messages = defineMessages({
|
|
search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
|
|
});
|
|
|
|
const mapStateToProps = (state) => ({
|
|
signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up',
|
|
});
|
|
|
|
const mapDispatchToProps = (dispatch) => ({
|
|
openClosedRegistrationsModal() {
|
|
dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
|
|
},
|
|
dispatchServer() {
|
|
dispatch(fetchServer());
|
|
}
|
|
});
|
|
|
|
class Header extends PureComponent {
|
|
|
|
static contextTypes = {
|
|
identity: PropTypes.object,
|
|
};
|
|
|
|
static propTypes = {
|
|
openClosedRegistrationsModal: PropTypes.func,
|
|
location: PropTypes.object,
|
|
signupUrl: PropTypes.string.isRequired,
|
|
dispatchServer: PropTypes.func,
|
|
intl: PropTypes.object.isRequired,
|
|
};
|
|
|
|
componentDidMount () {
|
|
const { dispatchServer } = this.props;
|
|
dispatchServer();
|
|
}
|
|
|
|
render () {
|
|
const { signedIn } = this.context.identity;
|
|
const { location, openClosedRegistrationsModal, signupUrl, intl } = this.props;
|
|
|
|
let content;
|
|
|
|
if (signedIn) {
|
|
content = (
|
|
<>
|
|
{location.pathname !== '/search' && <Link to='/search' className='button button-secondary' aria-label={intl.formatMessage(messages.search)}><Icon id='search' /></Link>}
|
|
{location.pathname !== '/publish' && <Link to='/publish' className='button button-secondary'><FormattedMessage id='compose_form.publish_form' defaultMessage='New post' /></Link>}
|
|
<Account />
|
|
</>
|
|
);
|
|
} else {
|
|
let signupButton;
|
|
|
|
if (registrationsOpen) {
|
|
signupButton = (
|
|
<a href={signupUrl} className='button'>
|
|
<FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
|
|
</a>
|
|
);
|
|
} else {
|
|
signupButton = (
|
|
<button className='button' onClick={openClosedRegistrationsModal}>
|
|
<FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
|
|
</button>
|
|
);
|
|
}
|
|
|
|
content = (
|
|
<>
|
|
{signupButton}
|
|
<a href='/auth/sign_in' className='button button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
|
|
</>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<div className='ui__header'>
|
|
<Link to='/' className='ui__header__logo'>
|
|
<WordmarkLogo />
|
|
<SymbolLogo />
|
|
</Link>
|
|
|
|
<div className='ui__header__links'>
|
|
{content}
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|
|
|
|
export default injectIntl(withRouter(connect(mapStateToProps, mapDispatchToProps)(Header)));
|