From 28b72dc01d5f7215fbc6399dd5bd7eeb353ce2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sat, 1 Jan 2022 23:41:25 +0100 Subject: [PATCH 1/2] Add column header to reactions page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/features/reactions/index.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/soapbox/features/reactions/index.js b/app/soapbox/features/reactions/index.js index 73c4472ca..5750c3053 100644 --- a/app/soapbox/features/reactions/index.js +++ b/app/soapbox/features/reactions/index.js @@ -4,16 +4,20 @@ import { OrderedSet as ImmutableOrderedSet } from 'immutable'; import ImmutablePureComponent from 'react-immutable-pure-component'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; +import { injectIntl, defineMessages, FormattedMessage } from 'react-intl'; import LoadingIndicator from '../../components/loading_indicator'; import MissingIndicator from '../../components/missing_indicator'; import { fetchFavourites, fetchReactions } from '../../actions/interactions'; import { fetchStatus } from '../../actions/statuses'; -import { FormattedMessage } from 'react-intl'; import AccountContainer from '../../containers/account_container'; import Column from '../ui/components/column'; import ScrollableList from '../../components/scrollable_list'; import { makeGetStatus } from '../../selectors'; +const messages = defineMessages({ + heading: { id: 'column.reactions', defaultMessage: 'Reactions' }, +}); + const mapStateToProps = (state, props) => { const getStatus = makeGetStatus(); const status = getStatus(state, { @@ -35,6 +39,7 @@ const mapStateToProps = (state, props) => { }; export default @connect(mapStateToProps) +@injectIntl class Reactions extends ImmutablePureComponent { static contextTypes = { @@ -78,14 +83,11 @@ class Reactions extends ImmutablePureComponent { }; render() { - const { params, reactions, accounts, status } = this.props; - const { username, statusId } = params; - - const back = `/@${username}/posts/${statusId}`; + const { intl, params, reactions, accounts, status } = this.props; if (!accounts) { return ( - + ); @@ -93,7 +95,7 @@ class Reactions extends ImmutablePureComponent { if (!status) { return ( - + ); @@ -102,7 +104,7 @@ class Reactions extends ImmutablePureComponent { const emptyMessage = ; return ( - + { reactions.size > 0 && (
From 4417b8010f6863b78a54db2537e72bf5b3fb65c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sat, 1 Jan 2022 23:45:38 +0100 Subject: [PATCH 2/2] Add column header to users page in dashboard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- app/soapbox/features/admin/user_index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/soapbox/features/admin/user_index.js b/app/soapbox/features/admin/user_index.js index 4406a0aad..53f3c2ecb 100644 --- a/app/soapbox/features/admin/user_index.js +++ b/app/soapbox/features/admin/user_index.js @@ -12,6 +12,7 @@ import { SimpleForm, TextInput } from 'soapbox/features/forms'; import { Set as ImmutableSet, OrderedSet as ImmutableOrderedSet, is } from 'immutable'; const messages = defineMessages({ + heading: { id: 'column.admin.users', defaultMessage: 'Users' }, empty: { id: 'admin.user_index.empty', defaultMessage: 'No users found.' }, searchPlaceholder: { id: 'admin.user_index.search_input_placeholder', defaultMessage: 'Who are you looking for?' }, }); @@ -100,7 +101,7 @@ class UserIndex extends ImmutablePureComponent { const showLoading = isLoading && accountIds.isEmpty(); return ( - +