From 0e84cbac3a726273132f5774e309d7f409503d30 Mon Sep 17 00:00:00 2001 From: Ryon Coleman Date: Tue, 14 Jan 2025 12:09:45 -0500 Subject: [PATCH] Latest content changes --- client/src/components/AboutCard/AboutCard.tsx | 9 +- .../AreaDetail/areaDetail.module.scss | 9 + .../components/DatasetCard/DatasetCard.tsx | 14 +- .../__snapshots__/datasetCard.test.tsx.snap | 6 - .../datasetContainer.test.tsx.snap | 6 - client/src/components/J40Footer/J40Footer.tsx | 2 + .../__snapshots__/J40Footer.spec.tsx.snap | 7 + .../LinkTypeWrapper.module.scss | 22 ++ .../LinkTypeWrapper.module.scss.d.ts | 4 + .../LinkTypeWrapper/LinkTypeWrapper.tsx | 85 ++++--- .../components/MapSearch/MapSearch.test.tsx | 34 ++- .../PrioritizationCopy.module.scss | 4 - .../PrioritizationCopy.test.tsx | 222 ++---------------- .../PrioritizationCopy/PrioritizationCopy.tsx | 13 +- .../PrioritizationCopy.test.tsx.snap | 20 +- .../PrioritizationCopy2.module.scss | 4 - .../PrioritizationCopy2.test.tsx | 6 +- .../PrioritizationCopy2.tsx | 13 +- .../PrioritizationCopy2.test.tsx.snap | 12 +- client/src/data/copy/about.tsx | 5 + client/src/data/copy/explore.tsx | 2 +- client/src/data/copy/faqs.tsx | 11 +- client/src/data/copy/methodology.tsx | 15 +- client/src/intl/en.json | 24 +- client/src/intl/es.json | 15 +- client/src/pages/about.tsx | 1 + .../src/pages/frequently-asked-questions.tsx | 1 + client/src/pages/methodology.tsx | 7 +- .../tests/__snapshots__/about.test.tsx.snap | 14 ++ .../tests/__snapshots__/contact.test.tsx.snap | 7 + .../__snapshots__/downloads.test.tsx.snap | 7 + .../freqAskedQuestions.test.tsx.snap | 14 +- .../__snapshots__/methodology.test.tsx.snap | 26 +- .../tests/__snapshots__/privacy.test.tsx.snap | 7 + .../techSupportDoc.test.tsx.snap | 7 + 35 files changed, 303 insertions(+), 352 deletions(-) create mode 100644 client/src/components/LinkTypeWrapper/LinkTypeWrapper.module.scss create mode 100644 client/src/components/LinkTypeWrapper/LinkTypeWrapper.module.scss.d.ts diff --git a/client/src/components/AboutCard/AboutCard.tsx b/client/src/components/AboutCard/AboutCard.tsx index c08d91c9..c7fc5290 100644 --- a/client/src/components/AboutCard/AboutCard.tsx +++ b/client/src/components/AboutCard/AboutCard.tsx @@ -1,8 +1,9 @@ -import React from 'react'; import {Grid} from '@trussworks/react-uswds'; +import React from 'react'; -import LinkTypeWrapper from '../LinkTypeWrapper'; import {hyphenizeString} from '../../../cypress/integration/common/helpers'; +import LinkTypeWrapper from '../LinkTypeWrapper'; +import {TagVariant} from '../LinkTypeWrapper/LinkTypeWrapper'; // the "body" section is the child object to allow for html versus just text interface AboutCardProps { @@ -10,6 +11,8 @@ interface AboutCardProps { header: string; size: 'small' | 'large'; linkText?: string | JSX.Element; + linkTag?: string; + linkTagVariant?: TagVariant; url?: string; openUrlNewTab?: boolean; className?: string; @@ -64,6 +67,8 @@ const AboutCard = (props: React.PropsWithChildren) => { internal={props.internal} url={props.url ? props.url : ''} openUrlNewTab={props.openUrlNewTab} + tag={props.linkTag} + tagVariant={props.linkTagVariant} // className={'j40-aboutcard-link'} />} diff --git a/client/src/components/AreaDetail/areaDetail.module.scss b/client/src/components/AreaDetail/areaDetail.module.scss index 79a22ff7..65586ce4 100644 --- a/client/src/components/AreaDetail/areaDetail.module.scss +++ b/client/src/components/AreaDetail/areaDetail.module.scss @@ -49,6 +49,15 @@ $sidePanelLabelFontColor: #171716; @include u-padding-right(2); @include u-padding-top(2); + p { + font: inherit; + margin: 0; + padding: 0; + + + p { + @include u-margin-top(2); + } + } } .showCategoriesExceed { diff --git a/client/src/components/DatasetCard/DatasetCard.tsx b/client/src/components/DatasetCard/DatasetCard.tsx index 2a27a57f..7f2a13d2 100644 --- a/client/src/components/DatasetCard/DatasetCard.tsx +++ b/client/src/components/DatasetCard/DatasetCard.tsx @@ -47,12 +47,14 @@ const DatasetCard = ({datasetCardProps}: IDatasetCardProps) => { diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap index 491c4a2d..85d01d0a 100644 --- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap @@ -738,6 +738,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > Check out the code on GitHub +   + + New Location + diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap index f3338b97..0e87f2f1 100644 --- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap @@ -511,7 +511,10 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > statistical areas - are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. Tracts that were identified as disadvantaged in the 1.0 version of the tool remain disadvantaged in the 2.0 version of the tool. + are determined by the U.S. Census Bureau once every ten years. The tool utilizes the census tract boundaries from 2010. +

+

+ Tracts that were identified as disadvantaged in the 1.0 version of the tool remain disadvantaged in the 2.0 version of the tool.

Due to limited data availability, tracts in American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands are considered disadvantaged if they meet the low income threshold only. @@ -578,7 +581,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis American Samoa, Guam, the Northern Mariana Islands, and the U.S. Virgin Islands: - For these U.S. Territories, the tool uses the following data: unemployment, poverty, low median income, and high school education. These burdens are in the workforce development category. Due to limited data availability, tracts in these U.S. Territories are considered disadvantaged if they meet the low income threshold only. + For these U.S. Territories, the tool uses the following data: unemployment, poverty, low median income, and high school education. These burdens are in the workforce development category. Due to limited data availability, tracts in these U.S. Territories are also considered disadvantaged if they meet the low income threshold only.

Check out the code on GitHub +   + + New Location + diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap index 18be91ae..708958b0 100644 --- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap @@ -456,14 +456,23 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
  • - For census tracts that were identified as disadvantaged in version 1.0 of the tool, but do not meet the methodology for the 2.0 version: If the census tract ID was identified as disadvantaged in version 1.0, then the census tract is considered disadvantaged + For census tracts that were identified as disadvantaged in version 1.0 of the tool, but do not meet the methodology for the 2.0 version:

    +
      +
    • +

      + + If the census tract ID was identified as disadvantaged in version 1.0, then the census tract is considered disadvantaged + +

      +
    • +
  • - Additionally, census tracts in certain U.S. Territories are considered disadvantaged if they meet the low income threshold only. This is because these Territories are not included in each of the nationally-consistent datasets on environmental and climate burdens used in the tool + Additionally, census tracts in certain U.S. Territories are considered disadvantaged if they meet the low income threshold only. This is because these Territories are not included in each of the nationally-consistent datasets on environmental and climate burdens used in the tool.

  • @@ -1144,12 +1153,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

      -
    • - - Used in: - - All categories -
    • Responsible party: @@ -3292,6 +3295,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > Check out the code on GitHub +   + + New Location +
    diff --git a/client/src/pages/tests/__snapshots__/privacy.test.tsx.snap b/client/src/pages/tests/__snapshots__/privacy.test.tsx.snap index 88d1f8ca..0f99e639 100644 --- a/client/src/pages/tests/__snapshots__/privacy.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/privacy.test.tsx.snap @@ -730,6 +730,13 @@ exports[`rendering of the Privacy Policy page matches Privacy Policy page snapsh > Check out the code on GitHub +   + + New Location + diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap index f2dfc0c8..93170868 100644 --- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap @@ -546,6 +546,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > Check out the code on GitHub +   + + New Location +