From 9ee80a52030a5ad5f337c8751fb8df965dddaba4 Mon Sep 17 00:00:00 2001 From: Vim <86254807+vim-usds@users.noreply.github.com> Date: Fri, 7 Oct 2022 19:19:28 -0700 Subject: [PATCH] Update copy from Word Doc (#2001) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add tsc compile * fix TS warning around headingLevel * Temporary fix around availableFor type error - correlated to fix needed in ticket 2000 * Add copy update from CEJST pages - STATUS doc - Add a period in Get the Data box - Update unselected side panel text - Update text under explore the map - Content and styling for territories note - persistent FAB - “Help improve the tool” - Water needs to be “Water and Wastewater” - Styling on demographics ( show ) => (show) - Update age in demographics to be Elderly over 65 - Wildfire description is not correct - Lead paint description needs to be updated - remove bullet from How you can help - Footer - remove RFI - Footer - remove Eng cal - add sign up link * Update side panel non-selected copy * Add back PEC button to each main page * Remove console logs from J40Header * Fix DOM warning on About page - can't have
  • in

    * Fix nested DOM warning on Explore page - Modify ExploreDataBox styling * Update side panel non-selected with icons - update height on mobile - update snapshots --- client/package.json | 3 +- .../src/components/AreaDetail/AreaDetail.tsx | 4 +- .../ExploreDataBox/ExploreDataBox.module.scss | 11 +- .../ExploreDataBox.module.scss.d.ts | 1 + .../ExploreDataBox/ExploreDataBox.tsx | 4 +- .../ExploreDataBox.test.tsx.snap | 18 +-- .../HowYouCanHelp/HowYouCanHelp.tsx | 4 +- .../__snapshots__/howYouCanHelp.test.tsx.snap | 3 - client/src/components/J40Footer/J40Footer.tsx | 25 +-- .../__snapshots__/J40Footer.spec.tsx.snap | 40 ++--- client/src/components/J40Header/J40Header.tsx | 3 - client/src/components/J40Map.module.scss | 4 + .../SidePanelInfo/SidePanelInfo.tsx | 95 +++++++---- .../__snapshots__/SidePanelInfo.test.tsx.snap | 69 ++++++-- .../__snapshots__/SurveyButton.test.tsx.snap | 2 +- .../TractDemographics/TractDemographics.tsx | 4 +- .../TractDemographics.test.tsx.snap | 18 +-- .../__snapshots__/mapInfoPanel.test.tsx.snap | 69 ++++++-- client/src/data/copy/common.tsx | 33 ++-- client/src/data/copy/contact.tsx | 2 +- client/src/data/copy/explore.tsx | 152 ++++++++++++------ client/src/data/copy/methodology.tsx | 10 +- .../{bellCurve.svg => bell-curve.svg} | 0 .../images/sidePanelIcons/census-tract.svg | 13 ++ .../{pieChart.svg => pie-chart.svg} | 0 .../images/sidePanelIcons/select-arrow.svg | 25 +++ .../images/sidePanelIcons/tribal-tract.svg | 13 ++ .../{upDown.svg => up-down.svg} | 0 client/src/intl/en.json | 108 ++++++++----- client/src/pages/about.tsx | 6 +- client/src/pages/contact.tsx | 2 + client/src/pages/index.tsx | 24 ++- client/src/pages/methodology.tsx | 2 + .../tests/__snapshots__/about.test.tsx.snap | 87 +++++----- .../tests/__snapshots__/contact.test.tsx.snap | 61 ++++--- .../__snapshots__/downloads.test.tsx.snap | 40 ++--- .../freqAskedQuestions.test.tsx.snap | 40 ++--- .../__snapshots__/methodology.test.tsx.snap | 61 ++++--- .../__snapshots__/publicEng.test.tsx.snap | 40 ++--- .../techSupportDoc.test.tsx.snap | 40 ++--- client/src/styles/global.scss | 6 + 41 files changed, 689 insertions(+), 453 deletions(-) rename client/src/images/sidePanelIcons/{bellCurve.svg => bell-curve.svg} (100%) create mode 100644 client/src/images/sidePanelIcons/census-tract.svg rename client/src/images/sidePanelIcons/{pieChart.svg => pie-chart.svg} (100%) create mode 100644 client/src/images/sidePanelIcons/select-arrow.svg create mode 100644 client/src/images/sidePanelIcons/tribal-tract.svg rename client/src/images/sidePanelIcons/{upDown.svg => up-down.svg} (100%) diff --git a/client/package.json b/client/package.json index 9b404eeb..14ee9ec8 100644 --- a/client/package.json +++ b/client/package.json @@ -29,7 +29,8 @@ "intl:compile-en": "formatjs compile src/intl/en.json --ast --out-file compiled-lang/en.json", "test:intl-extraction": "node src/intl/testIntlExtraction", "prepare": "cd .. && husky install client/.husky", - "gc": "node .generate_component $1" + "gc": "node .generate_component $1", + "compile": "tsc" }, "devDependencies": { "@formatjs/cli": "^4.8.2", diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx index 97d7b7db..464bc106 100644 --- a/client/src/components/AreaDetail/AreaDetail.tsx +++ b/client/src/components/AreaDetail/AreaDetail.tsx @@ -738,8 +738,10 @@ const AreaDetail = ({properties, hash}: IAreaDetailProps) => { is required, however, the title prop is already defining the category styling, so this is placed here to satisfy the requirement of the AccordionItems API, however it's not being used. + + Casting 'h4' as const because it needs to be a heading type as specified HeadingLevel. */ - headingLevel: 'h4', + headingLevel: 'h4' as const, title: , content: ( diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss index bd8551e3..e621ac93 100644 --- a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss +++ b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss @@ -1,6 +1,11 @@ @use '../../styles/design-system.scss' as *; -.fileDownIcon{ - margin-bottom: -4px; - @include u-padding-left(1); +.summaryBoxContainer{ + + @include u-margin-top(2.5); + + .fileDownIcon{ + margin-bottom: -4px; + @include u-padding-left(1); + } } diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts index 01bdf2fd..51216274 100644 --- a/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts +++ b/client/src/components/ExploreDataBox/ExploreDataBox.module.scss.d.ts @@ -1,5 +1,6 @@ declare namespace ExploreDataBoxNamespace { export interface IExploreDataBoxScss { + summaryBoxContainer: string; fileDownIcon: string; } } diff --git a/client/src/components/ExploreDataBox/ExploreDataBox.tsx b/client/src/components/ExploreDataBox/ExploreDataBox.tsx index 352bbdfb..0550830a 100644 --- a/client/src/components/ExploreDataBox/ExploreDataBox.tsx +++ b/client/src/components/ExploreDataBox/ExploreDataBox.tsx @@ -16,7 +16,7 @@ const ExploreDataBox = ({}: IExploreDataBoxProps) => { const intl = useIntl(); return ( - + {intl.formatMessage(EXPLORE_COPY.EXPLORE_DATA_BOX.TITLE)} @@ -26,7 +26,7 @@ const ExploreDataBox = ({}: IExploreDataBoxProps) => { -

    {EXPLORE_COPY.EXPLORE_DATA_BOX_BODY}

    + {EXPLORE_COPY.EXPLORE_DATA_BOX_BODY} diff --git a/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap b/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap index 0bd88451..7a497881 100644 --- a/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap +++ b/client/src/components/ExploreDataBox/__snapshots__/ExploreDataBox.test.tsx.snap @@ -24,18 +24,16 @@ exports[`rendering of ExploreDataBox Component checks if component renders 1`] =
    -

    - + Download the data with documentation and shapefiles, from the - - downloads - - page + + downloads + + page. -

    diff --git a/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx b/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx index 314335c4..ebdb1d35 100644 --- a/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx +++ b/client/src/components/HowYouCanHelp/HowYouCanHelp.tsx @@ -16,9 +16,9 @@ const HowYouCanHelp = () => {
  • {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_2}
  • -
  • + {/*
  • {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_3} -
  • + */}
  • {ABOUT_COPY.HOW_YOU_CAN_HELP_LIST_ITEMS.LIST_ITEM_4}
  • 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 6a12b5f7..6395b8fd 100644 --- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap +++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap @@ -27,9 +27,6 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl . -
  • - Have feedback about a specific census tract? You can either click here or click the “Send Feedback” button on the side-panel of a census tract on the map. -
  • Any other questions? Email: { @@ -33,27 +32,19 @@ const J40Footer = () => { COMMON_COPY.FOOTER_CEQ_ADDRESS.PHONE, ]} />, + , ], [ intl.formatMessage(COMMON_COPY.FOOTER.MORE_INFO), , - , -
  • + @@ -79,30 +92,7 @@ exports[`J40Footer renders correctly 1`] = ` class="usa-footer__secondary-link" > - Engagement calendar - - - - -
  • - Have feedback about a specific census tract? You can either click here or click the “Send Feedback” button on the side-panel of a census tract on the map. -
  • Any other questions? Email:
  • + @@ -846,30 +878,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > - Engagement calendar - - - - + @@ -546,30 +580,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > - Engagement calendar - - - - + @@ -546,30 +559,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > - Engagement calendar - - - - + @@ -459,30 +472,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > - Engagement calendar - - - - + @@ -2426,30 +2460,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > - Engagement calendar - - - - + @@ -1057,30 +1070,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > - Engagement calendar - - - - + @@ -459,30 +472,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > - Engagement calendar - - - -