add index pages

_config.yml

@@ -38,16 +38,35 @@ collections:
         permalink: /:path/
         output: true
 
-categories_order:
-    - Company
-    - How To Get DuckDuckGo
-    - DuckDuckGo Search Results
-    - DuckDuckGo Search Privacy
-    - DuckDuckGo Web Browsing Privacy
-    - DuckDuckGo Email Protection
-    - DuckDuckGo App Tracking Protection
-    - Misconceptions About DuckDuckGo
-    - Legal
+categories_data:
+    - name: Company
+      path: /company
+    - name: How To Get DuckDuckGo
+      path: /get-duckduckgo
+    - name: DuckDuckGo Search Results
+      path: /results
+    - name: DuckDuckGo Search Privacy
+      path: /search-privacy
+    - name: DuckDuckGo Web Browsing Privacy
+      path: /web-browsing-privacy
+    - name: DuckDuckGo Email Protection
+      path: /email-protection
+      sub_categories:
+          - name: Duck Addresses
+            path: /email-protection/duck-addresses
+          - name: Privacy
+            path: /email-protection/privacy
+          - name: Troubleshooting
+            path: /email-protection/troubleshooting
+    - name: DuckDuckGo App Tracking Protection
+      path: /p-app-tracking-protection
+    - name: Misconceptions About DuckDuckGo
+      path: /misconceptions
+    - name: Legal
+      path: /r-legal
+      sub_categories:
+          - name: Translated Microsoft Ads Notice
+            path: /translated
 
 defaults:
     - scope:

_docs/company/company-index.md

@@ -0,0 +1,12 @@
+---
+title: About DuckDuckGo
+nav_title: Company
+description: DuckDuckGo is an independent internet privacy company that offers a private alternative to Google search & Chrome in one free app.
+permalink: /company/index.html
+category: Company
+isIndex: true
+---
+
+DuckDuckGo is an independent internet privacy company. We help protect your privacy through our free web browser for {% include ddg-browser-os-list-linked.md %} that lets you search and browse the web, but – unlike Google – we don’t track your searches or browsing history. We block many other companies from trying to track you, too – all by default.
+
+{% include category-footer-nav.md %}

_docs/email-protection/duck-addresses/duck-addresses-index.md

@@ -0,0 +1,12 @@
+---
+title: DuckDuckGo Email Protection Duck Addresses
+description: DuckDuckGo Email Protection conceals your email address with Duck (@duck.com) Addresses. Learn to create and manage your Duck Addresses here.
+permalink: /email-protection/duck-addresses/index.html
+category: DuckDuckGo Email Protection
+sub_category: Duck Addresses
+isIndex: true
+---
+
+[DuckDuckGo Email Protection](https://duckduckgo.com/email) conceals your email address with Duck Addresses. There are two types of Duck Addresses: personal (example: name@duck.com) and private (automatically generated for you, example: avtzqdr@duck.com).
+
+{% include category-footer-nav.md %}

_docs/email-protection/email-protection-index.md

@@ -0,0 +1,11 @@
+---
+title: DuckDuckGo Email Protection
+description: Our free email forwarding service removes multiple types of hidden trackers and lets you hide your personal email address online.
+permalink: /email-protection/index.html
+category: DuckDuckGo Email Protection
+isIndex: true
+---
+
+[DuckDuckGo Email Protection](https://duckduckgo.com/email) is a free email forwarding service that removes multiple types of hidden email trackers and lets you create multiple unique private email addresses on the fly. Email Protection works with your current email account – no need to change providers or juggle multiple inboxes.
+
+{% include category-footer-nav.md %}

_docs/email-protection/privacy/privacy-index.md

@@ -0,0 +1,12 @@
+---
+title: DuckDuckGo Email Protection Privacy
+description: DuckDuckGo Email Protection hides your personal email address and limits hidden email tracking–all without saving the contents of your emails.
+permalink: /email-protection/privacy/index.html
+category: DuckDuckGo Email Protection
+sub_category: Privacy
+isIndex: true
+---
+
+Find out how [DuckDuckGo Email Protection](https://duckduckgo.com/email) limits hidden email tracking and helps you hide your personal email address through private Duck (duck.com) Addresses – without saving the contents of your emails.
+
+{% include category-footer-nav.md %}

_docs/email-protection/troubleshooting/troubleshooting-index.md

@@ -0,0 +1,12 @@
+---
+title: DuckDuckGo Email Protection Troubleshooting
+description: Frequently asked questions and common fixes for DuckDuckGo Email Protection accounts and individual Duck Addresses.
+permalink: /email-protection/troubleshooting/index.html
+category: DuckDuckGo Email Protection
+sub_category: Troubleshooting
+isIndex: true
+---
+
+Run into trouble with your [DuckDuckGo Email Protection](https://duckduckgo.com/email) account or one of your Duck Addresses? Here are a few frequently asked questions and common fixes.
+
+{% include category-footer-nav.md %}

_docs/get-duckduckgo/get-duckduckgo-index.md

@@ -0,0 +1,12 @@
+---
+title: How To Get DuckDuckGo
+nav_title: How To Get DuckDuckGo
+description: "Our free, privacy-protecting alternative to Google Search and Chrome is now available on all major platforms: iOS, Android, Mac and Windows."
+permalink: /get-duckduckgo/index.html
+category: How To Get DuckDuckGo
+isIndex: true
+---
+
+[DuckDuckGo Search](https://duckduckgo.com) and <a href="{{ site.baseurl }}/get-duckduckgo/does-duckduckgo-make-a-browser/">DuckDuckGo Private Browser</a> – our privacy-protecting alternative to Google Search and Chrome in one free app – is now available on all major platforms. Find step-by-step instructions for your device below.
+
+{% include category-footer-nav.md %}

_docs/misconceptions/misconceptions-index.md

@@ -0,0 +1,11 @@
+---
+title: Misconceptions About DuckDuckGo
+description: There are lots of false rumors about DuckDuckGo out there – don’t be fooled by them! Here’s the truth about some common misconceptions.
+permalink: /misconceptions/index.html
+category: Misconceptions About DuckDuckGo
+isIndex: true
+---
+
+There are lots of false rumors about DuckDuckGo out there – don’t be fooled by them! Here’s the truth about some of the most common ones we’ve seen floating around.
+
+{% include category-footer-nav.md %}

_docs/p-app-tracking-protection/app-tracking-protection-index.md

@@ -0,0 +1,11 @@
+---
+title: DuckDuckGo App Tracking Protection
+description: Offered in DuckDuckGo for Android, App Tracking Protection helps block 3rd-party trackers in your other apps, even when you’re not using them.
+permalink: /p-app-tracking-protection/index.html
+category: DuckDuckGo App Tracking Protection
+isIndex: true
+---
+
+Available in [DuckDuckGo Private Browser for Android](https://play.google.com/store/apps/details?id=com.duckduckgo.mobile.android), App Tracking Protection is a beta feature that helps block 3rd-party trackers in your apps, even when you’re not using them. It works locally on your device and does not collect personal data.
+
+{% include category-footer-nav.md %}

_docs/privacy/search-privacy-index.md

@@ -0,0 +1,11 @@
+---
+title: DuckDuckGo Search Privacy
+description: DuckDuckGo Search offers the key features you’d expect from a search engine--but unlike other search engines, it never tracks you.
+permalink: /search-privacy/index.html
+category: DuckDuckGo Search Privacy
+isIndex: true
+---
+
+[DuckDuckGo Search](https://duckduckgo.com) offers the key features you expect from a search engine, but unlike other search engines, it never tracks you. And because the connection between you and DuckDuckGo Search is encrypted, that means your internet provider can’t see the searches you make on DuckDuckGo either.
+
+{% include category-footer-nav.md %}

_docs/privacy/web-browsing-privacy-index.md

@@ -0,0 +1,11 @@
+---
+title: DuckDuckGo Web Browsing Privacy
+description: With our browsers and extensions, you get multiple layers of privacy protections that go above and beyond what most other browsers by default.
+permalink: /web-browsing-privacy/index.html
+category: DuckDuckGo Web Browsing Privacy
+isIndex: true
+---
+
+DuckDuckGo never tracks you. And when you leave our search engine and use <a href="{{ site.baseurl }}/get-duckduckgo/does-duckduckgo-make-a-browser/">our browsers</a> or <a href="{{ site.baseurl }}/desktop/adding-duckduckgo-to-your-browser/">extensions</a> to browse other sites, we aim to protect your privacy as much as possible with multiple layers of privacy protections that are continually evolving to keep up with new tracking methods. Other browsers offer some of these by default, like cookie and fingerprinting protections, but we also provide many other protections that most browsers do not offer by default, like <a href="{{ site.baseurl }}/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection">3rd-party Tracker Loading Protection</a>, <a href="{{ site.baseurl }}/privacy/web-tracking-protections/#global-privacy-control-gpc">Global Privacy Control</a>, <a href="{{ site.baseurl }}/privacy/web-tracking-protections/#link-tracking-protection">Link Tracking Protection</a>, <a href="{{ site.baseurl }}/privacy/web-tracking-protections/#cname-cloaking-protection">CNAME Cloaking Protection</a>, <a href="{{ site.baseurl }}/privacy/web-tracking-protections/#google-amp-protection">Google AMP Protection</a>, and more, which all help cover different tracking angles.
+
+{% include category-footer-nav.md %}

_docs/r-legal/legal-index.md

@@ -0,0 +1,11 @@
+---
+title: Legal
+description: Find disclosures and information about DuckDuckGo’s regulatory reporting, your personal privacy rights, and more at DuckDuckGo Help.
+permalink: /r-legal/index.html
+category: Legal
+isIndex: true
+---
+
+At DuckDuckGo, we don’t track you. That’s our [Privacy Policy](https://duckduckgo.com/privacy) in a nutshell. Have a small-print question? Refer to the disclosures below for information about DuckDuckGo’s regulatory reporting, your personal privacy rights, and more.
+
+{% include category-footer-nav.md %}

_docs/results/search-results-index.md

@@ -0,0 +1,12 @@
+---
+title: DuckDuckGo Search Results
+nav_title: DuckDuckGo Search Results
+description: DuckDuckGo Search offers the key features you expect from a search engine--but unlike Google, it respects your privacy and anonymity.
+permalink: /results/index.html
+category: DuckDuckGo Search Results
+isIndex: true
+---
+
+[DuckDuckGo Search](https://duckduckgo.com) offers the key features you expect from a search engine, but unlike Google or other popular search engines, it also respects your privacy and anonymity. Search features include regular links, images, videos, news, sports, weather, stocks, quick facts, and much more.
+
+{% include category-footer-nav.md %}

_docs/translated/translated-index.md

@@ -0,0 +1,9 @@
+---
+title: Translated Microsoft Ads Notice
+permalink: /translated/index.html
+category: Legal
+sub_category: Translated Microsoft Ads Notice
+isIndex: true
+---
+
+{% include category-footer-nav.md %}

_includes/category-footer-nav.md

@@ -0,0 +1,26 @@
+###### Learn More
+
+<ul class="footer-nav">
+{% assign docs = site.docs | where_exp:"item", "item.layout != 'redirect'" | where_exp:"item", "item.isIndex != true" | where_exp:"item", "item.category == page.category" | where_exp:"item", "item.sub_category == page.sub_category" | sort: 'order'%}
+{% for doc in docs %}
+    {% if doc.url != page.url %}
+        <li class="footer-nav-item">
+            <a href="{{ site.baseurl}}{{ doc.url }}">{{ doc.title }}</a>
+        </li>
+    {% endif %}
+{% endfor %}
+
+<!-- Show sub-categories -->
+
+{% assign category = site.categories_data | where_exp:"item", "item.name == page.category" | first %}
+{% for subcat in category.sub_categories %}
+{% if subcat.name != page.sub_category %}
+
+<li class="footer-nav-item">
+    <a href="{{ site.baseurl}}{{ subcat.path }}">{{ category.name }} - {{ subcat.name }}</a>
+</li>
+
+{% endif %}
+{% endfor %}
+
+</ul>

_layouts/default.html

@@ -44,13 +44,13 @@ <h1>
             </ul>
 
             <ul>
-                {% assign grouped = site.docs | where_exp:"item", "item.layout != 'redirect'" | group_by: 'category' %}
-                {% for category in site.categories_order %}
-                    {% assign group = grouped | where: 'name', category | first %}
+                {% assign grouped = site.docs | where_exp:"item", "item.layout != 'redirect'" | where_exp:"item", "item.isIndex != true" | group_by: 'category' %}
+                {% for category in site.categories_data %}
+                    {% assign group = grouped | where: 'name', category.name | first %}
                     {% if group %}
-                    <li class="nav-item top-level {% if group.name == page.category %}current{% endif %}">
+                    <li class="nav-item top-level {% if category.name == page.category %}current{% endif %}">
                         {% assign items = group.items | where_exp:"item", "item.sub_category == undefined" | sort: 'order' %}
-                        <a href="{{ site.baseurl }}{{ items.first.url }}">{{ group.name }}</a>
+                        <a href="{{ site.baseurl }}{{ category.path }}">{{ category.name }}</a>
                         <ul>
                             {% for item in items %}
                             <li class="nav-item {% if item.url == page.url %}current page{% endif %}"><a
@@ -60,19 +60,20 @@ <h1>
                             {% endfor %}
 
                             <!-- Sub-categories -->
-                            {% assign sub_groups = site.docs | where_exp:"item", "item.category == category"| where_exp:"item", "item.sub_category" | group_by: 'sub_category' %}
-                            {% for sub_group in sub_groups %}
-                            <li class="nav-item second-level {% if sub_group.name == page.sub_category %}current{% endif %}">
-                                <a href="{{ site.baseurl }}{{ sub_group.items.first.url }}">{{ sub_group.name }}</a>
-                                <ul>
-                                    {% for item in sub_group.items %}
-                                    <li class="nav-item {% if item.url == page.url %}current page{% endif %}"><a
-                                            href="{{ site.baseurl }}{{ item.url }}">
-                                            {% if item.nav_title %}{{ item.nav_title }}{% else %}{{ item.title }}{% endif %}
-                                        </a></li>
-                                    {% endfor %}
-                                </ul>
-                            </li>
+                            {% for subcat in category.sub_categories %}
+                                <!-- get docs for each subcategory -->
+                                <li class="nav-item second-level {% if subcat.name == page.sub_category %}current{% endif %}">
+                                    <a href="{{ site.baseurl }}{{ subcat.path }}">{{ subcat.name }}</a>
+                                    <ul>
+                                        {% assign sub_group = group.items | where_exp:"item", "item.sub_category == subcat.name" | sort: 'order' %}
+                                        {% for item in sub_group %}
+                                        <li class="nav-item {% if item.url == page.url %}current page{% endif %}"><a
+                                                href="{{ site.baseurl }}{{ item.url }}">
+                                                {% if item.nav_title %}{{ item.nav_title }}{% else %}{{ item.title }}{% endif %}
+                                            </a></li>
+                                        {% endfor %}
+                                    </ul>
+                                </li>
                             {% endfor %}
                         </ul>
                     </li>

_sass/_category-footer-nav.scss

@@ -0,0 +1,3 @@
+.footer-nav {
+    margin-top: 0;
+}

_sass/_welcome.scss

@@ -0,0 +1,3 @@
+.welcome-category-list {
+    margin-top: 15px;
+}

css/main.scss

@@ -34,3 +34,5 @@ $full-width-break: $nav-width + ($space * 4) + $content-max-width;
 @import "tables";
 @import "layout";
 @import "toc";
+@import "welcome";
+@import "category-footer-nav";

index.md

@@ -1,17 +1,18 @@
 ---
 title: Welcome
+nav_title: Welcome
+description: Want to know more about a DuckDuckGo product or feature? Find answers to frequently asked questions and more at DuckDuckGo Help.
 ---
 
 Welcome to DuckDuckGo Help - If you can't find an answer to your DuckDuckGo question, [ask the community](https://www.reddit.com/r/duckduckgo/)!
 
 {% include searchbox.html %}
 
-<br>
-
-## About DuckDuckGo
-
-[DuckDuckGo](https://duckduckgo.com/) is the Internet privacy company for everyone who's had enough of online tracking and wants to take back their privacy now. 
-
-For over a decade, we've created new technology and worked with policymakers to make online privacy simple and accessible for all. Every day, millions of people rely on our free all-in-one solution (private search engine, tracker blocker, mobile browser) to stay private online. In one download we deliver privacy, simplified.
-
-For more information, visit our [About page](https://duckduckgo.com/about).
+<!-- List of categories and sub-categories -->
+<ul class="welcome-category-list">
+{% for category in site.categories_data %}
+<li><a href="{{ site.baseurl }}{{ category.path }}">{{ category.name }}</a></li>
+    {% for subcat in category.sub_categories %}
+    <li><a href="{{ site.baseurl }}{{ subcat.path }}">{{ category.name }} - {{ subcat.name }}</a></li>
+    {% endfor %}
+{% endfor %}