From 22f39a228c51f026ee3a2cc6510c6bc007fa9f60 Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Mon, 3 May 2021 09:01:08 -0500
Subject: [PATCH] Navbar rework

---
 _data/nav/1_home.yml      |  3 ++
 _data/nav/2_providers.yml | 43 +++++++++++++++++++++++++++++
 _data/nav/3_software.yml  | 58 +++++++++++++++++++++++++++++++++++++++
 _data/nav/4_privacy.yml   | 12 ++++++++
 _data/nav/5_blog.yml      |  3 ++
 _includes/nav.html        | 55 ++++++++++---------------------------
 6 files changed, 134 insertions(+), 40 deletions(-)
 create mode 100644 _data/nav/1_home.yml
 create mode 100644 _data/nav/2_providers.yml
 create mode 100644 _data/nav/3_software.yml
 create mode 100644 _data/nav/4_privacy.yml
 create mode 100644 _data/nav/5_blog.yml

diff --git a/_data/nav/1_home.yml b/_data/nav/1_home.yml
new file mode 100644
index 00000000..9271f9b6
--- /dev/null
+++ b/_data/nav/1_home.yml
@@ -0,0 +1,3 @@
+type: link
+title: Home
+file: index.html
diff --git a/_data/nav/2_providers.yml b/_data/nav/2_providers.yml
new file mode 100644
index 00000000..e2993a18
--- /dev/null
+++ b/_data/nav/2_providers.yml
@@ -0,0 +1,43 @@
+type: dropdown
+title: Providers
+items:
+  - type: link
+    title: Cloud Storage
+    icon: fad fa-clouds
+    file: legacy_pages/providers/storage.html
+  - type: link
+    title: DNS Servers
+    icon: fad fa-map-signs
+    file: legacy_pages/providers/dns.html
+  - type: link
+    title: Email Providers
+    icon: fad fa-envelope
+    file: legacy_pages/providers/email.html
+  - type: link
+    title: Web Hosting
+    icon: fad fa-hdd
+    file: legacy_pages/providers/hosting.html
+  - type: link
+    title: Pastebins
+    icon: fad fa-clipboard
+    file: legacy_pages/providers/paste.html
+  - type: link
+    title: Search Engines
+    icon: fad fa-search-location
+    file: legacy_pages/providers/search-engines.html
+  - type: link
+    title: Social Networks
+    icon: fad fa-thumbs-up
+    file: legacy_pages/providers/social-networks.html
+  - type: link
+    title: Social News Aggregators
+    icon: fad fa-newspaper
+    file: legacy_pages/providers/social-news-aggregator.html
+  - type: link
+    title: Video Platforms
+    icon: fad fa-file-video
+    file: legacy_pages/providers/video.html
+  - type: link
+    title: VPN Services
+    icon: fad fa-network-wired
+    file: legacy_pages/providers/vpn.html
diff --git a/_data/nav/3_software.yml b/_data/nav/3_software.yml
new file mode 100644
index 00000000..5f3a0e14
--- /dev/null
+++ b/_data/nav/3_software.yml
@@ -0,0 +1,58 @@
+type: dropdown
+title: Software
+items:
+  - type: link
+    title: Browsers
+    icon: fad fa-browser
+    file: _evergreen/browsers.html
+  - type: link
+    title: Operating Systems
+    icon: fad fa-compact-disc
+    file: legacy_pages/os.html
+  - type: divider
+  - type: link
+    title: Calendar/Contacts Sync Tools
+    icon: fad fa-calendar-day
+    file: legacy_pages/software/cal-card.html
+  - type: link
+    title: Digital Notebooks
+    icon: fad fa-edit
+    file: legacy_pages/software/notebooks.html
+  - type: link
+    title: Email Clients
+    icon: fad fa-envelope-open-text
+    file: legacy_pages/software/email.html
+  - type: link
+    title: File Encryption Tools
+    icon: fad fa-file-certificate
+    file: legacy_pages/software/productivity.html
+    anchor: encrypt
+  - type: link
+    title: File Sharing and Sync
+    icon: fad fa-file-user
+    file: legacy_pages/software/file-sharing.html
+  - type: link
+    title: Metadata Removal Tools
+    icon: fad fa-file-times
+    file: legacy_pages/software/productivity.html
+    anchor: metadata-removal-tools
+  - type: link
+    title: Password Managers
+    icon: fad fa-user-lock
+    file: legacy_pages/software/passwords.html
+  - type: link
+    title: Productivity Tools
+    icon: fad fa-briefcase
+    file: legacy_pages/software/productivity.html
+  - type: link
+    title: Real-Time Communication Platforms
+    icon: fad fa-comments-alt
+    file: legacy_pages/software/real-time-communication.html
+  - type: link
+    title: Self-Contained Networks
+    icon: fad fa-chart-network
+    file: legacy_pages/software/networks.html
+  - type: link
+    title: Self-Hosted Cloud Servers
+    icon: fad fa-laptop-house
+    file: legacy_pages/software/cloud.html
diff --git a/_data/nav/4_privacy.yml b/_data/nav/4_privacy.yml
new file mode 100644
index 00000000..3db2423e
--- /dev/null
+++ b/_data/nav/4_privacy.yml
@@ -0,0 +1,12 @@
+type: dropdown
+title: Privacy
+items:
+  - type: link
+    title: Threat Modeling
+    icon: fad fa-bullseye-arrow
+    file: _evergreen/threat-modeling.html
+  - type: link
+    title: Global Mass Surveillance
+    icon: fad fa-drone-alt
+    file: legacy_pages/providers.html
+    anchor: ukusa
diff --git a/_data/nav/5_blog.yml b/_data/nav/5_blog.yml
new file mode 100644
index 00000000..7cc0e7d1
--- /dev/null
+++ b/_data/nav/5_blog.yml
@@ -0,0 +1,3 @@
+type: link
+title: Blog
+file: blog.html
diff --git a/_includes/nav.html b/_includes/nav.html
index 993621aa..4b4f4600 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -9,54 +9,29 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <div class="mr-auto"></div>
       <ul class="navbar-nav mt-2 mt-lg-0">
+        {% for item_hash in site.data.nav %}
+        {% assign item = item_hash[1] %}
+        {% if item.type == "link" %}
         <li class="nav-item">
-          <a class="nav-link" href="/">Home</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="/browsers/">Browsers</a>
+          <a class="nav-link" href="{% link {{ item.file }} %}">{{ item.title }}</a>
         </li>
+        {% elsif item.type == "dropdown" %}
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" id="providerDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Providers
+            {{ item.title }}
           </a>
           <div class="dropdown-menu" aria-labelledby="providerDropdown">
-            <a class="dropdown-item" href="/providers/#ukusa"><span class="fas fa-user-secret fa-fw"></span> Global Mass Surveillance</a>
-            <a class="dropdown-item" href="/providers/cloud-storage/"><span class="fas fa-cloud fa-fw"></span> Cloud Storage</a>
-            <a class="dropdown-item" href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> DNS Servers</a>
-            <a class="dropdown-item" href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> Email Providers</a>
-            <a class="dropdown-item" href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> Web Hosting</a>
-            <a class="dropdown-item" href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> Pastebins</a>
-            <a class="dropdown-item" href="/providers/search-engines/"><span class="fas fa-search fa-fw"></span> Search Engines</a>
-            <a class="dropdown-item" href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> Social Networks</a>
-            <a class="dropdown-item" href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> Social News Aggregators</a>
-            <a class="dropdown-item" href="/providers/video/"><span class="fas fa-video fa-fw"></span> Video Platforms</a>
-            <a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> VPN Services</a>
+            {% for subitem in item.items %}
+            {% if subitem.type == "link" %}
+            <a class="dropdown-item" href="{% link {{ subitem.file }} %}{%- if subitem.anchor -%}#{{ subitem.anchor }}{%- endif -%}"><span class="{{ subitem.icon | default: "fad fa-file" }} fa-fw"></span> {{ subitem.title }}</a>
+            {% elsif subitem.type == "divider" %}
+            <div class="dropdown-divider"></div>
+            {% endif %}
+            {% endfor %}
           </div>
         </li>
-        <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" id="softwareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            Software
-          </a>
-          <div class="dropdown-menu" aria-labelledby="softwareDropdown">
-            <a class="dropdown-item" href="/software/calendar-contacts/"><span class="fas fa-calendar fa-fw"></span> Calendar/Contacts Sync Tools</a>
-            <a class="dropdown-item" href="/software/notebooks/"><span class="far fa-sticky-note fa-fw"></span> Digital Notebooks</a>
-            <a class="dropdown-item" href="/software/email/"><span class="fas fa-envelope fa-fw"></span> Email Clients</a>
-            <a class="dropdown-item" href="/software/productivity/#encrypt"><span class="fas fa-lock fa-fw"></span> File Encryption Tools</a>
-            <a class="dropdown-item" href="/software/file-sharing/"><span class="fas fa-copy fa-fw"></span> File Sharing and Sync</a>
-            <a class="dropdown-item" href="/software/productivity/#metadata-removal-tools"><span class="far fa-eye-slash fa-fw"></span> Metadata Removal Tools</a>
-            <a class="dropdown-item" href="/software/passwords/"><span class="fas fa-user-lock fa-fw"></span> Password Managers</a>
-            <a class="dropdown-item" href="/software/productivity/"><span class="fas fa-briefcase fa-fw"></span> Productivity Tools</a>
-            <a class="dropdown-item" href="/software/real-time-communication/"><span class="fas fa-comments fa-fw"></span> Real-Time Communication Platforms</a>
-            <a class="dropdown-item" href="/software/networks/"><span class="fas fa-user-secret fa-fw"></span> Self-contained Networks</a>
-            <a class="dropdown-item" href="/software/cloud/"><span class="fas fa-hdd fa-fw"></span> Self-Hosted Cloud Servers</a>
-          </div>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="/operating-systems/">Operating Systems</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="/blog/">Blog</a>
-        </li>
+        {% endif %}
+        {% endfor %}
       </ul>
     </div>
   </div>