specify homepage navbar links & order in data

...rather than just making a guess off the order files are listed
by directory access, and using out-of-place 'Show in Navigation
Bar'

2 files changed, 6 insertions, 1 deletions

diff --git a/src/data/things/homepage-layout.js b/src/data/things/homepage-layout.js
index 344716cb..c18e8110 100644
--- a/src/data/things/homepage-layout.js
+++ b/src/data/things/homepage-layout.js
@@ -7,6 +7,7 @@ export class HomepageLayout extends Thing {
     HomepageLayoutRow,
 
     validators: {
+      isStringNonEmpty,
       validateArrayItems,
       validateInstanceOf,
     },
@@ -15,6 +16,11 @@ export class HomepageLayout extends Thing {
 
     sidebarContent: Thing.common.simpleString(),
 
+    navbarLinks: {
+      flags: {update: true, expose: true},
+      update: {validate: validateArrayItems(isStringNonEmpty)},
+    },
+
     rows: {
       flags: {update: true, expose: true},
 
diff --git a/src/data/things/static-page.js b/src/data/things/static-page.js
index 226e0b61..3d8d474c 100644
--- a/src/data/things/static-page.js
+++ b/src/data/things/static-page.js
@@ -25,6 +25,5 @@ export class StaticPage extends Thing {
     directory: Thing.common.directory(),
     content: Thing.common.simpleString(),
     stylesheet: Thing.common.simpleString(),
-    showInNavigationBar: Thing.common.flag(true),
   });
 }