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

Progress on group account search

Browse Source 
Added group member search, group removed account, album add styles
This commit is contained in:
mgabdev
2020-12-20 19:28:32 -05:00
parent 67eb9d5890
commit 1a8ecc672c
20 changed files with 225 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/gabsocial/features/account_albums.js
View File

@@ -67,6 +67,13 @@ class AccountAlbums extends ImmutablePureComponent {
// }
render() {
const {
account,
isMe,
} = this.props
if (!account) return null
return (
<Block>
<div className={[_s.d, _s.px10, _s.py10].join(' ')}>
@@ -76,18 +83,18 @@ class AccountAlbums extends ImmutablePureComponent {
<TabBar tabs={[
{
title: 'All Photos',
to: '/'
to: `/${account.get('username')}/photos`,
},
{
title: 'Albums',
isActive: true,
to: '/'
to: `/${account.get('username')}/albums`,
},
]}/>
</div>
<div className={[_s.d, _s.w100PC, _s.flexRow, _s.flexWrap, _s.px10, _s.mb15, _s.pb10].join(' ')}>
<Album />
{ isMe && <Album isAddable /> }
<Album />
<Album />
<Album />
@@ -111,7 +118,7 @@ class AccountAlbums extends ImmutablePureComponent {
// account,
// } = this.props
// if (!account) return null
// return (
// <Block>

1
app/javascript/gabsocial/features/album_create.js
View File

@@ -0,0 +1 @@
// : todo :

31
app/javascript/gabsocial/features/group_members.js
View File

@@ -10,6 +10,7 @@ import { me } from '../initial_state'
import {
fetchMembers,
expandMembers,
fetchGroupMembersAdminSearch,
} from '../actions/groups'
import { openPopover } from '../actions/popover'
import Account from '../components/account'
@@ -21,6 +22,10 @@ import ScrollableList from '../components/scrollable_list'
class GroupMembers extends ImmutablePureComponent {
state = {
query: '',
}
componentWillMount() {
const { groupId } = this.props
@@ -44,20 +49,29 @@ class GroupMembers extends ImmutablePureComponent {
this.props.onExpandMembers(this.props.groupId)
}, 300, { leading: true })
handleOnChange = (query) => {
this.setState({ query })
this.props.onChange(this.props.groupId, query)
}
render() {
const {
accountIds,
listAccountIds,
searchAcountIds,
hasMore,
group,
relationships,
} = this.props
const { query } = this.state
if (!group || !relationships) return <ColumnIndicator type='loading' />
const isAdminOrMod = relationships ? (relationships.get('admin') || relationships.get('moderator')) : false
if (!isAdminOrMod) return <ColumnIndicator type='missing' />
const accountIds = !!query ? searchAcountIds : listAccountIds
return (
<Block>
<BlockHeading title='Group Members' />
@@ -67,11 +81,8 @@ class GroupMembers extends ImmutablePureComponent {
id='group-member-search'
placeholder='Search group members'
prependIcon='search'
// value={value}
onKeyUp={this.handleKeyUp}
value={query}
onChange={this.handleOnChange}
onFocus={this.handleOnFocus}
onBlur={this.handleOnBlur}
autoComplete='off'
/>
</div>
@@ -109,17 +120,21 @@ class GroupMembers extends ImmutablePureComponent {
const mapStateToProps = (state, { params }) => {
const groupId = isObject(params) ? params['id'] : -1
const group = groupId === -1 ? null : state.getIn(['groups', groupId])
return {
group,
groupId,
listAccountIds: state.getIn(['user_lists', 'groups', groupId, 'items']),
searchAcountIds: state.getIn(['group_lists', 'member_search_accounts']),
relationships: state.getIn(['group_relationships', groupId]),
accountIds: state.getIn(['user_lists', 'groups', groupId, 'items']),
hasMore: !!state.getIn(['user_lists', 'groups', groupId, 'next']),
}
}
const mapDispatchToProps = (dispatch) => ({
onChange(groupId, query) {
dispatch(fetchGroupMembersAdminSearch(groupId, query))
},
onFetchMembers(groupId) {
dispatch(fetchMembers(groupId))
},

39
app/javascript/gabsocial/features/group_removed_accounts.js
View File

@@ -3,13 +3,13 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import ImmutablePureComponent from 'react-immutable-pure-component'
import ImmutablePropTypes from 'react-immutable-proptypes'
import { defineMessages, injectIntl } from 'react-intl'
import debounce from 'lodash.debounce'
import isObject from 'lodash.isobject'
import {
fetchRemovedAccounts,
expandRemovedAccounts,
removeRemovedAccount,
fetchGroupRemovedAccountsAdminSearch,
} from '../actions/groups'
import { FormattedMessage } from 'react-intl'
import Account from '../components/account'
@@ -21,6 +21,10 @@ import ScrollableList from '../components/scrollable_list'
class GroupRemovedAccounts extends ImmutablePureComponent {
state = {
query: '',
}
componentWillMount() {
const { groupId } = this.props
@@ -37,16 +41,24 @@ class GroupRemovedAccounts extends ImmutablePureComponent {
this.props.onExpandRemovedAccounts(this.props.groupId)
}, 300, { leading: true })
handleOnChange = (query) => {
this.setState({ query })
this.props.onChange(this.props.groupId, query)
}
render() {
const {
accountIds,
listAccountIds,
searchAcountIds,
hasMore,
group,
intl,
} = this.props
const { query } = this.state
if (!group) return <ColumnIndicator type='loading' />
const accountIds = !!query ? searchAcountIds : listAccountIds
return (
<Block>
<BlockHeading title='Removed Accounts' />
@@ -55,11 +67,8 @@ class GroupRemovedAccounts extends ImmutablePureComponent {
id='group-member-search'
placeholder='Search removed group members'
prependIcon='search'
// value={value}
onKeyUp={this.handleKeyUp}
value={query}
onChange={this.handleOnChange}
onFocus={this.handleOnFocus}
onBlur={this.handleOnBlur}
autoComplete='off'
/>
</div>
@@ -73,11 +82,11 @@ class GroupRemovedAccounts extends ImmutablePureComponent {
{
accountIds && accountIds.map((id) => (
<Account
compact
key={id}
id={id}
actionIcon='subtract'
onActionClick={() => this.props.onRemoveRemovedAccount(group.get('id'), id)}
actionTitle={intl.formatMessage(messages.remove)}
actionTitle='Allow to join'
/>
))
}
@@ -88,10 +97,6 @@ class GroupRemovedAccounts extends ImmutablePureComponent {
}
const messages = defineMessages({
remove: { id: 'groups.removed_accounts', defaultMessage: 'Allow joining' },
})
const mapStateToProps = (state, { params }) => {
const groupId = isObject(params) ? params['id'] : -1
const group = groupId === -1 ? null : state.getIn(['groups', groupId])
@@ -99,12 +104,16 @@ const mapStateToProps = (state, { params }) => {
return {
group,
groupId,
accountIds: state.getIn(['user_lists', 'group_removed_accounts', groupId, 'items']),
listAccountIds: state.getIn(['user_lists', 'group_removed_accounts', groupId, 'items']),
searchAcountIds: state.getIn(['group_lists', 'removed_search_accounts']),
hasMore: !!state.getIn(['user_lists', 'group_removed_accounts', groupId, 'next']),
}
}
const mapDispatchToProps = (dispatch) => ({
onChange(groupId, query) {
dispatch(fetchGroupRemovedAccountsAdminSearch(groupId, query))
},
onFetchRemovedAccounts(groupId) {
dispatch(fetchRemovedAccounts(groupId))
},
@@ -125,4 +134,4 @@ GroupRemovedAccounts.propTypes = {
onRemoveRemovedAccount: PropTypes.func.isRequired,
}
export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(GroupRemovedAccounts))
export default connect(mapStateToProps, mapDispatchToProps)(GroupRemovedAccounts)

2
app/javascript/gabsocial/features/messages/components/chat_message_item.js
View File

@@ -174,7 +174,7 @@ class ChatMessageItem extends ImmutablePureComponent {
!!expirationDate &&
<React.Fragment>
<DotTextSeperator />
<Text size='extraSmall' color='tertiary' className={_s.ml5}>Expires in {timeUntilExpiration}</Text>
<Text size='extraSmall' color='tertiary' className={_s.ml5}>Expires {timeUntilExpiration}</Text>
<Icon id='stopwatch' size='11px' className={[_s.d, _s.ml5, _s.displayInline, _s.cSecondary].join(' ')} />
</React.Fragment>
}