From 2fd3c9441c8c06b4546e046ec2549de54b26cd46 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 31 Dec 2020 20:47:15 -0600 Subject: [PATCH] Reports: display reported posts --- .../features/admin/components/report.js | 22 ++++++++++++++++++- app/styles/components/accordion.scss | 1 + app/styles/components/admin.scss | 21 ++++++++++++++++++ app/styles/components/buttons.scss | 2 +- 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/admin/components/report.js b/app/soapbox/features/admin/components/report.js index 36347e0d0..2f6111795 100644 --- a/app/soapbox/features/admin/components/report.js +++ b/app/soapbox/features/admin/components/report.js @@ -5,7 +5,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import { injectIntl, FormattedMessage, defineMessages } from 'react-intl'; import Avatar from 'soapbox/components/avatar'; import Button from 'soapbox/components/button'; +import StatusContent from 'soapbox/components/status_content'; import DropdownMenu from 'soapbox/containers/dropdown_menu_container'; +import Accordion from 'soapbox/features/ui/components/accordion'; import { closeReports, deactivateUsers, deleteUsers } from 'soapbox/actions/admin'; import snackbar from 'soapbox/actions/snackbar'; import { openModal } from 'soapbox/actions/modal'; @@ -30,6 +32,10 @@ class Report extends ImmutablePureComponent { report: ImmutablePropTypes.map.isRequired, }; + state = { + accordionExpanded: false, + }; + makeMenu = () => { const { intl, report } = this.props; @@ -83,8 +89,13 @@ class Report extends ImmutablePureComponent { })); } + handleAccordionToggle = setting => { + this.setState({ accordionExpanded: setting }); + } + render() { const { report } = this.props; + const { accordionExpanded } = this.state; const menu = this.makeMenu(); return ( @@ -100,7 +111,16 @@ class Report extends ImmutablePureComponent { values={{ acct: `@${report.getIn(['account', 'acct'])}` }} /> -
+
+ +
{report.get('statuses').map(status => )}
+
+
+
{report.get('content')}
— @{report.getIn(['actor', 'acct'])}
diff --git a/app/styles/components/accordion.scss b/app/styles/components/accordion.scss index 35ad3ea2e..9fea4d42e 100644 --- a/app/styles/components/accordion.scss +++ b/app/styles/components/accordion.scss @@ -20,6 +20,7 @@ text-transform: none !important; text-align: left !important; display: flex !important; + align-items: center; border: 0; width: 100%; diff --git a/app/styles/components/admin.scss b/app/styles/components/admin.scss index 7899634c4..ba29ef826 100644 --- a/app/styles/components/admin.scss +++ b/app/styles/components/admin.scss @@ -127,6 +127,7 @@ &__content { padding: 0 16px; + flex: 1; } &__title { @@ -155,4 +156,24 @@ } } } + + &__statuses .accordion { + padding: 10px; + margin-bottom: 6px; + + &__title { + font-size: 12px !important; + font-weight: normal !important; + margin-bottom: 0 !important; + } + + .status__content { + border-bottom: 1px solid var(--accent-color--med); + padding: 10px 0; + + &:last-child { + border: 0; + } + } + } } diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index 5eeda468e..e8b382a38 100644 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -72,7 +72,7 @@ button { } &.button-alternative { - color: var(--primary-text-color); + color: #fff; background: var(--brand-color); &:active,