Merge branch 'main' into cms/resources/protecting-rights-hiv

usdoj-crt · Nov 14, 2024 · 624b2e0 · 624b2e0
2 parents 2996294 + 580cbb7
commit 624b2e0
Show file tree

Hide file tree

Showing 849 changed files with 24,906 additions and 9,387 deletions.
diff --git a/.github/workflows/a11y.yml b/.github/workflows/a11y.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Install Ruby Dependencies
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.8
+          ruby-version: 3.2.2
           bundler-cache: true
 
       - name: Install Node.js Dependencies
@@ -22,11 +22,10 @@ jobs:
       - run: npm install
 
       - name: Start Server
-        run: npm run build:css && npm run build:js && bundle exec jekyll serve --config _config.yml,_config_test.yml --detach
+        run: npm run build:media && npm run build:css && npm run build:js && bundle exec jekyll serve --config _config.yml,_config_test.yml --detach
 
       - name: Run Accessibility Tests -- Desktop
         run: npm run test:a11y-desktop
 
       - name: Run Accessibility Tests -- Mobile
         run: npm run test:a11y-mobile
-
diff --git a/.github/workflows/content-grid.yml b/.github/workflows/content-grid.yml
@@ -0,0 +1,26 @@
+name: Build content grid
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./scripts
+    steps:
+      - name: Checkout Source
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Make the script files executable
+        run: chmod +x create_content_grid.sh
+      - name: Build content grid
+        run: ./create_content_grid.sh
+
+      - name: Archive content grid results
+        uses: actions/upload-artifact@v3
+        with:
+          name: content_grid
+          path: ./scripts/out/content_grid.csv
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -42,26 +42,32 @@ jobs:
       - name: Install Ruby dependencies
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.8
+          ruby-version: 3.2.2
           bundler-cache: true
 
       - name: Install Node.js dependencies
         uses: actions/setup-node@v3
         with:
           node-version: "16"
-      - run: npm install --production
+      - run: npm install --production=false  # Install linting tools
 
       - name: Build site
         run: bundle exec jekyll build
 
+      ################################
+      # Run npm prettier linting     #
+      ################################
+      - name: Prettier Lint
+        run: npm run lint:check || exit 1
+
       ################################
       # Run Linter against code base #
       ################################
       - name: Lint Code Base
         uses: github/[email protected]
         env:
           DEFAULT_BRANCH: main
-          FILTER_REGEX_INCLUDE: .*(\_assets|\_pages|\_site).*
+          FILTER_REGEX_INCLUDE: .*(\assets|\_pages|\_site).*
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LINTER_RULES_PATH: /
           VALIDATE_CSS: true

diff --git a/.github/workflows/psi.yml b/.github/workflows/psi.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Install Ruby Dependencies
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.8
+          ruby-version: 3.2.2
           bundler-cache: true
 
       - name: Install Node.js Dependencies
@@ -22,7 +22,7 @@ jobs:
           npm install
 
       - name: Start Server
-        run: npm run build:css && npm run build:js && bundle exec jekyll serve --config _config.yml,_config_test.yml --detach
+        run: npm run build:media && npm run build:css && npm run build:js && bundle exec jekyll serve --config _config.yml,_config_test.yml --detach
 
       - name: Run Lighthouse CI
         run: |

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@ node_modules
 .DS_Store
 playwright-report/
 test-results/
-_assets/js/dist/*
-_assets/css
-/scripts/out
+assets/js/dist/*
+assets/css
+assets/images/uswds
+assets/fonts
+/scripts/out
diff --git a/.markdown-lint.yml b/.markdown-lint.yml
@@ -26,6 +26,7 @@ MD026: false
 MD029: false                  # Ordered list item prefix
 MD033: false                  # Allow inline HTML
 MD036: false                  # Emphasis used instead of a heading
+MD024: false                  # Duplicate headings
 
 #################
 # Rules by tags #

diff --git a/.pa11yci-desktop b/.pa11yci-desktop
@@ -5,7 +5,7 @@
        "ignoreHTTPSErrors": true,
        "args": ["--disable-dev-shm-usage"]
      },
-    "hideElements": ["#fba-button", ".pa11y-skip", "#fba-modal-dialog"],
+    "hideElements": ["#feedback-button", ".pa11y-skip", "#fba-modal-dialog"],
     "standard": "WCAG2AA",
     "runners": ["axe"],
     "ignore": [

diff --git a/.pa11yci-mobile b/.pa11yci-mobile
@@ -7,7 +7,7 @@
         "--disable-dev-shm-usage"
       ]
     },
-    "hideElements": ["#fba-button", ".pa11y-skip", "#fba-modal-dialog"],
+    "hideElements": ["#feedback-button", ".pa11y-skip", "#fba-modal-dialog"],
     "standard": "WCAG2AA",
     "runners": [
       "axe"

diff --git a/.prettierignore b/.prettierignore
@@ -1 +1,2 @@
-/_assets/js/dist/*.js
+/assets/js/dist/*.js
+**/*.min.js
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.8
+3.2.2
diff --git a/Gemfile b/Gemfile
@@ -1,14 +1,14 @@
 source "https://rubygems.org"
-ruby '>= 2.7.8'
+ruby '>= 3.2.2'
 
-gem "jekyll", "~> 4.0"
+gem "jekyll"
 gem "autoprefixer-rails"
 
 group :jekyll_plugins do
   gem 'jekyll-polyglot'
   gem 'jekyll-redirect-from'
   gem 'jekyll-sitemap'
   gem 'jekyll-seo-tag'
-  gem 'jekyll-assets', git: "https://github.com/envygeeks/jekyll-assets"
-  gem 'jekyll-sass-converter', '~> 2.1.0'  # Locked because it breaks CI/CD
-end
+  gem 'jekyll-sass-converter'
+  gem 'nokogiri'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,45 +1,20 @@
-GIT
-  remote: https://github.com/envygeeks/jekyll-assets
-  revision: 056d2c88719ef3b1f90967a606dd1441581dd832
-  specs:
-    jekyll-assets (4.0.0.alpha)
-      activesupport (>= 5, < 7)
-      execjs (~> 2.7)
-      extras (~> 0.2)
-      fastimage (~> 2.0, >= 1.8)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-sanity (~> 1.2)
-      liquid-tag-parser (>= 1, < 3)
-      nokogiri (~> 1.10)
-      pathutil (~> 0.16)
-      sassc (>= 1.11, < 3.0)
-      sprockets (~> 4.0.beta7)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.4)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    autoprefixer-rails (10.4.13.0)
+    autoprefixer-rails (10.4.15.0)
       execjs (~> 2)
     colorator (1.1.0)
     concurrent-ruby (1.2.2)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    extras (0.3.0)
-      forwardable-extended (~> 2.5)
-    fastimage (2.2.7)
-    ffi (1.15.5)
+    execjs (2.9.1)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
+    google-protobuf (3.25.0)
     http_parser.rb (0.8.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -59,15 +34,12 @@ GEM
       safe_yaml (~> 1.0)
       terminal-table (>= 1.8, < 4.0)
       webrick (~> 1.7)
-    jekyll-polyglot (1.6.0)
+    jekyll-polyglot (1.7.0)
       jekyll (>= 4.0, >= 3.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sanity (1.6.0)
-      jekyll (>= 3.1, < 5.0)
-      pathutil (~> 0.16)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
@@ -79,57 +51,48 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    liquid-tag-parser (2.0.2)
-      extras (~> 0.3)
-      liquid (>= 3.0, < 5.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.2)
-    minitest (5.18.1)
-    nokogiri (1.15.2)
+    mini_portile2 (2.8.5)
+    nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.1)
-    racc (1.7.1)
-    rack (3.0.8)
+    public_suffix (5.0.3)
+    racc (1.7.3)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (4.1.2)
+    rexml (3.2.6)
+    rouge (4.2.0)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sprockets (4.2.0)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
+    sass-embedded (1.69.5)
+      google-protobuf (~> 3.23)
+      rake (>= 13.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
-    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   autoprefixer-rails
-  jekyll (~> 4.0)
-  jekyll-assets!
+  jekyll
   jekyll-polyglot
   jekyll-redirect-from
-  jekyll-sass-converter (~> 2.1.0)
+  jekyll-sass-converter
   jekyll-seo-tag
   jekyll-sitemap
+  nokogiri
 
 RUBY VERSION
-   ruby 2.7.8p225
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   2.1.4
+   2.4.10
diff --git a/README.md b/README.md
@@ -100,6 +100,10 @@ To check the validity of links locally using playwright, you can run with CHECK_
 CHECK_EXTERNAL_LINKS=true npx playwright test redirects.spec.js --reporter list --project='chromium' --retries=0
 ```
 
+### Content grid
+
+A content grid is generated as an artifact of every pull request as part of the github actions to centralize information about the content on the site. The content grid contains the title, link, deployment date, publish date, updated date, description, and tags of all content pages on the site. This can be retrieved by downloading the artifact from the github action "Build Content Grid".
+
 ## Technologies you should familiarize yourself with
 
 - [Jekyll](https://jekyllrb.com/docs/) - The primary site engine that builds your code and content.

diff --git a/_assets/css/styles.css b/_assets/css/styles.css
diff --git a/_assets/css/styles.css.map b/_assets/css/styles.css.map
diff --git a/_assets/css/styles.js b/_assets/css/styles.js
diff --git a/_assets/images/hero-mobile-2022.jpg b/_assets/images/hero-mobile-2022.jpg
diff --git a/_assets/images/landing/childcare.jpg b/_assets/images/landing/childcare.jpg
diff --git a/_assets/images/landing/community-integration.jpg b/_assets/images/landing/community-integration.jpg
diff --git a/_assets/images/landing/effective_communication.jpg b/_assets/images/landing/effective_communication.jpg
diff --git a/_assets/images/landing/emergency-planning.jpg b/_assets/images/landing/emergency-planning.jpg
diff --git a/_assets/images/landing/intro_ada.jpg b/_assets/images/landing/intro_ada.jpg
diff --git a/_assets/images/landing/mobility-devices.jpg b/_assets/images/landing/mobility-devices.jpg
diff --git a/_assets/images/landing/oud.jpg b/_assets/images/landing/oud.jpg
diff --git a/_assets/images/landing/parental-rights.jpg b/_assets/images/landing/parental-rights.jpg
diff --git a/_assets/images/landing/parking.jpg b/_assets/images/landing/parking.jpg
diff --git a/_assets/images/landing/service_animals.jpg b/_assets/images/landing/service_animals.jpg
diff --git a/_assets/images/landing/telehealth.jpg b/_assets/images/landing/telehealth.jpg
diff --git a/_assets/images/landing/voting.jpg b/_assets/images/landing/voting.jpg
diff --git a/_assets/js/dist/accordion-compiled.js b/_assets/js/dist/accordion-compiled.js
@@ -0,0 +1,14 @@
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+/******/ (function() { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	
+/******/ 	
+/******/ })()
+;
diff --git a/_assets/js/dist/clickTracking-compiled.js b/_assets/js/dist/clickTracking-compiled.js
@@ -0,0 +1,14 @@
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+/******/ (function() { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	
+/******/ 	
+/******/ })()
+;
diff --git a/_assets/js/dist/main-compiled.js b/_assets/js/dist/main-compiled.js
@@ -0,0 +1,14 @@
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+/******/ (function() { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	
+/******/ 	
+/******/ })()
+;
diff --git a/_assets/js/dist/netlifyPreview-compiled.js b/_assets/js/dist/netlifyPreview-compiled.js
@@ -0,0 +1,14 @@
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+/******/ (function() { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	
+/******/ 	
+/******/ })()
+;