Progress

app/javascript/gabsocial/features/groups/members/index.js

@@ -1,7 +1,6 @@
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { debounce } from 'lodash';
-import ColumnIndicator from '../../../components/column_indicator';
 import {
 	fetchMembers,
 	expandMembers,
@@ -10,7 +9,6 @@ import {
 } from '../../../actions/groups';
 import { FormattedMessage } from 'react-intl';
 import AccountContainer from '../../../containers/account_container';
-import Column from '../../../components/column';
 import ScrollableList from '../../../components/scrollable_list';
 import Dropdown from '../../../components/dropdown_menu'
 
@@ -51,15 +49,10 @@ class GroupMembers extends ImmutablePureComponent {
 		const { accountIds, hasMore, group, relationships, dispatch } = this.props;
 		
 		if (!group || !accountIds || !relationships) {
-			return (
-				<Column>
-					<LoadingIndicator />
-				</Column>
-			);
+			return <LoadingIndicator />
 		}
 
 		return (
-			<Column>
 				<ScrollableList
 					scrollKey='members'
 					hasMore={hasMore}
@@ -84,7 +77,6 @@ class GroupMembers extends ImmutablePureComponent {
 						);
 					})}
 				</ScrollableList>
-			</Column>
 		);
 	}
 

app/javascript/gabsocial/features/groups/removed_accounts/index.js

@@ -3,24 +3,23 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { debounce } from 'lodash';
 import ColumnIndicator from '../../../components/column_indicator';
 import {
-  fetchRemovedAccounts,
-  expandRemovedAccounts,
-  removeRemovedAccount,
+	fetchRemovedAccounts,
+	expandRemovedAccounts,
+	removeRemovedAccount,
 } from '../../../actions/groups';
 import { FormattedMessage } from 'react-intl';
 import AccountContainer from '../../../containers/account_container';
-import Column from '../../../components/column';
 import ScrollableList from '../../../components/scrollable_list';
 import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({
-  remove: { id: 'groups.removed_accounts', defaultMessage: 'Allow joining' },
+	remove: { id: 'groups.removed_accounts', defaultMessage: 'Allow joining' },
 });
 
 const mapStateToProps = (state, { params: { id } }) => ({
-  group: state.getIn(['groups', id]),
-  accountIds: state.getIn(['user_lists', 'groups_removed_accounts', id, 'items']),
-  hasMore: !!state.getIn(['user_lists', 'groups_removed_accounts', id, 'next']),
+	group: state.getIn(['groups', id]),
+	accountIds: state.getIn(['user_lists', 'groups_removed_accounts', id, 'items']),
+	hasMore: !!state.getIn(['user_lists', 'groups_removed_accounts', id, 'next']),
 });
 
 export default @connect(mapStateToProps)
@@ -28,53 +27,51 @@ export default @connect(mapStateToProps)
 class GroupRemovedAccounts extends ImmutablePureComponent {
 
 	static propTypes = {
-	  params: PropTypes.object.isRequired,
-	  dispatch: PropTypes.func.isRequired,
-	  accountIds: ImmutablePropTypes.list,
-	  hasMore: PropTypes.bool,
+		params: PropTypes.object.isRequired,
+		dispatch: PropTypes.func.isRequired,
+		accountIds: ImmutablePropTypes.list,
+		hasMore: PropTypes.bool,
 	};
 
-	componentWillMount () {
-	  const { params: { id } } = this.props;
+	componentWillMount() {
+		const { params: { id } } = this.props;
 
-	  this.props.dispatch(fetchRemovedAccounts(id));
+		this.props.dispatch(fetchRemovedAccounts(id));
 	}
 
-	componentWillReceiveProps (nextProps) {
-	  if (nextProps.params.id !== this.props.params.id) {
-	    this.props.dispatch(fetchRemovedAccounts(nextProps.params.id));
-	  }
+	componentWillReceiveProps(nextProps) {
+		if (nextProps.params.id !== this.props.params.id) {
+			this.props.dispatch(fetchRemovedAccounts(nextProps.params.id));
+		}
 	}
 
 	handleLoadMore = debounce(() => {
-	  this.props.dispatch(expandRemovedAccounts(this.props.params.id));
+		this.props.dispatch(expandRemovedAccounts(this.props.params.id));
 	}, 300, { leading: true });
 
-	render () {
-	  const { accountIds, hasMore, group, intl } = this.props;
+	render() {
+		const { accountIds, hasMore, group, intl } = this.props;
 
-	  if (!group || !accountIds) {
-	    return (<ColumnIndicator type='loading' />);
-	  }
+		if (!group || !accountIds) {
+			return <ColumnIndicator type='loading' />
+		}
 
-	  return (
-  <Column>
-	      <ScrollableList
-	        scrollKey='removed_accounts'
-	        hasMore={hasMore}
-	        onLoadMore={this.handleLoadMore}
-	        emptyMessage={<FormattedMessage id='group.removed_accounts.empty' defaultMessage='This group does not has any removed accounts.' />}
-  >
-    {accountIds.map(id => (<AccountContainer
-	          key={id}
-	          id={id}
-	          actionIcon='remove'
-	          onActionClick={() => this.props.dispatch(removeRemovedAccount(group.get('id'), id))}
-	          actionTitle={intl.formatMessage(messages.remove)}
-	        />))}
-  </ScrollableList>
-	    </Column>
-	  );
+		return (
+			<ScrollableList
+				scrollKey='removed_accounts'
+				hasMore={hasMore}
+				onLoadMore={this.handleLoadMore}
+				emptyMessage={<FormattedMessage id='group.removed_accounts.empty' defaultMessage='This group does not has any removed accounts.' />}
+			>
+				{accountIds.map(id => (<AccountContainer
+					key={id}
+					id={id}
+					actionIcon='remove'
+					onActionClick={() => this.props.dispatch(removeRemovedAccount(group.get('id'), id))}
+					actionTitle={intl.formatMessage(messages.remove)}
+				/>))}
+			</ScrollableList>
+		)
 	}
 
 }