resolves #29 fix component order on 404 page (PR #35)

mojavelinux · web-flow · commit ef683d58ce00 · 2020-12-10T02:43:04.000-07:00
diff --git a/src/helpers/siteStartPage.js b/src/helpers/siteStartPage.js
@@ -0,0 +1,4 @@
+'use strict'
+
+module.exports = ({ data: { root: { contentCatalog } } }) =>
+  contentCatalog && contentCatalog.getSiteStartPage()
diff --git a/src/layouts/404.hbs b/src/layouts/404.hbs
@@ -5,7 +5,7 @@
   </head>
   <body class="status-404">
 {{> header}}
-{{> body}}
+{{> body componentOrder=(lookup (lookup (lookup (siteStartPage) 'asciidoc') 'attributes') 'page-component-order')}}
 {{> footer}}
   </body>
 </html>
diff --git a/src/layouts/default.hbs b/src/layouts/default.hbs
@@ -5,7 +5,7 @@
   </head>
   <body class="article{{#with (or page.attributes.role page.role)}} {{{this}}}{{/with}}">
 {{> header}}
-{{> body}}
+{{> body componentOrder=page.attributes.component-order}}
 {{> footer}}
   </body>
 </html>
diff --git a/src/partials/nav-explore.hbs b/src/partials/nav-explore.hbs
@@ -6,7 +6,7 @@
   </div>
   {{/if}}
   <ul class="components">
-    {{#each (rearrange site.components 'name' page.attributes.component-order)}}
+    {{#each (rearrange site.components 'name' componentOrder)}}
     <li class="component{{#if (eq this @root.page.component)}} is-current{{/if}}">
       <a class="title" href="{{{relativize ./url}}}">{{{./title}}}</a>
       {{#if (or ./versions.[1] (ne ./versions.[0].displayVersion 'current'))}}
