diff --git a/.eslintrc b/.eslintrc index ecfa47b1e..a36216056 100644 --- a/.eslintrc +++ b/.eslintrc @@ -2,7 +2,7 @@ extends: airbnb settings: import/resolver: webpack env: - browser: yes + browser: true globals: $: true jQuery: true diff --git a/Gemfile.lock b/Gemfile.lock index ce9e1dcb8..45e41e66c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,6 +56,8 @@ GEM nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) + nokogiri (1.13.9-x86_64-linux) + racc (~> 1.4) parallel (1.22.1) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -80,6 +82,7 @@ GEM PLATFORMS ruby + x86_64-linux DEPENDENCIES html-proofer (= 3.19.4) @@ -89,7 +92,7 @@ DEPENDENCIES webrick (~> 1.7) RUBY VERSION - ruby 2.7.1p83 + ruby 3.0.1p64 BUNDLED WITH - 2.2.3 + 2.3.24 diff --git a/_config.ddev.yml b/_config.ddev.yml index 534ccb0cc..d94655090 100644 --- a/_config.ddev.yml +++ b/_config.ddev.yml @@ -1 +1,5 @@ app_env: ddev +navigation: + secondary: + - href: https://dev-admin.foia.gov/user/login + title: Agency login diff --git a/_config.development.yml b/_config.development.yml index 951384c48..d04609a6c 100644 --- a/_config.development.yml +++ b/_config.development.yml @@ -1 +1,5 @@ app_env: development +navigation: + secondary: + - href: https://dev-admin.foia.gov/user/login + title: Agency login diff --git a/_config.production.yml b/_config.production.yml index f0d2f5997..7f4541edf 100644 --- a/_config.production.yml +++ b/_config.production.yml @@ -1 +1,5 @@ app_env: production +navigation: + secondary: + - href: https://admin.foia.gov/user/login + title: Agency login diff --git a/_config.staging.yml b/_config.staging.yml index 11c27d6e1..bbb011531 100644 --- a/_config.staging.yml +++ b/_config.staging.yml @@ -1 +1,5 @@ app_env: staging +navigation: + secondary: + - href: https://stg-admin.foia.gov/user/login + title: Agency login diff --git a/_config.uat.yml b/_config.uat.yml index c0f52f062..4601079e2 100644 --- a/_config.uat.yml +++ b/_config.uat.yml @@ -1 +1,5 @@ app_env: uat +navigation: + secondary: + - href: https://uat-admin.foia.gov/user/login + title: Agency login diff --git a/js/components/cfoc_page.jsx b/js/components/cfoc_page.jsx index 0378cdd8b..e7e718288 100644 --- a/js/components/cfoc_page.jsx +++ b/js/components/cfoc_page.jsx @@ -49,7 +49,7 @@ function CFOCPageComponent(props) {