diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss index 028617d9..6df9b2e4 100644 --- a/client/src/components/AreaDetail/areaDetail.module.scss +++ b/client/src/components/AreaDetail/areaDetail.module.scss @@ -91,8 +91,9 @@ $sidePanelLabelFontColor: #171716; @include sidePanelLabelStyle; display: flex; justify-content: space-between; - padding: 0.3rem 0.5rem 0.3rem 1.2rem; - background-color: #DFE1E2; + padding: 0.5rem 0.5rem 0.5rem 1.2rem; + border-top: 1px solid $sidePanelBorderColor; + border-bottom: 1px solid $sidePanelBorderColor; } //Indicator box styles @@ -104,7 +105,7 @@ $sidePanelLabelFontColor: #171716; .indicatorBoxAdditional { @include indicatorBox; border-bottom: 1px solid #1b1b1b; - background-color: #F3F3F3; + background-color: $additionalCardsBGColor; } .indicatorRow { diff --git a/client/src/components/AreaDetail/index.tsx b/client/src/components/AreaDetail/index.tsx index e5c56de9..ada40b44 100644 --- a/client/src/components/AreaDetail/index.tsx +++ b/client/src/components/AreaDetail/index.tsx @@ -144,13 +144,13 @@ const AreaDetail = ({properties}:IAreaDetailProps) => { }, femaRisk: { id: 'areaDetail.indicator.femaRisk', - defaultMessage: 'FEMA Risk index', + defaultMessage: 'FEMA Risk Index', description: 'Risk based on 18 natural hazard types, in addition to a'+ "community's social vulnerability and community resilience", }, heartDisease: { id: 'areaDetail.indicator.heartDisease', - defaultMessage: 'Heart Disease', + defaultMessage: 'Heart disease', description: 'People ages 18 and up who report ever having been told by a' + 'doctor, nurse, or other health professionals that they had angina or coronary heart disease', }, @@ -216,7 +216,8 @@ const AreaDetail = ({properties}:IAreaDetailProps) => { }; const poverty:indicatorInfo = { label: intl.formatMessage(messages.poverty), - description: 'Household income is less than or equal to the federal "poverty level"', + description: "Percent of a block group's population in households where the household income" + + ' is at or below 100% of the federal poverty level', value: properties[constants.POVERTY_PROPERTY_PERCENTILE], }; // const linIsoInfo:indicatorInfo = { 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 214e32bb..02c64d0e 100644 --- a/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap +++ b/client/src/components/AreaDetail/tests/__snapshots__/areaDetail.test.tsx.snap @@ -114,7 +114,7 @@ exports[`rendering of the AreaDetail checks if various text fields are visible 1

- Household income is less than or equal to the federal "poverty level" + Percent of a block group's population in households where the household income is at or below 100% of the federal poverty level

  • - FEMA Risk index + FEMA Risk Index

    NaN @@ -232,7 +232,7 @@ exports[`rendering of the AreaDetail checks if various text fields are visible 1 >

    - Heart Disease + Heart disease

    NaN diff --git a/client/src/components/DatasetCard/datasetCard.module.scss b/client/src/components/DatasetCard/datasetCard.module.scss index c4fa5bc2..51288cc2 100644 --- a/client/src/components/DatasetCard/datasetCard.module.scss +++ b/client/src/components/DatasetCard/datasetCard.module.scss @@ -1,10 +1,21 @@ -.datasetCard { - background-color: white; +@import '../utils.scss'; + +@mixin baseCard { padding: 2.7rem 3rem 3rem 3rem; margin-bottom: 3rem; max-width: 34rem; } +.datasetCard { + @include baseCard; + background-color: white; +} + +.datasetCardAdditional { + @include baseCard; + background-color: $additionalCardsBGColor; +} + .datasetCardIndicator { margin-top: 0; font-size: x-large; diff --git a/client/src/components/DatasetCard/datasetCard.module.scss.d.ts b/client/src/components/DatasetCard/datasetCard.module.scss.d.ts index 136b1188..7dbf4e77 100644 --- a/client/src/components/DatasetCard/datasetCard.module.scss.d.ts +++ b/client/src/components/DatasetCard/datasetCard.module.scss.d.ts @@ -1,6 +1,7 @@ declare namespace DatasetCardScssNamespace { export interface IDatasetCardScss { datasetCard: string; + datasetCardAdditional:string; datasetCardIndicator:string; datasetCardWhatIsIt: string; datasetCardDescription: string; diff --git a/client/src/components/DatasetCard/index.tsx b/client/src/components/DatasetCard/index.tsx index 0b7a9980..b4bb3240 100644 --- a/client/src/components/DatasetCard/index.tsx +++ b/client/src/components/DatasetCard/index.tsx @@ -5,16 +5,12 @@ import * as styles from './datasetCard.module.scss'; interface IDatasetCardProps { datasetCardProps: { [key:string]: string } + additionalIndicator: boolean } -const DatasetCard = ({datasetCardProps}:IDatasetCardProps) => { +const DatasetCard = ({datasetCardProps, additionalIndicator}:IDatasetCardProps) => { const intl = useIntl(); const messages = defineMessages({ - whatIsIt: { - id: 'datasetCard.whatIsIt', - defaultMessage: 'What is it?', - description: 'label associated with explaining the card', - }, dataResolution: { id: 'datasetCard.dataResolution', defaultMessage: 'Data resolution: ', @@ -33,20 +29,13 @@ const DatasetCard = ({datasetCardProps}:IDatasetCardProps) => { }); return ( -
    +

    {datasetCardProps.indicator}

    -
    {intl.formatMessage(messages.whatIsIt)}
    {datasetCardProps.description}
      -
    • - - {intl.formatMessage(messages.dataResolution)} - - {datasetCardProps.dataResolution} -
    • {intl.formatMessage(messages.dataSource)} @@ -55,6 +44,12 @@ const DatasetCard = ({datasetCardProps}:IDatasetCardProps) => { {datasetCardProps.dataSourceLabel}
      • +
    • + + {intl.formatMessage(messages.dataResolution)} + + {datasetCardProps.dataResolution} +
    • {intl.formatMessage(messages.dataDateRange)} diff --git a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap index 8aecdcf6..76d24051 100644 --- a/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap +++ b/client/src/components/DatasetCard/tests/__snapshots__/datasetCard.test.tsx.snap @@ -6,20 +6,11 @@ exports[`rendering of the DatasetCard checks if component renders 1`] = `

      Area Median Income

      -
      - What is it? -
      Median income of the census block group calculated as a percent of the metropolitan area’s or state's median income.
        -
      • - - Data resolution: - - Census block group -
      • Data source: @@ -32,6 +23,12 @@ exports[`rendering of the DatasetCard checks if component renders 1`] = ` Census's American Community Survey
        • +
      • + + Data resolution: + + Census block group +
      • Data date range: diff --git a/client/src/components/DatasetCard/tests/datasetCard.test.tsx b/client/src/components/DatasetCard/tests/datasetCard.test.tsx index c5d7d537..fb74d525 100644 --- a/client/src/components/DatasetCard/tests/datasetCard.test.tsx +++ b/client/src/components/DatasetCard/tests/datasetCard.test.tsx @@ -3,12 +3,12 @@ import {render} from '@testing-library/react'; import {LocalizedComponent} from '../../../test/testHelpers'; import DatasetCard from '../../DatasetCard'; -import {cards} from '../../DatasetContainer/index'; +import {indicators} from '../../DatasetContainer/index'; describe('rendering of the DatasetCard', () => { const {asFragment} = render( - + , ); diff --git a/client/src/components/DatasetContainer/index.tsx b/client/src/components/DatasetContainer/index.tsx index 55f3e252..3049f214 100644 --- a/client/src/components/DatasetContainer/index.tsx +++ b/client/src/components/DatasetContainer/index.tsx @@ -3,12 +3,13 @@ import {useIntl} from 'gatsby-plugin-intl'; import {defineMessages} from 'react-intl'; import {Grid} from '@trussworks/react-uswds'; -import DatasetCard from '../DatasetCard'; import AlertWrapper from '../AlertWrapper'; +import DatasetCard from '../DatasetCard'; +import J40MainGridContainer from '../J40MainGridContainer'; import * as styles from './dsContainer.module.scss'; -export const cards = [ +export const indicators = [ { indicator: 'Area Median Income', description: `Median income of the census block group calculated as a percent @@ -19,26 +20,29 @@ export const cards = [ dataDateRange: `2015-2019`, }, { - indicator: 'Households below 100% of the federal poverty line', - description: `Percent of a block group's population in households where the - household income is at or below 100% the federal "poverty level."`, + indicator: 'Poverty', + description: `Percent of a block group's population in households where the household income` + + ` is at or below 100% of the federal poverty level`, dataResolution: `Census block group`, dataSourceLabel: `Census's American Community Survey`, dataSourceURL: `https://www.census.gov/programs-surveys/acs`, dataDateRange: `2015-2019`, }, { - indicator: 'Education. less than high school education', - description: `Percent of people age 25 or older in a block group whose - education is short of a high school diploma.`, + indicator: 'Education, less than high school education', + description: `Percent of people ages 25 years or older in a block group whose + education level is less than a high school diploma.`, dataResolution: `Census block group`, dataSourceLabel: `Census's American Community Survey`, dataSourceURL: `https://www.census.gov/programs-surveys/acs`, dataDateRange: `2015-2019`, }, +]; + +export const additionalIndicators = [ { indicator: 'Diabetes', - description: `People ages 18 years and up who report having ever been + description: `People ages 18 years and older who report having ever been told by a doctor, nurse, or other health professionals that they have diabetes other than diabetes during pregnancy.`, dataResolution: `Census tract`, @@ -59,7 +63,7 @@ export const cards = [ }, { indicator: 'Heart disease', - description: `People ages 18 years and up who report ever having been told + description: `People ages 18 years and older who report ever having been told by a doctor, nurse, or other health professionals that they had angina or coronary heart disease.`, dataResolution: `Census tract`, @@ -82,7 +86,7 @@ export const cards = [ within 500 meters, divided by distance in meters (not km).`, dataResolution: `Census block group`, dataSourceLabel: `Department of Transportation (DOT) traffic data`, - dataSourceURL: `#`, + dataSourceURL: `https://www.fhwa.dot.gov/policyinformation/hpms/shapefiles.cfm`, dataDateRange: `2017`, }, { @@ -136,8 +140,9 @@ export const cards = [ indicator: 'Diesel particulate matter', description: `Mixture of particles that is part of diesel exhaust in the air.`, dataResolution: `Census block group`, - dataSourceLabel: `U.S. Census Bureau`, - dataSourceURL: `https://www.census.gov/`, + dataSourceLabel: `Environmental Protection Agency (EPA) National Air Toxics Assessment (NATA) + `, + dataSourceURL: `https://www.epa.gov/national-air-toxics-assessment/2014-nata-assessment-results`, dataDateRange: `5-year estimates, 2015-2019`, }, { @@ -158,7 +163,7 @@ const DatasetContainer = () => { const messages = defineMessages({ cumulativeScore: { id: 'datasetContainer.header.cumulativeScore', - defaultMessage: 'Datasets used methodology', + defaultMessage: 'Datasets used in methodology', description: 'section label of which datasets are used in cumulative score', }, subTitle: { @@ -166,31 +171,76 @@ const DatasetContainer = () => { defaultMessage: 'The datasets come from a variety of sources and were selected' + ' based on relevance, availability, recency, and quality. The datasets seek to' + ' identify a range of human health, environmental, climate-related, and other' + - ' cumulative impacts on disadvantaged communities.', + ' cumulative impacts on communities.', description: 'description of the dataset section', }, + additionalSubtitle: { + id: 'datasetContainer.additionalSubtitle', + defaultMessage: 'Additional Indicators', + description: 'indicator heading', + }, + additionalText: { + id: 'datasetContainer.additionalText', + defaultMessage: 'These datasets provide additional information about each community.', + description: 'additional indicator heading', + }, }); // JSX return value: return ( <> - - - -

        {intl.formatMessage(messages.cumulativeScore)}

        -         -         + + - - -

        {intl.formatMessage(messages.subTitle)}

        -         -         -
        - {cards.map((card) => )} -
        + + + +

        {intl.formatMessage(messages.cumulativeScore)}

        +         +         + + + +

        {intl.formatMessage(messages.subTitle)}

        +         +         + +
        + {indicators.map((card) => )} +
        + +         +         + + + + + + +

        {intl.formatMessage(messages.additionalSubtitle)}

        +         +         + + + +

        {intl.formatMessage(messages.additionalText)}

        +         +         + +
        + {additionalIndicators.map((card) => )} +
        + +         +         ); }; diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap index fd0d930f..add0cea1 100644 --- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap +++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap @@ -3,633 +3,634 @@ exports[`rendering of the DatasetContainer checks if various text fields are visible 1`] = `
        -
        +
        -
        -

        +

        - - Limited data sources - - - — Datasets may be added, updated, or removed. - -
        -

        +

        + + Limited data sources + + + — Datasets may be added, updated, or removed. + +
        +

        +
        +
        +

        + Datasets used in methodology +

        +
        +
        +
        +
        +

        + The datasets come from a variety of sources and were selected based on relevance, availability, recency, and quality. The datasets seek to identify a range of human health, environmental, climate-related, and other cumulative impacts on communities. +

        +
        +
        +
        +
        +

        + Area Median Income +

        +
        + Median income of the census block group calculated as a percent + of the metropolitan area’s or state's median income. +
        + +
        +
        +

        + Poverty +

        +
        + Percent of a block group's population in households where the household income is at or below 100% of the federal poverty level +
        + +
        +
        +

        + Education, less than high school education +

        +
        + Percent of people ages 25 years or older in a block group whose + education level is less than a high school diploma. +
        +
        -

        - Datasets used methodology -

        -

        - The datasets come from a variety of sources and were selected based on relevance, availability, recency, and quality. The datasets seek to identify a range of human health, environmental, climate-related, and other cumulative impacts on disadvantaged communities. -

        -
        -
        -
        -
        -

        - Area Median Income -

        -
        - What is it? +
        +
        +

        + Additional Indicators +

        +
        +
        +
        +
        +

        + These datasets provide additional information about each community. +

        +
        - Median income of the census block group calculated as a percent - of the metropolitan area’s or state's median income. -
        - -
        -
        -

        - Households below 100% of the federal poverty line -

        -
        - What is it? -
        -
        - Percent of a block group's population in households where the - household income is at or below 100% the federal "poverty level." -
        - -
        -
        -

        - Education. less than high school education -

        -
        - What is it? -
        -
        - Percent of people age 25 or older in a block group whose - education is short of a high school diploma. -
        - -
        -
        -

        - Diabetes -

        -
        - What is it? -
        -
        - People ages 18 years and up who report having ever been +
        +

        + Diabetes +

        +
        + People ages 18 years and older who report having ever been told by a doctor, nurse, or other health professionals that they have diabetes other than diabetes during pregnancy. -
        - -
        -
        -

        - Asthma -

        -
        - What is it? -
        -
        - Weighted number of respondents people who answer “yes” both +
        + +
        +
        +

        + Asthma +

        +
        + Weighted number of respondents people who answer “yes” both to both of the following questions: “Have you ever been told by a doctor, nurse, or other health professional that you have asthma?” and the question “Do you still have asthma?” -
        - -
        -
        -

        - Heart disease -

        -
        - What is it? -
        -
        - People ages 18 years and up who report ever having been told +
        + +
        +
        +

        + Heart disease +

        +
        + People ages 18 years and older who report ever having been told by a doctor, nurse, or other health professionals that they had angina or coronary heart disease. -
        - -
        -
        -

        - Life expectancy -

        -
        - What is it? -
        -
        - Estimated years of life expectancy. -
        -
        + +
        +
        +

        + Life expectancy +

        +
        + Estimated years of life expectancy. +
        + -
        -
        -

        - Traffic proximity and volume -

        -
        - What is it? -
        -
        - Count of vehicles (average annual daily traffic) at major roads + +
        • +
      • + + Data resolution: + + Census tract +
        • +
      • + + Data date range: + + 2010-2015 +
        • +
      +
    +
    +

    + Traffic proximity and volume +

    +
    + Count of vehicles (average annual daily traffic) at major roads within 500 meters, divided by distance in meters (not km). -
    - -
    -
    -

    - FEMA Risk Index Expected Annual Loss Score -

    -
    - What is it? -
    -
    - Average economic loss in dollars resulting from natural +
    + +
    +
    +

    + FEMA Risk Index Expected Annual Loss Score +

    +
    + Average economic loss in dollars resulting from natural hazards each year. It is calculated for each hazard type and quantifies loss for relevant consequence types: buildings, people, and agriculture. -
    - -
    -
    -

    - Energy burden -

    -
    - What is it? -
    -
    - Average annual energy cost ($) divided by household income. -
    - -
    -
    -

    - Housing cost burden -

    -
    - What is it? -
    -
    - Households that are low income and spend more than 30% of their +
    + +
    +
    +

    + Energy burden +

    +
    + Average annual energy cost ($) divided by household income. +
    + +
    +
    +

    + Housing cost burden +

    +
    + Households that are low income and spend more than 30% of their income to housing costs. -
    -
    + -
    -
    -

    - Wastewater discharge -

    -
    - What is it? -
    -
    - RSEI modeled Toxic Concentrations at stream segments within 500 + +
    • +
  • + + Data resolution: + + Census tract +
    • +
  • + + Data date range: + + 2013-2017 +
    • + + +
    +

    + Wastewater discharge +

    +
    + RSEI modeled Toxic Concentrations at stream segments within 500 meters, divided by distance in kilometers (km). -
    -
    + - -
    -

    - Lead paint -

    -
    - What is it? -
    -
    - Percent of housing units built pre-1960, used as an + + +
  • + + Data resolution: + + Census block group +
    • +
  • + + Data date range: + + 2020 +
    • + +
    +
    +

    + Lead paint +

    +
    + Percent of housing units built pre-1960, used as an indicator of potential lead paint exposure in homes. -
    - -
    -
    -

    - Diesel particulate matter -

    -
    - What is it? -
    -
    - Mixture of particles that is part of diesel exhaust in the air. -
    - -
    -
    -

    - PM2.5 -

    -
    - What is it? -
    -
    - Fine inhalable particles, with diameters that are generally +
    + +
    +
    +

    + Diesel particulate matter +

    +
    + Mixture of particles that is part of diesel exhaust in the air. +
    + +
    +
    +

    + PM2.5 +

    +
    + Fine inhalable particles, with diameters that are generally 2.5 micrometers and smaller. -
    -
    + + + +
  • + + Data resolution: + + Census block group +
    • +
  • + + Data date range: + + 2017 +
    • + +
    + diff --git a/client/src/components/DownloadPacket/index.tsx b/client/src/components/DownloadPacket/index.tsx index 9d7d65dc..9590e18d 100644 --- a/client/src/components/DownloadPacket/index.tsx +++ b/client/src/components/DownloadPacket/index.tsx @@ -13,13 +13,13 @@ const DownloadPacket = () => { const messages = defineMessages({ downloadPacketHeader: { id: 'downloadPacket.header.text', - defaultMessage: 'Draft communities list (pre-decisional, 137MB)', + defaultMessage: `Draft communities list (${constants.DOWNLOAD_FILE_SIZE})`, description: 'download packet header text', }, downloadPacketInfo: { id: 'downloadPacket.info.text', - defaultMessage: 'The package includes the draft list of prioritized communities (.csv and .xlsx).'+ - ' This information should not be used to make program resource allocation decisions.', + defaultMessage: 'The package includes the draft list of prioritized communities (.csv and .xlsx) '+ + ` and information about how to use the list (.pdf). Last updated: ${constants.DOWNLOAD_LAST_UPDATED} `, description: 'download packet info text', }, downloadPacketButtonText: { diff --git a/client/src/components/HowYouCanHelp/index.tsx b/client/src/components/HowYouCanHelp/index.tsx index f342039b..ae9f1a8e 100644 --- a/client/src/components/HowYouCanHelp/index.tsx +++ b/client/src/components/HowYouCanHelp/index.tsx @@ -35,7 +35,7 @@ const HowYouCanHelp = () => { }, youCanHelpDataMethSuffixText: { id: 'youCanHelpDataMethSuffixText.link.suffix.text', - defaultMessage: 'and send us feedback', + defaultMessage: 'page and send us feedback.', description: 'send us feedbackv via email', }, youCanHelpSharingPrefixText: { @@ -62,8 +62,7 @@ const HowYouCanHelp = () => { {` `} {intl.formatMessage(messages.youCanHelpInfoLinkText)} - - {` `}. + .
  • @@ -83,8 +82,7 @@ const HowYouCanHelp = () => { {` `} {intl.formatMessage(messages.youCanHelpSharingLinkText)} - - {` `}. + .
    • diff --git a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap index a29f8de0..67f088ab 100644 --- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap +++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap @@ -15,7 +15,7 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl > recieve an email from you - . + .
  • @@ -26,7 +26,7 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl > Data and methodology - and send us feedback + page and send us feedback.
  • @@ -37,7 +37,7 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl > share your feedback - . + .
    • diff --git a/client/src/components/MapLegend/tests/__snapshots__/mapLegend.test.tsx.snap b/client/src/components/MapLegend/tests/__snapshots__/mapLegend.test.tsx.snap index c395c189..a1f12a42 100644 --- a/client/src/components/MapLegend/tests/__snapshots__/mapLegend.test.tsx.snap +++ b/client/src/components/MapLegend/tests/__snapshots__/mapLegend.test.tsx.snap @@ -11,7 +11,7 @@ exports[`rendering of the MapLegend checks if snapshots have changed 1`] = `

    - These communities are identified as experiencing disadvantages that merit the focus of certain Federal investments, including through the Justice40 Initiative + A community identified as experiencing disadvantages that merits the focus of certain Federal investments, including through the Justice40 Initiative

    diff --git a/client/src/components/MapWrapper/index.tsx b/client/src/components/MapWrapper/index.tsx index b7b828dc..3d361193 100644 --- a/client/src/components/MapWrapper/index.tsx +++ b/client/src/components/MapWrapper/index.tsx @@ -18,12 +18,17 @@ const MapWrapper = ({location}: IMapWrapperProps) => { const messages = defineMessages({ downloadLinkText: { id: 'mapwrapper.download.link', - defaultMessage: 'Download the draft list of communities of focus and datasets used', + defaultMessage: 'Download the draft list ', + description: 'download link for datasets', + }, + downloadLinkText1: { + id: 'mapwrapper.download1.link', + defaultMessage: `of communities of focus and datasets used. Last updated: ${constants.DOWNLOAD_LAST_UPDATED}`, description: 'download link for datasets', }, downloadContents: { id: 'mapwrapper.download.contents', - defaultMessage: 'ZIP file will contain one .xlsx, one .csv, and one .pdf (30 MB).', + defaultMessage: `ZIP file will contain one .xlsx, one .csv, and one .pdf (${constants.DOWNLOAD_FILE_SIZE}).`, description: 'download link contents', }, }); @@ -40,11 +45,14 @@ const MapWrapper = ({location}: IMapWrapperProps) => { - +
    {intl.formatMessage(messages.downloadLinkText)} + + {intl.formatMessage(messages.downloadLinkText1)} +
    {intl.formatMessage(messages.downloadContents)}
     diff --git a/client/src/components/__snapshots__/scoreStepsList.test.tsx.snap b/client/src/components/__snapshots__/scoreStepsList.test.tsx.snap index c7f4436d..b78c6efb 100644 --- a/client/src/components/__snapshots__/scoreStepsList.test.tsx.snap +++ b/client/src/components/__snapshots__/scoreStepsList.test.tsx.snap @@ -17,7 +17,7 @@ exports[`rendering of the component should match the snapshot of the MapIntroduc The methodology for identifying communities of focus is calculated at the census block group level. Census block geographical boundaries are determined by the U.S. Census Bureau once every ten years. This tool utilizes the census block boundaries from 2010.

    - The following describes the process for identifying disadvantaged communities. + The following describes the process for identifying communities of focus.

    @@ -36,9 +36,6 @@ exports[`rendering of the component should match the snapshot of the MapIntroduc

    -

    - Data inputs -

    @@ -87,7 +84,7 @@ exports[`rendering of the component should match the snapshot of the MapIntroduc class="usa-process-list__heading" data-testid="processListHeading" > - Current Formula + Determine communites of focus

    @@ -98,12 +95,17 @@ exports[`rendering of the component should match the snapshot of the MapIntroduc Under the existing formula, a census block group will be considered a community of focus if:

    - (The median income is <80% of the area median income OR + (The median income is less than 80% of the area median income

    - households living in poverty (at or below 100% of the federal poverty level) is >20%) + OR +

    +

    + households living in poverty (at or below 100% of the federal poverty level) is greater than 20%)

    - The high school degree achievement rate for adults 25 years and older is <95% + The high school degree achievement rate for adults 25 years and older is greater than 95%

    diff --git a/client/src/components/scoreStepsList.tsx b/client/src/components/scoreStepsList.tsx index b2597a88..9f3906fa 100644 --- a/client/src/components/scoreStepsList.tsx +++ b/client/src/components/scoreStepsList.tsx @@ -19,7 +19,7 @@ const ScoreStepsList = () => { block boundaries from 2010.

    - The following describes the process for identifying disadvantaged communities. + The following describes the process for identifying communities of focus.

    @@ -29,9 +29,6 @@ const ScoreStepsList = () => { Gather datasets

    {' '}

    -

    - Data inputs -

    The methodology includes the following inputs that are equally weighted.

    @@ -69,7 +66,7 @@ const ScoreStepsList = () => { - Current Formula + Determine communites of focus

    {' '}

    @@ -77,16 +74,19 @@ const ScoreStepsList = () => { community of focus if:

    - (The median income is <80% of the area median income OR + (The median income is less than 80% of the area median income

    - households living in poverty (at or below 100% of the federal poverty level) is >20%) + OR +

    +

    + households living in poverty (at or below 100% of the federal poverty level) is greater than 20%)

    AND

    - The high school degree achievement rate for adults 25 years and older is <95% + The high school degree achievement rate for adults 25 years and older is greater than 95%

    diff --git a/client/src/components/utils.scss b/client/src/components/utils.scss index 36a24a6c..df2da95c 100644 --- a/client/src/components/utils.scss +++ b/client/src/components/utils.scss @@ -10,6 +10,7 @@ $sidePanelBorderColor: #f2f2f2; $sidePanelBorder: 2px solid $sidePanelBorderColor; $mobileBreakpoint: 400px; $featureSelectBorderColor: #00bde3; +$additionalCardsBGColor: #FAFAFA; //Styles with Dataset container $datasetContainerColor: #eef6fb; diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx index 0d8c4f15..db242c00 100644 --- a/client/src/data/constants.tsx +++ b/client/src/data/constants.tsx @@ -63,6 +63,8 @@ export const PM25_PERCENTILE = 'Particulate matter (PM2.5) (percentile)'; // The name of the layer within the tiles that contains the score export const SCORE_SOURCE_LAYER = 'blocks'; +export const DOWNLOAD_FILE_SIZE = '143MB'; +export const DOWNLOAD_LAST_UPDATED = '09/20/21'; export type J40Properties = { [key: string]: any }; @@ -149,7 +151,7 @@ export const EXPLORE_TOOL_PAGE_TEXT = defineMessages({ }, PRIORITY_DESCRIPT: { id: 'legend.info.threshold.label', - defaultMessage: 'These communities are identified as experiencing disadvantages that merit' + + defaultMessage: 'A community identified as experiencing disadvantages that merits' + ' the focus of certain Federal investments, including through the Justice40 Initiative', description: 'the label of the threshold community legend', }, diff --git a/client/src/images/about-j40-1.svg b/client/src/images/about-j40-1.svg new file mode 100644 index 00000000..69d82d03 --- /dev/null +++ b/client/src/images/about-j40-1.svg @@ -0,0 +1,56 @@ + + + + +40% + + + + + + + + + + + + + + + + + + + + + + +40% + diff --git a/client/src/images/about-j40.svg b/client/src/images/about-j40.svg deleted file mode 100644 index ba896055..00000000 --- a/client/src/images/about-j40.svg +++ /dev/null @@ -1 +0,0 @@ -40% \ No newline at end of file diff --git a/client/src/images/about-usmap-1.svg b/client/src/images/about-usmap-1.svg new file mode 100644 index 00000000..322fb5e0 --- /dev/null +++ b/client/src/images/about-usmap-1.svg @@ -0,0 +1,893 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx index e3a6c510..ba325b55 100644 --- a/client/src/pages/index.tsx +++ b/client/src/pages/index.tsx @@ -9,9 +9,9 @@ import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; // @ts-ignore -import aboutUSMapImg from '../images/about-usmap.svg'; +import aboutUSMapImg from '../images/about-usmap-1.svg'; // @ts-ignore -import aboutJ40Img from '../images/about-j40.svg'; +import aboutJ40Img from '../images/about-j40-1.svg'; import accountBalanceIcon // @ts-ignore from '/node_modules/uswds/dist/img/usa-icons/account_balance.svg'; @@ -63,12 +63,12 @@ const IndexPage = ({location}: IndexPageProps) => { }, aboutScreenToolHeading: { id: 'index.heading.screentool', - defaultMessage: 'About the screening tool', + defaultMessage: 'The screening tool', description: 'heading for about screening tool', }, aboutJustice40Heading: { id: 'index.heading.justice40', - defaultMessage: 'About the Justice40 Initiative', + defaultMessage: 'The Justice40 Initiative', description: 'heading for about justice 40', }, }); @@ -197,7 +197,7 @@ const IndexPage = ({location}: IndexPageProps) => { Have ideas about how this tool can be improved to better diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx index 1f517c49..093a093a 100644 --- a/client/src/pages/methodology.tsx +++ b/client/src/pages/methodology.tsx @@ -59,11 +59,7 @@ const IndexPage = ({location}: MethodPageProps) => { - - - - - + diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss index ae295008..de6974f1 100644 --- a/client/src/styles/global.scss +++ b/client/src/styles/global.scss @@ -430,6 +430,7 @@ p.secondary.j40-indicator { .j40-aboutcard-image { flex: 1 0 10%; align-self: flex-start; + @include u-margin-top(5); } .j40-aboutcard-link {