random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed group item component subtitles

Browse Source 
• Removed:
- group item component subtitles until we get "unread count" working again
- unused messages, imports
This commit is contained in:
mgabdev 2020-05-15 17:03:31 -04:00
parent 2444f77e03
commit 02beb533c1
2 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/javascript/gabsocial/components/group_collection_item.js
View File

@ -6,15 +6,11 @@ import { defineMessages, injectIntl } from 'react-intl'
import classNames from 'classnames/bind' import classNames from 'classnames/bind'
import { PLACEHOLDER_MISSING_HEADER_SRC } from '../constants' import { PLACEHOLDER_MISSING_HEADER_SRC } from '../constants'
import { shortNumberFormat } from '../utils/numbers' import { shortNumberFormat } from '../utils/numbers'
import Button from './button'
import DotTextSeperator from './dot_text_seperator'
import Image from './image' import Image from './image'
import Text from './text' import Text from './text'
const messages = defineMessages({ const messages = defineMessages({
members: { id: 'groups.card.members', defaultMessage: 'Members' }, members: { id: 'groups.card.members', defaultMessage: 'Members' },
new_statuses: { id: 'groups.sidebar-panel.item.view', defaultMessage: 'new gabs' },
no_recent_activity: { id: 'groups.sidebar-panel.item.no_recent_activity', defaultMessage: 'No recent activity' },
viewGroup: { id: 'view_group', defaultMessage: 'View Group' }, viewGroup: { id: 'view_group', defaultMessage: 'View Group' },
member: { id: 'member', defaultMessage: 'Member' }, member: { id: 'member', defaultMessage: 'Member' },
admin: { id: 'admin', defaultMessage: 'Admin' }, admin: { id: 'admin', defaultMessage: 'Admin' },
@ -48,16 +44,6 @@ class GroupCollectionItem extends ImmutablePureComponent {
if (!relationships) return null if (!relationships) return null
const unreadCount = relationships.get('unread_count')
const subtitle = unreadCount > 0 ? (
<Fragment>
{shortNumberFormat(unreadCount)}
&nbsp;
{intl.formatMessage(messages.new_statuses)}
</Fragment>
) : intl.formatMessage(messages.no_recent_activity)
const isMember = relationships.get('member') const isMember = relationships.get('member')
const isAdmin = relationships.get('admin') const isAdmin = relationships.get('admin')
const coverSrc = group.get('cover_image_url') || '' const coverSrc = group.get('cover_image_url') || ''
@ -68,7 +54,6 @@ class GroupCollectionItem extends ImmutablePureComponent {
return ( return (
<Fragment> <Fragment>
{group.get('title')} {group.get('title')}
{subtitle}
{isMember && intl.formatMessage(messages.member)} {isMember && intl.formatMessage(messages.member)}
{isAdmin && intl.formatMessage(messages.admin)} {isAdmin && intl.formatMessage(messages.admin)}
</Fragment> </Fragment>
@ -149,10 +134,6 @@ class GroupCollectionItem extends ImmutablePureComponent {
&nbsp; &nbsp;
{intl.formatMessage(messages.members)} {intl.formatMessage(messages.members)}
</Text> </Text>
<DotTextSeperator />
<Text color='secondary' size='small' className={_s.ml5}>
{subtitle}
</Text>
</div> </div>
</div> </div>

27
app/javascript/gabsocial/components/group_list_item.js
View File

@ -11,13 +11,10 @@ import Text from './text'
const messages = defineMessages({ const messages = defineMessages({
members: { id: 'groups.card.members', defaultMessage: 'Members' }, members: { id: 'groups.card.members', defaultMessage: 'Members' },
new_statuses: { id: 'groups.sidebar-panel.item.view', defaultMessage: 'new gabs' },
no_recent_activity: { id: 'groups.sidebar-panel.item.no_recent_activity', defaultMessage: 'No recent activity' },
}) })
const mapStateToProps = (state, { id }) => ({ const mapStateToProps = (state, { id }) => ({
group: state.getIn(['groups', id]), group: state.getIn(['groups', id]),
relatioships: state.getIn(['group_relationships', id]),
}) })
export default export default
@ -27,7 +24,6 @@ class GroupListItem extends ImmutablePureComponent {
static propTypes = { static propTypes = {
group: ImmutablePropTypes.map, group: ImmutablePropTypes.map,
relationships: ImmutablePropTypes.map,
slim: PropTypes.bool, slim: PropTypes.bool,
isLast: PropTypes.bool, isLast: PropTypes.bool,
isHidden: PropTypes.bool, isHidden: PropTypes.bool,
@ -42,7 +38,6 @@ class GroupListItem extends ImmutablePureComponent {
const { const {
intl, intl,
group, group,
relationships,
slim, slim,
isLast, isLast,
isHidden, isHidden,
@ -50,25 +45,10 @@ class GroupListItem extends ImmutablePureComponent {
if (!group) return null if (!group) return null
let unreadCount, subtitle
if (relationships) {
unreadCount = relationships.get('unread_count')
subtitle = unreadCount > 0 ? (
<Fragment>
{shortNumberFormat(unreadCount)}
&nbsp;
{intl.formatMessage(messages.new_statuses)}
</Fragment>
) : intl.formatMessage(messages.no_recent_activity)
}
if (isHidden) { if (isHidden) {
return ( return (
<Fragment> <Fragment>
{group.get('title')} {group.get('title')}
{subtitle}
</Fragment> </Fragment>
) )
} }
@ -135,13 +115,6 @@ class GroupListItem extends ImmutablePureComponent {
</Text> </Text>
} }
{
subtitle &&
<Text color='secondary' size='small' className={_s.mt5}>
{subtitle}
</Text>
}
</div> </div>
</NavLink> </NavLink>
) )