diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-26 00:36:25 +0100 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2019-03-28 19:56:40 +0100 |
commit | 00f251b8fe7ee5c1143c880f113237c2fa543664 (patch) | |
tree | 359b9a99dee19c2f9a9cebb194d85cc81e6d981c /app/javascript/flavours/glitch/features/account_timeline | |
parent | abb53fa338ed1ca6bd78e3ca902950ba0c8e2976 (diff) |
[Glitch] Redesign profile column in web UI to match design on public pages
Port a96181f16f4ef74ce6a1efc5e893ddd87a127949 to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/features/account_timeline')
-rw-r--r-- | app/javascript/flavours/glitch/features/account_timeline/components/header.js | 12 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.js b/app/javascript/flavours/glitch/features/account_timeline/components/header.js index 8dc0be93e..8f742ee24 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/components/header.js +++ b/app/javascript/flavours/glitch/features/account_timeline/components/header.js @@ -25,6 +25,7 @@ export default class Header extends ImmutablePureComponent { onEndorseToggle: PropTypes.func.isRequired, onAddToList: PropTypes.func.isRequired, hideTabs: PropTypes.bool, + domain: PropTypes.string.isRequired, }; static contextTypes = { @@ -98,20 +99,11 @@ export default class Header extends ImmutablePureComponent { account={account} onFollow={this.handleFollow} onBlock={this.handleBlock} + domain={this.props.domain} /> <ActionBar account={account} - onBlock={this.handleBlock} - onMention={this.handleMention} - onDirect={this.handleDirect} - onReblogToggle={this.handleReblogToggle} - onReport={this.handleReport} - onMute={this.handleMute} - onBlockDomain={this.handleBlockDomain} - onUnblockDomain={this.handleUnblockDomain} - onEndorseToggle={this.handleEndorseToggle} - onAddToList={this.handleAddToList} /> {!hideTabs && ( diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js index df74ca890..ed6c0cb38 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js +++ b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js @@ -34,6 +34,7 @@ const makeMapStateToProps = () => { const mapStateToProps = (state, { accountId }) => ({ account: getAccount(state, accountId), + domain: state.getIn(['meta', 'domain']), }); return mapStateToProps; |