Fix ProfilePage issues, fixes #58
This commit is contained in:
parent
f04e1fddae
commit
a85684835f
2 changed files with 5 additions and 19 deletions
|
@ -72,7 +72,7 @@ class Header extends ImmutablePureComponent {
|
||||||
username: PropTypes.string,
|
username: PropTypes.string,
|
||||||
autoPlayGif: PropTypes.bool,
|
autoPlayGif: PropTypes.bool,
|
||||||
isStaff: PropTypes.bool.isRequired,
|
isStaff: PropTypes.bool.isRequired,
|
||||||
version: PropTypes.node,
|
version: PropTypes.object,
|
||||||
};
|
};
|
||||||
|
|
||||||
static defaultProps = {
|
static defaultProps = {
|
||||||
|
|
|
@ -10,8 +10,6 @@ import LinkFooter from '../features/ui/components/link_footer';
|
||||||
import SignUpPanel from '../features/ui/components/sign_up_panel';
|
import SignUpPanel from '../features/ui/components/sign_up_panel';
|
||||||
import ProfileInfoPanel from '../features/ui/components/profile_info_panel';
|
import ProfileInfoPanel from '../features/ui/components/profile_info_panel';
|
||||||
import { acctFull } from 'gabsocial/utils/accounts';
|
import { acctFull } from 'gabsocial/utils/accounts';
|
||||||
import { fetchAccount, fetchAccountByUsername } from '../actions/accounts';
|
|
||||||
import { fetchAccountIdentityProofs } from '../actions/identity_proofs';
|
|
||||||
import { getFeatures } from 'gabsocial/utils/features';
|
import { getFeatures } from 'gabsocial/utils/features';
|
||||||
|
|
||||||
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
|
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
|
||||||
|
@ -45,30 +43,18 @@ class ProfilePage extends ImmutablePureComponent {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
account: ImmutablePropTypes.map,
|
account: ImmutablePropTypes.map,
|
||||||
accountUsername: PropTypes.string.isRequired,
|
accountUsername: PropTypes.string.isRequired,
|
||||||
features: PropTypes.node,
|
features: PropTypes.object,
|
||||||
};
|
};
|
||||||
|
|
||||||
componentWillMount() {
|
|
||||||
const { params: { username }, accountId, me } = this.props;
|
|
||||||
|
|
||||||
if (accountId && accountId !== -1) {
|
|
||||||
this.props.dispatch(fetchAccount(accountId));
|
|
||||||
if (me) this.props.dispatch(fetchAccountIdentityProofs(accountId));
|
|
||||||
} else {
|
|
||||||
this.props.dispatch(fetchAccountByUsername(username));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { children, accountId, account, accountUsername, features } = this.props;
|
const { children, accountId, account, accountUsername, features } = this.props;
|
||||||
if (!account) return null;
|
const bg = account ? account.getIn(['customizations', 'background']) : undefined;
|
||||||
const bg = account.getIn(['customizations', 'background']);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={bg && `page page--customization page--${bg}` || 'page'}>
|
<div className={bg && `page page--customization page--${bg}` || 'page'}>
|
||||||
<Helmet>
|
{account && <Helmet>
|
||||||
<title>@{acctFull(account)}</title>
|
<title>@{acctFull(account)}</title>
|
||||||
</Helmet>
|
</Helmet>}
|
||||||
|
|
||||||
<div className='page__top'>
|
<div className='page__top'>
|
||||||
<HeaderContainer accountId={accountId} username={accountUsername} />
|
<HeaderContainer accountId={accountId} username={accountUsername} />
|
||||||
|
|
Loading…
Reference in a new issue