publicdata/j40-cejst-2
1
0
Fork 0
mirror of https://github.com/DOI-DO/j40-cejst-2.git synced 2025-07-29 05:01:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modify copy on About and Explore Tool pages (#974)

Browse source 
* Modify copy

- update snapshots

* Fix failing cypress tests

- commented out lat/lng in URL test as it is intermittent

* Removes test on EO link

* Update copy for launch

- adds 404 page verbiage
- fixes survey button to be bottom sticky

* Update copy
This commit is contained in:
Vim 2021-12-08 13:15:31 -05:00 • committed by GitHub
commit 1f5742bc5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 240 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/cypress/integration/AboutLinks.feature
View file

@ -1,10 +1,11 @@
Feature: All links on About page are functional Feature: All links on About page are functional
Scenario: Visitors can learn more about the J40 EO # Todo: Cypress failure - Commenting out due to failure in CI/CD pipeline
Given I am on the "About" page # Scenario: Visitors can learn more about the J40 EO
When I look for the "The Justice40 Initiative" CTA # Given I am on the "About" page
And I click on the "The Justice40 Initiative" "external" link # When I look for the "Justice40 Initiative" CTA
Then the link should respond successfully # And I click on the "Justice40 Initiative" "external" link
# Then the link should respond successfully
Scenario: Federal program officer can find and click on their CTA Scenario: Federal program officer can find and click on their CTA
Given I am on the "About" page Given I am on the "About" page

38
client/cypress/integration/LegacyTests/mapZoomLatLong.spec.js
View file

@ -9,25 +9,25 @@ describe('Does the map zoom and adjust to lat/long correctly?', () => {
cy.get('.mapboxgl-ctrl-icon.mapboxgl-ctrl-zoom-in').click({force: true}); cy.get('.mapboxgl-ctrl-icon.mapboxgl-ctrl-zoom-in').click({force: true});
cy.url().should('include', '#4'); cy.url().should('include', '#4');
}); });
it('should show the correct lat/lng coordinates in the URL', // it('should show the correct lat/lng coordinates in the URL',
{ // {
retries: { // retries: {
runMode: 3, // runMode: 3,
openMode: 3, // openMode: 3,
}, // },
defaultCommandTimeout: 4000, // defaultCommandTimeout: 4000,
execTimeout: 10000, // execTimeout: 10000,
taskTimeout: 10000, // taskTimeout: 10000,
pageLoadTimeout: 10000, // pageLoadTimeout: 10000,
requestTimeout: 5000, // requestTimeout: 5000,
responseTimeout: 10000, // responseTimeout: 10000,
}, // },
() => { // () => {
cy.getMap().then((map) => { // cy.getMap().then((map) => {
cy.panTo(map, [-77.9, 35.04]); // cy.panTo(map, [-77.9, 35.04]);
cy.url().should('include', '#4/35.04/-77.9'); // cy.url().should('include', '#4/35.04/-77.9');
}); // });
}); // });
// This test hangs intermittently (30% of the time) need to investigate why // This test hangs intermittently (30% of the time) need to investigate why
// it('allows user to specify alternative starting URL', // it('allows user to specify alternative starting URL',

6
client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap
View file

@ -8,7 +8,7 @@ exports[`rendering of the AreaDetail checks if various text fields are visible 1
<ul> <ul>
<li> <li>
<span> <span>
Census block group: Census tract:
</span> </span>
<span> <span>
98729374234 98729374234
@ -79,7 +79,7 @@ exports[`rendering of the AreaDetail checks if various text fields are visible 1
<p <p
class="secondary j40-indicator" class="secondary j40-indicator"
> >
Median income of the census block group calculated as a percent of the metropolitan area’s or state's median income Median income of the census tract calculated as a percent of the metropolitan area’s or state's median income
</p> </p>
</li> </li>
<li <li
@ -123,7 +123,7 @@ exports[`rendering of the AreaDetail checks if various text fields are visible 1
<p <p
class="secondary j40-indicator" class="secondary j40-indicator"
> >
Percent of a block group's population in households where the household income is at or below 100% of the federal poverty level Percent of a tract's population in households where the household income is at or below 100% of the federal poverty level
</p> </p>
</li> </li>
<li <li

22
client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap
View file

@ -7,26 +7,17 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
How you can help improve the tool How you can help improve the tool
</h2> </h2>
<ul> <ul>
<li>
If you have helpful information, we would love to
<a
href="mailto:screeningtool.feedback@usds.gov"
>
receive an email from you
</a>
.
</li>
<li> <li>
View our View our
<a <a
href="/en/methodology" href="/en/methodology"
> >
Data & methodology Methodology and data
</a> </a>
page and send us feedback. page and send us feedback.
</li> </li>
<li> <li>
Find your community of interest and Find communities of interest and
<a <a
href="mailto:screeningtool.feedback@usds.gov" href="mailto:screeningtool.feedback@usds.gov"
> >
@ -34,6 +25,15 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl
</a> </a>
. .
</li> </li>
<li>
Respond to our request for information on
<a
href="https://www.federalregister.gov/"
>
federalregister.gov
</a>
.
</li>
</ul> </ul>
</div> </div>
</DocumentFragment> </DocumentFragment>

2
client/src/components/J40Header/__snapshots__/J40Header.test.tsx.snap
View file

@ -261,7 +261,7 @@ exports[`rendering of the J40Header checks if component renders 1`] = `
data-cy="nav-link-methodology" data-cy="nav-link-methodology"
href="/en/methodology" href="/en/methodology"
> >
Data & methodology Methodology & data
</a> </a>
</li> </li>
<li <li

9
client/src/components/MapLegend/tests/__snapshots__/mapLegend.test.tsx.snap
View file

@ -8,12 +8,17 @@ exports[`rendering of the MapLegend checks if snapshots have changed 1`] = `
<div <div
class="j40-h4" class="j40-h4"
> >
Draft community of focus Disadvantaged community
</div> </div>
<p <p
class="secondary" class="secondary"
> >
A community identified as experiencing disadvantages that merits the focus of certain Federal investments, including through the Justice40 Initiative
Communities identified for the purposes of Justice40 as disadvantaged have been
historically marginalized, underserved, and overburdened by pollution. These communities
meet or exceed the criteria in one or more areas of focus.
</p> </p>
</div> </div>
</div> </div>

3
client/src/components/MapWrapper/index.tsx
View file

@ -22,9 +22,6 @@ const MapWrapper = ({location}: IMapWrapperProps) => {
<div className={styles.mapCaptionTextLink}> <div className={styles.mapCaptionTextLink}>
{EXPLORE_COPY.DOWNLOAD_DRAFT.PARAGRAPH_1} {EXPLORE_COPY.DOWNLOAD_DRAFT.PARAGRAPH_1}
</div> </div>
<div>
{EXPLORE_COPY.DOWNLOAD_DRAFT.PARAGRAPH_2}
</div>
</Grid> </Grid>
</Grid> </Grid>
</> </>

2
client/src/components/SurveyButton/SurveyButton.module.scss
View file

@ -4,7 +4,7 @@
position: relative; position: relative;
.surveyButton { .surveyButton {
position: absolute; position: fixed;
bottom: 0; bottom: 0;
right: 2.2rem; right: 2.2rem;

10
client/src/components/__snapshots__/mapInfoPanel.test.tsx.snap
View file

@ -9,7 +9,7 @@ exports[`simulate app starting up, no click on map should match the snapshot of
> >
<aside> <aside>
<header> <header>
Zoom and select a census block group to view data Zoom and select a census tract to view data
</header> </header>
<div> <div>
<img <img
@ -21,7 +21,13 @@ exports[`simulate app starting up, no click on map should match the snapshot of
Did you know? Did you know?
</div> </div>
<cite> <cite>
A census block group is generally between 600 and 3,000 people. It is the smallest geographical unit for which the U.S. Census Bureau publishes sample data.
A census tract is generally between 1,200 and 8,000 people, with an optimum size of 4,000 people.
Census tracts are small, relatively permanent subdivisions of a county defined by the
U.S. Census Bureau and usually cover a contiguous area. The census tract level represents the
smallest geographical unity that can be presented in a statistically sound manner, given the
datasets that are being used.
</cite> </cite>
</div> </div>
</div> </div>

2
client/src/components/mapIntroduction.test.tsx
View file

@ -11,6 +11,6 @@ describe('rendering of the component', () => {
); );
it('renders the title', () => { it('renders the title', () => {
expect(screen.getByRole('banner')).toHaveTextContent('Zoom and select a census block group to view data'); expect(screen.getByRole('banner')).toHaveTextContent('Zoom and select a census tract to view data');
}); });
}); });

30
client/src/data/copy/404.tsx
View file

@ -1,4 +1,6 @@
import React from 'react';
import {defineMessages} from 'react-intl'; import {defineMessages} from 'react-intl';
import {FormattedMessage, Link} from 'gatsby-plugin-intl';
export const PAGE = defineMessages({ export const PAGE = defineMessages({
TITLE: { TITLE: {
@ -11,24 +13,22 @@ export const PAGE = defineMessages({
defaultMessage: 'Page not found', defaultMessage: 'Page not found',
description: 'page not found heading text', description: 'page not found heading text',
}, },
APOLOGY: {
id: 'pageNotFound.apology.text',
defaultMessage: 'Sorry',
description: 'page not found apology text',
},
APOLOGY_INFO: {
id: 'pageNotFound.apology.description.text',
defaultMessage: 'we couldn’t find what you were looking for.',
description: 'page not found apology description text',
},
GUIDANCE: { GUIDANCE: {
id: 'pageNotFound.Guidance.text', id: 'pageNotFound.Guidance.text',
defaultMessage: 'Try creating a page in', defaultMessage: 'Try creating a page in',
description: 'page not found guidance text', description: 'page not found guidance text',
}, },
LINK_HOME: {
id: 'pageNotFound.link.to.go.home.text',
defaultMessage: 'Go home',
description: 'page not found link to go home text',
},
}); });
export const ERROR_MSG =
<FormattedMessage
id={'pageNotFound.apology.text'}
defaultMessage={`
Sorry, the page you were looking for was not found. Click {home} to go home.
`}
description={'page description'}
values={{
home: <Link to={'/'}>here</Link>,
homeEs: <Link to={'/methodology'}>aqui</Link>,
}}
/>;

84
client/src/data/copy/about.tsx
View file

@ -1,4 +1,8 @@
import React from 'react';
import {defineMessages} from 'react-intl'; import {defineMessages} from 'react-intl';
import {FormattedMessage} from 'gatsby-plugin-intl';
export const EXEC_ORDER_LINK = 'https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal.';
export const PAGE = defineMessages({ export const PAGE = defineMessages({
TILE: { TILE: {
@ -13,12 +17,12 @@ export const PAGE = defineMessages({
}, },
HEADING_1: { HEADING_1: {
id: 'index.heading.screentool', id: 'index.heading.screentool',
defaultMessage: 'The screening tool', defaultMessage: 'Screening tool',
description: 'heading for about screening tool', description: 'heading for about screening tool',
}, },
HEADING1_DESCRIPTION1: { HEADING1_DESCRIPTION1: {
id: 'about.page.sub.header.1.text.1', id: 'about.page.sub.header.1.text.1',
defaultMessage: 'On January 27, 2021, President Biden directed the Council on'+ defaultMessage: 'In Executive Order 14008 on Tackling the Climate Crisis at Home and Abroad'+
' Environmental Quality (CEQ) to create a climate and economic'+ ' Environmental Quality (CEQ) to create a climate and economic'+
' justice screening tool. The purpose of the tool is to help'+ ' justice screening tool. The purpose of the tool is to help'+
' Federal agencies identify disadvantaged communities and provide'+ ' Federal agencies identify disadvantaged communities and provide'+
@ -32,12 +36,12 @@ export const PAGE = defineMessages({
HEADING1_DESCRIPTION2: { HEADING1_DESCRIPTION2: {
id: 'about.page.sub.header.1.text.2', id: 'about.page.sub.header.1.text.2',
defaultMessage: 'The current version of the tool is in a public beta form and'+ defaultMessage: 'The current version of the tool is in a public beta form and'+
' will be updated based on feedback from the public.', ' will be updated based on feedback and research.',
description: 'about page sub header text', description: 'about page sub header text',
}, },
HEADING_2: { HEADING_2: {
id: 'index.heading.justice40', id: 'index.heading.justice40',
defaultMessage: 'The Justice40 Initiative', defaultMessage: 'Justice40 Initiative',
description: 'heading for about justice 40', description: 'heading for about justice 40',
}, },
HEADING2_DESCRIPTION1: { HEADING2_DESCRIPTION1: {
@ -53,20 +57,54 @@ export const PAGE = defineMessages({
' critical clean water infrastructure.', ' critical clean water infrastructure.',
description: 'about page sub header text', description: 'about page sub header text',
}, },
HEADING2_DESCRIPTION2: {
id: 'about.page.sub.header.2.text.2',
defaultMessage: 'Read more about the Justice40 Initiative in President Biden’s',
description: 'about page sub header text',
},
PRESIDENT_LINK_LABEL: {
id: 'index.presidentalLinkLabel',
defaultMessage: 'Executive Order 14008 on Tackling the Climate Crisis at Home and Abroad.',
description: 'Link url to presidential actions executive order. Part of paragraph 2',
},
}); });
export const EXEC_ORDER_LINK = 'https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/27/' + export const HEADING_1 = {
'executive-order-on-tackling-the-climate-crisis-at-home-and-abroad/'; DESCRIPTION_1:
<FormattedMessage
id={'about.page.sub.header.1.text.1'}
description={'about page sub header text'}
defaultMessage={`
In {eoLink} on Tackling the Climate Crisis at Home and Abroad,
President Biden directed the Council on
Environmental Quality (CEQ) to create a Climate and Economic
Justice Screening Tool. The purpose of the tool is to help
Federal agencies identify disadvantaged communities
that have been historically marginalized, underserved, and
overburdened by pollution. The tool provides
socioeconomic, environmental, and climate information
to inform decisions that may affect these communities. The tool
identifies disadvantaged communities
through publicly available, nationally consistent, high-quality
data.
`}
values={{
eoLink:
<a href={EXEC_ORDER_LINK}>
Executive Order 14008
</a>,
}}
/>,
};
export const HEADING_2 = {
DESCRIPTION_2:
<FormattedMessage
id={'about.page.sub.header.2.text.2'}
description={'about page sub header text'}
defaultMessage={`
Read more about the Justice40 Initiative in President Biden’s
{eoLink} on Tackling the Climate Crisis at Home and Abroad.
`}
values={{
eoLink:
<a href={EXEC_ORDER_LINK}>
Executive Order 14008
</a>,
}}
/>,
};
export const GITHUB_LINK = 'https://github.com/usds/justice40-tool'; export const GITHUB_LINK = 'https://github.com/usds/justice40-tool';
@ -83,14 +121,15 @@ export const HOW_TO_GET_STARTED = defineMessages({
}, },
FEDERAL_PM_INFO: { FEDERAL_PM_INFO: {
id: 'federal.pm.info', id: 'federal.pm.info',
defaultMessage: 'Download the screening tool’s draft list of communities of focus.'+ defaultMessage: `
' Explore data that may be useful to your program, and provide'+ Download the tool’s current list of communities, explore data that may be useful to your
' feedback on the tool.', program, and provide feedback on the tool.
`,
description: 'sub heading of page', description: 'sub heading of page',
}, },
FEDERAL_PM_LINK_TEXT: { FEDERAL_PM_LINK_TEXT: {
id: 'federal.pm.link', id: 'federal.pm.link',
defaultMessage: 'Go to data & methodology', defaultMessage: 'Methodology & data',
description: 'link text to go to methodology page', description: 'link text to go to methodology page',
}, },
COMMUNITY_MEMBERS_HEADING: { COMMUNITY_MEMBERS_HEADING: {
@ -100,8 +139,9 @@ export const HOW_TO_GET_STARTED = defineMessages({
}, },
COMMUNITY_MEMBERS_INFO: { COMMUNITY_MEMBERS_INFO: {
id: 'community.members.info', id: 'community.members.info',
defaultMessage: 'Explore data about communities of focus in your area, and help '+ defaultMessage: `
' provide feedback on the tool.', Explore data about communities in your area and provide feedback on the tool.
`,
description: 'sub heading of page', description: 'sub heading of page',
}, },
COMMUNITY_MEMBERS_LINK_TEXT: { COMMUNITY_MEMBERS_LINK_TEXT: {

2
client/src/data/copy/common.tsx
View file

@ -39,7 +39,7 @@ export const HEADER = defineMessages({
}, },
METHODOLOGY: { METHODOLOGY: {
id: 'header.methodology', id: 'header.methodology',
defaultMessage: 'Data & methodology', defaultMessage: 'Methodology & data',
description: 'Header navigate item to the Methodology page', description: 'Header navigate item to the Methodology page',
}, },
CONTACT: { CONTACT: {

96
client/src/data/copy/explore.tsx
View file

@ -21,30 +21,34 @@ export const PAGE_INTRO = defineMessages({
export const PAGE_DESCRIPTION = <FormattedMessage export const PAGE_DESCRIPTION = <FormattedMessage
id={'exploreTool.page.description'} id={'exploreTool.page.description'}
defaultMessage={ defaultMessage={`
`Zoom into the map to see communities of focus that can help Federal agencies Use the map to see disadvantaged communities that have been historically
identify disadvantaged communities and to provide socioeconomic, marginalized, underserved, and overburdened by pollution. The map uses
environmental, and climate information and data. Learn more about the methodology publicly-available, nationally-consistent, high-quality datasets. Learn more about
and datasets that were used to determine these communities of focus on the the methodology and datasets that were used to identify disavantaged communities
{methodologyLink} on the {methodologyLink} page.
page.`} `}
description={'page description'} description={'page description'}
values={{ values={{
methodologyLink: <Link to={'/methodology'}>Data & methodology</Link>, methodologyLink: <Link to={'/methodology'}>methodology & data</Link>,
methodologyLinkEs: <Link to={'/methodology'}>Datos y metodología</Link>, methodologyLinkEs: <Link to={'/methodology'}>metodología y datos</Link>,
}} }}
/>; />;
export const LEGEND = defineMessages({ export const LEGEND = defineMessages({
PRIORITY_LABEL: { PRIORITY_LABEL: {
id: 'legend.info.priority.label', id: 'legend.info.priority.label',
defaultMessage: 'Draft community of focus', defaultMessage: 'Disadvantaged community',
description: 'the label of the prioritized community legend', description: 'the label of the prioritized community legend',
}, },
PRIORITY_DESCRIPT: { PRIORITY_DESCRIPT: {
id: 'legend.info.threshold.label', id: 'legend.info.threshold.label',
defaultMessage: 'A community identified as experiencing disadvantages that merits' + defaultMessage: `
' the focus of certain Federal investments, including through the Justice40 Initiative', Communities identified for the purposes of Justice40 as disadvantaged have been
historically marginalized, underserved, and overburdened by pollution. These communities
meet or exceed the criteria in one or more areas of focus.
`,
description: 'the label of the threshold community legend', description: 'the label of the threshold community legend',
}, },
}); });
@ -153,7 +157,7 @@ export const MAP = defineMessages({
export const SIDE_PANEL_INITIAL_STATE = defineMessages({ export const SIDE_PANEL_INITIAL_STATE = defineMessages({
TITLE: { TITLE: {
id: 'mapIntro.mapIntroHeader', id: 'mapIntro.mapIntroHeader',
defaultMessage: 'Zoom and select a census block group to view data', defaultMessage: 'Zoom and select a census tract to view data',
description: 'introductory text of ways to use the map', description: 'introductory text of ways to use the map',
}, },
DID_YOU_KNOW: { DID_YOU_KNOW: {
@ -163,9 +167,13 @@ export const SIDE_PANEL_INITIAL_STATE = defineMessages({
}, },
CBG_DEFINITION: { CBG_DEFINITION: {
id: 'mapIntro.censusBlockGroupDefinition', id: 'mapIntro.censusBlockGroupDefinition',
defaultMessage: 'A census block group is generally between 600 and 3,000 people. ' + defaultMessage: `
'It is the smallest geographical unit for which the U.S. Census ' + A census tract is generally between 1,200 and 8,000 people, with an optimum size of 4,000 people.
'Bureau publishes sample data.', Census tracts are small, relatively permanent subdivisions of a county defined by the
U.S. Census Bureau and usually cover a contiguous area. The census tract level represents the
smallest geographical unity that can be presented in a statistically sound manner, given the
datasets that are being used.
`,
description: 'cites the definition and helpful information about census groups', description: 'cites the definition and helpful information about census groups',
}, },
}); });
@ -173,8 +181,8 @@ export const SIDE_PANEL_INITIAL_STATE = defineMessages({
export const SIDE_PANEL_CBG_INFO = defineMessages({ export const SIDE_PANEL_CBG_INFO = defineMessages({
CENSUS_BLOCK_GROUP: { CENSUS_BLOCK_GROUP: {
id: 'areaDetail.geographicInfo.censusBlockGroup', id: 'areaDetail.geographicInfo.censusBlockGroup',
defaultMessage: 'Census block group:', defaultMessage: 'Census tract:',
description: 'the census block group id number of the feature selected', description: 'the census tract id number of the feature selected',
}, },
COUNTY: { COUNTY: {
id: 'areaDetail.geographicInfo.county', id: 'areaDetail.geographicInfo.county',
@ -304,9 +312,9 @@ export const SIDE_PANEL_INDICATORS = defineMessages({
export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
AREA_MEDIAN_INCOME: { AREA_MEDIAN_INCOME: {
id: 'areaDetail.indicator.description.area_median_income', id: 'areaDetail.indicator.description.area_median_income',
defaultMessage: 'Median income of the census block group calculated as a percent of the metropolitan'+ defaultMessage: 'Median income of the census tract calculated as a percent of the metropolitan'+
' area’s or state\'s median income', ' area’s or state\'s median income',
description: 'Median income of the census block group calculated as a percent of the metropolitan'+ description: 'Median income of the census tract calculated as a percent of the metropolitan'+
' area’s or state\'s median income', ' area’s or state\'s median income',
}, },
EDUCATION: { EDUCATION: {
@ -316,9 +324,9 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
}, },
POVERTY: { POVERTY: {
id: 'areaDetail.indicator.description.poverty', id: 'areaDetail.indicator.description.poverty',
defaultMessage: 'Percent of a block group\'s population in households where the household income' + defaultMessage: 'Percent of a tract\'s population in households where the household income' +
' is at or below 100% of the federal poverty level', ' is at or below 100% of the federal poverty level',
description: 'Percent of a block group\'s population in households where the household income' + description: 'Percent of a tract\'s population in households where the household income' +
' is at or below 100% of the federal poverty level', ' is at or below 100% of the federal poverty level',
}, },
ASTHMA: { ASTHMA: {
@ -403,19 +411,23 @@ export const SIDE_PANEL_INDICATOR_DESCRIPTION = defineMessages({
export const DOWNLOAD_DRAFT = { export const DOWNLOAD_DRAFT = {
PARAGRAPH_1: <FormattedMessage PARAGRAPH_1: <FormattedMessage
id={'download.draft.ptag.1'} id={'download.draft.ptag.1'}
description={'Download the draft list of communities of focus and datasets used.'} description={'Download the current list of communities and datasets used.'}
defaultMessage={`{downloadDraft} of communities of focus and datasets used. Last updated: {dateUpdated}.`} defaultMessage={`
{downloadDraft} of communities and datasets used (ZIP file will contain one .xlsx,
one .csv, and one .pdf, with a size of {downloadFileSize}). Last updated: {dateUpdated}.
`}
values={{ values={{
downloadDraft: downloadDraft:
<a href={METHODOLOGY_COPY.DOWNLOAD_ZIP_URL}> <a href={METHODOLOGY_COPY.DOWNLOAD_ZIP_URL}>
{`Download the draft list v${METHODOLOGY_COPY.VERSION_NUMBER}`} {`Download the current list`}
</a>, </a>,
downloadDraftEs: downloadDraftEs:
<a href={METHODOLOGY_COPY.DOWNLOAD_ZIP_URL}> <a href={METHODOLOGY_COPY.DOWNLOAD_ZIP_URL}>
{'Descargue la lista preliminar'} {`Descargue la lista preliminar`}
</a>, </a>,
dateUpdated: METHODOLOGY_COPY.DOWNLOAD_LAST_UPDATED, dateUpdated: METHODOLOGY_COPY.DOWNLOAD_LAST_UPDATED,
dateUpdatedEs: METHODOLOGY_COPY.DOWNLOAD_LAST_UPDATED_ES, dateUpdatedEs: METHODOLOGY_COPY.DOWNLOAD_LAST_UPDATED_ES,
downloadFileSize: METHODOLOGY_COPY.DOWNLOAD_FILE_SIZE,
}} }}
/>, />,
PARAGRAPH_2: <FormattedMessage PARAGRAPH_2: <FormattedMessage
@ -436,34 +448,23 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
/>, />,
LIST_ITEM_1: <FormattedMessage LIST_ITEM_1: <FormattedMessage
id={'youCanHelpInfoText.list.item.1'} id={'youCanHelpInfoText.list.item.1'}
description={'how one can help us via email'}
defaultMessage={`If you have helpful information, we would love to {rxEmailFromYou}.`}
values={{
rxEmailFromYou:
<a href={`mailto:${CONTACT_COPY.FEEDBACK_EMAIL}`}>
{'receive an email from you'}
</a>,
}}
/>,
LIST_ITEM_2: <FormattedMessage
id={'youCanHelpInfoText.list.item.2'}
description={'give us feedback on our data and methodology'} description={'give us feedback on our data and methodology'}
defaultMessage={`View our {dataMeth} page and send us feedback.`} defaultMessage={`View our {dataMeth} page and send us feedback.`}
values={{ values={{
dataMeth: dataMeth:
<Link to={'/methodology'}> <Link to={'/methodology'}>
{'Data & methodology'} {'Methodology and data'}
</Link>, </Link>,
dataMethEs: dataMethEs:
<Link to={'/methodology'}> <Link to={'/methodology'}>
{'Datos y metodología'} {'Metodología y datos'}
</Link>, </Link>,
}} }}
/>, />,
LIST_ITEM_3: <FormattedMessage LIST_ITEM_2: <FormattedMessage
id={'youCanHelpInfoText.list.item.3'} id={'youCanHelpInfoText.list.item.2'}
description={'share your feedback'} description={'share your feedback'}
defaultMessage={`Find your community of interest and {shareFeedback}.`} defaultMessage={`Find communities of interest and {shareFeedback}.`}
values={{ values={{
shareFeedback: shareFeedback:
<a href={`mailto:${CONTACT_COPY.FEEDBACK_EMAIL}`}> <a href={`mailto:${CONTACT_COPY.FEEDBACK_EMAIL}`}>
@ -471,5 +472,16 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = {
</a>, </a>,
}} }}
/>, />,
LIST_ITEM_3: <FormattedMessage
id={'youCanHelpInfoText.list.item.3'}
description={'share your feedback'}
defaultMessage={`Respond to our request for information on {federalRegisterLink}.`}
values={{
federalRegisterLink:
<a href={`https://www.federalregister.gov/`}>
{'federalregister.gov'}
</a>,
}}
/>,
}; };

4
client/src/data/copy/methodology.tsx
View file

@ -24,8 +24,8 @@ export const PAGE = defineMessages({
// Download Package // Download Package
export const DOWNLOAD_FILE_SIZE = '111MB'; export const DOWNLOAD_FILE_SIZE = '111MB';
export const DOWNLOAD_LAST_UPDATED = '10/01/21'; export const DOWNLOAD_LAST_UPDATED = '12/15/21';
export const DOWNLOAD_LAST_UPDATED_ES = '01/10/21'; export const DOWNLOAD_LAST_UPDATED_ES = '15/12/21';
export const VERSION_NUMBER = '0.1'; export const VERSION_NUMBER = '0.1';
export const DOWNLOAD_ZIP_URL = [ export const DOWNLOAD_ZIP_URL = [

13
client/src/pages/404.tsx
View file

@ -1,5 +1,4 @@
import * as React from 'react'; import * as React from 'react';
import {Link} from 'gatsby-plugin-intl';
import {useIntl} from 'gatsby-plugin-intl'; import {useIntl} from 'gatsby-plugin-intl';
import {Grid} from '@trussworks/react-uswds'; import {Grid} from '@trussworks/react-uswds';
@ -33,12 +32,7 @@ const NotFoundPage =({location}: I404PageProps) => {
<Grid row> <Grid row>
<p> <p>
{intl.formatMessage(PAGE_NOT_FOUND_COPY.PAGE.APOLOGY)} {PAGE_NOT_FOUND_COPY.ERROR_MSG}
{' '}
<span role="img" aria-label="Pensive emoji">
😔
</span>{' '}
{intl.formatMessage(PAGE_NOT_FOUND_COPY.PAGE.APOLOGY_INFO)}
</p> </p>
</Grid> </Grid>
@ -51,11 +45,6 @@ const NotFoundPage =({location}: I404PageProps) => {
) : null} ) : null}
</Grid> </Grid>
<Grid>
<p>
<Link to="/">{intl.formatMessage(PAGE_NOT_FOUND_COPY.PAGE.LINK_HOME)}</Link>.
</p>
</Grid>
</J40MainGridContainer> </J40MainGridContainer>
</Layout> </Layout>

2
client/src/pages/__snapshots__/contact.test.tsx.snap
View file

@ -261,7 +261,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-cy="nav-link-methodology" data-cy="nav-link-methodology"
href="/en/methodology" href="/en/methodology"
> >
Data & methodology Methodology & data
</a> </a>
</li> </li>
<li <li

60
client/src/pages/__snapshots__/index.test.tsx.snap
View file

@ -261,7 +261,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-cy="nav-link-methodology" data-cy="nav-link-methodology"
href="/en/methodology" href="/en/methodology"
> >
Data & methodology Methodology & data
</a> </a>
</li> </li>
<li <li
@ -331,14 +331,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-testid="grid" data-testid="grid"
> >
<img <img
alt="The screening tool" alt="Screening tool"
class="j40-aboutcard-image" class="j40-aboutcard-image"
src="test-file-stub" src="test-file-stub"
/> />
</div> </div>
<div <div
class="tablet:grid-col-9" class="tablet:grid-col-9"
data-cy="the-screening-tool-block" data-cy="screening-tool-block"
data-testid="grid" data-testid="grid"
> >
<div <div
@ -346,13 +346,32 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-testid="grid" data-testid="grid"
> >
<h2> <h2>
The screening tool Screening tool
</h2> </h2>
<p> <p>
On January 27, 2021, President Biden directed the Council on Environmental Quality (CEQ) to create a climate and economic justice screening tool. The purpose of the tool is to help Federal agencies identify disadvantaged communities and provide socioeconomic, environmental, and climate information and data to inform decisions that may affect these communities. The tool identifies disadvantaged communities as communities of focus through publicly available, nationally consistent, high-quality data.
In
<a
href="https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal."
>
Executive Order 14008
</a>
on Tackling the Climate Crisis at Home and Abroad,
President Biden directed the Council on
Environmental Quality (CEQ) to create a Climate and Economic
Justice Screening Tool. The purpose of the tool is to help
Federal agencies identify disadvantaged communities
that have been historically marginalized, underserved, and
overburdened by pollution. The tool provides
socioeconomic, environmental, and climate information
to inform decisions that may affect these communities. The tool
identifies disadvantaged communities
through publicly available, nationally consistent, high-quality
data.
</p> </p>
<p> <p>
The current version of the tool is in a public beta form and will be updated based on feedback from the public. The current version of the tool is in a public beta form and will be updated based on feedback and research.
</p> </p>
</div> </div>
</div> </div>
@ -376,14 +395,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-testid="grid" data-testid="grid"
> >
<img <img
alt="The Justice40 Initiative" alt="Justice40 Initiative"
class="j40-aboutcard-image" class="j40-aboutcard-image"
src="test-file-stub" src="test-file-stub"
/> />
</div> </div>
<div <div
class="tablet:grid-col-9" class="tablet:grid-col-9"
data-cy="the-justice40-initiative-block" data-cy="justice40-initiative-block"
data-testid="grid" data-testid="grid"
> >
<div <div
@ -391,20 +410,22 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-testid="grid" data-testid="grid"
> >
<h2> <h2>
The Justice40 Initiative Justice40 Initiative
</h2> </h2>
<p> <p>
The tool will provide important information for the Justice40 Initiative. The goal of the Justice40 Initiative is to provide 40-percent of the overall benefits of certain federal programs in seven key areas to disadvantaged communities. These seven key areas are: climate change, clean energy and energy efficiency, clean transit, affordable and sustainable housing, training and workforce development, the remediation and reduction of legacy pollution, and the development of critical clean water infrastructure. The tool will provide important information for the Justice40 Initiative. The goal of the Justice40 Initiative is to provide 40-percent of the overall benefits of certain federal programs in seven key areas to disadvantaged communities. These seven key areas are: climate change, clean energy and energy efficiency, clean transit, affordable and sustainable housing, training and workforce development, the remediation and reduction of legacy pollution, and the development of critical clean water infrastructure.
</p> </p>
<p> <p>
Read more about the Justice40 Initiative in President Biden’s
Read more about the Justice40 Initiative in President Biden’s
<a <a
href="https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/27/executive-order-on-tackling-the-climate-crisis-at-home-and-abroad/" href="https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal."
rel="noreferrer"
target="_blank"
> >
Executive Order 14008 on Tackling the Climate Crisis at Home and Abroad. Executive Order 14008
</a> </a>
on Tackling the Climate Crisis at Home and Abroad.
</p> </p>
</div> </div>
</div> </div>
@ -457,7 +478,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Federal program managers Federal program managers
</h3> </h3>
<p> <p>
Download the screening tool’s draft list of communities of focus. Explore data that may be useful to your program, and provide feedback on the tool.
Download the tool’s current list of communities, explore data that may be useful to your
program, and provide feedback on the tool.
</p> </p>
<div <div
class="j40-aboutcard-sm-link" class="j40-aboutcard-sm-link"
@ -465,7 +489,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
<a <a
href="/en/methodology" href="/en/methodology"
> >
Go to data & methodology Methodology & data
</a> </a>
</div> </div>
</div> </div>
@ -509,7 +533,9 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Community members Community members
</h3> </h3>
<p> <p>
Explore data about communities of focus in your area, and help provide feedback on the tool.
Explore data about communities in your area and provide feedback on the tool.
</p> </p>
<div <div
class="j40-aboutcard-sm-link" class="j40-aboutcard-sm-link"

4
client/src/pages/__snapshots__/methodology.test.tsx.snap
View file

@ -261,7 +261,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
data-cy="nav-link-methodology" data-cy="nav-link-methodology"
href="/en/methodology" href="/en/methodology"
> >
Data & methodology Methodology & data
</a> </a>
</li> </li>
<li <li
@ -343,7 +343,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
<div> <div>
The package includes draft v0.1 of the list of communities of focus (.csv and .xlsx) and information about how to use the list (.pdf). The package includes draft v0.1 of the list of communities of focus (.csv and .xlsx) and information about how to use the list (.pdf).
<span> <span>
Last updated: 10/01/21 Last updated: 12/15/21
</span> </span>
</div> </div>
<div> <div>

8
client/src/pages/index.tsx
View file

@ -47,7 +47,7 @@ const IndexPage = ({location}: IndexPageProps) => {
header={intl.formatMessage(ABOUT_COPY.PAGE.HEADING_1)}> header={intl.formatMessage(ABOUT_COPY.PAGE.HEADING_1)}>
<> <>
<p> <p>
{intl.formatMessage(ABOUT_COPY.PAGE.HEADING1_DESCRIPTION1)} {ABOUT_COPY.HEADING_1.DESCRIPTION_1}
</p> </p>
<p> <p>
{intl.formatMessage(ABOUT_COPY.PAGE.HEADING1_DESCRIPTION2)} {intl.formatMessage(ABOUT_COPY.PAGE.HEADING1_DESCRIPTION2)}
@ -66,11 +66,7 @@ const IndexPage = ({location}: IndexPageProps) => {
{intl.formatMessage(ABOUT_COPY.PAGE.HEADING2_DESCRIPTION1)} {intl.formatMessage(ABOUT_COPY.PAGE.HEADING2_DESCRIPTION1)}
</p> </p>
<p> <p>
{intl.formatMessage(ABOUT_COPY.PAGE.HEADING2_DESCRIPTION2)} {ABOUT_COPY.HEADING_2.DESCRIPTION_2}
{' '}
<a href={ABOUT_COPY.EXEC_ORDER_LINK} target={'_blank'} rel="noreferrer">
{intl.formatMessage(ABOUT_COPY.PAGE.PRESIDENT_LINK_LABEL)}
</a>
</p> </p>
</> </>
</AboutCard> </AboutCard>

4
client/src/styles/global.scss
View file

@ -347,10 +347,6 @@ p.secondary.j40-indicator {
width: 3rem; width: 3rem;
} }
.j40-aboutcard-link {
font-weight: bold;
}
div.j40-aboutcard-sm-link { div.j40-aboutcard-sm-link {
@include u-margin-top(2); @include u-margin-top(2);
} }