From 0bd9102ddef14b6929e0e0df562e24a0299b36d8 Mon Sep 17 00:00:00 2001
From: Angela Tran <angela@compiler.la>
Date: Mon, 31 Mar 2025 22:39:49 +0000
Subject: [PATCH 1/4] chore: update Gemfile.lock

---
 Gemfile.lock | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b5cbda3..91a9e43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,9 +11,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.17.1-aarch64-linux-gnu)
-    ffi (1.17.1-x86_64-linux-gnu)
-    ffi (1.17.1-x86_64-linux-musl)
+    ffi (1.17.1)
     forwardable-extended (2.6.0)
     http_parser.rb (0.8.0)
     i18n (1.14.7)

From ca47cdeb3dc0abd3da700cd5a7fcdea466476a86 Mon Sep 17 00:00:00 2001
From: Angela Tran <angela@compiler.la>
Date: Mon, 31 Mar 2025 22:40:44 +0000
Subject: [PATCH 2/4] refactor: extract navbar items out to data file

---
 src/_data/nav.yml      | 18 ++++++++++++++++++
 src/_includes/nav.html | 30 ++++++++++++++----------------
 2 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 src/_data/nav.yml

diff --git a/src/_data/nav.yml b/src/_data/nav.yml
new file mode 100644
index 0000000..6628471
--- /dev/null
+++ b/src/_data/nav.yml
@@ -0,0 +1,18 @@
+- name: Home
+  path: /
+
+- name: About
+  path: /about
+
+- name: Our Work
+  path: /our-work
+
+- name: Jobs
+  path: /jobs
+
+- name: Blog
+  path: /blog
+
+- name: Capabilities Statement
+  target: _blank
+  path: /capabilities
diff --git a/src/_includes/nav.html b/src/_includes/nav.html
index f405c5b..1b8111f 100644
--- a/src/_includes/nav.html
+++ b/src/_includes/nav.html
@@ -27,24 +27,22 @@
         <div class="modal-body">
           <div class="d-flex align-items-center h-100 offset-lg-2 col-lg-10">
             <ul class="list-unstyled">
+              {% for nav_item in site.data.nav %}
               <li>
-                <a class="h2 text-white d-inline-block mb-4 pb-2 pb-lg-0" href="/">Home</a>
-              </li>
-              <li>
-                <a class="h2 text-white d-inline-block mb-4 pb-2 pb-lg-0" href="/about">About</a>
-              </li>
-              <li>
-                <a class="h2 text-white d-inline-block mb-4 pb-2 pb-lg-0" href="/our-work">Our Work</a>
-              </li>
-              <li>
-                <a class="h2 text-white d-inline-block mb-4 pb-2 pb-lg-0" href="/jobs">Jobs</a>
-              </li>
-              <li>
-                <a class="h2 text-white d-inline-block mb-4 pb-2 pb-lg-0" href="/blog">Blog</a>
-              </li>
-              <li>
-                <a class="h2 text-white d-inline-block" target="_blank" href="/capabilities">Capabilities Statement</a>
+                <a
+                  class="h2 text-white d-inline-block{% unless forloop.last %} mb-4 pb-2 pb-lg-0{% endunless %}"
+                  {%
+                  if
+                  nav_item.target
+                  %}target="{{ nav_item.target }}"
+                  {%
+                  endif
+                  %}
+                  href="{{ nav_item.path }}"
+                  >{{ nav_item.name }}</a
+                >
               </li>
+              {% endfor %}
             </ul>
           </div>
         </div>

From 4ceac173b5b91fd605b80e5d849c612b72beba07 Mon Sep 17 00:00:00 2001
From: Angela Tran <angela@compiler.la>
Date: Mon, 31 Mar 2025 22:50:00 +0000
Subject: [PATCH 3/4] feat(desktop): show links on the page instead of in a
 modal

---
 src/_includes/nav.html | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/_includes/nav.html b/src/_includes/nav.html
index 1b8111f..792bfc2 100644
--- a/src/_includes/nav.html
+++ b/src/_includes/nav.html
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-dark">
+<nav class="navbar navbar-expand-lg navbar-dark">
   <a class="d-inline-block" href="/"
     ><img width="88" height="46" src="/assets/compiler_logo_stacked.svg" alt="Compiler logo"
   /></a>
@@ -13,7 +13,18 @@
   >
     <span class="navbar-toggler-icon"></span>
   </button>
-  <div class="modal fade" tabindex="-1" id="navbarToggler" aria-label="menu">
+  <div class="d-none d-lg-block container-fluid">
+    <ul class="navbar-nav me-auto mb-2 mb-lg-0 d-flex justify-content-end">
+      {% for nav_item in site.data.nav %}
+      <li class="nav-item">
+        <a class="nav-link" href="{{ nav_item.path }}" {% if nav_item.target %} target="{{ nav_item.target }}" {% endif %}
+          >{{ nav_item.name }}</a
+        >
+      </li>
+      {% endfor %}
+    </ul>
+  </div>
+  <div class="d-lg-none modal fade" tabindex="-1" id="navbarToggler" aria-label="menu">
     <div class="modal-dialog modal-fullscreen">
       <div class="modal-content">
         <div class="modal-header border-0 d-flex justify-content-end">

From 1e3d49f11b0de3ba5e441be4a258b86c19eeb1ca Mon Sep 17 00:00:00 2001
From: Angela Tran <angela@compiler.la>
Date: Mon, 31 Mar 2025 22:59:23 +0000
Subject: [PATCH 4/4] feat: add attributes to indicate current page in Desktop
 navbar

---
 src/_includes/nav.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/_includes/nav.html b/src/_includes/nav.html
index 792bfc2..63cd9a1 100644
--- a/src/_includes/nav.html
+++ b/src/_includes/nav.html
@@ -17,7 +17,19 @@
     <ul class="navbar-nav me-auto mb-2 mb-lg-0 d-flex justify-content-end">
       {% for nav_item in site.data.nav %}
       <li class="nav-item">
-        <a class="nav-link" href="{{ nav_item.path }}" {% if nav_item.target %} target="{{ nav_item.target }}" {% endif %}
+        {% assign current_path = page.url | remove:".html" %}
+        <a
+          class="nav-link{% if nav_item.path == current_path %} active"
+          aria-current="page{% endif %}"
+          href="{{ nav_item.path }}"
+          {%
+          if
+          nav_item.target
+          %}
+          target="{{ nav_item.target }}"
+          {%
+          endif
+          %}
           >{{ nav_item.name }}</a
         >
       </li>