From 64839d01eec52d7e2d8ffbd98971820d1091053b Mon Sep 17 00:00:00 2001 From: Carlos Felix <63804190+carlosfelix2@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:05:19 -0500 Subject: [PATCH] Remove public engagement page and add v1.0 to previous versions --- client/.env.development | 3 + client/.env.production | 3 + client/gatsby-config.js | 1 - client/src/components/J40Header/J40Header.tsx | 10 +- .../__snapshots__/J40Header.test.tsx.snap | 10 - .../PublicEngageButton.module.scss | 50 - .../PublicEngageButton.module.scss.d.ts | 19 - .../PublicEngageButton.test.tsx | 16 - .../PublicEngageButton/PublicEngageButton.tsx | 46 - .../PublicEngageButton.test.tsx.snap | 27 - .../components/PublicEngageButton/index.tsx | 3 - .../PublicEvent/PublicEvent.module.scss | 5 - .../PublicEvent/PublicEvent.module.scss.d.ts | 12 - .../PublicEvent/PublicEvent.test.tsx | 18 - .../components/PublicEvent/PublicEvent.tsx | 81 - .../__snapshots__/PublicEvent.test.tsx.snap | 61 - client/src/components/PublicEvent/index.tsx | 3 - .../PublicVideoBox/PublicVideoBox.module.scss | 88 - .../PublicVideoBox.module.scss.d.ts | 18 - .../PublicVideoBox/PublicVideoBox.test.tsx | 24 - .../PublicVideoBox/PublicVideoBox.tsx | 73 - .../PublicVideoBox.test.tsx.snap | 113 -- .../src/components/PublicVideoBox/index.tsx | 3 - client/src/data/copy/downloads.tsx | 45 +- client/src/data/copy/methodology.tsx | 3 + client/src/data/copy/previousVer.tsx | 89 +- client/src/data/copy/publicEngage.tsx | 461 +----- client/src/intl/en.json | 176 +- client/src/intl/es.json | 43 +- client/src/pages/about.tsx | 1 - .../src/pages/frequently-asked-questions.tsx | 1 - client/src/pages/previous-versions.tsx | 91 +- client/src/pages/public-engagement.tsx | 85 +- .../tests/__snapshots__/about.test.tsx.snap | 10 - .../tests/__snapshots__/contact.test.tsx.snap | 10 - .../__snapshots__/downloads.test.tsx.snap | 10 - .../freqAskedQuestions.test.tsx.snap | 10 - .../__snapshots__/methodology.test.tsx.snap | 10 - .../__snapshots__/publicEng.test.tsx.snap | 1421 ----------------- .../techSupportDoc.test.tsx.snap | 10 - client/src/pages/tests/publicEng.test.tsx | 16 - client/src/styles/global.scss | 123 +- 42 files changed, 322 insertions(+), 2980 deletions(-) delete mode 100644 client/src/components/PublicEngageButton/PublicEngageButton.module.scss delete mode 100644 client/src/components/PublicEngageButton/PublicEngageButton.module.scss.d.ts delete mode 100644 client/src/components/PublicEngageButton/PublicEngageButton.test.tsx delete mode 100644 client/src/components/PublicEngageButton/PublicEngageButton.tsx delete mode 100644 client/src/components/PublicEngageButton/__snapshots__/PublicEngageButton.test.tsx.snap delete mode 100644 client/src/components/PublicEngageButton/index.tsx delete mode 100644 client/src/components/PublicEvent/PublicEvent.module.scss delete mode 100644 client/src/components/PublicEvent/PublicEvent.module.scss.d.ts delete mode 100644 client/src/components/PublicEvent/PublicEvent.test.tsx delete mode 100644 client/src/components/PublicEvent/PublicEvent.tsx delete mode 100644 client/src/components/PublicEvent/__snapshots__/PublicEvent.test.tsx.snap delete mode 100644 client/src/components/PublicEvent/index.tsx delete mode 100644 client/src/components/PublicVideoBox/PublicVideoBox.module.scss delete mode 100644 client/src/components/PublicVideoBox/PublicVideoBox.module.scss.d.ts delete mode 100644 client/src/components/PublicVideoBox/PublicVideoBox.test.tsx delete mode 100644 client/src/components/PublicVideoBox/PublicVideoBox.tsx delete mode 100644 client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap delete mode 100644 client/src/components/PublicVideoBox/index.tsx delete mode 100644 client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap delete mode 100644 client/src/pages/tests/publicEng.test.tsx diff --git a/client/.env.development b/client/.env.development index 3a2733d4..99732c41 100644 --- a/client/.env.development +++ b/client/.env.development @@ -14,6 +14,7 @@ GATSBY_DATA_PIPELINE_TRIBAL_PATH_LOCAL=data_pipeline/data/tribal GATSBY_2_0_TRIBAL_PATH=data-versions/2.0/data/tribal GATSBY_BETA_SCORE_PATH=data-versions/beta/data/score +GATSBY_1_0_SCORE_PATH=data-versions/1.0/data/score GATSBY_2_0_SCORE_PATH=data-versions/2.0/data/score GATSBY_DATA_PIPELINE_SEARCH_PATH_LOCAL=data_pipeline/data/score/search/tracts.json @@ -23,6 +24,8 @@ GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP=downloadable/beta-shapefile-codebook.zip GATSBY_FILE_DL_PATH_BETA_DATA_DOC=downloadable/beta-data-documentation.zip +GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip +GATSBY_FILE_DL_PATH_1_0_DATA_DOC=downloadable/1.0-data-documentation.zip GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-slides.pptx diff --git a/client/.env.production b/client/.env.production index 439f3249..3e69b4ce 100644 --- a/client/.env.production +++ b/client/.env.production @@ -11,6 +11,7 @@ GATSBY_CDN_TILES_BASE_URL=https://static-data-screeningtool.geoplatform.gov GATSBY_2_0_TRIBAL_PATH=data-versions/2.0/data/tribal GATSBY_BETA_SCORE_PATH=data-versions/beta/data/score +GATSBY_1_0_SCORE_PATH=data-versions/1.0/data/score GATSBY_2_0_SCORE_PATH=data-versions/2.0/data/score GATSBY_2_0_MAP_TRACT_SEARCH_PATH=data-versions/2.0/data/score/search/tracts.json @@ -19,6 +20,8 @@ GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS=downloadable/beta-communities.xlsx GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV=downloadable/beta-communities.csv GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP=downloadable/beta-shapefile-codebook.zip GATSBY_FILE_DL_PATH_BETA_DATA_DOC=downloadable/beta-data-documentation.zip +GATSBY_FILE_DL_PATH_1_0_SHAPE_FILE_ZIP=downloadable/1.0-shapefile-codebook.zip +GATSBY_FILE_DL_PATH_1_0_DATA_DOC=downloadable/1.0-data-documentation.zip GATSBY_FILE_DL_PATH_BETA_TRAINING_SLIDES_PPT=downloadable/technical-training-slides.pptx GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_XLS=downloadable/2.0-communities.xlsx diff --git a/client/gatsby-config.js b/client/gatsby-config.js index 37323dbb..fa5915cf 100644 --- a/client/gatsby-config.js +++ b/client/gatsby-config.js @@ -90,7 +90,6 @@ module.exports = { '/contact', '/methodology', '/404', - '/public-engagement', '/downloads', ], }, diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx index bf6e8977..c91c6a39 100644 --- a/client/src/components/J40Header/J40Header.tsx +++ b/client/src/components/J40Header/J40Header.tsx @@ -144,13 +144,6 @@ const J40Header = ({location}:IJ40Header) => { data-cy={'nav-link-about'}> {intl.formatMessage(COMMON_COPY.HEADER.ABOUT)} , - - {intl.formatMessage(COMMON_COPY.HEADER.PUBLIC_ENG)} - , { -
  • - - Engagement calendar - -
  • diff --git a/client/src/components/PublicEngageButton/PublicEngageButton.module.scss b/client/src/components/PublicEngageButton/PublicEngageButton.module.scss deleted file mode 100644 index 65c8e8cf..00000000 --- a/client/src/components/PublicEngageButton/PublicEngageButton.module.scss +++ /dev/null @@ -1,50 +0,0 @@ -@use '../../styles/design-system.scss' as *; - -.tagContainer { - align-self: flex-end; - @include u-margin-bottom(1); - @include u-margin-right(1); - .tag { - // @include u-bg("gray-cool-10"); // Standard gray - @include u-bg("yellow-20v"); // "new" yellow - color: black; - border-radius: 5px; - @include u-text('bold'); - } -} - -.container { - display: flex; - flex-direction: column; - @include u-padding-top(2.5); - @include u-margin-top(4); - - .link, .link:visited { - color:white; - text-decoration: none; - - .engagementButton{ - // @include u-text("blue-70v"); - // @include u-bg("yellow-20v"); - height: 40px; - - // &:hover { - // @include u-bg("yellow-20"); - // @include u-text("gray-90"); - // } - - .buttonContainer{ - display: flex; - - .buttonImage{ - @include u-margin-right(1); - width: 21px; - margin-top: -3px; - - filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(119deg) brightness(105%) contrast(101%); - } - } - } - } - -} \ No newline at end of file diff --git a/client/src/components/PublicEngageButton/PublicEngageButton.module.scss.d.ts b/client/src/components/PublicEngageButton/PublicEngageButton.module.scss.d.ts deleted file mode 100644 index 39ef4b86..00000000 --- a/client/src/components/PublicEngageButton/PublicEngageButton.module.scss.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -declare namespace PublicEngagementButton { - export interface IPublicEventScss { - tag: string; - tagContainer: string; - container: string; - link: string; - engagementButton: string; - buttonContainer: string; - buttonImage: string; - - } - } - -declare const PublicEventScssModule: PublicEngagementButton.IPublicEventScss & { - /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */ - locals: PublicEngagementButton.IPublicEventScss; - }; - - export = PublicEventScssModule; diff --git a/client/src/components/PublicEngageButton/PublicEngageButton.test.tsx b/client/src/components/PublicEngageButton/PublicEngageButton.test.tsx deleted file mode 100644 index cb5ac86a..00000000 --- a/client/src/components/PublicEngageButton/PublicEngageButton.test.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import * as React from 'react'; -import {render} from '@testing-library/react'; -import {LocalizedComponent} from '../../test/testHelpers'; -import PublicEngageButton from './PublicEngageButton'; - -describe('rendering of the PublicEngageButton', () => { - const {asFragment} = render( - - - , - ); - - it('checks if component renders', () => { - expect(asFragment()).toMatchSnapshot(); - }); -}); diff --git a/client/src/components/PublicEngageButton/PublicEngageButton.tsx b/client/src/components/PublicEngageButton/PublicEngageButton.tsx deleted file mode 100644 index 53c66cf1..00000000 --- a/client/src/components/PublicEngageButton/PublicEngageButton.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import React from 'react'; -import {useIntl, Link} from 'gatsby-plugin-intl'; -import { - Button, - // Tag -} from '@trussworks/react-uswds'; - -import * as styles from './PublicEngageButton.module.scss'; -import * as PUBLIC_ENG_COPY from '../../data/copy/publicEngage'; - -// @ts-ignore -import eventIcon from '/node_modules/uswds/dist/img/usa-icons/event.svg'; - -const PublicEngageButton = () => { - const intl = useIntl(); - - return ( -
    - {/* Remove Updated Tag for now */} - {/*
    - - {intl.formatMessage(PUBLIC_ENG_COPY.PUBLIC_ENG_BUTTON.TAG_LABEL)} - -
    */} - - - -
    - ); -}; - -export default PublicEngageButton; diff --git a/client/src/components/PublicEngageButton/__snapshots__/PublicEngageButton.test.tsx.snap b/client/src/components/PublicEngageButton/__snapshots__/PublicEngageButton.test.tsx.snap deleted file mode 100644 index a957b511..00000000 --- a/client/src/components/PublicEngageButton/__snapshots__/PublicEngageButton.test.tsx.snap +++ /dev/null @@ -1,27 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`rendering of the PublicEngageButton checks if component renders 1`] = ` - -
    - - - -
    -     -`; diff --git a/client/src/components/PublicEngageButton/index.tsx b/client/src/components/PublicEngageButton/index.tsx deleted file mode 100644 index 87b318ec..00000000 --- a/client/src/components/PublicEngageButton/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import PublicEngageButton from './PublicEngageButton'; - -export default PublicEngageButton; diff --git a/client/src/components/PublicEvent/PublicEvent.module.scss b/client/src/components/PublicEvent/PublicEvent.module.scss deleted file mode 100644 index c64a1afb..00000000 --- a/client/src/components/PublicEvent/PublicEvent.module.scss +++ /dev/null @@ -1,5 +0,0 @@ -@use '../../styles/design-system.scss' as *; - -.description { - @include u-margin-top(2); -} diff --git a/client/src/components/PublicEvent/PublicEvent.module.scss.d.ts b/client/src/components/PublicEvent/PublicEvent.module.scss.d.ts deleted file mode 100644 index 99f65c76..00000000 --- a/client/src/components/PublicEvent/PublicEvent.module.scss.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -declare namespace PublicEventNamespace { - export interface IPublicEventScss { - description: string; - } - } - -declare const PublicEventScssModule: PublicEventNamespace.IPublicEventScss & { - /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */ - locals: PublicEventNamespace.IPublicEventScss; - }; - - export = PublicEventScssModule; diff --git a/client/src/components/PublicEvent/PublicEvent.test.tsx b/client/src/components/PublicEvent/PublicEvent.test.tsx deleted file mode 100644 index d9f07272..00000000 --- a/client/src/components/PublicEvent/PublicEvent.test.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import * as React from 'react'; -import {render} from '@testing-library/react'; -import {LocalizedComponent} from '../../test/testHelpers'; -import PublicEvent from './PublicEvent'; - -import * as PUBLIC_ENG_COPY from '../../data/copy/publicEngage'; - -describe('rendering of the PublicEvent', () => { - const {asFragment} = render( - - - , - ); - - it('checks if component renders', () => { - expect(asFragment()).toMatchSnapshot(); - }); -}); diff --git a/client/src/components/PublicEvent/PublicEvent.tsx b/client/src/components/PublicEvent/PublicEvent.tsx deleted file mode 100644 index 39408b3c..00000000 --- a/client/src/components/PublicEvent/PublicEvent.tsx +++ /dev/null @@ -1,81 +0,0 @@ -import React from 'react'; -import {useIntl} from 'gatsby-plugin-intl'; -import { - CollectionDescription, - CollectionHeading, - CollectionItem, - CollectionThumbnail, - Button, -} from '@trussworks/react-uswds'; - -import LinkTypeWrapper from '../LinkTypeWrapper'; -import * as PUBLIC_ENGAGE_COPY from '../../data/copy/publicEngage'; -import * as styles from './PublicEvent.module.scss'; - -export interface IPublicEvent { - event: { - DATE: Date, - NAME: JSX.Element, - DESC: JSX.Element, - NUMBER: Number, - IMAGE: React.ReactElement | string, - EXPIRED_IMG: React.ReactElement | string, - FIELDS: JSX.Element, - REG_LINK?: string | null, - DATA_CY: string, - } -} - - -const PublicEvent = ({event}:IPublicEvent) => { - const intl = useIntl(); - - const eventName = event.NUMBER === 0 ? - `CEJST ${intl.formatMessage(event.NAME)}` : - `CEJST ${intl.formatMessage(event.NAME)} #${event.NUMBER}`; - - const isEventExpired = new Date() > event.DATE; - - return ( - - }> - - {/* Heading */} - - {isEventExpired ? eventName : } - - - {/* Description */} - - {intl.formatMessage(event.DESC)} - - - {/* Event info */} - - - {intl.formatMessage(PUBLIC_ENGAGE_COPY.EVENT_FIELDS.EVENT_INFO)} - - {`: ${intl.formatMessage(event.FIELDS.INFO)}`} - - - {/* Registration Link */} - - - - - - - ); -}; - -export default PublicEvent; diff --git a/client/src/components/PublicEvent/__snapshots__/PublicEvent.test.tsx.snap b/client/src/components/PublicEvent/__snapshots__/PublicEvent.test.tsx.snap deleted file mode 100644 index 2db5da0c..00000000 --- a/client/src/components/PublicEvent/__snapshots__/PublicEvent.test.tsx.snap +++ /dev/null @@ -1,61 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`rendering of the PublicEvent checks if component renders 1`] = ` - -
  • - Alt text -
    -

    - CEJST training session #1 -

    -

    - - The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital - Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic - Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to - use the current version of the tool. The presenters at these webinars will be available to - provide technical support and address issues related to accessing and using the tool. - -

    -

    - - Event info - - : March 9th (4:00 - 5:00 PM EST) -

    -

    - - - -

    -
    -
    • - -`; diff --git a/client/src/components/PublicEvent/index.tsx b/client/src/components/PublicEvent/index.tsx deleted file mode 100644 index c1340045..00000000 --- a/client/src/components/PublicEvent/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import PublicEvent from './PublicEvent'; - -export default PublicEvent; diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.module.scss b/client/src/components/PublicVideoBox/PublicVideoBox.module.scss deleted file mode 100644 index 644ba2aa..00000000 --- a/client/src/components/PublicVideoBox/PublicVideoBox.module.scss +++ /dev/null @@ -1,88 +0,0 @@ -@use "../../styles/design-system.scss" as *; - -.publicVideoContainer { - @include u-margin-top(3); - - @include at-media-max('desktop'){ - @include u-margin-bottom(3); - } - - .publicVideoLink { - display: flex; - text-decoration: none; - - .youTubeBtn { - @include u-text("blue-70v"); - @include u-bg("yellow-20v"); - height: 40px; - @include u-margin-top(3); - margin-left: auto; - margin-right: auto; - width: 14rem; - - &:hover { - @include u-bg("yellow-20"); - @include u-text("gray-90"); - } - .buttonContainer { - display: flex; - - .buttonText { - @include u-margin-right(1); - } - - .buttonImage { - width: 21px; - margin-top: -3px; - - filter: invert(13%) sepia(76%) saturate(5142%) hue-rotate(192deg) brightness(80%) contrast(106%); - } - } - } - } -}; - -.publicVideoContainerBeta { - background-color: #F0F0F0; - border-color: #D8D9DA; - - @include u-margin-top(3); - - @include at-media-max('desktop'){ - @include u-margin-bottom(3); - } - - .publicVideoLink { - display: flex; - text-decoration: none; - - .youTubeBtn { - @include u-text("white"); - @include u-bg("gray-60"); - height: 40px; - @include u-margin-top(3); - margin-left: auto; - margin-right: auto; - width: 14rem; - - &:hover { - @include u-bg("gray-90"); - @include u-text("gray-10"); - } - .buttonContainer { - display: flex; - - .buttonText { - @include u-margin-right(1); - } - - .buttonImage { - width: 21px; - margin-top: -3px; - - filter: invert(100%) sepia(0%) saturate(7489%) hue-rotate(232deg) brightness(101%) contrast(101%); - } - } - } - } -}; \ No newline at end of file diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.module.scss.d.ts b/client/src/components/PublicVideoBox/PublicVideoBox.module.scss.d.ts deleted file mode 100644 index 18c50d61..00000000 --- a/client/src/components/PublicVideoBox/PublicVideoBox.module.scss.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare namespace PublicVideoBoxNamespace { - export interface IPublicVideoBoxScss { - publicVideoContainer: string; - publicVideoContainerBeta: string; - publicVideoLink: string; - youTubeBtn: string; - buttonContainer: string; - buttonText: string; - buttonImage: string; - } - } - -declare const PublicVideoBoxScssModule: PublicVideoBoxNamespace.IPublicVideoBoxScss & { - /** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */ - locals: PublicVideoBoxNamespace.IPublicVideoBoxScss; - }; - - export = PublicVideoBoxScssModule; diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.test.tsx b/client/src/components/PublicVideoBox/PublicVideoBox.test.tsx deleted file mode 100644 index 8c4f1431..00000000 --- a/client/src/components/PublicVideoBox/PublicVideoBox.test.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import * as React from 'react'; -import {render} from '@testing-library/react'; -import {LocalizedComponent} from '../../test/testHelpers'; -import PublicVideoBox from './PublicVideoBox'; - -describe('rendering of the PublicVideoBox', () => { - it('checks if component renders when it is in beta', () => { - const {asFragment} = render( - - - , - ); - expect(asFragment()).toMatchSnapshot(); - }); - - it('checks if component renders when it is NOT in beta', () => { - const {asFragment} = render( - - - , - ); - expect(asFragment()).toMatchSnapshot(); - }); -}); diff --git a/client/src/components/PublicVideoBox/PublicVideoBox.tsx b/client/src/components/PublicVideoBox/PublicVideoBox.tsx deleted file mode 100644 index 7661fbe7..00000000 --- a/client/src/components/PublicVideoBox/PublicVideoBox.tsx +++ /dev/null @@ -1,73 +0,0 @@ -import React from 'react'; -import {Button, SummaryBox, SummaryBoxContent, SummaryBoxHeading} from '@trussworks/react-uswds'; -import {useIntl} from 'gatsby-plugin-intl'; - -import DownloadButton from '../DownloadButton'; - -import * as styles from './PublicVideoBox.module.scss'; -import * as PUBLIC_COPY from '../../data/copy/publicEngage'; -import {getDownloadFileUrl} from '../../data/copy/downloads'; - -// @ts-ignore -import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg'; - -interface IPublicVideoBox { - isBeta: boolean, - youTubeLink: string, -} - -const PublicVideoBox = ({isBeta, youTubeLink}:IPublicVideoBox) => { - const intl = useIntl(); - - return ( - - - - {isBeta ? - intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.TITLE_BETA) : - intl.formatMessage(PUBLIC_COPY.PUBLIC_ENG_VIDEO.TITLE)} - - - - {isBeta ? PUBLIC_COPY.RICH_COPY.VIDEO_BOX_BODY2 : PUBLIC_COPY.RICH_COPY.VIDEO_BOX_BODY1} - - - - {isBeta && } - - - ); -}; - -export default PublicVideoBox; diff --git a/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap b/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap deleted file mode 100644 index 2be9eb1c..00000000 --- a/client/src/components/PublicVideoBox/__snapshots__/PublicVideoBox.test.tsx.snap +++ /dev/null @@ -1,113 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`rendering of the PublicVideoBox checks if component renders when it is NOT in beta 1`] = ` - -
    -
    -

    - What's new overview -

    -
    - - Watch a recorded update from CEQ on the changes in the 1.0 version of the tool. - - - - -
    -
    -
    -     -`; - -exports[`rendering of the PublicVideoBox checks if component renders when it is in beta 1`] = ` - -
    -
    -

    - Need information about the public beta? -

    -
    - - Watch a recorded version of the beta version of the CEJST training on YouTube. - - - - - - - -
    -
    -
    -     -`; diff --git a/client/src/components/PublicVideoBox/index.tsx b/client/src/components/PublicVideoBox/index.tsx deleted file mode 100644 index 2a520165..00000000 --- a/client/src/components/PublicVideoBox/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import PublicVideoBox from './PublicVideoBox'; - -export default PublicVideoBox; diff --git a/client/src/data/copy/downloads.tsx b/client/src/data/copy/downloads.tsx index a1ef1d71..a84253b9 100644 --- a/client/src/data/copy/downloads.tsx +++ b/client/src/data/copy/downloads.tsx @@ -3,7 +3,7 @@ import React from 'react'; import {defineMessages} from 'react-intl'; import {FormattedDate, FormattedMessage, FormattedNumber} from 'gatsby-plugin-intl'; import * as COMMON_COPY from './common'; -import {VERSION_NUMBER} from './methodology'; +import {VERSION_NUMBER, VERSIONS} from './methodology'; export const PAGE_INTRO = defineMessages({ PAGE_TILE: { @@ -28,10 +28,15 @@ export const PAGE_INTRO = defineMessages({ }, }); -export const getDownloadFileUrl = (filePath: string | undefined, isBeta: boolean) => { +export const getDownloadFileUrl = (filePath: string | undefined, version: VERSIONS = VERSIONS.V2_0) => { + const scorePath = version === VERSIONS.BETA ? + process.env.GATSBY_BETA_SCORE_PATH : + version === VERSIONS.V1_0 ? + process.env.GATSBY_1_0_SCORE_PATH : + process.env.GATSBY_2_0_SCORE_PATH; return [ process.env.GATSBY_CDN_TILES_BASE_URL, - (isBeta ? process.env.GATSBY_BETA_SCORE_PATH : process.env.GATSBY_2_0_SCORE_PATH), + scorePath, filePath, ].join('/'); }; @@ -41,89 +46,89 @@ export const DOWNLOAD_FILES = { NARWAL: { COMMUNITIES_LIST_XLS: { SIZE: 35.6, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_XLS, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_XLS), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, COMMUNITIES_LIST_CSV: { SIZE: 42, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_CSV, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_CSV), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, SHAPE_FILE: { SIZE: 356.8, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_SHAPE_FILE_ZIP, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_SHAPE_FILE_ZIP), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, TSD: { SIZE: 4.4, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_TSD_PDF, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_TSD_PDF), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, TSD_ES: { SIZE: 4.8, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_ES_PDF, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_ES_PDF), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, HOW_TO_COMMUNITIES: { SIZE: 687.9, // KB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_PDF, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_PDF), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, HOW_TO_COMMUNITIES_ES: { SIZE: 761.8, // KB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_ES_PDF, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_COMMUNITIES_LIST_ES_PDF), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, INSTRUCTIONS: { SIZE: 228.4, // KB // Todo: Update when actual file is uploaded - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_INSTRUCT_PDF, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_INSTRUCT_PDF), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, INSTRUCTIONS_ES: { SIZE: 173.6, // KB // Todo: Update when actual file is uploaded - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_INSTRUCT_ES_PDF, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_INSTRUCT_ES_PDF), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, COMP_CHART: { SIZE: 33.1, // KB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_TOOL_COMP_PDF, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_TOOL_COMP_PDF), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, M_23_09_ES: { SIZE: 120.5, // KB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_M_23_09_SIGNED_PDF, false), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_2_0_M_23_09_SIGNED_PDF), LAST_UPDATED: COMMON_COPY.METH_2_0_RELEASE_DATE, }, }, BETA: { COMMUNITIES_LIST_XLS: { SIZE: 23.7, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS, true), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_XLS, VERSIONS.BETA), LAST_UPDATED: new Date('10/27/2022').getTime(), }, COMMUNITIES_LIST_CSV: { SIZE: 26.8, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV, true), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_COMMUNITIES_LIST_CSV, VERSIONS.BETA), LAST_UPDATED: new Date('10/27/2022').getTime(), }, SHAPE_FILE: { SIZE: 351.4, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP, true), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_BETA_SHAPE_FILE_ZIP, VERSIONS.BETA), LAST_UPDATED: new Date('10/27/2022').getTime(), }, TSD: { SIZE: 2.4, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_PDF, true), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_PDF, VERSIONS.BETA), LAST_UPDATED: new Date('10/27/2022').getTime(), }, TSD_ES: { SIZE: 4.8, // MB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_ES_PDF, true), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_TSD_ES_PDF, VERSIONS.BETA), LAST_UPDATED: new Date('10/27/2022').getTime(), }, HOW_TO_COMMUNITIES: { SIZE: 658.3, // KB - URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF, true), + URL: getDownloadFileUrl(process.env.GATSBY_FILE_DL_PATH_HOW_TO_COMMUNITIES_PDF, VERSIONS.BETA), LAST_UPDATED: new Date('10/27/2022').getTime(), }, }, diff --git a/client/src/data/copy/methodology.tsx b/client/src/data/copy/methodology.tsx index 16e16943..bae2eb68 100644 --- a/client/src/data/copy/methodology.tsx +++ b/client/src/data/copy/methodology.tsx @@ -6,6 +6,9 @@ import {boldFn, linkFn, simpleLink} from './common'; export const VERSION_NUMBER = (2.0).toFixed(1); +// eslint-disable-next-line no-unused-vars +export enum VERSIONS {BETA, V1_0, V2_0} + export const PAGE = defineMessages({ TITLE: { id: 'methodology.page.title.text', diff --git a/client/src/data/copy/previousVer.tsx b/client/src/data/copy/previousVer.tsx index 5f7679dd..2189716e 100644 --- a/client/src/data/copy/previousVer.tsx +++ b/client/src/data/copy/previousVer.tsx @@ -1,6 +1,6 @@ import React from 'react'; import {FormattedDate, FormattedMessage, defineMessages} from 'gatsby-plugin-intl'; -import {METH_2_0_RELEASE_DATE, METH_BETA_RELEASE_DATE} from './common'; +import {METH_1_0_RELEASE_DATE, METH_2_0_RELEASE_DATE, METH_BETA_RELEASE_DATE} from './common'; export const PAGE = defineMessages({ TITLE: { @@ -18,43 +18,51 @@ export const CARD = { />, BODY: , - releaseDate: , }} />, - BUTTON1: , - BUTTON1_ALT_TAG: , - BUTTON2: , - BUTTON2_ALT_TAG: , + endDate: , + }} />, }; @@ -81,3 +89,36 @@ export const BUTTON = defineMessages({ }, }); + +export const VIDEO = defineMessages({ + BUTTON1_BETA_TEXT: { + id: 'public.eng.page.video.box.button1.beta.text', + defaultMessage: `Watch on beta demo`, + description: 'Navigate to the previous version page. This is that box button text.', + }, + BUTTON1_1_0_TEXT: { + id: 'public.eng.page.video.box.button1.1_0.text', + defaultMessage: `Watch v1.0 demo`, + description: 'Navigate to the previous version page. This is that box button text.', + }, + IMG_ALT_TEXT1: { + id: 'public.eng.page.video.box.button.img.alt.text1', + defaultMessage: `the icon to show that this button will open in a new tab`, + description: 'Navigate to the previous version page. This is alt tag of the image in the button.', + }, + BUTTON2_TEXT: { + id: 'public.eng.page.video.box.button2.text', + defaultMessage: `Download slide deck`, + description: 'Navigate to the previous version page. This is the button text for the second button.', + }, + BUTTON2_BETA_TEXT: { + id: 'public.eng.page.video.box.button2.beta.text', + defaultMessage: `Download beta slide deck`, + description: 'Navigate to the previous version page. This is the button text for the second button.', + }, + IMG_ALT_TEXT2: { + id: 'public.eng.page.video.box.button.img.alt.text2', + defaultMessage: `the icon to show that this button will download the file`, + description: 'Navigate to the previous version page. This is alt tag of the image in the 2nd button.', + }, +}); diff --git a/client/src/data/copy/publicEngage.tsx b/client/src/data/copy/publicEngage.tsx index ff51cdd2..4dac3934 100644 --- a/client/src/data/copy/publicEngage.tsx +++ b/client/src/data/copy/publicEngage.tsx @@ -1,452 +1,23 @@ /* eslint-disable max-len */ import React from 'react'; -import {FormattedMessage} from 'gatsby-plugin-intl'; -import {defineMessages} from 'gatsby-plugin-intl'; - +import {FormattedMessage, defineMessages} from 'gatsby-plugin-intl'; +import {PAGES_ENDPOINTS} from '../constants'; import {linkFn} from './common'; -import {VERSION_NUMBER} from './methodology'; -import mar9 from '../../images/eventDates/mar9.svg'; -import mar10 from '../../images/eventDates/mar10.svg'; -import mar16 from '../../images/eventDates/mar16.svg'; -import mar22 from '../../images/eventDates/mar22.svg'; -import mar30 from '../../images/eventDates/mar30.svg'; -import mar31 from '../../images/eventDates/mar31.svg'; -import apr15 from '../../images/eventDates/apr15.svg'; -import may10 from '../../images/eventDates/may10.svg'; -import may19 from '../../images/eventDates/may19.svg'; -import mar9Exp from '../../images/eventDates/mar9-inactive.svg'; -import mar10Exp from '../../images/eventDates/mar10-inactive.svg'; -import mar16Exp from '../../images/eventDates/mar16-inactive.svg'; -import mar22Exp from '../../images/eventDates/mar22-inactive.svg'; -import mar30Exp from '../../images/eventDates/mar30-inactive.svg'; -import mar31Exp from '../../images/eventDates/mar31-inactive.svg'; -import apr15Exp from '../../images/eventDates/apr15-inactive.svg'; -import may10Exp from '../../images/eventDates/may10-inactive.svg'; -import may19Exp from '../../images/eventDates/may19-inactive.svg'; -import oct4Exp from '../../images/eventDates/oct4-inactive.svg'; -import oct9Exp from '../../images/eventDates/oct9-inactive.svg'; - - -export const PAGE_INTRO = defineMessages({ - PAGE_TILE: { - id: 'public.eng.page.title.text', - defaultMessage: 'Public engagement opportunities', - description: 'Navigate to the public engagement page, this will be the publiceng page title text', - }, - PAGE_HEADING1: { - id: 'public.eng.page.heading1.text', - defaultMessage: 'Public engagement opportunities', - description: 'Navigate to the public engagement page, this will be the publiceng page header text', - }, - PAGE_DESCRIPTION1: { - id: 'public.eng.page.description1.text', - defaultMessage: ` - The Council on Environmental Quality (CEQ) is hosting engagement opportunities to connect with the public about the current versions of the Climate and Economic Justice Screening Tool (CEJST). These sessions are an opportunity to obtain training on the tool or to provide the feedback on the latest version of the tool. CEQ hopes that members of the public will join these engagements to learn about the tool, ask questions, an share feedback. - `, - description: 'Navigate to the public engagement page, this will be the publiceng page description 1 text', - }, - PAGE_DESCRIPTION2: { - id: 'public.eng.page.description2.text', - defaultMessage: ` - Pre-registration is required to participate and speak at the sessions. - `, - description: 'Navigate to the public engagement page, this will be the publiceng page description 2 text', - }, - PAGE_COMING_SOON: { - id: 'public.eng.page.coming.soon.text', - defaultMessage: ` - Coming soon! - `, - description: 'Navigate to the public engagement page, this will be the publiceng page coming soon text', - }, - SURVEY_TEXT: { - id: 'fab.survey.text', - defaultMessage: `Help improve the site & data`, - description: 'Navigate to the public engagement page, this will be the text for floating action button', +export const PAGE_TITLE = defineMessages({ + REDIRECT_TITLE: { + id: 'public.eng.page.redirect.title', + defaultMessage: 'Public engagement', + description: 'Navigate to the public engagement page. This is the redirect title.', }, }); -export const RICH_COPY = { - PAGE_DESCRIPTION3: Sign-up for updates from CEQ. - `} - description={`Navigate to the public engagement page, this will be the publiceng page description 3 text`} - values={{ - link1: linkFn('https://lp.constantcontactpages.com/su/Vm8pCFj/spring', false, true), - }} - />, - PAGE_HEADING2: , - PAGE_HEADING3: , - VIDEO_BOX_BODY1: , - VIDEO_BOX_BODY2: , -}; - -export const PUBLIC_ENG_VIDEO = defineMessages({ - TITLE: { - id: 'public.eng.page.video.box.title.text', - defaultMessage: `What's new overview`, - description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box title text.', - }, - TITLE_BETA: { - id: 'public.eng.page.video.box.title.beta.text', - defaultMessage: `Need information about the public beta?`, - description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box title text.', - }, - BUTTON1_TEXT: { - id: 'public.eng.page.video.box.button1.text', - defaultMessage: `Watch on YouTube`, - description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box button text.', - }, - BUTTON1_BETA_TEXT: { - id: 'public.eng.page.video.box.button1.beta.text', - defaultMessage: `Watch on beta demo`, - description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box button text.', - }, - IMG_ALT_TEXT1: { - id: 'public.eng.page.video.box.button.img.alt.text1', - defaultMessage: `the icon to show that this button will open in a new tab`, - description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is alt tag of the image in the button.', - }, - BUTTON2_TEXT: { - id: 'public.eng.page.video.box.button2.text', - defaultMessage: `Download slide deck`, - description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is the button text for the second button.', - }, - BUTTON2_BETA_TEXT: { - id: 'public.eng.page.video.box.button2.beta.text', - defaultMessage: `Download beta slide deck`, - description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is the button text for the second button.', - }, - IMG_ALT_TEXT2: { - id: 'public.eng.page.video.box.button.img.alt.text2', - defaultMessage: `the icon to show that this button will download the file`, - description: 'Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is alt tag of the image in the 2nd button.', - }, -}); - -export const PUBLIC_ENG_BUTTON = defineMessages({ - LABEL: { - id: 'public.eng.page.button.label', - defaultMessage: `Public engagement`, - description: 'Navigate to the public engagement page, this will be the public engagement button label', - }, - TAG_LABEL: { - id: 'public.eng.page.tag.label', - defaultMessage: `UPDATED`, - description: 'Navigate to the public engagement page, this will be the public engagement tag label', - }, - IMG_ICON_ALT_TAG: { - id: 'public.eng.page.button.img.alt.tag', - defaultMessage: `an icon that represents a calendar`, - description: 'Navigate to the public engagement page, this will be the public engagement button icon alt tag text', - }, -}); - -export const EVENT_TYPES = { - TRAINING_SESS: defineMessages({ - NAME: { - id: 'public.eng.page.event.training.sess.name', - defaultMessage: `training session`, - description: 'Navigate to the public engagement page, this will be the public engagement page event training session name', - }, - DESCRIPTION: { - id: 'public.eng.page.event.training.description', - defaultMessage: ` - The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital - Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic - Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to - use the current version of the tool. The presenters at these webinars will be available to - provide technical support and address issues related to accessing and using the tool. - `, - description: 'Navigate to the public engagement page, this will be the public engagement page event training session description', - }, - }), - LISTENING_SESS: defineMessages({ - NAME: { - id: 'public.eng.page.event.listening.sess.name', - defaultMessage: `listening session`, - description: 'Navigate to the public engagement page, this will be the public engagement page event listening session name', - }, - DESCRIPTION: { - id: 'public.eng.page.event.listening.sess.description', - defaultMessage: ` - CEQ is hosting public listening sessions to seek input and feedback on the beta version of the - tool, including on the datasets it includes and the methodology it uses. This feedback is critical - to the development and enhancement of the tool. This feedback will help CEQ update and refine the - tool to ensure that it reflects the environmental, climate and other challenges that communities - are experiencing. - `, - description: 'Navigate to the public engagement page, this will be the public engagement page event listening session description', - }, - }), - WHEJAC_DAY1: defineMessages({ - NAME: { - id: 'public.eng.page.event.whejac.meeting.day.1.name', - defaultMessage: `Public WHEJAC meeting day one`, - description: 'public engagement page event WHEJAC meeting day 1 name', - }, - DESCRIPTION: { - id: 'public.eng.page.event.whejac.meeting.day.1.description', - defaultMessage: ` - The White House Environmental Justice Advisory Council is also soliciting feedback on the beta version of the Climate and Economic Justice Screening Tool at its public meeting. The link above has additional details. - `, - description: 'public engagement page event WHEJAC day 1 description', - }, - }), - WHEJAC_DAY2: defineMessages({ - NAME: { - id: 'public.eng.page.event.whejac.meeting.day.2.name', - defaultMessage: `Public WHEJAC meeting day two`, - description: 'public engagement page event WHEJAC meeting day 2 name', - }, - DESCRIPTION: { - id: 'public.eng.page.event.whejac.meeting.day.2.description', - defaultMessage: ` - The White House Environmental Justice Advisory Council is also soliciting feedback on the beta version of the Climate and Economic Justice Screening Tool at its public meeting. The link above has additional details. - `, - description: 'public engagement page event WHEJAC day 2 description', - }, - }), -}; - -export const EVENT_FIELDS = defineMessages({ - EVENT_INFO: { - id: 'public.eng.page.event.info.label', - defaultMessage: 'Event info', - description: 'Navigate to the public engagement page, this will be the public engagement page event info label', - }, - REG_LINK: { - id: 'public.eng.page.event.reglink.label', - defaultMessage: 'Registration link', - description: 'Navigate to the public engagement page, this will be the public engagement page event registration link label', - }, -}); - -// All events dates are set one day ahead of actual date to account for timezone differences -// Note: all events in this events in this array must be in chronological order starting with the oldest event. -export const EVENTS = [ - { - DATE: new Date(2022, 2, 10), - NAME: EVENT_TYPES.TRAINING_SESS.NAME, - DESC: EVENT_TYPES.TRAINING_SESS.DESCRIPTION, - NUMBER: 1, - IMAGE: mar9, - EXPIRED_IMG: mar9Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.event.training.1.info', - defaultMessage: `March 9th (4:00 - 5:00 PM EST)`, - description: 'Navigate to the public engagement page, this will be the public engagement page event training session 1 date', - }, - }), - REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_D-Om_xXhTtiLv71y3Rr1CQ`, - DATA_CY: `mar-9-reg-link-block`, - }, - { - DATE: new Date(2022, 2, 11), - NAME: EVENT_TYPES.TRAINING_SESS.NAME, - DESC: EVENT_TYPES.TRAINING_SESS.DESCRIPTION, - NUMBER: 2, - IMAGE: mar10, - EXPIRED_IMG: mar10Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.event.training.2.info', - defaultMessage: `March 10th (4:00 - 5:00 PM EST)`, - description: 'Navigate to the public engagement page, this will be the public engagement page event training session 2 date', - }, - }), - REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_QsSqshI4TpmRBkI6nVlWxQ`, - DATA_CY: `mar-10-reg-link-block`, - - }, - { - DATE: new Date(2022, 2, 17), - NAME: EVENT_TYPES.TRAINING_SESS.NAME, - DESC: EVENT_TYPES.TRAINING_SESS.DESCRIPTION, - NUMBER: 3, - IMAGE: mar16, - EXPIRED_IMG: mar16Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.event.training.3.info', - defaultMessage: `March 16th (4:00 - 5:00 PM EST)`, - description: 'Navigate to the public engagement page, this will be the public engagement page event training session 3 date', - }, - }), - REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_q86iMtpwTESYa6f0xpIk7g`, - DATA_CY: `mar-16-reg-link-block`, - }, - { - DATE: new Date(2022, 2, 23), - NAME: EVENT_TYPES.LISTENING_SESS.NAME, - DESC: EVENT_TYPES.LISTENING_SESS.DESCRIPTION, - NUMBER: 1, - IMAGE: mar22, - EXPIRED_IMG: mar22Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.event.listening.1.info', - defaultMessage: `March 22nd (4:00 - 5:00 PM EST)`, - description: 'Navigate to the public engagement page, this will be the public engagement page event listening session 1 date', - }, - }), - REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_YT7_uLZqScGHgyAcTCuJjA`, - DATA_CY: `mar-22-reg-link-block`, - - }, - { - DATE: new Date(2022, 2, 31), - NAME: EVENT_TYPES.WHEJAC_DAY1.NAME, - DESC: EVENT_TYPES.WHEJAC_DAY1.DESCRIPTION, - NUMBER: 0, - IMAGE: mar30, - EXPIRED_IMG: mar30Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.whejac.meeting.day.1.info', - defaultMessage: `March 30th (3:00 - 7:00 PM EST)`, - description: 'public engagement page event WHEJAC', - }, - }), - REG_LINK: `https://usepa.zoomgov.com/webinar/register/WN_wCwVP1dtT0auAR5kfucVtw`, - DATA_CY: `mar-30-reg-link-block`, - }, - { - DATE: new Date(2022, 3, 1), - NAME: EVENT_TYPES.WHEJAC_DAY2.NAME, - DESC: EVENT_TYPES.WHEJAC_DAY2.DESCRIPTION, - NUMBER: 0, - IMAGE: mar31, - EXPIRED_IMG: mar31Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.whejac.meeting.day.2.info', - defaultMessage: `March 31th (3:00 - 7:30 PM EST)`, - description: 'public engagement page event WHEJAC', - }, - }), - REG_LINK: `https://usepa.zoomgov.com/webinar/register/WN_wCwVP1dtT0auAR5kfucVtw`, - DATA_CY: `mar-31-reg-link-block`, - }, - { - DATE: new Date(2022, 3, 16), - NAME: EVENT_TYPES.LISTENING_SESS.NAME, - DESC: EVENT_TYPES.LISTENING_SESS.DESCRIPTION, - NUMBER: 2, - IMAGE: apr15, - EXPIRED_IMG: apr15Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.event.listening.2.info', - defaultMessage: `April 15th (4:00 - 5:00 PM EST)`, - description: 'Navigate to the public engagement page, this will be the public engagement page event listening session 2 date', - }, - }), - REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_dLw3xChiTlaOLGdHXQWk0w`, - DATA_CY: `apr-15-reg-link-block`, - }, - { - DATE: new Date(2022, 4, 11), - NAME: EVENT_TYPES.LISTENING_SESS.NAME, - DESC: EVENT_TYPES.LISTENING_SESS.DESCRIPTION, - NUMBER: 3, - IMAGE: may10, - EXPIRED_IMG: may10Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.event.listening.3.info', - defaultMessage: `May 10th (4:00 PM EST)`, - description: 'Navigate to the public engagement page, this will be the public engagement page event listening session 3 date', - }, - }), - REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_dt0xRNioR8SugY2hrDk1JA`, - DATA_CY: `may-10-reg-link-block`, - }, - { - DATE: new Date(2022, 4, 20), - NAME: EVENT_TYPES.LISTENING_SESS.NAME, - DESC: EVENT_TYPES.LISTENING_SESS.DESCRIPTION, - NUMBER: 4, - IMAGE: may19, - EXPIRED_IMG: may19Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.event.listening.4.info', - defaultMessage: `May 19th (4:00 PM EST)`, - description: 'Navigate to the public engagement page, this will be the public engagement page event listening session 4 date', - }, - }), - REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_1PR73vLDQpq1zoAWkhKB5g`, - DATA_CY: `may-19-reg-link-block`, - }, - { - DATE: new Date(2022, 9, 5), - NAME: EVENT_TYPES.TRAINING_SESS.NAME, - DESC: EVENT_TYPES.TRAINING_SESS.DESCRIPTION, - NUMBER: 4, - IMAGE: oct4Exp, - EXPIRED_IMG: oct4Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.event.training.4.info', - defaultMessage: `October 4th (4:00 - 5:00 PM EST)`, - description: 'Navigate to the public engagement page, this will be the public engagement page event training session 4 date', - }, - }), - REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_q86iMtpwTESYa6f0xpIk7g`, - DATA_CY: `oct-4-reg-link-block`, - }, - { - DATE: new Date(2022, 9, 10), - NAME: EVENT_TYPES.TRAINING_SESS.NAME, - DESC: EVENT_TYPES.TRAINING_SESS.DESCRIPTION, - NUMBER: 5, - IMAGE: oct9Exp, - EXPIRED_IMG: oct9Exp, - FIELDS: defineMessages({ - INFO: { - id: 'public.eng.page.event.training.5.info', - defaultMessage: `October 9th (4:00 - 5:00 PM EST)`, - description: 'Navigate to the public engagement page, this will be the public engagement page event training session 5 date', - }, - }), - REG_LINK: `https://pitc.zoomgov.com/webinar/register/WN_q86iMtpwTESYa6f0xpIk7g`, - DATA_CY: `oct-9-reg-link-block`, - }, -]; +export const REDIRECT_TEXT = +Previous Version page. Click here if you are not redirected after 5 seconds.'} + description={`Navigate to the public engagement page. This is the redirect message.`} + values={{ + link1: linkFn(PAGES_ENDPOINTS.PREVIOUS_VERSIONS, true, false), + }} +/>; diff --git a/client/src/intl/en.json b/client/src/intl/en.json index 2fda8bbb..a3607efa 100644 --- a/client/src/intl/en.json +++ b/client/src/intl/en.json @@ -1274,10 +1274,6 @@ "defaultMessage": "This decision was made after meaningful and robust consultation with Tribal Nations. This is consistent with CEQ’s Action Plan for Consultation and Coordination with Tribal Nations, President Biden’s Memorandum on Tribal Consultation and Strengthening Nation-to-Nation Consultation, and Executive Order 13175 on Consultation and Coordination With Indian Tribal Governments.", "description": "Navigate to the explore the map page. Under the map, you will see tribal nations paragraph 2" }, - "fab.survey.text": { - "defaultMessage": "Help improve the site & data", - "description": "Navigate to the public engagement page, this will be the text for floating action button" - }, "faqs.page.Q1": { "defaultMessage": "What is the Climate and Economic Justice Screening Tool (CEJST)?", "description": "Navigate to the FAQs page, this will be Q1" @@ -2279,8 +2275,8 @@ "description": "page not found title text" }, "previous.versions.page.body.text": { - "defaultMessage": "The beta version of the methodology and data was used during the public beta period to get feedback on the tool from {betaDate} - {releaseDate}.", - "description": "Navigate to the previous version page. This is the Cards body text" + "defaultMessage": "The 1.0 versions of the methodology and data were available on the tool’s website from {startDate} – {endDate}.", + "description": "Navigate to the previous version page. This is the Version 1.0 Card body text" }, "previous.versions.page.button1.alt.tag.text": { "defaultMessage": "a button that allows to download the data and documentation to the tool", @@ -2299,180 +2295,44 @@ "description": "Navigate to the previous version page. This is the Cards button2 text" }, "previous.versions.page.card.text": { - "defaultMessage": "Beta version", - "description": "Navigate to the previous version page. This is the Cards title text" + "defaultMessage": "Version 1.0", + "description": "Navigate to the previous version page. This is the Version 1.0 Card title text" }, "previous.versions.page.title.text": { "defaultMessage": "Previous versions", "description": "Navigate to the previous version page. This is the page title text" }, - "public.eng.page.button.img.alt.tag": { - "defaultMessage": "an icon that represents a calendar", - "description": "Navigate to the public engagement page, this will be the public engagement button icon alt tag text" + "public.eng.page.redirect.text": { + "defaultMessage": "The public engagement content has moved to the Previous Version page. Click here if you are not redirected after 5 seconds.", + "description": "Navigate to the public engagement page. This is the redirect message." }, - "public.eng.page.button.label": { + "public.eng.page.redirect.title": { "defaultMessage": "Public engagement", - "description": "Navigate to the public engagement page, this will be the public engagement button label" - }, - "public.eng.page.coming.soon.text": { - "defaultMessage": "Coming soon!", - "description": "Navigate to the public engagement page, this will be the publiceng page coming soon text" - }, - "public.eng.page.description1.text": { - "defaultMessage": "The Council on Environmental Quality (CEQ) is hosting engagement opportunities to connect with the public about the current versions of the Climate and Economic Justice Screening Tool (CEJST). These sessions are an opportunity to obtain training on the tool or to provide the feedback on the latest version of the tool. CEQ hopes that members of the public will join these engagements to learn about the tool, ask questions, an share feedback.", - "description": "Navigate to the public engagement page, this will be the publiceng page description 1 text" - }, - "public.eng.page.description2.text": { - "defaultMessage": "Pre-registration is required to participate and speak at the sessions.", - "description": "Navigate to the public engagement page, this will be the publiceng page description 2 text" - }, - "public.eng.page.description3.text": { - "defaultMessage": "As they become available, additional public trainings and engagement opportunities on the Climate and Economic Justice Screening Tool will also be posted on this page. Sign-up for updates from CEQ.", - "description": "Navigate to the public engagement page, this will be the publiceng page description 3 text" - }, - "public.eng.page.event.info.label": { - "defaultMessage": "Event info", - "description": "Navigate to the public engagement page, this will be the public engagement page event info label" - }, - "public.eng.page.event.listening.1.info": { - "defaultMessage": "March 22nd (4:00 - 5:00 PM EST)", - "description": "Navigate to the public engagement page, this will be the public engagement page event listening session 1 date" - }, - "public.eng.page.event.listening.2.info": { - "defaultMessage": "April 15th (4:00 - 5:00 PM EST)", - "description": "Navigate to the public engagement page, this will be the public engagement page event listening session 2 date" - }, - "public.eng.page.event.listening.3.info": { - "defaultMessage": "May 10th (4:00 PM EST)", - "description": "Navigate to the public engagement page, this will be the public engagement page event listening session 3 date" - }, - "public.eng.page.event.listening.4.info": { - "defaultMessage": "May 19th (4:00 PM EST)", - "description": "Navigate to the public engagement page, this will be the public engagement page event listening session 4 date" - }, - "public.eng.page.event.listening.sess.description": { - "defaultMessage": "CEQ is hosting public listening sessions to seek input and feedback on the beta version of the tool, including on the datasets it includes and the methodology it uses. This feedback is critical to the development and enhancement of the tool. This feedback will help CEQ update and refine the tool to ensure that it reflects the environmental, climate and other challenges that communities are experiencing.", - "description": "Navigate to the public engagement page, this will be the public engagement page event listening session description" - }, - "public.eng.page.event.listening.sess.name": { - "defaultMessage": "listening session", - "description": "Navigate to the public engagement page, this will be the public engagement page event listening session name" - }, - "public.eng.page.event.reglink.label": { - "defaultMessage": "Registration link", - "description": "Navigate to the public engagement page, this will be the public engagement page event registration link label" - }, - "public.eng.page.event.training.1.info": { - "defaultMessage": "March 9th (4:00 - 5:00 PM EST)", - "description": "Navigate to the public engagement page, this will be the public engagement page event training session 1 date" - }, - "public.eng.page.event.training.2.info": { - "defaultMessage": "March 10th (4:00 - 5:00 PM EST)", - "description": "Navigate to the public engagement page, this will be the public engagement page event training session 2 date" - }, - "public.eng.page.event.training.3.info": { - "defaultMessage": "March 16th (4:00 - 5:00 PM EST)", - "description": "Navigate to the public engagement page, this will be the public engagement page event training session 3 date" - }, - "public.eng.page.event.training.4.info": { - "defaultMessage": "October 4th (4:00 - 5:00 PM EST)", - "description": "Navigate to the public engagement page, this will be the public engagement page event training session 4 date" - }, - "public.eng.page.event.training.5.info": { - "defaultMessage": "October 9th (4:00 - 5:00 PM EST)", - "description": "Navigate to the public engagement page, this will be the public engagement page event training session 5 date" - }, - "public.eng.page.event.training.description": { - "defaultMessage": "The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to use the current version of the tool. The presenters at these webinars will be available to provide technical support and address issues related to accessing and using the tool.", - "description": "Navigate to the public engagement page, this will be the public engagement page event training session description" - }, - "public.eng.page.event.training.sess.name": { - "defaultMessage": "training session", - "description": "Navigate to the public engagement page, this will be the public engagement page event training session name" - }, - "public.eng.page.event.whejac.meeting.day.1.description": { - "defaultMessage": "The White House Environmental Justice Advisory Council is also soliciting feedback on the beta version of the Climate and Economic Justice Screening Tool at its public meeting. The link above has additional details.", - "description": "public engagement page event WHEJAC day 1 description" - }, - "public.eng.page.event.whejac.meeting.day.1.name": { - "defaultMessage": "Public WHEJAC meeting day one", - "description": "public engagement page event WHEJAC meeting day 1 name" - }, - "public.eng.page.event.whejac.meeting.day.2.description": { - "defaultMessage": "The White House Environmental Justice Advisory Council is also soliciting feedback on the beta version of the Climate and Economic Justice Screening Tool at its public meeting. The link above has additional details.", - "description": "public engagement page event WHEJAC day 2 description" - }, - "public.eng.page.event.whejac.meeting.day.2.name": { - "defaultMessage": "Public WHEJAC meeting day two", - "description": "public engagement page event WHEJAC meeting day 2 name" - }, - "public.eng.page.heading1.text": { - "defaultMessage": "Public engagement opportunities", - "description": "Navigate to the public engagement page, this will be the publiceng page header text" - }, - "public.eng.page.sub.header2.text": { - "defaultMessage": "Upcoming events for CEJST version {version}", - "description": "Navigate to the public engagement page, this will be the publiceng page sub header text" - }, - "public.eng.page.sub.header3.text": { - "defaultMessage": "Previous events for public beta", - "description": "Navigate to the public engagement page, this will be the publiceng page sub header text" - }, - "public.eng.page.tag.label": { - "defaultMessage": "UPDATED", - "description": "Navigate to the public engagement page, this will be the public engagement tag label" - }, - "public.eng.page.title.text": { - "defaultMessage": "Public engagement opportunities", - "description": "Navigate to the public engagement page, this will be the publiceng page title text" - }, - "public.eng.page.video.box.body.text": { - "defaultMessage": "Watch a recorded update from CEQ on the changes in the 1.0 version of the tool.", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box body text." - }, - "public.eng.page.video.box.body2.text": { - "defaultMessage": "Watch a recorded version of the beta version of the CEJST training on YouTube.", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box body text." + "description": "Navigate to the public engagement page. This is the redirect title." }, "public.eng.page.video.box.button.img.alt.text1": { "defaultMessage": "the icon to show that this button will open in a new tab", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is alt tag of the image in the button." + "description": "Navigate to the previous version page. This is alt tag of the image in the button." }, "public.eng.page.video.box.button.img.alt.text2": { "defaultMessage": "the icon to show that this button will download the file", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is alt tag of the image in the 2nd button." + "description": "Navigate to the previous version page. This is alt tag of the image in the 2nd button." + }, + "public.eng.page.video.box.button1.1_0.text": { + "defaultMessage": "Watch v1.0 demo", + "description": "Navigate to the previous version page. This is that box button text." }, "public.eng.page.video.box.button1.beta.text": { "defaultMessage": "Watch on beta demo", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box button text." - }, - "public.eng.page.video.box.button1.text": { - "defaultMessage": "Watch on YouTube", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box button text." + "description": "Navigate to the previous version page. This is that box button text." }, "public.eng.page.video.box.button2.beta.text": { "defaultMessage": "Download beta slide deck", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is the button text for the second button." + "description": "Navigate to the previous version page. This is the button text for the second button." }, "public.eng.page.video.box.button2.text": { "defaultMessage": "Download slide deck", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is the button text for the second button." - }, - "public.eng.page.video.box.title.beta.text": { - "defaultMessage": "Need information about the public beta?", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box title text." - }, - "public.eng.page.video.box.title.text": { - "defaultMessage": "What's new overview", - "description": "Navigate to the public engagement page, there will be box that allows users to watch previously recorded videos. This is that box title text." - }, - "public.eng.page.whejac.meeting.day.1.info": { - "defaultMessage": "March 30th (3:00 - 7:00 PM EST)", - "description": "public engagement page event WHEJAC" - }, - "public.eng.page.whejac.meeting.day.2.info": { - "defaultMessage": "March 31th (3:00 - 7:30 PM EST)", - "description": "public engagement page event WHEJAC" + "description": "Navigate to the previous version page. This is the button text for the second button." }, "technical.support.doc.page.coming.soon.text": { "defaultMessage": "Coming Soon!", diff --git a/client/src/intl/es.json b/client/src/intl/es.json index 954c5520..2a46ff4b 100644 --- a/client/src/intl/es.json +++ b/client/src/intl/es.json @@ -568,55 +568,22 @@ "pageNotFound.apology.text": "Lo sentimos, no se pudo encontrar la página que estaba buscando. Explore el mapa u obtenga más información acerca de la herramienta.", "pageNotFound.heading.text": "No se encontró la página", "pageNotFound.title.text": "No se encontró la página", - "previous.versions.page.body.text": "La versión beta de la metodología y los datos se utilizaron durante el periodo de la versión beta pública para obtener comentarios sobre la herramienta desde {betaDate} - {releaseDate}.", + "previous.versions.page.body.text": "La versión beta de la metodología y los datos se utilizaron durante el periodo de la versión beta pública para obtener comentarios sobre la herramienta desde {startDate} \u2013 {endDate}.", "previous.versions.page.button1.alt.tag.text": "un botón que permite descargar los datos y la documentación a la herramienta", "previous.versions.page.button1.text": "Información y documentación", "previous.versions.page.button2.alt.tag.text": "un botón que permite descargar el archivo de forma y el libro de código a la herramienta", "previous.versions.page.button2.text": "Archivo de forma y libro de código", - "previous.versions.page.card.text": "Versión beta", + "previous.versions.page.card.text": "Versión 1.0", "previous.versions.page.title.text": "Versiones anteriores", - "public.eng.page.button.img.alt.tag": "un icono que representa un calendario", - "public.eng.page.button.label": "Participación pública", - "public.eng.page.coming.soon.text": "¡Próximamente!", - "public.eng.page.description1.text": "El Consejo sobre la Calidad del Medio Ambiente (CEQ) está organizando sesiones de participación para conectar con el público acerca de las versiones actuales de la Herramienta de evaluación de la justicia climática y económica(CEJST). Estas sesiones son una oportunidad para capacitarse sobre la herramienta o proporcionar comentarios sobre la versión más reciente de la herramienta. El CEQ espera que el público participe en estos eventos para aprender sobre la herramienta, obtener respuestas para sus preguntas y presentar comentarios.", - "public.eng.page.description2.text": "Es necesaria la preinscripción para participar en las sesiones y hacer uso de la palabra.", - "public.eng.page.description3.text": "Según estén disponibles, en esta página se publicarán oportunidades adicionales de capacitaciones y participación para el público sobre la Herramienta de evaluación de la justicia climática y económica. Suscríbase para recibir actualizaciones del CEQ.", - "public.eng.page.event.info.label": "Información sobre eventos", - "public.eng.page.event.listening.1.info": "22 de marzo (4:00 - 5:00 PM EST)", - "public.eng.page.event.listening.2.info": "15 de abril (4:00 - 5:00 PM EST)", - "public.eng.page.event.listening.3.info": "10 de mayo (4:00 PM EST)", - "public.eng.page.event.listening.4.info": "19 de mayo (4:00 PM EST)", - "public.eng.page.event.listening.sess.description": "El CEQ llevará a cabo sesiones para escuchar opiniones del público, comentarios e ideas sobre la versión beta de la herramienta, incluidos los conjuntos de datos y la metodología que utiliza. Estos comentarios son cruciales para el desarrollo y la mejora de la herramienta. Estos comentarios ayudarán al CEQ a actualizar y refinar la herramienta para garantizar que refleje los desafíos ambientales, climáticos o de otra índole que experimentan las comunidades.", - "public.eng.page.event.listening.sess.name": "Sesión de conexión", - "public.eng.page.event.reglink.label": "Enlace para inscripción", - "public.eng.page.event.training.1.info": "9 de marzo (4:00 - 5:00 PM EST)", - "public.eng.page.event.training.2.info": "10 de marzo (4:00 - 5:00 PM EST)", - "public.eng.page.event.training.3.info": "16 de marzo (4:00 - 5:00 PM EST)", - "public.eng.page.event.training.4.info": "4 de octubre (4:00 - 5:00 PM EST)", - "public.eng.page.event.training.5.info": "9 de octubre (4:00 - 5:00 PM EST)", - "public.eng.page.event.training.description": "El Consejo sobre la Calidad del Medio Ambiente (CEQ) de la Casa Blanca, en colaboración con el Servicio Digital de los Estados Unidos, llevará a cabo una serie de \"Webinarios de capacitación\" para usuarios de la Herramienta de evaluación de la justicia climática y económica. Estos webinarios son una oportunidad para que miembros del público aprendan a utilizar la versión actual de la herramienta. Los presentadores en estos webinarios estarán disponibles para proporcionar apoyo técnico y abordar asuntos relacionados con el acceso y el uso de la herramienta.", - "public.eng.page.event.training.sess.name": "sesión de capacitación", - "public.eng.page.event.whejac.meeting.day.1.description": "El Consejo Asesor de Justicia Ambiental de la Casa Blanca (WHEJAC) también está solicitando comentarios sobre la versión beta de la Herramienta de evaluación de la justicia climática y económica en su reunión pública. En el enlace anterior hay información adicional.", - "public.eng.page.event.whejac.meeting.day.1.name": "Primer día de la reunión pública del Consejo WHEJAC", - "public.eng.page.event.whejac.meeting.day.2.description": "El Consejo Asesor de Justicia Ambiental de la Casa Blanca (WHEJAC) también está solicitando comentarios sobre la versión beta de la Herramienta de evaluación de la justicia climática y económica en su reunión pública. En el enlace anterior hay información adicional.", - "public.eng.page.event.whejac.meeting.day.2.name": "Segundo día de la reunión pública de WHEJAC", - "public.eng.page.heading1.text": "Oportunidades de participación pública", - "public.eng.page.sub.header2.text": "Eventos próximos de la versión {version} de la CEJST", - "public.eng.page.sub.header3.text": "Eventos anteriores de la versión beta para el público", - "public.eng.page.tag.label": "ACTUALIZADO", - "public.eng.page.title.text": "Oportunidades de participación pública", - "public.eng.page.video.box.body.text": "Vea una actualización grabada de CEQ respecto a los cambios de la versión 1.0 de la herramienta.", - "public.eng.page.video.box.body2.text": "Vea una versión grabada de la capacitación de la Herramienta CEJST en YouTube.", + "public.eng.page.redirect.title": "Participación pública", + "public.eng.page.redirect.text": "El contenido de participación pública se ha movido a la página Versión anterior. Haga clic aquí si no es redirigido después de 5 segundos.", "public.eng.page.video.box.button.img.alt.text1": "el icono para mostrar que este botón se abrirá en una pestaña nueva", "public.eng.page.video.box.button.img.alt.text2": "el icono para mostrar que este botón descargará el archivo", "public.eng.page.video.box.button1.beta.text": "Ver en demo beta", + "public.eng.page.video.box.button1.1_0.text": "Ver v1.0 demo", "public.eng.page.video.box.button1.text": "Véalo en YouTube", "public.eng.page.video.box.button2.beta.text": "Descargue diapositivas de la versión beta", "public.eng.page.video.box.button2.text": "Descargue diapositivas", - "public.eng.page.video.box.title.beta.text": "¿Necesita información acerca de la versión beta para el público?", - "public.eng.page.video.box.title.text": "Aspecto general de novedades", - "public.eng.page.whejac.meeting.day.1.info": "30 de marzo (3:00 - 7:00 PM EST)", - "public.eng.page.whejac.meeting.day.2.info": "31 de marzo (3:00 - 7:00 PM EST)", "technical.support.doc.page.coming.soon.text": "¡Próximamente!", "technical.support.doc.page.title.text": "Documento de apoyo técnico" } diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx index 7cf1bf23..6d5bbe9f 100644 --- a/client/src/pages/about.tsx +++ b/client/src/pages/about.tsx @@ -85,7 +85,6 @@ const AboutPage = ({location}: IAboutPageProps) => { diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx index cd203b1a..c9fd387a 100644 --- a/client/src/pages/frequently-asked-questions.tsx +++ b/client/src/pages/frequently-asked-questions.tsx @@ -218,7 +218,6 @@ const FAQPage = ({location}: IFAQPageProps) => { activeSubPageIndex={2} endPoints={[ PAGES_ENDPOINTS.ABOUT, - PAGES_ENDPOINTS.PUBLIC_ENG, PAGES_ENDPOINTS.FAQS, ]} /> diff --git a/client/src/pages/previous-versions.tsx b/client/src/pages/previous-versions.tsx index 75e4038f..2c02766a 100644 --- a/client/src/pages/previous-versions.tsx +++ b/client/src/pages/previous-versions.tsx @@ -2,16 +2,19 @@ import * as React from 'react'; import {useIntl} from 'gatsby-plugin-intl'; import {useWindowSize} from 'react-use'; -import {Card, CardBody, CardFooter, CardHeader, Grid} from '@trussworks/react-uswds'; +import {Card, CardBody, CardFooter, CardGroup, CardHeader, Grid, Button} from '@trussworks/react-uswds'; +import DatasetsButton from '../components/DatasetsButton'; import DownloadButton from '../components/DownloadButton'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; -import DatasetsButton from '../components/DatasetsButton'; import SubPageNav from '../components/SubPageNav'; import * as PREV_VER_COPY from '../data/copy/previousVer'; import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS, DATA_SURVEY_LINKS} from '../data/constants'; import {getDownloadFileUrl} from '../data/copy/downloads'; +import {VERSIONS} from '../data/copy/methodology'; +// @ts-ignore +import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg'; interface IPreviousVersionsProps { location: Location; @@ -41,8 +44,8 @@ const PreviousVersions = ({location}: IPreviousVersionsProps) => { {/* First column */}
    - + + +

    {PREV_VER_COPY.CARD_1_0.TITLE}

    +     + +

    {PREV_VER_COPY.CARD_1_0.BODY}

    +     + + + + + + + +     +
    diff --git a/client/src/pages/public-engagement.tsx b/client/src/pages/public-engagement.tsx index 6e8bfb24..5545a1d1 100644 --- a/client/src/pages/public-engagement.tsx +++ b/client/src/pages/public-engagement.tsx @@ -1,12 +1,9 @@ -import * as React from 'react'; -import {Collection, CollectionHeading, CollectionItem, Grid} from '@trussworks/react-uswds'; import {useIntl} from 'gatsby-plugin-intl'; - +import * as React from 'react'; +import {useEffect} from 'react'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; -import PublicEvent from '../components/PublicEvent'; -import PublicVideoBox from '../components/PublicVideoBox'; - +import {PAGES_ENDPOINTS} from '../data/constants'; import * as PUBLIC_ENG_COPY from '../data/copy/publicEngage'; interface IPublicEngagementPageProps { @@ -16,70 +13,24 @@ interface IPublicEngagementPageProps { const PublicEngagementPage = ({location}: IPublicEngagementPageProps) => { const intl = useIntl(); - // The reverse() is an in-place algorithm and so a temporary variable is needed: - const events = [...PUBLIC_ENG_COPY.EVENTS]; - events.reverse(); + // Gatsby does not support redirection for AWS S3, so we do it here. + useEffect(() => { + // Gatsby does not support window during the build, so we check first before we use it. + const isInBrowser = () => typeof window !== undefined; + if (isInBrowser()) { + const targetUrl = window.location.pathname.replace(PAGES_ENDPOINTS.PUBLIC_ENG, PAGES_ENDPOINTS.PREVIOUS_VERSIONS); + setTimeout(() => { + window.location.replace(targetUrl); + }, 5000); + } + }, []); return ( - - + - -

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

    - - - -

    - {intl.formatMessage(PUBLIC_ENG_COPY.PAGE_INTRO.PAGE_DESCRIPTION1)} -

    -

    - {intl.formatMessage(PUBLIC_ENG_COPY.PAGE_INTRO.PAGE_DESCRIPTION2)} -

    -

    - {PUBLIC_ENG_COPY.RICH_COPY.PAGE_DESCRIPTION3} -

    -     - - - -     - - -

    - {PUBLIC_ENG_COPY.RICH_COPY.PAGE_HEADING2} -

    -     - - - - - - - {intl.formatMessage(PUBLIC_ENG_COPY.PAGE_INTRO.PAGE_COMING_SOON)} - - - - - - - - - - -

    - {PUBLIC_ENG_COPY.RICH_COPY.PAGE_HEADING3} -

    -     - - - - - - {events.map((event, index) => )} - - - - +
    + {PUBLIC_ENG_COPY.REDIRECT_TEXT} +
    ); diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap index 5867810e..6c5aa7d3 100644 --- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap @@ -318,16 +318,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis About -
  • - - 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 622c2f41..e4796a73 100644 --- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap @@ -318,16 +318,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis About
    • -
  • - - Engagement calendar - -
  • diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap index d8bbf026..bc132283 100644 --- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap @@ -318,16 +318,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis About
    • -
  • - - Engagement calendar - -
  • diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap index 8f03d4d7..9aa5915e 100644 --- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap @@ -318,16 +318,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis About
    • -
  • - - 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 256b90cf..794ba7f2 100644 --- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap @@ -318,16 +318,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis About
    • -
  • - - Engagement calendar - -
  • diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap deleted file mode 100644 index 1977ab8a..00000000 --- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap +++ /dev/null @@ -1,1421 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`rendering of the DatasetContainer checks if various text fields are visible 1`] = ` - - -
    -
    -

    - Public engagement opportunities -

    -
    -
    -

    - - The Council on Environmental Quality (CEQ) is hosting engagement opportunities to connect with the public about the current versions of the Climate and Economic Justice Screening Tool (CEJST). These sessions are an opportunity to obtain training on the tool or to provide the feedback on the latest version of the tool. CEQ hopes that members of the public will join these engagements to learn about the tool, ask questions, an share feedback. - -

    -

    - - Pre-registration is required to participate and speak at the sessions. - -

    -

    - - As they become available, additional public trainings and engagement opportunities on the Climate and Economic Justice Screening Tool will also be posted on this page. - - Sign-up - - for updates from CEQ. - -

    -
    -
    -
    -
    -

    - What's new overview -

    -
    - - Watch a recorded update from CEQ on the changes in the 1.0 version of the tool. - - - - -
    -
    -
    -
    -
    -
    -

    - Upcoming events for CEJST version 2.0 -

    -
    -
    -
    -
      -
    • -
      -

      - - Coming soon! - -

      -
      -
      • -
    -
    -
    -
    -
    -

    - Need information about the public beta? -

    -
    - - Watch a recorded version of the beta version of the CEJST training on YouTube. - - - - - - - -
    -
    -
    -
    -
    -
    -

    - Previous events for public beta -

    -
    -
    -
    -
      -
    • - Alt text -
      -

      - CEJST training session #5 -

      -

      - - The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital - Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic - Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to - use the current version of the tool. The presenters at these webinars will be available to - provide technical support and address issues related to accessing and using the tool. - -

      -

      - - Event info - - : October 9th (4:00 - 5:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST training session #4 -

      -

      - - The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital - Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic - Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to - use the current version of the tool. The presenters at these webinars will be available to - provide technical support and address issues related to accessing and using the tool. - -

      -

      - - Event info - - : October 4th (4:00 - 5:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST listening session #4 -

      -

      - - CEQ is hosting public listening sessions to seek input and feedback on the beta version of the - tool, including on the datasets it includes and the methodology it uses. This feedback is critical - to the development and enhancement of the tool. This feedback will help CEQ update and refine the - tool to ensure that it reflects the environmental, climate and other challenges that communities - are experiencing. - -

      -

      - - Event info - - : May 19th (4:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST listening session #3 -

      -

      - - CEQ is hosting public listening sessions to seek input and feedback on the beta version of the - tool, including on the datasets it includes and the methodology it uses. This feedback is critical - to the development and enhancement of the tool. This feedback will help CEQ update and refine the - tool to ensure that it reflects the environmental, climate and other challenges that communities - are experiencing. - -

      -

      - - Event info - - : May 10th (4:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST listening session #2 -

      -

      - - CEQ is hosting public listening sessions to seek input and feedback on the beta version of the - tool, including on the datasets it includes and the methodology it uses. This feedback is critical - to the development and enhancement of the tool. This feedback will help CEQ update and refine the - tool to ensure that it reflects the environmental, climate and other challenges that communities - are experiencing. - -

      -

      - - Event info - - : April 15th (4:00 - 5:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST Public WHEJAC meeting day two -

      -

      - - The White House Environmental Justice Advisory Council is also soliciting feedback on the beta version of the Climate and Economic Justice Screening Tool at its public meeting. The link above has additional details. - -

      -

      - - Event info - - : March 31th (3:00 - 7:30 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST Public WHEJAC meeting day one -

      -

      - - The White House Environmental Justice Advisory Council is also soliciting feedback on the beta version of the Climate and Economic Justice Screening Tool at its public meeting. The link above has additional details. - -

      -

      - - Event info - - : March 30th (3:00 - 7:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST listening session #1 -

      -

      - - CEQ is hosting public listening sessions to seek input and feedback on the beta version of the - tool, including on the datasets it includes and the methodology it uses. This feedback is critical - to the development and enhancement of the tool. This feedback will help CEQ update and refine the - tool to ensure that it reflects the environmental, climate and other challenges that communities - are experiencing. - -

      -

      - - Event info - - : March 22nd (4:00 - 5:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST training session #3 -

      -

      - - The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital - Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic - Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to - use the current version of the tool. The presenters at these webinars will be available to - provide technical support and address issues related to accessing and using the tool. - -

      -

      - - Event info - - : March 16th (4:00 - 5:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST training session #2 -

      -

      - - The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital - Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic - Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to - use the current version of the tool. The presenters at these webinars will be available to - provide technical support and address issues related to accessing and using the tool. - -

      -

      - - Event info - - : March 10th (4:00 - 5:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    • - Alt text -
      -

      - CEJST training session #1 -

      -

      - - The White House Council on Environmental Quality (CEQ), in partnership with the U.S. Digital - Service, is hosting a series of 'Training Webinars' for users of the Climate and Economic - Justice Screening Tool. These webinars are an opportunity for members of the public to learn how to - use the current version of the tool. The presenters at these webinars will be available to - provide technical support and address issues related to accessing and using the tool. - -

      -

      - - Event info - - : March 9th (4:00 - 5:00 PM EST) -

      -

      - - - -

      -
      -
      • -
    -
    -
    -
    -
    - -     -`; diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap index a9ede788..39088101 100644 --- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap @@ -318,16 +318,6 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis About
    • -
  • - - Engagement calendar - -
  • diff --git a/client/src/pages/tests/publicEng.test.tsx b/client/src/pages/tests/publicEng.test.tsx deleted file mode 100644 index 7f4da05c..00000000 --- a/client/src/pages/tests/publicEng.test.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import * as React from 'react'; -import {render} from '@testing-library/react'; -import {LocalizedComponent} from '../../test/testHelpers'; -import PublicEngagementPage from '../public-engagement'; - -describe('rendering of the DatasetContainer', () => { - const {asFragment} = render( - - - , - ); - - it('checks if various text fields are visible', () => { - expect(asFragment()).toMatchSnapshot(); - }); -}); diff --git a/client/src/styles/global.scss b/client/src/styles/global.scss index 69a5fb54..2bce6495 100644 --- a/client/src/styles/global.scss +++ b/client/src/styles/global.scss @@ -44,8 +44,8 @@ There are 3 things that should be included in this file: ****************************** */ -$primary-color: #112f4e; // Used for header font color - selection color is #005EA2 -$j40-blue-background-color: #e7f2f5; // Hex value of 'blue-cool-5' +$primary-color: #112f4e; // Used for header font color - selection color is #005EA2 +$j40-blue-background-color: #e7f2f5; // Hex value of 'blue-cool-5' $disadvantaged-color-side-panel: #1a4480; // The j40-element mixin is used to create any font element. E.g.

    ,

    tags, etc. @@ -58,23 +58,24 @@ $disadvantaged-color-side-panel: #1a4480; } h1 { - @include j40-element('3xl', 2, 'bold', 5 ); + @include j40-element('3xl', 2, 'bold', 5); } h2 { - @include j40-element('xl', 2, 'bold', 4 ); + @include j40-element('xl', 2, 'bold', 4); } h3 { - @include j40-element('lg', 2, 'bold', 4 ); + @include j40-element('lg', 2, 'bold', 4); } -h4, .j40-h4 { - @include j40-element('sm', 1, 'bold', 3 ); +h4, +.j40-h4 { + @include j40-element('sm', 1, 'bold', 3); } h5 { - @include j40-element('md', 4, 'bold', 0 ); + @include j40-element('md', 4, 'bold', 0); } h6 { @@ -103,7 +104,7 @@ p.flush { } .j40-footer-ceq-font { - @include j40-element('lg', 2, 'bold', 0 ); + @include j40-element('lg', 2, 'bold', 0); } @@ -126,16 +127,16 @@ li.usa-nav__primary-item a { position: relative; } -li.usa-nav__primary-item a:hover::after{ - background-color: #005ea2; - border-radius: 0; - content: ""; - display: block; - position: absolute; - height: 0.25rem; - left: 1rem; - right: 1rem; - bottom: -0.25rem; +li.usa-nav__primary-item a:hover::after { + background-color: #005ea2; + border-radius: 0; + content: ""; + display: block; + position: absolute; + height: 0.25rem; + left: 1rem; + right: 1rem; + bottom: -0.25rem; } .remove-link-style { @@ -168,10 +169,11 @@ li.usa-nav__primary-item a:hover::after{ justify-content: space-between; align-items: flex-end; - @include at-media-max("tablet"){ + @include at-media-max("tablet") { flex-direction: column; } } + .j40-mb5-mt3 { @include u-margin-bottom(5); @include u-margin-top(3); @@ -208,7 +210,7 @@ li[class*='datasetCard-module'] .usa-link--external::after { .j40-footer { @include u-margin-top(4); - .usa-footer__primary-section.pb2{ + .usa-footer__primary-section.pb2 { @include u-padding-bottom(2); } @@ -220,7 +222,7 @@ li[class*='datasetCard-module'] .usa-link--external::after { } } - .footer-link-first-child{ + .footer-link-first-child { @include u-display('inline-block'); @include u-margin-top(1.5) } @@ -259,6 +261,7 @@ The reason the Icon was changed was to match the other overlayed icons - such as } } } + .mapboxgl-ctrl { button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-background { .mapboxgl-ctrl-icon { @@ -270,11 +273,12 @@ The reason the Icon was changed was to match the other overlayed icons - such as /** Beacon - the beacon's color (*-location-dot) and proximity animation (::before), inner radius (::after) was changed and . The reason the beacon was changed was to increase the contrast between the beacon and the census tract layers */ -.mapboxgl-user-location-dot, .mapboxgl-user-location-dot::before { +.mapboxgl-user-location-dot, +.mapboxgl-user-location-dot::before { background-color: #0076d6 !important; } -.mapboxgl-user-location-dot::after { +.mapboxgl-user-location-dot::after { border: 4px solid #FFF !important; } @@ -285,6 +289,7 @@ Beacon - the beacon's color (*-location-dot) and proximity animation (::before), margin-right: 12px; margin-top: 15px; } + .mapboxgl-popup-content { box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.5) !important; border-radius: 8px !important; @@ -333,7 +338,8 @@ Beacon - the beacon's color (*-location-dot) and proximity animation (::before), // see more here: https://thatemil.com/blog/2014/04/06/intrinsic-sizing-of-svg-in-responsive-web-design/ .mapboxgl-ctrl-icon { height: 1em; - pointer-events: none; /* this keeps the icons from "eating" the click events instead of the button getting them */ + pointer-events: none; + /* this keeps the icons from "eating" the click events instead of the button getting them */ } } @@ -402,7 +408,9 @@ Beacon - the beacon's color (*-location-dot) and proximity animation (::before), //As per Mikel Maron's (MapBox advocate) suggestion to use svg data URI override: a.mapboxgl-ctrl-logo { background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='88' height='23' viewBox='0 0 88 23' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' fill-rule='evenodd'%3E %3Cdefs%3E %3Cpath id='logo' d='M11.5 2.25c5.105 0 9.25 4.145 9.25 9.25s-4.145 9.25-9.25 9.25-9.25-4.145-9.25-9.25 4.145-9.25 9.25-9.25zM6.997 15.983c-.051-.338-.828-5.802 2.233-8.873a4.395 4.395 0 013.13-1.28c1.27 0 2.49.51 3.39 1.42.91.9 1.42 2.12 1.42 3.39 0 1.18-.449 2.301-1.28 3.13C12.72 16.93 7 16 7 16l-.003-.017zM15.3 10.5l-2 .8-.8 2-.8-2-2-.8 2-.8.8-2 .8 2 2 .8z'/%3E %3Cpath id='text' d='M50.63 8c.13 0 .23.1.23.23V9c.7-.76 1.7-1.18 2.73-1.18 2.17 0 3.95 1.85 3.95 4.17s-1.77 4.19-3.94 4.19c-1.04 0-2.03-.43-2.74-1.18v3.77c0 .13-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V8.23c0-.12.1-.23.23-.23h1.4zm-3.86.01c.01 0 .01 0 .01-.01.13 0 .22.1.22.22v7.55c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V15c-.7.76-1.69 1.19-2.73 1.19-2.17 0-3.94-1.87-3.94-4.19 0-2.32 1.77-4.19 3.94-4.19 1.03 0 2.02.43 2.73 1.18v-.75c0-.12.1-.23.23-.23h1.4zm26.375-.19a4.24 4.24 0 00-4.16 3.29c-.13.59-.13 1.19 0 1.77a4.233 4.233 0 004.17 3.3c2.35 0 4.26-1.87 4.26-4.19 0-2.32-1.9-4.17-4.27-4.17zM60.63 5c.13 0 .23.1.23.23v3.76c.7-.76 1.7-1.18 2.73-1.18 1.88 0 3.45 1.4 3.84 3.28.13.59.13 1.2 0 1.8-.39 1.88-1.96 3.29-3.84 3.29-1.03 0-2.02-.43-2.73-1.18v.77c0 .12-.1.23-.23.23h-1.4c-.13 0-.23-.1-.23-.23V5.23c0-.12.1-.23.23-.23h1.4zm-34 11h-1.4c-.13 0-.23-.11-.23-.23V8.22c.01-.13.1-.22.23-.22h1.4c.13 0 .22.11.23.22v.68c.5-.68 1.3-1.09 2.16-1.1h.03c1.09 0 2.09.6 2.6 1.55.45-.95 1.4-1.55 2.44-1.56 1.62 0 2.93 1.25 2.9 2.78l.03 5.2c0 .13-.1.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.8 0-1.46.7-1.59 1.62l.01 4.68c0 .13-.11.23-.23.23h-1.41c-.13 0-.23-.11-.23-.23v-4.59c0-.98-.74-1.71-1.62-1.71-.85 0-1.54.79-1.6 1.8v4.5c0 .13-.1.23-.23.23zm53.615 0h-1.61c-.04 0-.08-.01-.12-.03-.09-.06-.13-.19-.06-.28l2.43-3.71-2.39-3.65a.213.213 0 01-.03-.12c0-.12.09-.21.21-.21h1.61c.13 0 .24.06.3.17l1.41 2.37 1.4-2.37a.34.34 0 01.3-.17h1.6c.04 0 .08.01.12.03.09.06.13.19.06.28l-2.37 3.65 2.43 3.7c0 .05.01.09.01.13 0 .12-.09.21-.21.21h-1.61c-.13 0-.24-.06-.3-.17l-1.44-2.42-1.44 2.42a.34.34 0 01-.3.17zm-7.12-1.49c-1.33 0-2.42-1.12-2.42-2.51 0-1.39 1.08-2.52 2.42-2.52 1.33 0 2.42 1.12 2.42 2.51 0 1.39-1.08 2.51-2.42 2.52zm-19.865 0c-1.32 0-2.39-1.11-2.42-2.48v-.07c.02-1.38 1.09-2.49 2.4-2.49 1.32 0 2.41 1.12 2.41 2.51 0 1.39-1.07 2.52-2.39 2.53zm-8.11-2.48c-.01 1.37-1.09 2.47-2.41 2.47s-2.42-1.12-2.42-2.51c0-1.39 1.08-2.52 2.4-2.52 1.33 0 2.39 1.11 2.41 2.48l.02.08zm18.12 2.47c-1.32 0-2.39-1.11-2.41-2.48v-.06c.02-1.38 1.09-2.48 2.41-2.48s2.42 1.12 2.42 2.51c0 1.39-1.09 2.51-2.42 2.51z'/%3E %3C/defs%3E %3Cmask id='clip'%3E %3Crect x='0' y='0' width='100%25' height='100%25' fill='white'/%3E %3Cuse xlink:href='%23logo'/%3E %3Cuse xlink:href='%23text'/%3E %3C/mask%3E %3Cg id='outline' opacity='0.3' stroke='%23000' stroke-width='3'%3E %3Ccircle mask='url(/studio-manual/assets/%23clip)' cx='11.5' cy='11.5' r='9.25'/%3E %3Cuse xlink:href='%23text' mask='url(/studio-manual/assets/%23clip)'/%3E %3C/g%3E %3Cg id='fill' opacity='0.9' fill='%23fff'%3E %3Cuse xlink:href='%23logo'/%3E %3Cuse xlink:href='%23text'/%3E %3C/g%3E %3C/svg%3E") !important; -}; +} + +; /* @@ -415,15 +423,16 @@ a.mapboxgl-ctrl-logo { } // The following two styles will only work in browsers that support the ":has" selector -button.usa-accordion__button:has(div[class*="disCategoryContainer"]) { +button.usa-accordion__button:has(div[class*="disCategoryContainer"]) { background-color: $disadvantaged-color-side-panel; background-image: url("../images/sidePanelIcons/accordion-plus.svg"); - div[class*="disCategoryContainer"]{ + div[class*="disCategoryContainer"] { color: white; } } -button.usa-accordion__button[aria-expanded=true]:has(div[class*="disCategoryContainer"]) { + +button.usa-accordion__button[aria-expanded=true]:has(div[class*="disCategoryContainer"]) { background-image: url("../images/sidePanelIcons/accordion-minus.svg"); } @@ -433,15 +442,15 @@ button.usa-accordion__button[aria-expanded=true]:has(div[class*="disCategoryCont ****************************** */ -[class*="demographicsContainer"]{ +[class*="demographicsContainer"] { .usa-accordion__heading { - font-size: .8rem; + font-size: .8rem; - .usa-accordion__button{ - background-color: white; - padding: .6rem; - } + .usa-accordion__button { + background-color: white; + padding: .6rem; + } } .usa-accordion__content { @@ -455,7 +464,7 @@ button.usa-accordion__button[aria-expanded=true]:has(div[class*="disCategoryCont *************************************** */ -.usa-collection__body{ +.usa-collection__body { width: 0; } @@ -524,17 +533,47 @@ button.usa-accordion__button[aria-expanded=true]:has(div[class*="disCategoryCont list-style: none; } -.previous-versions-container .usa-card__header, .usa-card__heading, .usa-card__body, .usa-card__footer { +.previous-versions-container .usa-card__header, +.usa-card__heading, +.usa-card__body, +.usa-card__footer { font-family: "Source Sans Pro Web", "Helvetica Neue", "Helvetica", "Roboto", "Arial", "sans-serif" !important; } -/* +.previous-versions-demoLink { + display: flex; + text-decoration: none; + justify-content: center; + + .youTubeBtn { + height: 40px; + @include u-margin-top(3); + width: 14rem; + + .buttonContainer { + display: flex; + justify-content: center; + + .buttonText { + @include u-margin-right(1); + } + + .buttonImage { + width: 21px; + margin-top: -3px; + filter: invert(100%) sepia(100%) saturate(1%) hue-rotate(137deg) brightness(103%) contrast(101%); + } + } + } +} + + /* ****************************** * FAQs PAGE STYLES ****************************** */ -.faqs-dot-alignment{ - align-self: flex-start; - padding-top: 5px; -} + .faqs-dot-alignment { + align-self: flex-start; + padding-top: 5px; + } \ No newline at end of file