|
|
@@ -22,7 +22,6 @@ import BookmarkButton from '../BookmarkButton';
|
|
|
import PageCreator from './PageCreator';
|
|
|
import RevisionAuthor from './RevisionAuthor';
|
|
|
import DrawerToggler from './DrawerToggler';
|
|
|
-import UserPicture from '../User/UserPicture';
|
|
|
|
|
|
|
|
|
// eslint-disable-next-line react/prop-types
|
|
|
@@ -79,29 +78,6 @@ const UserPagePathNav = ({ pageId, pagePath }) => {
|
|
|
);
|
|
|
};
|
|
|
|
|
|
-/* eslint-disable react/prop-types */
|
|
|
-const UserInfo = ({ pageUser }) => {
|
|
|
- return (
|
|
|
- <div className="grw-users-info d-flex align-items-center d-edit-none">
|
|
|
- <UserPicture user={pageUser} />
|
|
|
-
|
|
|
- <div className="users-meta">
|
|
|
- <h1 className="user-page-name">
|
|
|
- {pageUser.name}
|
|
|
- </h1>
|
|
|
- <div className="user-page-meta mt-1 mb-0">
|
|
|
- <span className="user-page-username mr-2"><i className="icon-user mr-1"></i>{pageUser.username}</span>
|
|
|
- <span className="user-page-email mr-2">
|
|
|
- <i className="icon-envelope mr-1"></i>
|
|
|
- {pageUser.isEmailPublished ? pageUser.email : '*****'}
|
|
|
- </span>
|
|
|
- {pageUser.introduction && <span className="user-page-introduction">{pageUser.introduction}</span>}
|
|
|
- </div>
|
|
|
- </div>
|
|
|
-
|
|
|
- </div>
|
|
|
- );
|
|
|
-};
|
|
|
/* eslint-enable react/prop-types */
|
|
|
|
|
|
/* eslint-disable react/prop-types */
|
|
|
@@ -164,18 +140,7 @@ const GrowiSubNavigation = (props) => {
|
|
|
<TagLabels />
|
|
|
</div>
|
|
|
) }
|
|
|
-
|
|
|
- { isUserPage
|
|
|
- ? (
|
|
|
- <>
|
|
|
- <UserPagePathNav pageId={pageId} pagePath={path} />
|
|
|
- <UserInfo pageUser={pageUser} />
|
|
|
- </>
|
|
|
- )
|
|
|
- : (
|
|
|
- <PagePathNav pageId={pageId} pagePath={path} isPageForbidden={isPageForbidden} />
|
|
|
- )
|
|
|
- }
|
|
|
+ <PagePathNav pageId={pageId} pagePath={path} isPageForbidden={isPageForbidden} />
|
|
|
|
|
|
</div>
|
|
|
</div>
|