Merge pull request #299 from ocftw/fix/rearrange-page-order-in-naviga…

…tionList fix: fix page order in navigationList
ocftw · Oct 31, 2023 · d7ceee0 · d7ceee0
2 parents 7d7392f + 00ac13e
commit d7ceee0
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 1 deletion.
diff --git a/homepage/_pages/en/cards.md b/homepage/_pages/en/cards.md
@@ -1,6 +1,7 @@
 ---
 unique_slug: cards
 name: Cards
+page_order: 2
 layout_list:
   - type: layout_section
     title: Talent, Event & Project Cards

diff --git a/homepage/_pages/en/index.md b/homepage/_pages/en/index.md
@@ -1,6 +1,7 @@
 ---
 unique_slug: index
 name: Home
+page_order: 1
 layout_list:
   - type: layout_banner
     title: Open StarTer Village

diff --git a/homepage/_pages/en/resource.md b/homepage/_pages/en/resource.md
@@ -1,6 +1,7 @@
 ---
 unique_slug: resource
 name: Resource
+page_order: 3
 layout_list:
   - type: layout_banner
     hero_image: /images/uploads/img_3584_2.jpeg

diff --git a/homepage/_pages/zh-tw/cards.md b/homepage/_pages/zh-tw/cards.md
@@ -1,6 +1,7 @@
 ---
 unique_slug: cards
 name: 卡片頁
+page_order: 2
 layout_list:
   - type: layout_section
     title: 卡片介紹

diff --git a/homepage/_pages/zh-tw/index.md b/homepage/_pages/zh-tw/index.md
@@ -1,6 +1,7 @@
 ---
 unique_slug: index
 name: 首頁
+page_order: 1
 layout_list:
   - type: layout_banner
     title: 開源星手村

diff --git a/homepage/_pages/zh-tw/resource.md b/homepage/_pages/zh-tw/resource.md
@@ -1,6 +1,7 @@
 ---
 unique_slug: resource
 name: 資源頁
+page_order: 3
 layout_list:
   - type: layout_banner
     hero_image: /images/uploads/img_3584_2.jpeg

diff --git a/homepage/src/lib/getNavigationList.js b/homepage/src/lib/getNavigationList.js
@@ -21,6 +21,7 @@ export async function getPagesList(lang) {
     return {
       path: data.unique_slug,
       name: data.name,
+      order: data.page_order,
     };
   });
 
@@ -33,10 +34,11 @@ export async function getNavigationList(lang) {
   // * dynamic page navigation
   const navigationList = pagesList
     .filter((page) => page.path && page.name)
+    .sort((a, b) => a.order - b.order)
     .map((page) => {
       page.path = page.path.replace('index', '');
       return { link: `/${page.path}`, text: page.name };
-    });
+    })
 
   return navigationList;
 }
diff --git a/homepage/src/pages/admin/config.json b/homepage/src/pages/admin/config.json
@@ -35,6 +35,9 @@
           "i18n": "duplicate"
         },
         { "label": "Name", "name": "name", "widget": "string", "i18n": true },
+        {
+          "label": "Page order", "name": "page_order", "widget": "number", "value_type": "int", "i18n": "duplicate"
+        },
         {
           "label": "Layout & Content",
           "name": "layout_list",