generate page data for CMS

weseek · Oct 12, 2023 · c8a4fa5 · c8a4fa5
1 parent a61d2a7
commit c8a4fa5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/apps/app/src/server/routes/cms.ts b/apps/app/src/server/routes/cms.ts
@@ -11,6 +11,19 @@ const logger = loggerFactory('growi:routes:cms:pages');
 module.exports = function(crowi) {
   const Page = crowi.model('Page');
 
+  const generatePageDataForCMS = (page) => {
+    const md = new MarkdownIt({ html: true, linkify: true });
+    md.use(markdownItMeta).use(markdownItEmoji);
+    const htmlString = md.render(page.revision.body);
+    const frontMatter = md.meta.cms;
+    // frontMatter に title が存在しなければ、path の最後の '/' 以降の文字列をタイトルにする
+    const title = frontMatter?.title || page.path.match(/([^/]+)$/)[1];
+
+    return {
+      page, title, htmlString, frontMatter,
+    };
+  };
+
   const actions: any = {};
   const api: any = {};
 
@@ -62,14 +75,9 @@ module.exports = function(crowi) {
       return timeB - timeA;
     });
 
-    const pagesWithHTMLString = pagesSortedByPublishedAt.map((page) => {
-      const md = new MarkdownIt({ html: true, linkify: true });
-      md.use(markdownItMeta).use(markdownItEmoji);
+    const pagesDataForCMS = pagesSortedByPublishedAt.map(page => generatePageDataForCMS(page));
 
-      return { page, htmlString: md.render(page.revision.body), frontMatter: md.meta.cms };
-    });
-
-    return res.json(ApiResponse.success(pagesWithHTMLString));
+    return res.json(ApiResponse.success(pagesDataForCMS));
   };
 
   api.get = async function(req, res) {
@@ -106,10 +114,9 @@ module.exports = function(crowi) {
       }
     }
 
-    const md = new MarkdownIt({ html: true, linkify: true });
-    md.use(markdownItMeta).use(markdownItEmoji);
+    const pageDataForCMS = generatePageDataForCMS(page);
 
-    return res.json(ApiResponse.success({ page, htmlString: md.render(page.revision.body), frontMatter: md.meta.cms }));
+    return res.json(ApiResponse.success(pageDataForCMS));
   };
 
   return actions;

diff --git a/apps/mobliz-clone/src/pages/[pageId].tsx b/apps/mobliz-clone/src/pages/[pageId].tsx
@@ -19,6 +19,7 @@ const DetailPage: NextPage<Props> = (props: Props) => {
   useEffect(() => {
     axios.get(`${process.env.NEXT_PUBLIC_APP_SITE_URL}/_cms/${pageId}.json`)
       .then((response) => {
+        console.log(response);
         setHTMLString(response.data.htmlString);
       })
       .catch((error) => {