データ読み込みのクラスをシングルトン化

3 files changed, 5 insertions, 8 deletions

diff --git a/src/app/article/all/[pageId]/page.tsx b/src/app/article/all/[pageId]/page.tsx
index 0374401..fda6fbb 100644
--- a/src/app/article/all/[pageId]/page.tsx
+++ b/src/app/article/all/[pageId]/page.tsx
@@ -21,8 +21,7 @@ export async function generateMetadata(context: PageType) {
 }
 export default async function Page(context: PageType) {
   const pageId = getPageIdNumber(context.params.pageId);
-  const al = new ArticleLoader()
-  const loadedData = await al.loadData();
+  const loadedData = await ArticleLoader.instance.loadData();
   const chunkdData = chunk(loadedData, PPV);
   const displayData = chunkdData[pageId - 1];
   return (
@@ -142,8 +141,7 @@ if (!Number.isInteger(PPV)) {
 }
 //export const dynamicParams = true;
 export async function generateStaticParams() {
-  const al = new ArticleLoader()
-  const loadedData = await al.loadData();
+  const loadedData = await ArticleLoader.instance.loadData();
   const chunkdData = chunk(loadedData, PPV);
   return chunkdData.map((data, index) => {
     return { pageId: `page-${index + 1}`, data: data };
diff --git a/src/app/article/tag/[tagName]/page.tsx b/src/app/article/tag/[tagName]/page.tsx
index d41befb..84c1677 100644
--- a/src/app/article/tag/[tagName]/page.tsx
+++ b/src/app/article/tag/[tagName]/page.tsx
@@ -12,9 +12,8 @@ export async function generateMetadata(context: PageType) {
   }
 }
 export default async function Page(context: PageType) {
-  const al = new ArticleLoader()
   const nowPageTagName = decodeURIComponent(context.params.tagName);
-  const loadedData = await al.loadData().then(articles => {
+  const loadedData = await ArticleLoader.instance.loadData().then(articles => {
     const filterd = articles.filter(article => {
       if (article.tags.includes(nowPageTagName)) {
         return true;
@@ -35,7 +34,7 @@ export default async function Page(context: PageType) {
   );
 }
 export async function generateStaticParams() {
-  const tagList = await new ArticleLoader().getTagList();
+  const tagList = await ArticleLoader.instance.getTagList();
   return tagList.map((data, index) => {
     return { tagName: data.tag };
   });
diff --git a/src/app/article/tag/page.tsx b/src/app/article/tag/page.tsx
index f1d161b..4f6ae0b 100644
--- a/src/app/article/tag/page.tsx
+++ b/src/app/article/tag/page.tsx
@@ -13,7 +13,7 @@ export async function generateMetadata(context: PageType) {
   }
 }
 export default async function Page(context: PageType) {
-  const tagList = await new ArticleLoader().getTagList();
+  const tagList = await ArticleLoader.instance.getTagList();
   type TAG = { tag: string, count: number, primary?: boolean };
   const elementListPcPart: TAG[] = [];
   const elementListAkiba: TAG[] = [];