jam411 3 лет назад
Родитель
Сommit
14a09f4bd1

+ 6 - 6
packages/app/src/components/UsersHomePageFooter.tsx

@@ -1,17 +1,17 @@
 import React from 'react';
 import React from 'react';
 
 
 import { RecentlyCreatedIcon } from '~/components/Icons/RecentlyCreatedIcon';
 import { RecentlyCreatedIcon } from '~/components/Icons/RecentlyCreatedIcon';
-// import { BookmarkList } from '~/components/PageList/BookmarkList';
-// import { RecentCreated } from '~/components/RecentCreated/RecentCreated';
+import BookmarkList from '~/components/PageList/BookmarkList';
+import RecentCreated from '~/components/RecentCreated/RecentCreated';
 import styles from '~/components/UsersHomePageFooter.module.scss';
 import styles from '~/components/UsersHomePageFooter.module.scss';
 
 
 type UsersHomePageFooterProps = {
 type UsersHomePageFooterProps = {
   creatorId: string,
   creatorId: string,
 }
 }
 
 
-export const UsersHomePageFooter = (props: UsersHomePageFooterProps) => {
+export const UsersHomePageFooter = (props: UsersHomePageFooterProps): JSX.Element => {
 
 
-  // const { creatorId } = props;
+  const { creatorId } = props;
 
 
   // TODO: Check CSS module
   // TODO: Check CSS module
   return (
   return (
@@ -23,7 +23,7 @@ export const UsersHomePageFooter = (props: UsersHomePageFooterProps) => {
         </h2>
         </h2>
         <div id="user-bookmark-list" className="page-list">
         <div id="user-bookmark-list" className="page-list">
           <div className="page-list-container">
           <div className="page-list-container">
-            {/* <BookmarkList userId={creatorId} /> */}
+            <BookmarkList userId={creatorId} />
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
@@ -34,7 +34,7 @@ export const UsersHomePageFooter = (props: UsersHomePageFooterProps) => {
         </h2>
         </h2>
         <div id="user-created-list" className="page-list">
         <div id="user-created-list" className="page-list">
           <div className="page-list-container">
           <div className="page-list-container">
-            {/* <RecentCreated userId={creatorId} /> */}
+            <RecentCreated userId={creatorId} />
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>

+ 4 - 6
packages/app/src/pages/[[...path]].page.tsx

@@ -329,14 +329,12 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
             </div> */}
             </div> */}
           </div>
           </div>
         </div>
         </div>
-        {/* TODO: Check CSS import */}
         <footer className="footer d-edit-none">
         <footer className="footer d-edit-none">
           {/* TODO: Enable page_list.html */}
           {/* TODO: Enable page_list.html */}
-          {/* TODO: Enable isIdenticalPathPage or useIdenticalPath */}
-          {/* { !props.isIdenticalPathPage && ( */}
-          <Comments pageId={pageId} />
-          {/* )} */}
-          { isUsersHomePage(props.currentPathname) && (<UsersHomePageFooter creatorId={pageWithMeta?.data.creator._id}/>) }
+          { !props.isIdenticalPathPage && (<Comments pageId={pageId} />) }
+          { (pageWithMeta != null && isUsersHomePage(pageWithMeta.data.path)) && (
+            <UsersHomePageFooter creatorId={pageWithMeta.data.creator._id}/>
+          )}
           <PageContentFooter />
           <PageContentFooter />
         </footer>
         </footer>