Rework layout and add new header to user pages (#747)

Lokiedu · Jan 21, 2017 · fc3d902 · fc3d902
1 parent b2c27fc
commit fc3d902
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/src/pages/base/user.js b/src/pages/base/user.js
@@ -42,6 +42,8 @@ import ProfileHeader from '../../components/profile';
 import Sidebar from '../../components/sidebar';
 import SidebarAlt from '../../components/sidebarAlt';
 import User from '../../components/user';
+import { getName } from '../../utils/user';
+import Avatar from '../../components/user/avatar';
 
 // FIXME: These links won't hide/show properly if following/unfollowing is performed directly on the page.
 // Something is wrong with the redux state.
@@ -91,18 +93,26 @@ const BaseUserPage = (props) => {
       </Header>
 
       <Page>
-        <Sidebar />
-        <PageMain className="page__main-no_space">
-          <ProfileHeader
-            current_user={current_user}
-            editable={false}
-            followers={followers}
-            following={following}
-            triggers={triggers}
-            user={user}
-          />
+        <PageMain>
           <PageBody>
+            <Sidebar isFixed={false} />
             <PageContent>
+              <div className="page_head">
+                <h1 className="page_head__title">
+                  {getName(user)}
+                </h1>
+                <div className="page_head__icon">
+                  <Avatar user={user} size={37} />
+                </div>
+              </div>
+              <ProfileHeader
+                current_user={current_user}
+                editable={false}
+                followers={followers}
+                following={following}
+                triggers={triggers}
+                user={user}
+              />
               <div className="layout__space-double">
                 <div className="layout__grid tabs">
                   <div className="layout__grid_item">