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
* 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: {EXPLORE_COPY.EXPLORE_DATA_BOX_BODY}
-
+
Download the data with documentation and shapefiles, from the
-
- downloads
-
- page
+
+ downloads
+
+ page.
-
- {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3_PART1)}
- {
- windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
- constants.USWDS_BREAKPOINTS.MOBILE_LG &&
+
+ {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3_PART1)}
+
- }
- {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA3_PART2)}
-
- {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART1)} - { - windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG && + { + windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG && +
+ {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART1)}
- }
- {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART2)}
- {
- windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG &&
-
- }
- {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA4_PART3)}
-
- {EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE_PARA5} -
+ { + windowWidth > constants.USWDS_BREAKPOINTS.MOBILE_LG && +
+ {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA5_PART1)}
+
+ {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA5_PART2)}
+
+ {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA5_PART3)}
+
+ {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA5_PART4)}
+
+ {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA6_PART1)}
+
+ {intl.formatMessage(EXPLORE_COPY.SIDE_PANEL_INITIAL_STATE.PARA6_PART2)}
+
- Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color
+ Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted
- on the map. This color is an opacity. This is so information about the map can be seen.
+ on the map.
- The tool uses percentiles
+ The tool ranks most of the burdens using percentiles
- , percentages
+ . Percentiles show how much burden each tract experiences when compared to other tracts.
+
+
+
+ Thresholds
+
+
+
+ , or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages
- , or a simple yes/no to indicate how much burden the communities are experiencing in each tract.
+ or a simple yes/no
+
+
+
+ .
- The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden
-
- AND
-
- it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.
-
+ Federally Recognized Tribal lands are also highlighted
+
+
+
+ highlighted on the map. These communities are also considered disadvantaged.
+
- Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color
+ Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted
- on the map. This color is an opacity. This is so information about the map can be seen.
+ on the map.
- The tool uses percentiles
+ The tool ranks most of the burdens using percentiles
- , percentages
+ . Percentiles show how much burden each tract experiences when compared to other tracts.
+
+
+
+ Thresholds
+
+
+
+ , or cutoffs, are used to determine if communities in a tract are disadvantaged. Certain burdens use percentages
- , or a simple yes/no to indicate how much burden the communities are experiencing in each tract.
+ or a simple yes/no
+
+
+
+ .
- The tool also uses thresholds. If the tract meets or exceeds the threshold of any climate, environmental, or other burden
-
- AND
-
- it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged.
-
+ Federally Recognized Tribal lands are also highlighted
+
+
+
+ highlighted on the map. These communities are also considered disadvantaged.
+
{ABOUT_COPY.CONTENT.PARA2}
-+
{ABOUT_COPY.CONTENT.PARA4}
diff --git a/client/src/pages/contact.tsx b/client/src/pages/contact.tsx index bd420a1f..a89c7f35 100644 --- a/client/src/pages/contact.tsx +++ b/client/src/pages/contact.tsx @@ -5,6 +5,7 @@ import {useIntl, FormattedMessage} from 'gatsby-plugin-intl'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; import LinkTypeWrapper from '../components/LinkTypeWrapper'; +import PublicEngageButton from '../components/PublicEngageButton'; import RequestForInfo from '../components/RequestForInfo'; import * as CONTACT_COPY from '../data/copy/contact'; @@ -23,6 +24,7 @@ const ContactPage = ({location}: IContactPageProps) => {- {EXPLORE_COPY.PAGE_DESCRIPTION1} -
-- {EXPLORE_COPY.PAGE_DESCRIPTION2} -
-+ {EXPLORE_COPY.PAGE_DESCRIPTION1} +
++ {EXPLORE_COPY.PAGE_DESCRIPTION2} +
-
{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_0}
{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_1}
{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_2}
-{EXPLORE_COPY.NOTE_ON_TERRITORIES.PARA_3}
+
CEQ will update the tool each year based on public feedback, research, and the availability of new data. The current version of the tool is version 1.0. @@ -752,9 +774,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis . -