department-of-veterans-affairs · sbashamoni · Sep 13, 2024
diff --git a/.scss-lint.yml b/.scss-lint.yml
@@ -137,6 +137,7 @@ linters:
     properties: []
   VendorPrefixes:
     enabled: true
+    identifier_list: bourbon
     include: []
     exclude: []
   ZeroUnit:

diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gem "aws-sdk-sqs"
 gem "aws-sdk-ec2"
 gem "bgs", git: "https://github.com/department-of-veterans-affairs/ruby-bgs.git", ref: "a2e055b5a52bd1e2bb8c2b3b8d5820b1a404cd3d"
 gem "bootsnap", require: false
-gem "caseflow", git: "https://github.com/department-of-veterans-affairs/caseflow-commons", ref: "9bd3635fbd8094d25160669f38d8699e2f1d7a98"
+gem "caseflow", git: "https://github.com/department-of-veterans-affairs/caseflow-commons", ref: "716b58caf2116da5fca21c3b3aeea6c9712f3b9d"
 gem "coffee-rails", "> 4.1.0"
 gem "connect_vbms", git: "https://github.com/department-of-veterans-affairs/connect_vbms.git", branch: "master"
 gem "connect_vva", git: "https://github.com/department-of-veterans-affairs/connect_vva.git", ref: "dfd1aeb2605c1f237f520bcdc41b059202e8944d"
@@ -29,10 +29,10 @@ gem "newrelic_rpm"
 gem "nokogiri", ">=1.10.5"
 gem "omniauth-saml-va", git: "https://github.com/department-of-veterans-affairs/omniauth-saml-va", branch: "pek-iam-ssoi"
 #gem "omniauth-saml-va", git: "https://github.com/department-of-veterans-affairs/omniauth-saml-va", ref: "fbe2b878c250b14ee996ef6699c42df2c42e41a1"
-gem "pg", "~> 1.1.0", platforms: :ruby
+gem "pg", "~> 0.18", platforms: :ruby
 gem "puma", "5.6.4"
 gem "rack-cors", ">= 1.0.4"
-gem "rails", "6.1.7.4"
+gem "rails", "6.0.6.1"
 gem "redis-namespace"
 gem "redis-rails", "~> 5.0.2"
 gem "redis-semaphore"
@@ -44,6 +44,7 @@ gem "sentry-raven"
 gem "shoryuken", "3.1.11"
 gem "therubyracer", platforms: :ruby
 gem "turbolinks"
+gem "uglifier", ">= 1.3.0"
 gem "uswds-rails", git: "https://github.com/18F/uswds-rails-gem.git"
 gem "wannabe_bool"
 gem "zaru"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -20,14 +20,16 @@ GIT
 
 GIT
   remote: https://github.com/department-of-veterans-affairs/caseflow-commons
-  revision: 9bd3635fbd8094d25160669f38d8699e2f1d7a98
-  ref: 9bd3635fbd8094d25160669f38d8699e2f1d7a98
+  revision: 716b58caf2116da5fca21c3b3aeea6c9712f3b9d
+  ref: 716b58caf2116da5fca21c3b3aeea6c9712f3b9d
   specs:
     caseflow (0.4.8)
       aws-sdk-s3
+      bourbon (= 4.2.7)
       d3-rails
       jquery-rails
       momentjs-rails
+      neat
       rails (>= 4.2.7.1)
       redis-namespace
       redis-rails
@@ -98,40 +100,38 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actioncable (6.0.6.1)
+      actionpack (= 6.0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionmailbox (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionmailer (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.4)
-      actionview (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (6.0.6.1)
+      actionview (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actiontext (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionview (6.0.6.1)
+      activesupport (= 6.0.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -141,30 +141,28 @@ GEM
       activemodel (>= 4.1, < 6.2)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activejob (6.0.6.1)
+      activesupport (= 6.0.6.1)
       globalid (>= 0.3.6)
     activejob_dj_overrides (0.2.0)
       delayed_job
       rails (>= 4.2)
-    activemodel (6.1.7.4)
-      activesupport (= 6.1.7.4)
-    activerecord (6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
-    activestorage (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activerecord (6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activestorage (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
       marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (6.1.7.4)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     akami (1.3.1)
@@ -197,6 +195,9 @@ GEM
     bigdecimal (3.1.8)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
+    bourbon (4.2.7)
+      sass (~> 3.4)
+      thor (~> 0.19)
     brakeman (4.10.1)
     builder (3.3.0)
     bundler-audit (0.7.0.1)
@@ -230,7 +231,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    d3-rails (7.8.5)
+    d3-rails (5.9.2)
       railties (>= 3.1)
     database_cleaner (1.8.5)
     date (3.3.4)
@@ -255,8 +256,8 @@ GEM
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
     ffi (1.14.2)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashdiff (1.1.0)
@@ -300,7 +301,7 @@ GEM
       net-smtp
     makara (0.4.1)
       activerecord (>= 3.0.0)
-    marcel (1.0.4)
+    marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.1.0)
     mime-types (3.3.1)
@@ -319,17 +320,19 @@ GEM
     multipart-post (2.4.1)
     mustermann (1.1.2)
       ruby2_keywords (~> 0.0.1)
-    net-imap (0.4.14)
+    neat (4.0.0)
+      thor (~> 0.19)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.4.0.1)
       net-protocol
     newrelic_rpm (6.14.0)
-    nio4r (2.7.3)
+    nio4r (2.7.0)
     nokogiri (1.15.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -343,7 +346,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
-    pg (1.1.4)
+    pg (0.21.0)
     pkcs11 (0.3.3)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -363,20 +366,20 @@ GEM
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.4)
-      actioncable (= 6.1.7.4)
-      actionmailbox (= 6.1.7.4)
-      actionmailer (= 6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actiontext (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
-      bundler (>= 1.15.0)
-      railties (= 6.1.7.4)
+    rails (6.0.6.1)
+      actioncable (= 6.0.6.1)
+      actionmailbox (= 6.0.6.1)
+      actionmailer (= 6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actiontext (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.6.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
@@ -386,12 +389,12 @@ GEM
       loofah (~> 2.21)
       nokogiri (~> 1.14)
     rails_stdout_logging (0.0.5)
-    railties (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    railties (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.2.1)
     rb-fsevent (0.10.4)
@@ -508,31 +511,33 @@ GEM
       tilt (~> 2.0)
     single_cov (1.6.0)
     socksify (1.7.1)
-    sprockets (3.7.3)
-      base64
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.5.1)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     statsd-instrument (3.7.0)
     strscan (3.1.0)
     systemu (2.6.5)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (1.3.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
     tilt (2.0.11)
     timecop (0.9.2)
     timeout (0.4.1)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
     tzinfo-data (1.2020.6)
       tzinfo (>= 1.0.0)
+    uglifier (4.2.0)
+      execjs (>= 0.3.0, < 3)
     unicode-display_width (1.5.0)
     uuid (2.3.9)
       macaddr (~> 1.0)
@@ -606,12 +611,12 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri (>= 1.10.5)
   omniauth-saml-va!
-  pg (~> 1.1.0)
+  pg (~> 0.18)
   pry
   pry-byebug
   puma (= 5.6.4)
   rack-cors (>= 1.0.4)
-  rails (= 6.1.7.4)
+  rails (= 6.0.6.1)
   rails_stdout_logging
   rb-readline
   redis-namespace
@@ -639,6 +644,7 @@ DEPENDENCIES
   timecop
   turbolinks
   tzinfo-data
+  uglifier (>= 1.3.0)
   uswds-rails!
   wannabe_bool
   webdrivers
@@ -647,4 +653,4 @@ DEPENDENCIES
   zero_downtime_migrations
 
 BUNDLED WITH
-   2.4.17
+   2.4.19
diff --git a/app/assets/stylesheets/_commons.scss b/app/assets/stylesheets/_commons.scss
@@ -1,3 +1,5 @@
+@import 'bourbon';
+@import 'neat';
 @import 'uswds_rails_overrides/core/defaults';
 @import 'uswds/all';
 @import 'uswds_rails_overrides/all';
@@ -571,6 +573,14 @@ div {
 }
 
 
+//-----------------------------------*
+// CSS based on Web Design Guidelines.
+// - Uses Neat.bourbon.io as a grid
+// - Uses patterns and components
+//   from refills.bourbon.io/unstyled/
+//-----------------------------------*/
+
+
 //===========================
 // Form controls
 // =========================*/

diff --git a/bin/rails b/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative "../config/boot"
-require "rails/commands"
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require_relative "../config/boot"
-require "rake"
+require_relative '../config/boot'
+require 'rake'
 Rake.application.run