Progress

app/javascript/gabsocial/pages/error_page.js

@@ -0,0 +1,12 @@
+export default class ErrorPage extends PureComponent {
+
+	render() {
+		const { children } = this.props;
+
+		return (
+			<div>
+				{children}
+			</div>
+		)
+	}
+}

app/javascript/gabsocial/pages/group_page.js

@@ -4,8 +4,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 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 DefaultLayout from '../components/default_layout';
+// import GroupSidebarPanel from '../features/groups/sidebar_panel';
+import DefaultLayout from '../components/layouts/default_layout';
 import { WhoToFollowPanel } from '../components/panel';
 import LinkFooter from '../components/link_footer';
 
@@ -39,7 +39,6 @@ class GroupPage extends ImmutablePureComponent {
 					TOP: top,
 					RIGHT: (
 						<Fragment>
-							<GroupSidebarPanel />
 							<WhoToFollowPanel />
 						</Fragment>
 					),

app/javascript/gabsocial/pages/groups_page.js

@@ -0,0 +1,56 @@
+import { Fragment } from 'react'
+import LinkFooter from '../components/link_footer'
+import GroupsPanel from '../components/panel/groups_panel'
+import DefaultLayout from '../components/layouts/default_layout'
+
+export default class GroupsPage extends PureComponent {
+
+  handleClickNewList () {
+    console.log("handleClickNewList")
+  }
+
+  handleClickEditLists () {
+    console.log("handleClickEditLists")
+  }
+
+  render() {
+    const { children } = this.props
+
+    const tabs = [
+      {
+        title: 'Featured',
+        to: '/groups'
+      },
+      {
+        title: 'My Groups',
+        to: '/groups/browse/member'
+      },
+      { // only if is_pro
+        title: 'Admin',
+        to: '/groups/browse/admin'
+      },
+    ]
+
+    return (
+      <DefaultLayout
+        title='Groups'
+        actions={[
+          {
+            icon: 'list-delete',
+            onClick: this.handleClickEditLists
+          },
+        ]}
+        layout={(
+          <Fragment>
+            <GroupsPanel slim />
+            <LinkFooter />
+          </Fragment>
+        )}
+        tabs={tabs}
+        showBackBtn
+      >
+        { children }
+      </DefaultLayout>
+    )
+  }
+}

app/javascript/gabsocial/pages/notifications_page.js

@@ -18,6 +18,7 @@ export default class NotificationsPage extends PureComponent {
             <LinkFooter />
           </Fragment>
         )}
+        showBackBtn
       >
         {children}
       </DefaultLayout>

app/javascript/gabsocial/pages/search_page.js

@@ -1,32 +1,17 @@
-import { Fragment } from 'react';
-import Header from '../features/search/components/header';
-import LinkFooter from '../components/link_footer';
-import { WhoToFollowPanel, SignUpPanel } from '../components/panel';
-import DefaultLayout from '../components/layouts/default_layout';
+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 SearchLayout from '../components/layouts/search_layout'
 
 export default class SearchPage extends PureComponent {
-
-  static propTypes = {
-    children: PropTypes.node,
-  };
-
   render() {
+    const { children } = this.props
+
     return (
-      <DefaultLayout
-        layout={{
-          TOP: <Header/>,
-          RIGHT: (
-            <Fragment>
-              <SignUpPanel />
-              <WhoToFollowPanel />
-            </Fragment>
-          ),
-          LEFT: <LinkFooter/>,
-        }}
-      >
-        {this.props.children}
-      </DefaultLayout>
+      <SearchLayout>
+        {children}
+      </SearchLayout>
     )
   }
-
-};
+}