This commit is contained in:
mgabdev
2020-05-07 00:03:34 -04:00
parent c1131db577
commit a026d86b86
22 changed files with 217 additions and 221 deletions

View File

@@ -59,10 +59,11 @@ class GroupPage extends ImmutablePureComponent {
group={group}
relationships={relationships}
actions={[
{
icon: 'ellipsis',
onClick: null,
},
// : todo :
// {
// icon: 'ellipsis',
// onClick: null,
// },
]}
layout={(
<Fragment>

View File

@@ -2,7 +2,10 @@ import { Fragment } from 'react'
import { me } from '../initial_state'
import { defineMessages, injectIntl } from 'react-intl'
import { openModal } from '../actions/modal'
import { MODAL_GROUP_CREATE } from '../constants'
import {
MODAL_GROUP_CREATE,
MODAL_PRO_UPGRADE,
} from '../constants'
import PageTitle from '../features/ui/util/page_title'
import LinkFooter from '../components/link_footer'
import GroupsPanel from '../components/panel/groups_panel'
@@ -22,8 +25,12 @@ const mapStateToProps = (state) => ({
})
const mapDispatchToProps = (dispatch) => ({
onOpenGroupCreateModal() {
dispatch(openModal(MODAL_GROUP_CREATE))
onOpenGroupCreateModal(isPro) {
if (!isPro) {
dispatch(openModal(MODAL_PRO_UPGRADE))
} else {
dispatch(openModal(MODAL_GROUP_CREATE))
}
},
})
@@ -39,6 +46,10 @@ class GroupsPage extends PureComponent {
onOpenGroupCreateModal: PropTypes.func.isRequired,
}
handleOnOpenGroupCreateModal = () => {
this.props.onOpenGroupCreateModal(this.props.isPro)
}
render() {
const {
intl,
@@ -47,7 +58,12 @@ class GroupsPage extends PureComponent {
onOpenGroupCreateModal,
} = this.props
const actions = []
const actions = [
{
icon: 'add',
onClick: this.handleOnOpenGroupCreateModal,
},
]
const tabs = [
{
title: intl.formatMessage(messages.featured),
@@ -64,11 +80,6 @@ class GroupsPage extends PureComponent {
]
if (isPro) {
actions.push({
icon: 'add',
onClick: onOpenGroupCreateModal,
})
tabs.push({
title: intl.formatMessage(messages.admin),
to: '/groups/browse/admin',
@@ -79,7 +90,6 @@ class GroupsPage extends PureComponent {
return (
<DefaultLayout
showBackBtn
title={title}
actions={actions}
tabs={tabs}

View File

@@ -15,6 +15,7 @@ import TrendsPanel from '../components/panel/trends_panel'
import DefaultLayout from '../layouts/default_layout'
import TimelineComposeBlock from '../components/timeline_compose_block'
import Divider from '../components/divider'
import PullToRefresher from '../components/pull_to_refresher'
const messages = defineMessages({
home: { id: 'home', defaultMessage: 'Home' },
@@ -116,6 +117,8 @@ class HomePage extends PureComponent {
badge={totalQueuedItemsCount}
/>
<PullToRefresher />
<TimelineComposeBlock autoFocus={false} />
<Divider />

View File

@@ -47,6 +47,7 @@ class SearchPage extends PureComponent {
return (
<Layout
noComposeButton
title={title}
showBackBtn
tabs={tabs}