progress
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
import { Fragment } from 'react'
|
||||
import PageTitle from '../features/ui/util/page_title'
|
||||
import LinkFooter from '../components/link_footer'
|
||||
import WhoToFollowPanel from '../components/panel/who_to_follow_panel'
|
||||
import TrendsPanel from '../components/panel/trends_panel'
|
||||
import DefaultLayout from '../layouts/default_layout'
|
||||
import LinkFooter from '../components/link_footer'
|
||||
import TrendsPanel from '../components/panel/trends_panel'
|
||||
import WhoToFollowPanel from '../components/panel/who_to_follow_panel'
|
||||
|
||||
export default class BasicPage extends PureComponent {
|
||||
|
||||
static propTypes = {
|
||||
title: PropTypes.string.isRequired,
|
||||
children: PropTypes.node.isRequired,
|
||||
@@ -31,4 +32,5 @@ export default class BasicPage extends PureComponent {
|
||||
</DefaultLayout>
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -12,7 +12,7 @@ import TimelineComposeBlock from '../components/timeline_compose_block'
|
||||
import Divider from '../components/divider'
|
||||
|
||||
const messages = defineMessages({
|
||||
community: { 'id': 'column.community', 'defaultMessage': 'Community timeline' },
|
||||
community: { 'id': 'column.community', 'defaultMessage': 'Community feed' },
|
||||
})
|
||||
|
||||
const mapDispatchToProps = (dispatch) => ({
|
||||
|
||||
@@ -50,36 +50,12 @@ class GroupPage extends ImmutablePureComponent {
|
||||
relationships,
|
||||
} = this.props
|
||||
|
||||
// <div className="column-header__wrapper">
|
||||
// <h1 className="column-header">
|
||||
// <Link to={`/groups/${id}`} className={classNames('btn grouped active')}>
|
||||
// {intl.formatMessage(messages.tabLatest)}
|
||||
// </Link>
|
||||
|
||||
// <div className='column-header__buttons'>
|
||||
// <button
|
||||
// className={classNames('column-header__button', { 'active': !collapsed })}
|
||||
// title={intl.formatMessage(collapsed ? messages.show : messages.hide)}
|
||||
// aria-label={intl.formatMessage(collapsed ? messages.show : messages.hide)}
|
||||
// aria-pressed={collapsed ? 'false' : 'true'}
|
||||
// onClick={this.handleToggleClick}
|
||||
// ><Icon id='sliders' /></button>
|
||||
// </div>
|
||||
// </h1>
|
||||
// {!collapsed && <div className='column-header__collapsible'>
|
||||
// <div className='column-header__collapsible-inner'>
|
||||
// <div className='column-header__collapsible__extra'>
|
||||
// <ColumnSettingsContainer />
|
||||
// </div>
|
||||
// </div>
|
||||
// </div>}
|
||||
// </div>
|
||||
|
||||
const groupTitle = !!group ? group.get('title') : ''
|
||||
|
||||
return (
|
||||
<GroupLayout
|
||||
showBackBtn
|
||||
title={intl.formatMessage(messages.group)}
|
||||
group={group}
|
||||
relationships={relationships}
|
||||
actions={[
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { Fragment } from 'react'
|
||||
import { openModal } from '../actions/modal'
|
||||
import { defineMessages, injectIntl } from 'react-intl'
|
||||
import { MODAL_HOME_TIMELINE_SETTINGS } from '../constants'
|
||||
import IntersectionObserverArticle from '../components/intersection_observer_article'
|
||||
import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper'
|
||||
import PageTitle from '../features/ui/util/page_title'
|
||||
@@ -25,7 +26,7 @@ const mapStateToProps = (state) => ({
|
||||
|
||||
const mapDispatchToProps = (dispatch) => ({
|
||||
onOpenHomePageSettingsModal() {
|
||||
dispatch(openModal('HOME_TIMELINE_SETTINGS'))
|
||||
dispatch(openModal(MODAL_HOME_TIMELINE_SETTINGS))
|
||||
},
|
||||
})
|
||||
|
||||
@@ -35,10 +36,10 @@ export default
|
||||
class HomePage extends PureComponent {
|
||||
|
||||
static propTypes = {
|
||||
intl: PropTypes.object.isRequired,
|
||||
children: PropTypes.node.isRequired,
|
||||
totalQueuedItemsCount: PropTypes.number.isRequired,
|
||||
intl: PropTypes.object.isRequired,
|
||||
onOpenHomePageSettingsModal: PropTypes.func.isRequired,
|
||||
totalQueuedItemsCount: PropTypes.number.isRequired,
|
||||
}
|
||||
|
||||
intersectionObserverWrapper = new IntersectionObserverWrapper()
|
||||
@@ -59,7 +60,6 @@ class HomePage extends PureComponent {
|
||||
this.intersectionObserverWrapper.disconnect()
|
||||
}
|
||||
|
||||
|
||||
render() {
|
||||
const {
|
||||
intl,
|
||||
@@ -110,13 +110,18 @@ class HomePage extends PureComponent {
|
||||
</Fragment>
|
||||
)}
|
||||
>
|
||||
|
||||
<PageTitle
|
||||
path={intl.formatMessage(messages.home)}
|
||||
badge={totalQueuedItemsCount}
|
||||
/>
|
||||
|
||||
<TimelineComposeBlock autoFocus={false} />
|
||||
|
||||
<Divider />
|
||||
|
||||
{children}
|
||||
|
||||
</DefaultLayout>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ const mapDispatchToProps = (dispatch) => ({
|
||||
onOpenListEditModal(list) {
|
||||
if (!list) return
|
||||
const listId = list.get('id')
|
||||
dispatch(openModal(MODAL_LIST_EDITOR, { listId }))
|
||||
dispatch(openModal(MODAL_LIST_EDITOR, { id: listId }))
|
||||
},
|
||||
// : todo :
|
||||
// onOpenListTimelineSettingsModal() {
|
||||
@@ -65,7 +65,7 @@ class ListPage extends ImmutablePureComponent {
|
||||
return (
|
||||
<DefaultLayout
|
||||
showBackBtn
|
||||
title={title}
|
||||
title={intl.formatMessage(messages.list)}
|
||||
actions={[
|
||||
{
|
||||
icon: 'cog',
|
||||
|
||||
Reference in New Issue
Block a user