Progress

app/javascript/gabsocial/pages/group_page.js

@@ -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 ColumnsArea from '../components/columns_area';
+import PageLayout from '../components/page_layout';
 import { WhoToFollowPanel } from '../components/panel';
 import LinkFooter from '../components/link_footer';
 import PromoPanel from '../components/promo_panel';
@@ -35,7 +35,7 @@ class GroupPage extends ImmutablePureComponent {
 		const top = group ? <HeaderContainer groupId={group.get('id')} /> : null;
 
 		return (
-			<ColumnsArea
+			<PageLayout
 				layout={{
 					TOP: top,
 					RIGHT: (
@@ -58,7 +58,7 @@ class GroupPage extends ImmutablePureComponent {
 				}}
 			>
 				{children}
-			</ColumnsArea>
+			</PageLayout>
 		)
 	}
 }

app/javascript/gabsocial/pages/home_page.js

@@ -3,7 +3,7 @@ import GroupSidebarPanel from '../features/groups/sidebar_panel';
 import LinkFooter from '../components/link_footer';
 import PromoPanel from '../components/promo_panel';
 import UserPanel from '../components/user_panel';
-import ColumnsArea from '../components/columns_area';
+import PageLayout from '../components/page_layout';
 import TimelineComposeBlock from '../components/timeline_compose_block';
 
 export default class HomePage extends PureComponent {
@@ -11,26 +11,20 @@ export default class HomePage extends PureComponent {
     const {children} = this.props;
 
     return (
-      <ColumnsArea
+      <PageLayout
         layout={{
-          TOP: null,
           RIGHT: (
             <Fragment>
               <GroupSidebarPanel />
-            </Fragment>
-          ),
-          LEFT: (
-            <Fragment>
-              <UserPanel />
               <PromoPanel />
               <LinkFooter />
             </Fragment>
-          )
+          ),
         }}
       >
         <TimelineComposeBlock size={46} shouldCondense={true} autoFocus={false} />
         {children}
-      </ColumnsArea>
+      </PageLayout>
     )
   }
 }

app/javascript/gabsocial/pages/profile_page.js

@@ -5,7 +5,7 @@ import HeaderContainer from '../features/account_timeline/containers/header_cont
 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 ColumnsArea from '../components/columns_area';
+import PageLayout from '../components/page_layout';
 
 const mapStateToProps = (state, { params: { username }, withReplies = false }) => {
   const accounts = state.getIn(['accounts']);
@@ -48,7 +48,7 @@ class ProfilePage extends ImmutablePureComponent {
     const { accountId, account, accountUsername } = this.props;
 
     return (
-      <ColumnsArea
+      <PageLayout
         layout={{
           TOP: <HeaderContainer accountId={accountId} username={accountUsername} />,
           RIGHT: (
@@ -62,7 +62,7 @@ class ProfilePage extends ImmutablePureComponent {
         }}
       >
         {this.props.children}
-      </ColumnsArea>
+      </PageLayout>
     )
   }
 }

app/javascript/gabsocial/pages/search_page.js

@@ -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 ColumnsArea from '../components/columns_area';
+import PageLayout from '../components/page_layout';
 
 export default class SearchPage extends PureComponent {
 
@@ -12,7 +12,7 @@ export default class SearchPage extends PureComponent {
 
   render() {
     return (
-      <ColumnsArea
+      <PageLayout
         layout={{
           TOP: <Header/>,
           RIGHT: (
@@ -25,7 +25,7 @@ export default class SearchPage extends PureComponent {
         }}
       >
         {this.props.children}
-      </ColumnsArea>
+      </PageLayout>
     )
   }