From 5633d0f86ea3ea1da575486962b5abb417bac1b6 Mon Sep 17 00:00:00 2001 From: Vim <86254807+vim-usds@users.noreply.github.com> Date: Wed, 21 Sep 2022 13:39:54 -0700 Subject: [PATCH] Fix all link colors, prevent logo from wrapping, update non-selected side-panel (#1908) * Update links colors - Language links - Download links - Simple links - External links - Side panel demographics links - return to top links - update snapshots * Fix wrapping on logo title - remove beta pill * Update un-selected side panel copy (desktop) - two icons are needed * Remove icons on mobile view * Remove the pub. eng. button on all pages * Add usa-link class to all links - will create consiste visible state on all links * Remove tribal toggle - remove tribal layer from feature flag and make it default --- .../src/components/AreaDetail/AreaDetail.tsx | 149 +++++++------- .../__snapshots__/areaDetail.test.tsx.snap | 54 ++--- .../__snapshots__/Categories.test.tsx.snap | 38 ++++ .../__snapshots__/CategoryCard.test.tsx.snap | 5 + .../src/components/DatasetContainer/index.tsx | 2 +- .../datasetContainer.test.tsx.snap | 1 + .../components/DownloadLink/DownloadLink.tsx | 2 +- .../__snapshots__/DownloadLink.test.tsx.snap | 1 + .../GovernmentBanner.test.tsx.snap | 2 + .../__snapshots__/howYouCanHelp.test.tsx.snap | 1 + .../__snapshots__/J40Footer.spec.tsx.snap | 2 +- .../J40Header/J40Header.module.scss | 18 +- client/src/components/J40Header/J40Header.tsx | 9 +- .../__snapshots__/J40Header.test.tsx.snap | 16 +- client/src/components/J40Map.tsx | 43 +--- .../components/Language/Language.module.scss | 4 +- client/src/components/Language/Language.tsx | 2 +- .../__snapshots__/Language.test.tsx.snap | 2 + .../LinkTypeWrapper/LinkTypeWrapper.tsx | 2 +- .../linkTypeWrapper.test.tsx.snap | 1 + .../SidePanelInfo/SidePanelInfo.module.scss | 14 +- .../SidePanelInfo/SidePanelInfo.tsx | 122 +++++++++--- .../__snapshots__/SidePanelInfo.test.tsx.snap | 142 +++++++++---- .../components/SubPageNav/SubPageNav.test.tsx | 8 +- .../TractDemographics.module.scss | 4 +- .../TractDemographics/TractDemographics.tsx | 8 +- .../TractDemographics.test.tsx.snap | 42 ++-- .../__snapshots__/mapInfoPanel.test.tsx.snap | 142 +++++++++---- client/src/components/mapInfoPanel.tsx | 17 +- client/src/data/copy/common.tsx | 11 +- client/src/data/copy/explore.tsx | 187 +++++++++++++----- client/src/data/getOSBaseMap.tsx | 121 +----------- client/src/data/tribalToggleLayerOSMap.tsx | 111 +++++++++++ client/src/intl/en.json | 114 +++++++---- client/src/pages/about.tsx | 2 - client/src/pages/contact.tsx | 2 - client/src/pages/downloads.tsx | 2 - client/src/pages/index.tsx | 2 - client/src/pages/methodology.tsx | 2 - .../tests/__snapshots__/about.test.tsx.snap | 41 +--- .../tests/__snapshots__/contact.test.tsx.snap | 40 +--- .../__snapshots__/downloads.test.tsx.snap | 42 +--- .../freqAskedQuestions.test.tsx.snap | 18 +- .../__snapshots__/methodology.test.tsx.snap | 78 ++++---- .../__snapshots__/publicEng.test.tsx.snap | 18 +- .../techSupportDoc.test.tsx.snap | 18 +- 46 files changed, 933 insertions(+), 729 deletions(-) create mode 100644 client/src/data/tribalToggleLayerOSMap.tsx diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx index a505ef36..cddfdb27 100644 --- a/client/src/components/AreaDetail/AreaDetail.tsx +++ b/client/src/components/AreaDetail/AreaDetail.tsx @@ -23,7 +23,6 @@ import mailIcon from '/node_modules/uswds/dist/img/usa-icons/mail_outline.svg'; interface IAreaDetailProps { properties: constants.J40Properties, hash: string[], - isCensusLayerSelected: boolean, } /** @@ -106,7 +105,7 @@ export const indicatorFilter = (label:MessageDescriptor) => { * @param {IAreaDetailProps} {} * @return {void} */ -const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps) => { +const AreaDetail = ({properties, hash}: IAreaDetailProps) => { const intl = useIntl(); // console.log the properties of the census that is selected: @@ -118,7 +117,6 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps) const countyName = properties[constants.COUNTY_NAME] ? properties[constants.COUNTY_NAME] : "N/A"; const stateName = properties[constants.STATE_NAME] ? properties[constants.STATE_NAME] : "N/A"; const sidePanelState = properties[constants.SIDE_PANEL_STATE]; - const landAreaName = properties[constants.LAND_AREA_NAME]; const isCommunityFocus = score >= constants.SCORE_BOUNDARY_THRESHOLD; @@ -775,92 +773,81 @@ const AreaDetail = ({properties, hash, isCensusLayerSelected}: IAreaDetailProps) return ( diff --git a/client/src/components/mapInfoPanel.tsx b/client/src/components/mapInfoPanel.tsx index c0ec0687..60e9c121 100644 --- a/client/src/components/mapInfoPanel.tsx +++ b/client/src/components/mapInfoPanel.tsx @@ -7,8 +7,6 @@ interface IMapInfoPanelProps { featureProperties: { [key:string]: string | number } | undefined, selectedFeatureId: string | number | undefined hash: string[], - isCensusLayerSelected: boolean, - layerToggled: boolean, // indicates if census layer or tribal layer has been toggled } const MapInfoPanel = ({ @@ -16,23 +14,18 @@ const MapInfoPanel = ({ featureProperties, selectedFeatureId, hash, - isCensusLayerSelected, - layerToggled, }:IMapInfoPanelProps) => { return (
- {/* The tertiary conditional statement below will control the side panel state. Currently + {/* + The tertiary conditional statement below will control the side panel state. Currently there are two states, namely showing the AreaDetail or SidePanelInfo. When a feature - is selected, on - for example - the census tract layer, and if the Tribal Layer is the selected - the Side Panel should revert back to the SidePanelInfo. - - A new boolean called layerToggle captures that a layer has been selected and to render - the SidePanelInfo component */} - {(featureProperties && selectedFeatureId && !layerToggled) ? + is selected, show the AreaDetail. When not selected show SidePanelInfo + */} + {(featureProperties && selectedFeatureId) ? : } diff --git a/client/src/data/copy/common.tsx b/client/src/data/copy/common.tsx index 0e28b248..11492f8c 100644 --- a/client/src/data/copy/common.tsx +++ b/client/src/data/copy/common.tsx @@ -20,7 +20,7 @@ export interface IDefineMessage { * */ export const italicFn = (str:string) => {str}; export const boldFn = (str:string) => {str}; -export const simpleLink = (href:string) => (str:string) => {str}; +export const simpleLink = (href:string) => (str:string) => {str}; // export const downloadLink = (href:string) => (str:string) => {str}; export const downloadLink = (href:string) => (str:string) => ; // eslint-disable-next-line max-len @@ -101,13 +101,8 @@ export const ALERTS = { export const HEADER = defineMessages({ TITLE_LINE_1: { id: 'common.pages.header.title.line1', - defaultMessage: `Climate and Economic Justice`, - description: 'Navigate to the about page. This is Title in nav header line 1 of 2', - }, - TITLE_LINE_2: { - id: 'common.pages.header.title.line2', - defaultMessage: `Screening Tool`, - description: 'Navigate to the about page. This is Title in nav header line 2 of 2', + defaultMessage: `Climate and Economic Justice Screening Tool`, + description: 'Navigate to the about page. This is Title in nav header', }, ABOUT: { id: 'common.pages.header.about', diff --git a/client/src/data/copy/explore.tsx b/client/src/data/copy/explore.tsx index 1ea020ec..2b50b1ea 100644 --- a/client/src/data/copy/explore.tsx +++ b/client/src/data/copy/explore.tsx @@ -207,86 +207,185 @@ export const MAP = defineMessages({ }); -// Side Panel copy +// Side Panel non-selected state copy export const SIDE_PANEL_INITIAL_STATE = defineMessages({ - TITLE: { - id: 'explore.map.page.side.panel.info.title', - defaultMessage: 'Things to know', - description: 'introductory text of ways to use the map', - }, - PARA1: { - id: 'explore.map.page.side.panel.info.para1', - defaultMessage: ` - This tool identifies communities that are marginalized, underserved, and overburdened by pollution. These communities are located in census tracts that are at or above the thresholds in one or more of eight categories of criteria. - `, - description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first paragraph of this side panel`, - }, HEADING1: { id: 'explore.map.page.side.panel.info.heading1', defaultMessage: ` - Zoom in or search and select to see data about any census tract of interest + How to use the map: `, - description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first paragraph of this side panel`, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the first heading of the non-selected side panel', }, - PARA2: { - id: 'explore.map.page.side.panel.info.para2', + PARA1_PART1: { + id: 'explore.map.page.side.panel.info.para.1.part.1', defaultMessage: ` - The tool uses census tracts that represent about 4,000 people, which is the smallest unit of geography for which consistent data can be displayed on the map. + Zoom in `, - description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the second paragraph of this side panel`, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Zoom in', }, - PARA3: { - id: 'explore.map.page.side.panel.info.para3', + PARA1_PART2: { + id: 'explore.map.page.side.panel.info.para.1.part.2', defaultMessage: ` - The tool ranks each census tract using percentiles that show how much burden each tract experiences relative to all other tracts, for each criterion. + , search `, - description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the third paragraph of this side panel`, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show search', }, - PARA4: { - id: 'explore.map.page.side.panel.info.para4', + PARA1_PART3: { + id: 'explore.map.page.side.panel.info.para.1.part.2', defaultMessage: ` - Percentages are used for certain variables, i.e. those relating to high school achievement rate and to the share of individuals not currently enrolled in higher education. + , or locate yourself `, - description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the forth paragraph of this side panel`, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or locate yourself', }, - ALT_TEXT_ICON1: { - id: 'explore.map.page.side.panel.info.alt.text.icon1', + PARA1_PART4: { + id: 'explore.map.page.side.panel.info.para.1.part.4', defaultMessage: ` - An icon that has depicts pieces of a block selected mimicking the census block census tracts + and select `, - description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first icon in this side panel`, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show and select', }, - ALT_TEXT_ICON2: { - id: 'explore.map.page.side.panel.info.alt.text.icon2', + PARA1_PART5: { + id: 'explore.map.page.side.panel.info.para.1.part.5', defaultMessage: ` - An icon that a bell curve or gaussian distribution + to see information about any census tract `, - description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the second icon in this side panel`, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show to see information about any census tract', }, - ALT_TEXT_ICON3: { - id: 'explore.map.page.side.panel.info.alt.text.icon3', + HEADING2: { + id: 'explore.map.page.side.panel.info.heading2', defaultMessage: ` - An icon that depicts a part of pie chart being removed + Things to know: `, - description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the third icon in this side panel`, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know:`, }, - ALT_TEXT_ICON4: { - id: 'explore.map.page.side.panel.info.alt.text.icon4', + PARA2_PART1: { + id: 'explore.map.page.side.panel.info.para.2.part.1', defaultMessage: ` - An icon that has an up arrow and a down arrow + The tool uses census tracts `, - description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the forth icon in this side panel`, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses census tracts', + }, + PARA2_PART2: { + id: 'explore.map.page.side.panel.info.para.2.part.2', + defaultMessage: ` + . Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation. + `, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.', + }, + PARA3_PART1: { + id: 'explore.map.page.side.panel.info.para.3.part.1', + defaultMessage: ` + Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color + `, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color', + }, + PARA3_PART2: { + id: 'explore.map.page.side.panel.info.para.3.part.2', + defaultMessage: ` + on the map. This color is an opacity. This is so information about the map can be seen. + `, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show on the map. This color is an opacity. This is so information about the map can be seen.', + }, + PARA4_PART1: { + id: 'explore.map.page.side.panel.info.para.4.part.1', + defaultMessage: ` + The tool uses percentiles + `, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses percentiles', + }, + PARA4_PART2: { + id: 'explore.map.page.side.panel.info.para.4.part.2', + defaultMessage: ` + , percentages + `, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show percentages', + }, + PARA4_PART3: { + id: 'explore.map.page.side.panel.info.para.4.part.3', + defaultMessage: ` + , or a simple yes/no to indicate how much burden the communities are experiencing in each tract. + `, + description: '`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or a simple yes/no to indicate how much burden the communities are experiencing in each tract.', }, }); export const SIDE_PANEL_INITIAL_STATE_PARA5 = AND it meets the threshold for the associated socioeconomic burden, then communites in the tract are considered disadvantaged. `} description={`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane`} + values={{ + bold: COMMON_COPY.boldFn, + }} />; +export const SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT = defineMessages({ + PLUS: { + id: 'explore.map.page.side.panel.info.alt.text.icon.plus', + defaultMessage: ` + a plus icon indicating that the user can zoom in + *`, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a plus icon indicating that the user can zoom in`, + }, + SEARCH: { + id: 'explore.map.page.side.panel.info.alt.text.icon.search', + defaultMessage: ` + a magnifying glass icon informing the user can search + `, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a magnifying glass icon informing the user can search`, + }, + LOCATE: { + id: 'explore.map.page.side.panel.info.alt.text.icon.locate', + defaultMessage: ` + a gps icon informing the user can locate + `, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a gps icon informing the user can locate`, + }, + MOUSE: { + id: 'explore.map.page.side.panel.info.alt.text.icon.mouse', + defaultMessage: ` + a mouse arrow icon informing the user can use the mouse + `, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a mouse arrow icon informing the user can use the mouse`, + }, + TRACT: { + id: 'explore.map.page.side.panel.info.alt.text.icon.tract', + defaultMessage: ` + a tract icon informing the user of census tracts + `, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a tract icon informing the user of census tracts`, + }, + DAC_CIRCLE: { + id: 'explore.map.page.side.panel.info.alt.text.icon.dac.circle', + defaultMessage: ` + a blue circle icon informing the user of what a disadvantaged community is depicted as + `, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a blue circle icon informing the user of what a disadvantaged community is depicted as`, + }, + BELL_CURVE: { + id: 'explore.map.page.side.panel.info.alt.text.icon.bell', + defaultMessage: ` + An icon that a bell curve or gaussian distribution + `, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that a bell curve or gaussian distribution`, + }, + PIE_CHART: { + id: 'explore.map.page.side.panel.info.alt.text.icon.pie', + defaultMessage: ` + An icon that depicts a part of pie chart being removed + `, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that depicts a part of pie chart being removed`, + }, + UP_ARROW: { + id: 'explore.map.page.side.panel.info.alt.text.icon.up.arrow', + defaultMessage: ` + An icon that has an up arrow and a down arrow + `, + description: `Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that has an up arrow and a down arrow`, + }, +}); + export const SIDE_PANEL_VERION = { TITLE: { - return !censusSelected ? { - - /** - * Tribal Source - */ - 'version': 8, - - /** - * Map Sources - * */ - 'sources': { - - /** - * The base map source source allows us to define where the tiles can be fetched from. - */ - [constants.BASE_MAP_SOURCE_NAME]: { - 'type': 'raster', - 'tiles': cartoLightBaseLayer.noLabels, - 'minzoom': constants.GLOBAL_MIN_ZOOM, - 'maxzoom': constants.GLOBAL_MAX_ZOOM, - }, - - /** - * Tribal source - */ - [constants.TRIBAL_SOURCE_NAME]: { - 'type': 'vector', - 'promoteId': constants.TRIBAL_ID, - 'tiles': [tribalURL()], - 'minzoom': constants.TRIBAL_MIN_ZOOM, - 'maxzoom': constants.TRIBAL_MAX_ZOOM, - }, - - // The labels source: - 'labels': { - 'type': 'raster', - 'tiles': cartoLightBaseLayer.labelsOnly, - }, - }, - - - /** - * Tribal Layers - */ - 'layers': [ - - // The baseMapLayer - { - 'id': constants.BASE_MAP_LAYER_ID, - 'source': constants.BASE_MAP_SOURCE_NAME, - 'type': 'raster', - 'minzoom': constants.GLOBAL_MIN_ZOOM, - 'maxzoom': constants.GLOBAL_MAX_ZOOM, - }, - - /** - * Tribal layer - */ - { - 'id': constants.TRIBAL_LAYER_ID, - 'source': constants.TRIBAL_SOURCE_NAME, - 'source-layer': constants.TRIBAL_SOURCE_LAYER, - 'type': 'fill', - 'paint': { - 'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR, - 'fill-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY, - }, - 'minzoom': constants.TRIBAL_MIN_ZOOM, - 'maxzoom': constants.TRIBAL_MAX_ZOOM, - }, - - /** - * Tribal layer - controls the border between features - */ - { - 'id': constants.FEATURE_BORDER_LAYER_ID, - 'source': constants.TRIBAL_SOURCE_NAME, - 'source-layer': constants.TRIBAL_SOURCE_LAYER, - 'type': 'line', - 'paint': { - 'line-color': constants.FEATURE_BORDER_COLOR, - 'line-width': constants.FEATURE_BORDER_WIDTH, - 'line-opacity': constants.FEATURE_BORDER_OPACITY}, - 'minzoom': constants.TRIBAL_MIN_ZOOM, - 'maxzoom': constants.TRIBAL_MAX_ZOOM, - }, - - /** - * Alaska layer - */ - { - 'id': constants.TRIBAL_ALASKA_POINTS_LAYER_ID, - 'source': constants.TRIBAL_SOURCE_NAME, - 'source-layer': constants.TRIBAL_SOURCE_LAYER, - 'type': 'circle', - 'filter': ['==', ['geometry-type'], 'Point'], - 'paint': { - 'circle-radius': constants.TRIBAL_ALASKA_CIRCLE_RADIUS, - 'circle-color': constants.PRIORITIZED_FEATURE_FILL_COLOR, - 'circle-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY, - 'circle-stroke-color': constants.FEATURE_BORDER_COLOR, - 'circle-stroke-width': constants.ALAKSA_POINTS_STROKE_WIDTH, - 'circle-stroke-opacity': constants.FEATURE_BORDER_OPACITY, - }, - 'minzoom': constants.TRIBAL_MIN_ZOOM, - 'maxzoom': constants.TRIBAL_MAX_ZOOM, - }, - ], - } : - { +export const getOSBaseMap = (): Style => { + return { 'version': 8, /** diff --git a/client/src/data/tribalToggleLayerOSMap.tsx b/client/src/data/tribalToggleLayerOSMap.tsx new file mode 100644 index 00000000..e768d82d --- /dev/null +++ b/client/src/data/tribalToggleLayerOSMap.tsx @@ -0,0 +1,111 @@ +/** + * This file holds the tribal layer styling for the OS map in case we want to add the toggle back. + */ +// const tribal:any = { +// /** +// * Tribal Source +// */ +// 'version': 8, + +// /** +// * Map Sources +// * */ +// 'sources': { + +// /** +// * The base map source source allows us to define where the tiles can be fetched from. +// */ +// [constants.BASE_MAP_SOURCE_NAME]: { +// 'type': 'raster', +// 'tiles': cartoLightBaseLayer.noLabels, +// 'minzoom': constants.GLOBAL_MIN_ZOOM, +// 'maxzoom': constants.GLOBAL_MAX_ZOOM, +// }, + +// /** +// * Tribal source +// */ +// [constants.TRIBAL_SOURCE_NAME]: { +// 'type': 'vector', +// 'promoteId': constants.TRIBAL_ID, +// 'tiles': [tribalURL()], +// 'minzoom': constants.TRIBAL_MIN_ZOOM, +// 'maxzoom': constants.TRIBAL_MAX_ZOOM, +// }, + +// // The labels source: +// 'labels': { +// 'type': 'raster', +// 'tiles': cartoLightBaseLayer.labelsOnly, +// }, +// }, + + +// /** +// * Tribal Layers +// */ +// 'layers': [ + +// // The baseMapLayer +// { +// 'id': constants.BASE_MAP_LAYER_ID, +// 'source': constants.BASE_MAP_SOURCE_NAME, +// 'type': 'raster', +// 'minzoom': constants.GLOBAL_MIN_ZOOM, +// 'maxzoom': constants.GLOBAL_MAX_ZOOM, +// }, + +// /** +// * Tribal layer +// */ +// { +// 'id': constants.TRIBAL_LAYER_ID, +// 'source': constants.TRIBAL_SOURCE_NAME, +// 'source-layer': constants.TRIBAL_SOURCE_LAYER, +// 'type': 'fill', +// 'paint': { +// 'fill-color': constants.PRIORITIZED_FEATURE_FILL_COLOR, +// 'fill-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY, +// }, +// 'minzoom': constants.TRIBAL_MIN_ZOOM, +// 'maxzoom': constants.TRIBAL_MAX_ZOOM, +// }, + +// /** +// * Tribal layer - controls the border between features +// */ +// { +// 'id': constants.FEATURE_BORDER_LAYER_ID, +// 'source': constants.TRIBAL_SOURCE_NAME, +// 'source-layer': constants.TRIBAL_SOURCE_LAYER, +// 'type': 'line', +// 'paint': { +// 'line-color': constants.FEATURE_BORDER_COLOR, +// 'line-width': constants.FEATURE_BORDER_WIDTH, +// 'line-opacity': constants.FEATURE_BORDER_OPACITY}, +// 'minzoom': constants.TRIBAL_MIN_ZOOM, +// 'maxzoom': constants.TRIBAL_MAX_ZOOM, +// }, + +// /** +// * Alaska layer +// */ +// { +// 'id': constants.TRIBAL_ALASKA_POINTS_LAYER_ID, +// 'source': constants.TRIBAL_SOURCE_NAME, +// 'source-layer': constants.TRIBAL_SOURCE_LAYER, +// 'type': 'circle', +// 'filter': ['==', ['geometry-type'], 'Point'], +// 'paint': { +// 'circle-radius': constants.TRIBAL_ALASKA_CIRCLE_RADIUS, +// 'circle-color': constants.PRIORITIZED_FEATURE_FILL_COLOR, +// 'circle-opacity': constants.HIGH_ZOOM_PRIORITIZED_FEATURE_FILL_OPACITY, +// 'circle-stroke-color': constants.FEATURE_BORDER_COLOR, +// 'circle-stroke-width': constants.ALAKSA_POINTS_STROKE_WIDTH, +// 'circle-stroke-opacity': constants.FEATURE_BORDER_OPACITY, +// }, +// 'minzoom': constants.TRIBAL_MIN_ZOOM, +// 'maxzoom': constants.TRIBAL_MAX_ZOOM, +// }, +// ], +// }; diff --git a/client/src/intl/en.json b/client/src/intl/en.json index 423a8e80..f04a2681 100644 --- a/client/src/intl/en.json +++ b/client/src/intl/en.json @@ -224,12 +224,8 @@ "description": "Navigate to the about page. This is Header navigate item to the public eng page" }, "common.pages.header.title.line1": { - "defaultMessage": "Climate and Economic Justice", - "description": "Navigate to the about page. This is Title in nav header line 1 of 2" - }, - "common.pages.header.title.line2": { - "defaultMessage": "Screening Tool", - "description": "Navigate to the about page. This is Title in nav header line 2 of 2" + "defaultMessage": "Climate and Economic Justice Screening Tool", + "description": "Navigate to the about page. This is Title in nav header" }, "common.pages.header.tsd": { "defaultMessage": "Technical Support Document", @@ -903,50 +899,98 @@ "defaultMessage": "Projected wildfire risk", "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show wildfire risk" }, - "explore.map.page.side.panel.info.alt.text.icon1": { - "defaultMessage": "An icon that has depicts pieces of a block selected mimicking the census block census tracts", - "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first icon in this side panel" - }, - "explore.map.page.side.panel.info.alt.text.icon2": { + "explore.map.page.side.panel.info.alt.text.icon.bell": { "defaultMessage": "An icon that a bell curve or gaussian distribution", - "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the second icon in this side panel" + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that a bell curve or gaussian distribution" }, - "explore.map.page.side.panel.info.alt.text.icon3": { + "explore.map.page.side.panel.info.alt.text.icon.dac.circle": { + "defaultMessage": "a blue circle icon informing the user of what a disadvantaged community is depicted as", + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a blue circle icon informing the user of what a disadvantaged community is depicted as" + }, + "explore.map.page.side.panel.info.alt.text.icon.locate": { + "defaultMessage": "a gps icon informing the user can locate", + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a gps icon informing the user can locate" + }, + "explore.map.page.side.panel.info.alt.text.icon.mouse": { + "defaultMessage": "a mouse arrow icon informing the user can use the mouse", + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a mouse arrow icon informing the user can use the mouse" + }, + "explore.map.page.side.panel.info.alt.text.icon.pie": { "defaultMessage": "An icon that depicts a part of pie chart being removed", - "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the third icon in this side panel" + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that depicts a part of pie chart being removed" }, - "explore.map.page.side.panel.info.alt.text.icon4": { + "explore.map.page.side.panel.info.alt.text.icon.plus": { + "defaultMessage": "a plus icon indicating that the user can zoom in *", + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a plus icon indicating that the user can zoom in" + }, + "explore.map.page.side.panel.info.alt.text.icon.search": { + "defaultMessage": "a magnifying glass icon informing the user can search", + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a magnifying glass icon informing the user can search" + }, + "explore.map.page.side.panel.info.alt.text.icon.tract": { + "defaultMessage": "a tract icon informing the user of census tracts", + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show a tract icon informing the user of census tracts" + }, + "explore.map.page.side.panel.info.alt.text.icon.up.arrow": { "defaultMessage": "An icon that has an up arrow and a down arrow", - "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the forth icon in this side panel" + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show An icon that has an up arrow and a down arrow" }, "explore.map.page.side.panel.info.heading1": { - "defaultMessage": "Zoom in or search and select to see data about any census tract of interest", - "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first paragraph of this side panel" + "defaultMessage": "How to use the map:", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show the first heading of the non-selected side panel" }, - "explore.map.page.side.panel.info.para1": { - "defaultMessage": "This tool identifies communities that are marginalized, underserved, and overburdened by pollution. These communities are located in census tracts that are at or above the thresholds in one or more of eight categories of criteria.", - "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the first paragraph of this side panel" + "explore.map.page.side.panel.info.heading2": { + "defaultMessage": "Things to know:", + "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know:" }, - "explore.map.page.side.panel.info.para2": { - "defaultMessage": "The tool uses census tracts that represent about 4,000 people, which is the smallest unit of geography for which consistent data can be displayed on the map.", - "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the second paragraph of this side panel" + "explore.map.page.side.panel.info.para.1.part.1": { + "defaultMessage": "Zoom in", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Zoom in" }, - "explore.map.page.side.panel.info.para3": { - "defaultMessage": "The tool ranks each census tract using percentiles that show how much burden each tract experiences relative to all other tracts, for each criterion.", - "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the third paragraph of this side panel" + "explore.map.page.side.panel.info.para.1.part.2": { + "defaultMessage": ", or locate yourself", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or locate yourself" }, - "explore.map.page.side.panel.info.para4": { - "defaultMessage": "Percentages are used for certain variables, i.e. those relating to high school achievement rate and to the share of individuals not currently enrolled in higher education.", - "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the forth paragraph of this side panel" + "explore.map.page.side.panel.info.para.1.part.4": { + "defaultMessage": "and select", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show and select" + }, + "explore.map.page.side.panel.info.para.1.part.5": { + "defaultMessage": "to see information about any census tract", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show to see information about any census tract" + }, + "explore.map.page.side.panel.info.para.2.part.1": { + "defaultMessage": "The tool uses census tracts", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses census tracts" + }, + "explore.map.page.side.panel.info.para.2.part.2": { + "defaultMessage": ". Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation.", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Census tracts are a small unit of geography. They make it possible to display data consistenly across the nation." + }, + "explore.map.page.side.panel.info.para.3.part.1": { + "defaultMessage": "Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Communities that are disadvantaged live in tracts that experience burdens. These tracts are highlighted in a blueish gray color" + }, + "explore.map.page.side.panel.info.para.3.part.2": { + "defaultMessage": "on the map. This color is an opacity. This is so information about the map can be seen.", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show on the map. This color is an opacity. This is so information about the map can be seen." + }, + "explore.map.page.side.panel.info.para.4.part.1": { + "defaultMessage": "The tool uses percentiles", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show The tool uses percentiles" + }, + "explore.map.page.side.panel.info.para.4.part.2": { + "defaultMessage": ", percentages", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show percentages" + }, + "explore.map.page.side.panel.info.para.4.part.3": { + "defaultMessage": ", or a simple yes/no to indicate how much burden the communities are experiencing in each tract.", + "description": "`Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show or a simple yes/no to indicate how much burden the communities are experiencing in each tract." }, "explore.map.page.side.panel.info.para5": { - "defaultMessage": "Thresholds for each category determine if a tract should be identified as disadvantaged because it has exceeded a certain value for the relevant indicators.", + "defaultMessage": "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.", "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show Things to know, this is the fifth paragraph of this side pane" }, - "explore.map.page.side.panel.info.title": { - "defaultMessage": "Things to know", - "description": "introductory text of ways to use the map" - }, "explore.map.page.side.panel.is.community.of.focus": { "defaultMessage": "Identified as disadvantaged?", "description": "Navigate to the explore the map page. When the map is in view, click on the map. The side panel will show asking IF the communities is focused on" diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx index baf8229e..a0710460 100644 --- a/client/src/pages/about.tsx +++ b/client/src/pages/about.tsx @@ -5,7 +5,6 @@ import AboutCard from '../components/AboutCard/AboutCard'; import AboutCardsContainer from '../components/AboutCard/AboutCardsContainer'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; -import PublicEngageButton from '../components/PublicEngageButton'; import * as ABOUT_COPY from '../data/copy/about'; import * as COMMON_COPY from '../data/copy/common'; @@ -42,7 +41,6 @@ const AboutPage = ({location}: IAboutPageProps) => {

{intl.formatMessage(ABOUT_COPY.PAGE.HEADING)}

-
{/* Section 1 */} diff --git a/client/src/pages/contact.tsx b/client/src/pages/contact.tsx index 4cb386e2..bd420a1f 100644 --- a/client/src/pages/contact.tsx +++ b/client/src/pages/contact.tsx @@ -6,7 +6,6 @@ import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; import LinkTypeWrapper from '../components/LinkTypeWrapper'; import RequestForInfo from '../components/RequestForInfo'; -import PublicEngageButton from '../components/PublicEngageButton'; import * as CONTACT_COPY from '../data/copy/contact'; import * as COMMON_COPY from '../data/copy/common'; @@ -24,7 +23,6 @@ const ContactPage = ({location}: IContactPageProps) => {

{intl.formatMessage(CONTACT_COPY.PAGE_INTRO.PAGE_HEADING)}

-
diff --git a/client/src/pages/downloads.tsx b/client/src/pages/downloads.tsx index 7c8bc3e5..7b116c70 100644 --- a/client/src/pages/downloads.tsx +++ b/client/src/pages/downloads.tsx @@ -4,7 +4,6 @@ import {useIntl} from 'gatsby-plugin-intl'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; -import PublicEngageButton from '../components/PublicEngageButton'; import SubPageNav from '../components/SubPageNav'; import {useWindowSize} from 'react-use'; @@ -25,7 +24,6 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {

{intl.formatMessage(DOWNLOADS_COPY.PAGE_INTRO.PAGE_HEADING1)}

-
diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx index 7388238a..ab18854a 100644 --- a/client/src/pages/index.tsx +++ b/client/src/pages/index.tsx @@ -6,7 +6,6 @@ import HowYouCanHelp from '../components/HowYouCanHelp'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; import MapWrapper from '../components/MapWrapper'; -import PublicEngageButton from '../components/PublicEngageButton'; import * as EXPLORE_COPY from '../data/copy/explore'; @@ -26,7 +25,6 @@ const ExporeToolPage = ({location}: IMapPageProps) => {

{intl.formatMessage(EXPLORE_COPY.PAGE_INTRO.PAGE_HEADING)}

-
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx index 7a13d839..34538b63 100644 --- a/client/src/pages/methodology.tsx +++ b/client/src/pages/methodology.tsx @@ -7,7 +7,6 @@ import DatasetContainer from '../components/DatasetContainer'; import J40MainGridContainer from '../components/J40MainGridContainer'; import MethodologyFormula from '../components/MethodologyFormula'; import Layout from '../components/layout'; -import PublicEngageButton from '../components/PublicEngageButton'; import SubPageNav from '../components/SubPageNav'; import {useWindowSize} from 'react-use'; @@ -29,7 +28,6 @@ const IndexPage = ({location}: MethodPageProps) => {

{intl.formatMessage(METHODOLOGY_COPY.PAGE.HEADING)}

-
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap index 0734b65a..5356da6a 100644 --- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap @@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis src="test-file-stub" /> English Español @@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" >
-
- Climate and Economic Justice -
-
-
- Screening Tool -
-
- BETA -
-
+ Climate and Economic Justice Screening Tool
English Español @@ -348,27 +342,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis > About -
- - - -
Methodology & data @@ -661,6 +635,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="j40-aboutcard-sm-link" > Explore the map @@ -888,7 +863,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > Engagement calendar diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap index cf4e404c..068a8e71 100644 --- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap @@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis src="test-file-stub" /> English Español @@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" >
-
- Climate and Economic Justice -
-
-
- Screening Tool -
-
- BETA -
-
+ Climate and Economic Justice Screening Tool
English Español @@ -346,27 +340,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

Contact

-
- - - -
English Español @@ -346,27 +340,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

Downloads

-
- - - -
English Español @@ -428,7 +422,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > Engagement calendar diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap index 1594619a..40f8e4fc 100644 --- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap @@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis src="test-file-stub" /> English Español @@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" >
-
- Climate and Economic Justice -
-
-
- Screening Tool -
-
- BETA -
-
+ Climate and Economic Justice Screening Tool
English Español @@ -346,27 +340,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis

Methodology

-
- - - -
at or above the 90th percentile for expected agriculture loss rate OR expected building loss rate OR expected population loss rate @@ -496,12 +472,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis is at or above the 65th percentile for low income AND 80% or more of individuals 15 or older are not enrolled in higher education @@ -530,12 +508,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis at or above the 90th percentile for energy burden OR PM2.5 in the air @@ -549,12 +529,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis is at or above the 65th percentile for low income AND 80% or more of individuals 15 or older are not enrolled in higher education @@ -585,12 +567,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis at or above the 90th percentile for diesel particulate matter exposure or traffic proximity and volume @@ -606,12 +590,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis is at or above the 65th percentile for low income AND 80% or more of individuals 15 or older are not enrolled in higher education @@ -640,18 +626,21 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis at or above the 90th percentile for lead paint AND median home value is at or less than the 90th percentile OR at or above the 90th percentile for the housing cost burden @@ -665,12 +654,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis is at or above the 65th percentile for low income AND 80% or more of individuals 15 or older are not enrolled in higher education @@ -699,18 +690,21 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis at or above the 90th percentile for proximity to hazardous waste facilities OR proximity to National Priorities List (NPL) sites OR proximity to Risk Management Plan (RMP) facilities @@ -724,12 +718,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis is at or above the 65th percentile for low income AND 80% or more of individuals 15 or older are not enrolled in higher education @@ -758,6 +754,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis at or above the 90th percentile for wastewater discharge @@ -771,12 +768,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis is at or above the 65th percentile for low income AND 80% or more of individuals 15 or older are not enrolled in higher education @@ -805,24 +804,28 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis at or above the 90th percentile for asthma OR diabetes OR heart disease OR low life expectancy @@ -836,12 +839,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis is at or above the 65th percentile for low income AND 80% or more of individuals 15 or older are not enrolled in higher education @@ -870,24 +875,28 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis at or above the 90th percentile for low median income as a percentage of area median income OR linguistic isolation OR unemployment OR percentage of individuals in households at or below 100% Federal poverty @@ -901,12 +910,14 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis 10% or more of adults 25 or older have not attained a high school degree AND 80% or more of individuals 15 or older are not enrolled in higher education @@ -2292,6 +2303,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
Return to top @@ -2377,7 +2389,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > Engagement calendar diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap index 0b7ab9f2..5c06d3ce 100644 --- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap @@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis src="test-file-stub" /> English Español @@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" >
-
- Climate and Economic Justice -
-
-
- Screening Tool -
-
- BETA -
-
+ Climate and Economic Justice Screening Tool
English Español @@ -1026,7 +1020,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > Engagement calendar diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap index 1a485e4d..d1c5e569 100644 --- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap @@ -146,11 +146,13 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis src="test-file-stub" /> English Español @@ -194,17 +196,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" >
-
- Climate and Economic Justice -
-
-
- Screening Tool -
-
- BETA -
-
+ Climate and Economic Justice Screening Tool
English Español @@ -428,7 +422,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis class="usa-footer__secondary-link" > Engagement calendar