group sidebar panel ui
This commit is contained in:
parent
c5c2585239
commit
61134fb645
@ -0,0 +1,45 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
import Item from './item';
|
||||||
|
import Icon from 'gabsocial/components/icon';
|
||||||
|
|
||||||
|
const messages = defineMessages({
|
||||||
|
title: { id: 'groups.sidebar-panel.title', defaultMessage: 'Groups you\'re in' },
|
||||||
|
});
|
||||||
|
|
||||||
|
const mapStateToProps = (state, { id }) => ({
|
||||||
|
groupIds: state.getIn(['group_lists', 'member']),
|
||||||
|
});
|
||||||
|
|
||||||
|
export default @connect(mapStateToProps)
|
||||||
|
@injectIntl
|
||||||
|
class GroupSidebarPanel extends ImmutablePureComponent {
|
||||||
|
static propTypes = {
|
||||||
|
groupIds: ImmutablePropTypes.list,
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { intl, groupIds } = this.props;
|
||||||
|
|
||||||
|
// Only when there are groups to show
|
||||||
|
if (groupIds.count() === 0) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className='wtf-panel group-sidebar-panel'>
|
||||||
|
<div className='wtf-panel-header'>
|
||||||
|
<Icon id='users' className='wtf-panel-header__icon' />
|
||||||
|
<span className='wtf-panel-header__label'>{intl.formatMessage(messages.title)}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className='wtf-panel__content'>
|
||||||
|
<div className="group-sidebar-panel__items">
|
||||||
|
{groupIds.map(groupId => <Item key={groupId} id={groupId} />)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,45 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
|
import { Link } from 'react-router-dom';
|
||||||
|
import { shortNumberFormat } from '../../../utils/numbers';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
|
||||||
|
const messages = defineMessages({
|
||||||
|
new_statuses: { id: 'groups.sidebar-panel.item.view', defaultMessage: 'new gabs' },
|
||||||
|
no_recent_activity: { id: 'groups.sidebar-panel.item.no_recent_activity', defaultMessage: 'No recent activity' },
|
||||||
|
});
|
||||||
|
|
||||||
|
const mapStateToProps = (state, { id }) => ({
|
||||||
|
group: state.getIn(['groups', id]),
|
||||||
|
relationships: state.getIn(['group_relationships', id]),
|
||||||
|
});
|
||||||
|
|
||||||
|
export default @connect(mapStateToProps)
|
||||||
|
@injectIntl
|
||||||
|
class Item extends ImmutablePureComponent {
|
||||||
|
static propTypes = {
|
||||||
|
group: ImmutablePropTypes.map,
|
||||||
|
relationships: ImmutablePropTypes.map,
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { intl, group, relationships } = this.props;
|
||||||
|
|
||||||
|
// Wait for relationships
|
||||||
|
if (!relationships) return null;
|
||||||
|
|
||||||
|
const unreadCount = relationships.get('unread_count');
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Link to={`/groups/${group.get('id')}`} className="group-sidebar-panel__item">
|
||||||
|
<div className="group-sidebar-panel__item__title">{group.get('title')}</div>
|
||||||
|
<div className="group-sidebar-panel__item__meta">
|
||||||
|
{unreadCount > 0 && <span className="group-sidebar-panel__item__meta__unread">{shortNumberFormat(unreadCount)} {intl.formatMessage(messages.new_statuses)}</span>}
|
||||||
|
{unreadCount === 0 && <span>{intl.formatMessage(messages.no_recent_activity)}</span>}
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@ -8,7 +8,8 @@ import LinkFooter from '../features/ui/components/link_footer';
|
|||||||
import PromoPanel from '../features/ui/components/promo_panel';
|
import PromoPanel from '../features/ui/components/promo_panel';
|
||||||
import HeaderContainer from '../features/groups/timeline/containers/header_container';
|
import HeaderContainer from '../features/groups/timeline/containers/header_container';
|
||||||
import GroupPanel from '../features/groups/timeline/components/panel';
|
import GroupPanel from '../features/groups/timeline/components/panel';
|
||||||
import { fetchGroup } from '../actions/groups';
|
import { fetchGroup, fetchGroups } from '../actions/groups';
|
||||||
|
import GroupSidebarPanel from '../features/groups/sidebar_panel';
|
||||||
|
|
||||||
const mapStateToProps = (state, { params: { id } }) => ({
|
const mapStateToProps = (state, { params: { id } }) => ({
|
||||||
group: state.getIn(['groups', id]),
|
group: state.getIn(['groups', id]),
|
||||||
@ -27,6 +28,7 @@ class GroupPage extends ImmutablePureComponent {
|
|||||||
componentWillMount() {
|
componentWillMount() {
|
||||||
const { params: { id }, dispatch } = this.props;
|
const { params: { id }, dispatch } = this.props;
|
||||||
|
|
||||||
|
dispatch(fetchGroups('member'));
|
||||||
dispatch(fetchGroup(id));
|
dispatch(fetchGroup(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,6 +62,7 @@ class GroupPage extends ImmutablePureComponent {
|
|||||||
|
|
||||||
<div className='columns-area__panels__pane columns-area__panels__pane--right'>
|
<div className='columns-area__panels__pane columns-area__panels__pane--right'>
|
||||||
<div className='columns-area__panels__pane__inner'>
|
<div className='columns-area__panels__pane__inner'>
|
||||||
|
<GroupSidebarPanel />
|
||||||
<WhoToFollowPanel />
|
<WhoToFollowPanel />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -7,6 +7,7 @@ import WhoToFollowPanel from '../features/ui/components/who_to_follow_panel';
|
|||||||
import LinkFooter from '../features/ui/components/link_footer';
|
import LinkFooter from '../features/ui/components/link_footer';
|
||||||
import PromoPanel from '../features/ui/components/promo_panel';
|
import PromoPanel from '../features/ui/components/promo_panel';
|
||||||
import UserPanel from '../features/ui/components/user_panel';
|
import UserPanel from '../features/ui/components/user_panel';
|
||||||
|
import GroupSidebarPanel from '../features/groups/sidebar_panel';
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
account: state.getIn(['accounts', me]),
|
account: state.getIn(['accounts', me]),
|
||||||
@ -42,6 +43,7 @@ class GroupsPage extends ImmutablePureComponent {
|
|||||||
|
|
||||||
<div className='columns-area__panels__pane columns-area__panels__pane--right'>
|
<div className='columns-area__panels__pane columns-area__panels__pane--right'>
|
||||||
<div className='columns-area__panels__pane__inner'>
|
<div className='columns-area__panels__pane__inner'>
|
||||||
|
<GroupSidebarPanel />
|
||||||
<WhoToFollowPanel />
|
<WhoToFollowPanel />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
@import 'gabsocial/components/group-card';
|
@import 'gabsocial/components/group-card';
|
||||||
@import 'gabsocial/components/group-detail';
|
@import 'gabsocial/components/group-detail';
|
||||||
@import 'gabsocial/components/group-form';
|
@import 'gabsocial/components/group-form';
|
||||||
|
@import 'gabsocial/components/group-sidebar-panel';
|
||||||
|
|
||||||
@import 'gabsocial/polls';
|
@import 'gabsocial/polls';
|
||||||
@import 'gabsocial/introduction';
|
@import 'gabsocial/introduction';
|
||||||
|
@ -0,0 +1,29 @@
|
|||||||
|
.group-sidebar-panel {
|
||||||
|
&__items {
|
||||||
|
padding: 0 15px 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__item {
|
||||||
|
display: block;
|
||||||
|
color: $primary-text-color;
|
||||||
|
text-decoration: none;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
|
||||||
|
&:last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__title {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__meta {
|
||||||
|
font-size: 0.8em;
|
||||||
|
color: $gab-secondary-text;
|
||||||
|
|
||||||
|
&__unread {
|
||||||
|
color: $gab-brand-default;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user