show group sidebar panel across the site
This commit is contained in:
parent
3a59b29fdd
commit
aefe5a44f3
|
@ -29,6 +29,7 @@ import GroupsPage from 'gabsocial/pages/groups_page';
|
||||||
import GroupPage from 'gabsocial/pages/group_page';
|
import GroupPage from 'gabsocial/pages/group_page';
|
||||||
import SearchPage from 'gabsocial/pages/search_page';
|
import SearchPage from 'gabsocial/pages/search_page';
|
||||||
import HomePage from 'gabsocial/pages/home_page';
|
import HomePage from 'gabsocial/pages/home_page';
|
||||||
|
import GroupSidebarPanel from '../groups/sidebar_panel';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
Status,
|
Status,
|
||||||
|
@ -67,6 +68,7 @@ import { previewState as previewVideoState } from './components/video_modal';
|
||||||
// Dummy import, to make sure that <Status /> ends up in the application bundle.
|
// Dummy import, to make sure that <Status /> ends up in the application bundle.
|
||||||
// Without this it ends up in ~8 very commonly used bundles.
|
// Without this it ends up in ~8 very commonly used bundles.
|
||||||
import '../../components/status';
|
import '../../components/status';
|
||||||
|
import { fetchGroups } from '../../actions/groups';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave Gab Social.' },
|
beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave Gab Social.' },
|
||||||
|
@ -120,12 +122,14 @@ const LAYOUT = {
|
||||||
],
|
],
|
||||||
RIGHT: [
|
RIGHT: [
|
||||||
// <TrendsPanel />,
|
// <TrendsPanel />,
|
||||||
|
<GroupSidebarPanel />
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
STATUS: {
|
STATUS: {
|
||||||
TOP: null,
|
TOP: null,
|
||||||
LEFT: null,
|
LEFT: null,
|
||||||
RIGHT: [
|
RIGHT: [
|
||||||
|
<GroupSidebarPanel />,
|
||||||
<WhoToFollowPanel />,
|
<WhoToFollowPanel />,
|
||||||
// <TrendsPanel />,
|
// <TrendsPanel />,
|
||||||
<LinkFooter />,
|
<LinkFooter />,
|
||||||
|
@ -370,6 +374,7 @@ class UI extends React.PureComponent {
|
||||||
if (me) {
|
if (me) {
|
||||||
this.props.dispatch(expandHomeTimeline());
|
this.props.dispatch(expandHomeTimeline());
|
||||||
this.props.dispatch(expandNotifications());
|
this.props.dispatch(expandNotifications());
|
||||||
|
this.props.dispatch(fetchGroups('member'));
|
||||||
|
|
||||||
setTimeout(() => this.props.dispatch(fetchFilters()), 500);
|
setTimeout(() => this.props.dispatch(fetchFilters()), 500);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ 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, fetchGroups } from '../actions/groups';
|
import { fetchGroup } from '../actions/groups';
|
||||||
import GroupSidebarPanel from '../features/groups/sidebar_panel';
|
import GroupSidebarPanel from '../features/groups/sidebar_panel';
|
||||||
|
|
||||||
const mapStateToProps = (state, { params: { id } }) => ({
|
const mapStateToProps = (state, { params: { id } }) => ({
|
||||||
|
@ -28,7 +28,6 @@ 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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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]),
|
||||||
|
@ -43,6 +44,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'>
|
||||||
<WhoToFollowPanel />
|
<WhoToFollowPanel />
|
||||||
|
<GroupSidebarPanel />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -9,6 +9,7 @@ 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 ComposeFormContainer from '../features/compose/containers/compose_form_container';
|
import ComposeFormContainer from '../features/compose/containers/compose_form_container';
|
||||||
import Avatar from '../components/avatar';
|
import Avatar from '../components/avatar';
|
||||||
|
import GroupSidebarPanel from '../features/groups/sidebar_panel';
|
||||||
|
|
||||||
const mapStateToProps = state => ({
|
const mapStateToProps = state => ({
|
||||||
account: state.getIn(['accounts', me]),
|
account: state.getIn(['accounts', me]),
|
||||||
|
@ -48,6 +49,7 @@ class HomePage 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'>
|
||||||
<WhoToFollowPanel />
|
<WhoToFollowPanel />
|
||||||
|
<GroupSidebarPanel />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue