From 87900f01975b1b347caad51ed678bd00647aad92 Mon Sep 17 00:00:00 2001
From: Mike <mike@madebymike.com.au>
Date: Tue, 12 Nov 2019 09:27:11 +1100
Subject: [PATCH] Better navigation langmarks

---
 .env                                         |  2 +-
 site/_includes/partials/global/site-foot.njk |  2 +-
 site/_includes/partials/global/site-head.njk |  1 +
 site/_includes/partials/nav.njk              | 10 ++++++----
 site/src/js/keystone-login.js                |  9 ++++++---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.env b/.env
index e9889c2..f70c1a4 100644
--- a/.env
+++ b/.env
@@ -1 +1 @@
-KEYSTONE_API = http://localhost:3000/admin/api/
\ No newline at end of file
+KEYSTONE_API = https://keystone-blog-enrichment.herokuapp.com/admin/api
\ No newline at end of file
diff --git a/site/_includes/partials/global/site-foot.njk b/site/_includes/partials/global/site-foot.njk
index 87f14fb..436d023 100644
--- a/site/_includes/partials/global/site-foot.njk
+++ b/site/_includes/partials/global/site-foot.njk
@@ -1,4 +1,3 @@
-{% set ariaNavLabel = 'footer' %}
 <footer role="contentinfo">
   <div class="theme">
     <div class="l-container">
@@ -14,6 +13,7 @@
             {% endif %}
           </div>
           <div class="l-footer-nav">
+            {% set navLocation = 'footer' %}
             {% include "partials/nav.njk" %}
           </div>
         </div>
diff --git a/site/_includes/partials/global/site-head.njk b/site/_includes/partials/global/site-head.njk
index 9e57619..2675fae 100644
--- a/site/_includes/partials/global/site-head.njk
+++ b/site/_includes/partials/global/site-head.njk
@@ -6,6 +6,7 @@
         <span class="l-site-title site-title">{{ site.name }}</span>
       </span>
     </a>
+    {% set navLocation = 'primary' %}
     {% include "partials/nav.njk" %}
   </header>
 </div>
\ No newline at end of file
diff --git a/site/_includes/partials/nav.njk b/site/_includes/partials/nav.njk
index 1c7be86..7173d7b 100644
--- a/site/_includes/partials/nav.njk
+++ b/site/_includes/partials/nav.njk
@@ -1,6 +1,8 @@
-{% set ariaNavLabel = 'primary' %}
+{% set navLandmark = 'nav' if navLocation === 'primary' else 
+  'div' %}
+
 {% if navigation.items %}
-  <nav>
+  <{{navLandmark}}>
     <ul class="l-navigation navigation" aria-label="{{ ariaNavLabel }}">
       {% for item in navigation.items %}
         {% set externalAttribute = '' %}
@@ -21,7 +23,7 @@
         </li>
       {% endfor %}
 
-      {% if site.keystone.login !== false %}
+      {% if site.keystone.login and navLocation === 'primary' %}
         <li>
           <a href="/login" class="l-login" id="keystone-nav-login">
           Login {% include "partials/icons/login.svg" %}
@@ -29,5 +31,5 @@
         </li>
         {% endif%}
       </ul >
-    </nav>
+    </{{navLandmark}}>
   {% endif %}
\ No newline at end of file
diff --git a/site/src/js/keystone-login.js b/site/src/js/keystone-login.js
index 2ba9326..6ce3d23 100644
--- a/site/src/js/keystone-login.js
+++ b/site/src/js/keystone-login.js
@@ -175,12 +175,15 @@ const loginUI = document.getElementById("keystone-nav-login");
 if (loginUI) {
   getAuthenticatedUser()
     .then(authenticatedUser => {
-      if (authenticatedUser) {
+      if (authenticatedUser === false) {
+        // null = unauthenticated User
+        // false = failed to get User info (API error)
+
+        loginUI.innerHTML = "";
+      } else {
         createLogoutEvent(authenticatedUser);
         loginUI.addEventListener("click", createLogoutEvent(authenticatedUser));
         loginUI.innerHTML = `Logout ${logoutIcon}`;
-      } else {
-        loginUI.innerHTML = "";
       }
     })
     .catch(e => {