random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
mgabdev
2020-02-17 12:50:29 -05:00
parent cdde454915
commit be3daea78b
28 changed files with 456 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/gabsocial/pages/group_page.js
View File

@@ -5,7 +5,7 @@ import { fetchGroup } from '../actions/groups';
import HeaderContainer from '../features/groups/timeline/containers/header_container';
import GroupPanel from '../features/groups/timeline/components/panel';
import GroupSidebarPanel from '../features/groups/sidebar_panel';
import PageLayout from '../components/page_layout';
import DefaultLayout from '../components/default_layout';
import { WhoToFollowPanel } from '../components/panel';
import LinkFooter from '../components/link_footer';
@@ -34,7 +34,7 @@ class GroupPage extends ImmutablePureComponent {
const top = group ? <HeaderContainer groupId={group.get('id')} /> : null;
return (
<PageLayout
<DefaultLayout
layout={{
TOP: top,
RIGHT: (
@@ -56,7 +56,7 @@ class GroupPage extends ImmutablePureComponent {
}}
>
{children}
</PageLayout>
</DefaultLayout>
)
}
}

32
app/javascript/gabsocial/pages/home_page.js
View File

@@ -1,13 +1,10 @@
import { Fragment } from 'react'
import GroupSidebarPanel from '../components/panel/groups_panel'
import LinkFooter from '../components/link_footer'
import SignUpPanel from '../components/panel/sign_up_panel'
import WhoToFollowPanel from '../components/panel/who_to_follow_panel'
import TrendsPanel from '../components/panel/trends_panel'
import ProgressPanel from '../components/panel/progress_panel'
import UserPanel from '../components/user_panel'
import Search from '../components/search'
import PageLayout from '../components/page_layout'
import DefaultLayout from '../components/layouts/default_layout'
import TimelineComposeBlock from '../components/timeline_compose_block'
export default class HomePage extends PureComponent {
@@ -15,27 +12,22 @@ export default class HomePage extends PureComponent {
const { children } = this.props
return (
<PageLayout
<DefaultLayout
title='Home'
layout={{
HEADER_RIGHT: <Search />,
RIGHT: (
<Fragment>
<UserPanel />
<WhoToFollowPanel />
<TrendsPanel />
<GroupSidebarPanel />
<SignUpPanel />
<ProgressPanel />
<LinkFooter />
</Fragment>
),
}}
layout={(
<Fragment>
<UserPanel />
<ProgressPanel />
<WhoToFollowPanel />
<GroupSidebarPanel />
<LinkFooter />
</Fragment>
)}
>
<TimelineComposeBlock autoFocus={false} shouldCondense />
<div className={[styles.default, styles.borderBottom1PX, styles.borderColorSubtle2, styles.marginBottom15PX, styles.width100PC].join(' ')} />
{children}
</PageLayout>
</DefaultLayout>
)
}
}

26
app/javascript/gabsocial/pages/notifications_page.js Normal file
View File

@@ -0,0 +1,26 @@
import { Fragment } from 'react'
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 '../components/layouts/default_layout'
export default class NotificationsPage extends PureComponent {
render() {
const { children } = this.props
return (
<DefaultLayout
title='Notifications'
layout={(
<Fragment>
<TrendsPanel />
<WhoToFollowPanel />
<LinkFooter />
</Fragment>
)}
>
{children}
</DefaultLayout>
)
}
}

28
app/javascript/gabsocial/pages/profile_page.js
View File

@@ -1,11 +1,11 @@
import { Fragment } from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import HeaderContainer from '../features/account_timeline/containers/header_container';
import ProfileInfoPanel from '../features/account_timeline/components/profile_info_panel/profile_info_panel';
import { WhoToFollowPanel, SignUpPanel } from '../components/panel';
import LinkFooter from '../components/link_footer';
import PageLayout from '../components/page_layout';
// import HeaderContainer from '../features/account_timeline/containers/header_container';
// import ProfileInfoPanel from '../features/account_timeline/components/profile_info_panel/profile_info_panel';
// import { WhoToFollowPanel, SignUpPanel } from '../components/panel';
// import LinkFooter from '../components/link_footer';
import ProfileLayout from '../components/layouts/profile_layout';
const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
const accounts = state.getIn(['accounts']);
@@ -48,21 +48,9 @@ class ProfilePage extends ImmutablePureComponent {
const { accountId, account, accountUsername } = this.props;
return (
<PageLayout
layout={{
TOP: <HeaderContainer accountId={accountId} username={accountUsername} />,
RIGHT: (
<Fragment>
<SignUpPanel />
<WhoToFollowPanel />
<LinkFooter />
</Fragment>
),
LEFT: <ProfileInfoPanel username={accountUsername} account={account} />,
}}
>
{this.props.children}
</PageLayout>
<ProfileLayout>
{ /*this.props.children */ }
</ProfileLayout>
)
}
}

6
app/javascript/gabsocial/pages/search_page.js
View File

@@ -2,7 +2,7 @@ import { Fragment } from 'react';
import Header from '../features/search/components/header';
import LinkFooter from '../components/link_footer';
import { WhoToFollowPanel, SignUpPanel } from '../components/panel';
import PageLayout from '../components/page_layout';
import DefaultLayout from '../components/layouts/default_layout';
export default class SearchPage extends PureComponent {
@@ -12,7 +12,7 @@ export default class SearchPage extends PureComponent {
render() {
return (
<PageLayout
<DefaultLayout
layout={{
TOP: <Header/>,
RIGHT: (
@@ -25,7 +25,7 @@ export default class SearchPage extends PureComponent {
}}
>
{this.props.children}
</PageLayout>
</DefaultLayout>
)
}