From f369a7c76585b4a18695ce84e6830262e7ca29ca Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 20 Mar 2023 21:42:54 -0500 Subject: [PATCH 1/3] Use "danger" text for deleting account and group --- app/soapbox/features/group/manage-group.tsx | 4 ++-- app/soapbox/features/settings/index.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx index e7dea7f20..384b2f888 100644 --- a/app/soapbox/features/group/manage-group.tsx +++ b/app/soapbox/features/group/manage-group.tsx @@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom'; import { deleteGroup, editGroup } from 'soapbox/actions/groups'; import { openModal } from 'soapbox/actions/modals'; import List, { ListItem } from 'soapbox/components/list'; -import { CardBody, Column, Spinner } from 'soapbox/components/ui'; +import { CardBody, Column, Spinner, Text } from 'soapbox/components/ui'; import { useAppDispatch, useGroup } from 'soapbox/hooks'; import ColumnForbidden from '../ui/components/column-forbidden'; @@ -78,7 +78,7 @@ const ManageGroup: React.FC = ({ params }) => { {group.relationship.role === 'owner' && ( - + {intl.formatMessage(messages.deleteGroup)}} onClick={onDeleteGroup} /> )} diff --git a/app/soapbox/features/settings/index.tsx b/app/soapbox/features/settings/index.tsx index e01ed848c..77bb22ef8 100644 --- a/app/soapbox/features/settings/index.tsx +++ b/app/soapbox/features/settings/index.tsx @@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom'; import { fetchMfa } from 'soapbox/actions/mfa'; import List, { ListItem } from 'soapbox/components/list'; -import { Card, CardBody, CardHeader, CardTitle, Column } from 'soapbox/components/ui'; +import { Card, CardBody, CardHeader, CardTitle, Column, Text } from 'soapbox/components/ui'; import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks'; import Preferences from '../preferences'; @@ -155,7 +155,7 @@ const Settings = () => { ))} {features.security && ( - + {intl.formatMessage(messages.deleteAccount)}} onClick={navigateToDeleteAccount} /> )} From cc3585f319c2381a49f7ca462205c9bbfc4f02c7 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 20 Mar 2023 21:52:44 -0500 Subject: [PATCH 2/3] Manage group: add headers --- app/soapbox/features/group/manage-group.tsx | 38 ++++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx index 384b2f888..4fe027ee8 100644 --- a/app/soapbox/features/group/manage-group.tsx +++ b/app/soapbox/features/group/manage-group.tsx @@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom'; import { deleteGroup, editGroup } from 'soapbox/actions/groups'; import { openModal } from 'soapbox/actions/modals'; import List, { ListItem } from 'soapbox/components/list'; -import { CardBody, Column, Spinner, Text } from 'soapbox/components/ui'; +import { CardBody, CardHeader, CardTitle, Column, Spinner, Text } from 'soapbox/components/ui'; import { useAppDispatch, useGroup } from 'soapbox/hooks'; import ColumnForbidden from '../ui/components/column-forbidden'; @@ -21,6 +21,8 @@ const messages = defineMessages({ deleteConfirm: { id: 'confirmations.delete_group.confirm', defaultMessage: 'Delete' }, deleteHeading: { id: 'confirmations.delete_group.heading', defaultMessage: 'Delete group' }, deleteMessage: { id: 'confirmations.delete_group.message', defaultMessage: 'Are you sure you want to delete this group? This is a permanent action that cannot be undone.' }, + members: { id: 'group.tabs.members', defaultMessage: 'Members' }, + other: { id: 'settings.other', defaultMessage: 'Other options' }, }); interface IManageGroup { @@ -66,20 +68,38 @@ const ManageGroup: React.FC = ({ params }) => { {group.relationship.role === 'owner' && ( - - - - - + <> + + + + + + + + + + )} + + + + + + {group.relationship.role === 'owner' && ( - - {intl.formatMessage(messages.deleteGroup)}} onClick={onDeleteGroup} /> - + <> + + + + + + {intl.formatMessage(messages.deleteGroup)}} onClick={onDeleteGroup} /> + + )} From f61e0d889af14e864cf27987a796592b4b96e7e8 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 20 Mar 2023 21:56:15 -0500 Subject: [PATCH 3/3] "Blocked members" --> "Banned members" --- app/soapbox/features/group/manage-group.tsx | 2 +- app/soapbox/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/group/manage-group.tsx b/app/soapbox/features/group/manage-group.tsx index 4fe027ee8..3f960fc51 100644 --- a/app/soapbox/features/group/manage-group.tsx +++ b/app/soapbox/features/group/manage-group.tsx @@ -16,7 +16,7 @@ const messages = defineMessages({ heading: { id: 'column.manage_group', defaultMessage: 'Manage group' }, editGroup: { id: 'manage_group.edit_group', defaultMessage: 'Edit group' }, pendingRequests: { id: 'manage_group.pending_requests', defaultMessage: 'Pending requests' }, - blockedMembers: { id: 'manage_group.blocked_members', defaultMessage: 'Blocked members' }, + blockedMembers: { id: 'manage_group.blocked_members', defaultMessage: 'Banned members' }, deleteGroup: { id: 'manage_group.delete_group', defaultMessage: 'Delete group' }, deleteConfirm: { id: 'confirmations.delete_group.confirm', defaultMessage: 'Delete' }, deleteHeading: { id: 'confirmations.delete_group.heading', defaultMessage: 'Delete group' }, diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 0c0b8aff0..1be8a0e20 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -927,7 +927,7 @@ "login_external.errors.instance_fail": "The instance returned an error.", "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?", "login_form.header": "Sign In", - "manage_group.blocked_members": "Blocked members", + "manage_group.blocked_members": "Banned members", "manage_group.confirmation.copy": "Copy link", "manage_group.confirmation.info_1": "As the owner of this group, you can assign staff, delete posts and much more.", "manage_group.confirmation.info_2": "Post the group's first post and get the conversation started.",