From 0e219f8bcfbfe1be650ff684d7e7dc6a9c0c6921 Mon Sep 17 00:00:00 2001
From: David Saeger <david@dds.mil>
Date: Wed, 24 Jul 2024 14:03:12 -0400
Subject: [PATCH] adds google analytics and dap

---
 CONTRIBUTING.md        |  4 ++--
 Gemfile.lock           | 27 +++++++++++++++------------
 _config.yml            |  3 +++
 src/_layouts/home.html |  4 +---
 src/_layouts/page.html | 28 ++++++++++++++++------------
 src/_redirects         |  2 +-
 src/index.md           |  2 --
 7 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 08d45661..917eff28 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -76,13 +76,13 @@ By making a contribution to this project, I certify that:
 
 Code.mil is a static website generated using [Jekyll](https://jekyllrb.com), a static website generator written in the [Ruby](https://ruby-lang.org) programming language. Development dependencies are managed using the [Bundler](https://bundler.io) gem.
 
-This project uses Ruby version 2.6.2 which may be installed using a Ruby version manager like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm).
+This project uses Ruby version 3.0.5 which may be installed using a Ruby version manager like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm).
 
 ```sh
 rbenv install 3.0.5
 ```
 
-Once you've installed Ruby 2.6.2 and the Bundler gem (`gem install bundler`), install the project's gems by running::
+Once you've installed Ruby 3.0.5 and the Bundler gem (`gem install bundler`), install the project's gems by running::
 
 ```sh
 bundle install
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c02b9d3..f245cedc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,10 +12,11 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
-    em-websocket (0.5.2)
+    concurrent-ruby (1.3.3)
+    csv (3.3.0)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
@@ -29,14 +30,15 @@ GEM
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
-    http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    http_parser.rb (0.8.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.0)
+    jekyll (3.10.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
       kramdown (>= 1.17, < 3)
@@ -45,6 +47,7 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
+      webrick (>= 1.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-watch (2.2.1)
@@ -53,8 +56,8 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.4.1)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
@@ -70,11 +73,11 @@ GEM
     public_suffix (4.0.6)
     racc (1.7.3)
     rainbow (3.0.0)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.0)
+    rouge (3.30.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
diff --git a/_config.yml b/_config.yml
index 3b7ace1c..98336b00 100644
--- a/_config.yml
+++ b/_config.yml
@@ -36,3 +36,6 @@ scripts:
 styles:
   - /assets/css/main.css
   - /assets/css/custom.css
+
+google_analytics_ua: G-1DDRY0RP72
+dap_agency: DOD
diff --git a/src/_layouts/home.html b/src/_layouts/home.html
index 1669b55c..883e0dd4 100644
--- a/src/_layouts/home.html
+++ b/src/_layouts/home.html
@@ -2,6 +2,4 @@
 layout: default
 ---
 
-<div class="usa-grid usa-section">
-  {{ content }}
-</div>
+<div class="usa-grid usa-section">{{ content }}</div>
diff --git a/src/_layouts/page.html b/src/_layouts/page.html
index 887700ed..7f0f6ea0 100644
--- a/src/_layouts/page.html
+++ b/src/_layouts/page.html
@@ -5,23 +5,27 @@
   class: usa-grid usa-section usa-content usa-layout-docs
 ---
 
-{%- assign sidenav = site.data.navigation[page.sidenav] | default: page.sidenav -%}
-
-{%- if sidenav -%}
-  <aside class="usa-layout-docs-sidenav sidenav {% if page.sticky_sidenav %}usa-sticky-sidenav{% endif %}">
-    {% include sidenav.html links=sidenav %}
-  </aside>
+{%- assign sidenav = site.data.navigation[page.sidenav] | default: page.sidenav
+-%} {%- if sidenav -%}
+<aside
+  class="usa-layout-docs-sidenav sidenav {% if page.sticky_sidenav %}usa-sticky-sidenav{% endif %}"
+>
+  {% include sidenav.html links=sidenav %}
+</aside>
 {% endif -%}
 
 <div class="usa-layout-docs-main_content">
   <header>
     {%- if page.title -%}
-      <h1>{{ page.title }}</h1>
-
-      {%- if page.updated_at -%}
-        <small class="usa-font-lead">Last updated <time datetime="{{ page.updated_at }}">{{ page.updated_at | date_to_string: 'ordinal', 'US' }}</time>.</small>
-      {%- endif -%}
-    {%- endif -%}
+    <h1>{{ page.title }}</h1>
+    {%- if page.updated_at -%}
+    <small class="usa-font-lead"
+      >Last updated
+      <time datetime="{{ page.updated_at }}"
+        >{{ page.updated_at | date_to_string: 'ordinal', 'US' }}</time
+      >.</small
+    >
+    {%- endif -%} {%- endif -%}
   </header>
 
   {{ content }}
diff --git a/src/_redirects b/src/_redirects
index ae50ae13..50fe929d 100644
--- a/src/_redirects
+++ b/src/_redirects
@@ -1 +1 @@
-https://code-mil.netlify.com/* https://code.mil/:splat 301!
+https://code.mil/:splat 301!
diff --git a/src/index.md b/src/index.md
index 5f0c7c35..3e0ba72f 100644
--- a/src/index.md
+++ b/src/index.md
@@ -26,10 +26,8 @@ graphics:
     title: Make us better.
     description: We've drafted this documentation in partnership with the open source community. You can help improve our open source strategy by improving these documents! Open an issue or a pull request with your suggestions.
 
-
 intro: |
   The U.S. Department of Defense (<abbr title="Department of Defense">DoD</abbr>) faces unique challenges in open sourcing its code. Unlike most software projects, code written by U.S. Federal government employees typically does not have copyright protections under U.S. and some international laws. This can make it difficult to attach an open source license to our code. The [Defense Digital Service](https://dds.mil) (<abbr title="Defense Digital Service">DDS</abbr>) has been working with DoD and the open source community since early 2017 to develop a guideline for supporting open source software (<abbr title="open source software">OSS</abbr>) within the Department.
-
 ---
 
 <div class="usa-width-two-thirds" markdown="1">