Better navigation langmarks

MadeByMike · Nov 11, 2019 · 87900f0 · 87900f0
1 parent fb6b7c4
commit 87900f0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/.env b/.env
@@ -1 +1 @@
-KEYSTONE_API = http://localhost:3000/admin/api/
+KEYSTONE_API = https://keystone-blog-enrichment.herokuapp.com/admin/api
diff --git 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
@@ -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>
diff --git 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,13 +23,13 @@
         </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" %}
           </a>
         </li>
         {% endif%}
       </ul >
-    </nav>
+    </{{navLandmark}}>
   {% endif %}
diff --git 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 => {