From 88f6cea0485ff47c6de717340cf67f70b19bd315 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 10 Sep 2017 22:40:01 +0100
Subject: [PATCH] Refactor to use a for loop

---
 source/_includes/nav.html.twig | 40 ++++++++++++++--------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig
index 045d2607..f7ab0203 100644
--- a/source/_includes/nav.html.twig
+++ b/source/_includes/nav.html.twig
@@ -1,35 +1,27 @@
 <header class="w-100 pa3 ph4-ns bg-white">
   <div class="db dt-ns mw9 center w-100">
     <div class="db dtc-ns v-mid tl w-50">
-      <a href="/" class="dib f5 f4-ns mt0 mb1 link" title="Home">
+      <a href="/" class="dib f5 f4-ns mt0 mb1 link black-70" title="Home">
         {{ site.title }}
       </a>
     </div>
 
+    {% set links = [
+        { title: 'About', href: '/' },
+        { title: 'Experience', href: '/experience' },
+        { title: 'Testimonials', href: '/testimonials' },
+        { title: 'Talks', href: '/talks' },
+        { title: 'Blog', href: '/blog' },
+        { title: 'Contact', href: '/contact' }
+    ] %}
+
     <nav class="db dtc-ns v-mid w-100 tl tr-ns mt2 mt0-ns">
-      <a href="/" class="f6 hover-blue link ml2 ml-m ml4-l dib {{ page.url == '/.' ? 'black' : 'black-70' }}">
-        About
-      </a>
-
-      <a href="/experience" class="f6 hover-blue link ml2 ml-m ml4-l dib {{ page.url == '/experience' ? 'black' : 'black-70' }}">
-        Experience
-      </a>
-
-      <a href="/testimonials" class="f6 hover-blue link ml2 ml-m ml4-l dib {{ page.url == '/testimonials' ? 'black' : 'black-70' }}">
-        Testimonials
-      </a>
-
-      <a href="/talks" class="f6 hover-blue link ml2 ml-m ml4-l dib {{ page.url matches '#^/talks/?#' ? 'black' : 'black-70' }}">
-        Talks
-      </a>
-
-      <a href="/blog" class="f6 hover-blue link ml2 ml-m ml4-l dib {{ page.url matches '#^/blog/?#' ? 'black' : 'black-70' }}">
-        Blog
-      </a>
-
-      <a href="/contact" class="f6 hover-blue link ml2 ml-m ml4-l dn dib-l {{ page.url matches '#^/contact/?#' ? 'black' : 'black-70' }}">
-        Contact
-      </a>
+        {% for link in links %}
+            {% set pattern = '#^' ~ link.href ~ '(.|/)?#' %}
+            <a href="{{ link.href }}" class="f6 hover-blue link ml2 ml-m ml4-l dib {{ page.url matches pattern ? 'black' : 'black-70' }}">
+                {{- link.title -}}
+            </a>
+        {% endfor %}
     </nav>
   </div>
 </header>