diff --git a/.github/workflows/deploy_be_staging.yml b/.github/workflows/deploy_be_staging.yml index db28ba97..461c3088 100644 --- a/.github/workflows/deploy_be_staging.yml +++ b/.github/workflows/deploy_be_staging.yml @@ -109,7 +109,8 @@ jobs: # Deploy to S3 for the staging URL message: | ** Map Deployed! ** - Find it here: https://justice40-data.s3.amazonaws.com/data-pipeline-staging/${{env.PR_NUMBER}}/${{env.SHA_NUMBER}}/data/score/tiles + Map with Staging Backend: https://screeningtool.geoplatform.gov/en/cejst/?flags=stage_hash=${{env.PR_NUMBER}}/${{env.SHA_NUMBER}} + Find tiles here: https://justice40-data.s3.amazonaws.com/data-pipeline-staging/${{env.PR_NUMBER}}/${{env.SHA_NUMBER}}/data/score/tiles repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token-user-login: "github-actions[bot]" allow-repeats: false diff --git a/.github/workflows/deploy_fe_main.yml b/.github/workflows/deploy_fe_main.yml index 6a975a62..483e3fcf 100644 --- a/.github/workflows/deploy_fe_main.yml +++ b/.github/workflows/deploy_fe_main.yml @@ -89,7 +89,7 @@ jobs: with: message: | **🚢 PR Deployed! 🚢** - Find it here: https://d3r1k4gynx5dw4.cloudfront.net ! + Find it here: https://screeningtool.geoplatform.gov ! repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token-user-login: "github-actions[bot]" # The user.login for temporary GitHub tokens allow-repeats: false # This is the default diff --git a/.github/workflows/refresh-be-cdn.yml b/.github/workflows/refresh-be-cdn.yml index 533d5426..0acd0ea8 100644 --- a/.github/workflows/refresh-be-cdn.yml +++ b/.github/workflows/refresh-be-cdn.yml @@ -6,9 +6,9 @@ on: description: This will invalidate the backend CDN, are you sure you want to proceed? (Y/n) default: n required: true - schedule: - # runs every 6 hours: - - cron: "0 */6 * * *" + # to allow this action to run every 6 hours + # schedule: + # - cron: "0 */6 * * *" env: BE_CDN_ID: E1324VDMNCO97N jobs: diff --git a/DATASETS.md b/DATASETS.md index 03728ef7..a3b47795 100644 --- a/DATASETS.md +++ b/DATASETS.md @@ -6,6 +6,8 @@ This page contains web links to the datasets that are uploaded as part of our da - Census data, generated by the [Generate Census Github Action](https://github.com/usds/justice40-tool/blob/main/.github/workflows/generate-census.yml): - Score data, generated by the [Generate Score Github Action](https://github.com/usds/justice40-tool/blob/main/.github/workflows/generate-score.yml): +- GeoJSON data: +- Shapefile data: - EJScreen: - Census ACS 2019: - Housing and Transportation Index: diff --git a/client/.env.development b/client/.env.development index d121e51f..74560b49 100644 --- a/client/.env.development +++ b/client/.env.development @@ -3,7 +3,7 @@ # Feature Tiles env variables: # The TILES_BASE_URL will be determined by the DATA_SOURCE env variable -GATSBY_CDN_TILES_BASE_URL=https://d3jqyw10j8e7p9.cloudfront.net +GATSBY_CDN_TILES_BASE_URL=https://static-data-screeningtool.geoplatform.gov GATSBY_LOCAL_TILES_BASE_URL=http://localhost:5000/data/data-pipeline GATSBY_DATA_PIPELINE_SCORE_PATH_LOCAL=data_pipeline/data/score diff --git a/client/.env.production b/client/.env.production index 69f9b1cf..fea22c57 100644 --- a/client/.env.production +++ b/client/.env.production @@ -3,7 +3,7 @@ # Feature Tiles env variables: # The TILES_BASE_URL will always point to the CDN -GATSBY_CDN_TILES_BASE_URL=https://d3jqyw10j8e7p9.cloudfront.net +GATSBY_CDN_TILES_BASE_URL=https://static-data-screeningtool.geoplatform.gov GATSBY_DATA_PIPELINE_SCORE_PATH=data-pipeline/data/score GATSBY_SCORE_DOWNLOAD_FILE_PATH=downloadable/Screening_Tool_Data.zip diff --git a/client/cypress/integration/Contact.feature b/client/cypress/integration/Contact.feature index 1a26d887..db39d5bc 100644 --- a/client/cypress/integration/Contact.feature +++ b/client/cypress/integration/Contact.feature @@ -5,10 +5,10 @@ Feature: The Contact page will open from all other pages When I click on the "Contact" page in the navigation Then I see "Contact" in the title - Scenario: Contact page open when navigating from Explore the tool page - Given I am on the "Explore the tool" page - When I click on the "Contact" page in the navigation - Then I see "Contact" in the title + # Scenario: Contact page open when navigating from Explore the tool page + # Given I am on the "Explore the tool" page + # When I click on the "Contact" page in the navigation + # Then I see "Contact" in the title Scenario: Contact page open when navigating from Methodology page Given I am on the "Methodology" page diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx index f6a4872f..a72f47f2 100644 --- a/client/src/components/AreaDetail/AreaDetail.tsx +++ b/client/src/components/AreaDetail/AreaDetail.tsx @@ -620,9 +620,6 @@ const AreaDetail = ({properties}:IAreaDetailProps) => { alt={'tbd'} /> - {/*
- {'mail -
*/} diff --git a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap index c19f07bb..44408c9a 100644 --- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap +++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap @@ -1649,11 +1649,7 @@ exports[`rendering of the AreaDetail checks if indicators for NATION is present
Heart disease
- - Navigate to the explore the tool page. When the map is in view, click on the map. The side panel - will show an indicator desciption of Weighted percent of people ages 18 years and older who have - been told they have heart disease - + People ages 18 years and older who have been told they have heart disease
diff --git a/client/src/components/DownloadPacket/index.tsx b/client/src/components/DownloadPacket/index.tsx index 8ca03a0e..fc6486d9 100644 --- a/client/src/components/DownloadPacket/index.tsx +++ b/client/src/components/DownloadPacket/index.tsx @@ -24,7 +24,7 @@ const DownloadPacket = () => {
- + + + + ); +}; + +export default PublicVideoBox; diff --git a/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap b/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap new file mode 100644 index 00000000..a814db3b --- /dev/null +++ b/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap @@ -0,0 +1,46 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`rendering of the PublicVideoBox checks if component renders 1`] = ` + +
+
+

+ Can't make an upcoming session? +

+
+ Watch a recorded version of the CEJST training on YouTube. + + + +
+
+
+ +`; diff --git a/client/src/components/PublicVideoBox/index.tsx b/client/src/components/PublicVideoBox/index.tsx new file mode 100644 index 00000000..2a520165 --- /dev/null +++ b/client/src/components/PublicVideoBox/index.tsx @@ -0,0 +1,3 @@ +import PublicVideoBox from './PublicVideoBox'; + +export default PublicVideoBox; diff --git a/client/src/components/RequestForInfo/RequestForInfo.module.scss b/client/src/components/RequestForInfo/RequestForInfo.module.scss new file mode 100644 index 00000000..f2d56b19 --- /dev/null +++ b/client/src/components/RequestForInfo/RequestForInfo.module.scss @@ -0,0 +1,12 @@ +@use '../../styles/design-system.scss' as *; + +.rfiBox { + @include at-media-max("desktop") { + @include u-margin-top(2); + @include u-margin-bottom(2); + + }; + + @include u-margin-top(10); + +} \ No newline at end of file diff --git a/client/src/components/RequestForInfo/RequestForInfo.module.scss.d.ts b/client/src/components/RequestForInfo/RequestForInfo.module.scss.d.ts new file mode 100644 index 00000000..a73df67a --- /dev/null +++ b/client/src/components/RequestForInfo/RequestForInfo.module.scss.d.ts @@ -0,0 +1,12 @@ +declare namespace RequestForInfoNamespace { + export interface IRequestForInfoScss { + rfiBox: string; + } + } + +declare const RequestForInfoScssModule: RequestForInfoNamespace.IRequestForInfoScss & { + /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */ + locals: RequestForInfoNamespace.IRequestForInfoScss; + }; + + export = RequestForInfoScssModule; diff --git a/client/src/components/RequestForInfo/RequestForInfo.test.tsx b/client/src/components/RequestForInfo/RequestForInfo.test.tsx new file mode 100644 index 00000000..c016c225 --- /dev/null +++ b/client/src/components/RequestForInfo/RequestForInfo.test.tsx @@ -0,0 +1,16 @@ +import * as React from 'react'; +import {render} from '@testing-library/react'; +import {LocalizedComponent} from '../../test/testHelpers'; +import RequestForInfo from './RequestForInfo'; + +describe('rendering of the RequestForInfo', () => { + const {asFragment} = render( + + + , + ); + + it('checks if component renders', () => { + expect(asFragment()).toMatchSnapshot(); + }); +}); diff --git a/client/src/components/RequestForInfo/RequestForInfo.tsx b/client/src/components/RequestForInfo/RequestForInfo.tsx new file mode 100644 index 00000000..4619d6ad --- /dev/null +++ b/client/src/components/RequestForInfo/RequestForInfo.tsx @@ -0,0 +1,18 @@ +import React from 'react'; +import {SummaryBox} from '@trussworks/react-uswds'; +import {useIntl} from 'gatsby-plugin-intl'; + +import * as CONTACT_COPY from '../../data/copy/contact'; +import * as styles from './RequestForInfo.module.scss'; + +const RequestForInfo = () => { + const intl = useIntl(); + + return ( + + {CONTACT_COPY.RFI_BOX_BODY} + + ); +}; + +export default RequestForInfo; diff --git a/client/src/components/RequestForInfo/__snapshots__/RequestForInfo.test.tsx.snap b/client/src/components/RequestForInfo/__snapshots__/RequestForInfo.test.tsx.snap new file mode 100644 index 00000000..bfec58d3 --- /dev/null +++ b/client/src/components/RequestForInfo/__snapshots__/RequestForInfo.test.tsx.snap @@ -0,0 +1,35 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`rendering of the RequestForInfo checks if component renders 1`] = ` + +
+
+

+ Request for Infomation +

+
+ During the beta period, comments may be submitted on the Climate and Economic Justice Screening Tool via CEQ’s Request for Information available on + + federalregister.gov + + . +
+
+
+ +`; diff --git a/client/src/components/RequestForInfo/index.tsx b/client/src/components/RequestForInfo/index.tsx new file mode 100644 index 00000000..48fe35df --- /dev/null +++ b/client/src/components/RequestForInfo/index.tsx @@ -0,0 +1,3 @@ +import RequestForInfo from './RequestForInfo'; + +export default RequestForInfo; diff --git a/client/src/data/copy/contact.tsx b/client/src/data/copy/contact.tsx index 798b54de..db6b0bf2 100644 --- a/client/src/data/copy/contact.tsx +++ b/client/src/data/copy/contact.tsx @@ -32,6 +32,23 @@ export const PAGE_INTRO = defineMessages({ }, }); +export const RFI_BOX = defineMessages({ + TITLE: { + id: 'contact.page.request.for.info.box.title', + defaultMessage: 'Request for Infomation', + description: 'Navigate to the contact page, this is the title of the request for information box', + }, +}); + +export const RFI_BOX_BODY = federalregister.gov.`} + description={'Navigate to the contact page, this is the body of the request for information box'} + values={{ + link1: COMMON_COPY.linkFn(`https://www.federalregister.gov/d/2022-03920`, false, true), + }} +/>; + export const CENSUS_TRACT_FEEDBACK = { TITLE: federalregister.gov.", + "description": "Navigate to the contact page, this is the body of the request for information box" + }, + "contact.page.request.for.info.box.title": { + "defaultMessage": "Request for Infomation", + "description": "Navigate to the contact page, this is the title of the request for information box" + }, "contact.page.sub.header.text": { "defaultMessage": "Email us", "description": "Navigate to the contact page, this is the contact page sub header text" @@ -420,8 +428,8 @@ "description": "Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show an indicator desciption of Economic loss rate to the population in fatalities and \n injuries resulting from natural hazards" }, "explore.tool.page.side.panel.indicator.description.heartDisease": { - "defaultMessage": "Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show an indicator desciption of Weighted percent of people ages 18 years and older who have been told they have heart disease", - "description": "People ages 18 years and older who have been told they have heart disease" + "defaultMessage": "People ages 18 years and older who have been told they have heart disease", + "description": "Navigate to the explore the tool page. When the map is in view, click on the map. The side panel will show an indicator desciption of Weighted percent of people ages 18 years and older who have \n been told they have heart disease" }, "explore.tool.page.side.panel.indicator.description.high.ed": { "defaultMessage": "Percent of the census tract's population 15 or older not enrolled in college, university, or graduate school", @@ -1292,7 +1300,7 @@ "description": "Navigate to the the public engagement page, this will be the public engagement page event training session name" }, "public.eng.page.event.whejac.meeting.day.1.description": { - "defaultMessage": "Members of the public are encouraged to provide comments relevant to the beta version of the Climate and Economic Justice Screening Tool that was developed by CEQ and federal government agencies implementation of the Justice40 Initiative will be considered by the WHEJAC during the public meeting.", + "defaultMessage": "The White House Environmental Justice Advisory Council is also soliciting feedback on the beta version of the Climate and Economic Justice Screening Tool at its public meeting. The link above has additional details.", "description": "public engagement page event WHEJAC day 1 description" }, "public.eng.page.event.whejac.meeting.day.1.name": { @@ -1300,7 +1308,7 @@ "description": "public engagement page event WHEJAC meeting day 1 name" }, "public.eng.page.event.whejac.meeting.day.2.description": { - "defaultMessage": "Members of the public are encouraged to attend and hear updates and discussion from the WHEJAC Climate and Economic Justice Screening Tool workgroup, the Justice40 workgroup, and the WHEJAC business time and meeting conversation during which the WHEJAC will use reflect on the meeting proceedings and public comment period; provide workgroup updates; discuss action items and finalize next steps.", + "defaultMessage": "The White House Environmental Justice Advisory Council is also soliciting feedback on the beta version of the Climate and Economic Justice Screening Tool at its public meeting. The link above has additional details.", "description": "public engagement page event WHEJAC day 2 description" }, "public.eng.page.event.whejac.meeting.day.2.name": { @@ -1323,6 +1331,22 @@ "defaultMessage": "Public engagement opportunities", "description": "Navigate to the the public engagement page, this will be the publiceng page title text" }, + "public.eng.page.video.box.body.text": { + "defaultMessage": "Watch a recorded version of the CEJST training on YouTube.", + "description": "Navigate to the the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box body text." + }, + "public.eng.page.video.box.button.img.alt.text": { + "defaultMessage": "the icon to show that this button will open in a new tab", + "description": "Navigate to the the public engagement page, there will be box that allows users to watch previously recorded videos. This is alt tag of the image in the button." + }, + "public.eng.page.video.box.button.text": { + "defaultMessage": "Watch on YouTube", + "description": "Navigate to the the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box button text." + }, + "public.eng.page.video.box.title.text": { + "defaultMessage": "Can't make an upcoming session?", + "description": "Navigate to the the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box title text." + }, "public.eng.page.whejac.meeting.day.1.info": { "defaultMessage": "March 31th (3:00 - 7:30 PM EST)", "description": "public engagement page event WHEJAC" diff --git a/client/src/pages/__snapshots__/contact.test.tsx.snap b/client/src/pages/__snapshots__/contact.test.tsx.snap index 981fabe3..4cb7b151 100644 --- a/client/src/pages/__snapshots__/contact.test.tsx.snap +++ b/client/src/pages/__snapshots__/contact.test.tsx.snap @@ -339,11 +339,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

@@ -399,6 +399,40 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

+
+
+
+

+ Request for Infomation +

+
+ During the beta period, comments may be submitted on the Climate and Economic Justice Screening Tool via CEQ’s Request for Information available on + + federalregister.gov + + . +
+
+
+
diff --git a/client/src/pages/__snapshots__/methodology.test.tsx.snap b/client/src/pages/__snapshots__/methodology.test.tsx.snap index 91c5624d..810971eb 100644 --- a/client/src/pages/__snapshots__/methodology.test.tsx.snap +++ b/client/src/pages/__snapshots__/methodology.test.tsx.snap @@ -420,6 +420,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis