Updated Explore, Group, Groups Pages

• Updated:
- Explore, Group, Groups Pages

app/javascript/gabsocial/pages/group_page.js

@@ -7,6 +7,7 @@ import PageTitle from '../features/ui/util/page_title'
 import GroupLayout from '../layouts/group_layout'
 import TimelineComposeBlock from '../components/timeline_compose_block'
 import Divider from '../components/divider'
+import GroupSortBlock from '../components/group_sort_block'
 
 const messages = defineMessages({
 	group: { id: 'group', defaultMessage: 'Group' },
@@ -20,7 +21,7 @@ const mapStateToProps = (state, { params: { id } }) => ({
 const mapDispatchToProps = (dispatch) => ({
 	onFetchGroup(groupId) {
 		dispatch(fetchGroup(groupId))
-	}
+	},
 })
 
 export default
@@ -34,10 +35,13 @@ class GroupPage extends ImmutablePureComponent {
 		children: PropTypes.node.isRequired,
 		relationships: ImmutablePropTypes.map,
 		onFetchGroup: PropTypes.func.isRequired,
+		sortByValue: PropTypes.string.isRequired,
+		sortByTopValue: PropTypes.string.isRequired,
 	}
 	
 	componentDidMount() {
 		this.props.onFetchGroup(this.props.params.id)
+		// this.props.onFetchGroup(this.props.params.slug)
 	}
 
 	render() {
@@ -46,29 +50,35 @@ class GroupPage extends ImmutablePureComponent {
 			children,
 			group,
 			relationships,
+			isTimeline,
 		} = this.props
 
 		const groupTitle = !!group ? group.get('title') : ''
 		const groupId = !!group ? group.get('id') : undefined
-
+		
 		return (
 			<GroupLayout
 				showBackBtn
-				title={groupTitle}
+				title={'Group'}
 				group={group}
 				groupId={groupId}
 				relationships={relationships}
+				isTimeline={isTimeline}
 			>
 				<PageTitle path={[groupTitle, intl.formatMessage(messages.group)]} />
 
 				{
-					!!relationships && relationships.get('member') &&
+					!!relationships && isTimeline && relationships.get('member') &&
 					<Fragment>
 						<TimelineComposeBlock size={46} groupId={groupId} autoFocus />
 						<Divider />
 					</Fragment>
 				}
 
+				{
+					isTimeline && <GroupSortBlock />
+				}
+
 				{children}
 			</GroupLayout>
 		)