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

Fix ProfilePage issues, fixes #58

Browse source
This commit is contained in:
Alex Gleason 2020-05-26 23:56:54 -05:00
parent f04e1fddae
commit a85684835f
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/gabsocial/features/account/components/header.js
View file

@ -72,7 +72,7 @@ class Header extends ImmutablePureComponent {
username: PropTypes.string,
autoPlayGif: PropTypes.bool,
isStaff: PropTypes.bool.isRequired,
version: PropTypes.node,
version: PropTypes.object,
};
static defaultProps = {

22
app/gabsocial/pages/profile_page.js
View file

@ -10,8 +10,6 @@ import LinkFooter from '../features/ui/components/link_footer';
import SignUpPanel from '../features/ui/components/sign_up_panel';
import ProfileInfoPanel from '../features/ui/components/profile_info_panel';
import { acctFull } from 'gabsocial/utils/accounts';
import { fetchAccount, fetchAccountByUsername } from '../actions/accounts';
import { fetchAccountIdentityProofs } from '../actions/identity_proofs';
import { getFeatures } from 'gabsocial/utils/features';
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
@ -45,30 +43,18 @@ class ProfilePage extends ImmutablePureComponent {
static propTypes = {
account: ImmutablePropTypes.map,
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() {
const { children, accountId, account, accountUsername, features } = this.props;
if (!account) return null;
const bg = account.getIn(['customizations', 'background']);
const bg = account ? account.getIn(['customizations', 'background']) : undefined;
return (
<div className={bg && `page page--customization page--${bg}` || 'page'}>
<Helmet>
{account && <Helmet>
<title>@{acctFull(account)}</title>
</Helmet>
</Helmet>}
<div className='page__top'>
<HeaderContainer accountId={accountId} username={accountUsername} />