diff --git a/client/src/components/AreaDetail/AreaDetail.tsx b/client/src/components/AreaDetail/AreaDetail.tsx index 252fdc712..6f3a6597d 100644 --- a/client/src/components/AreaDetail/AreaDetail.tsx +++ b/client/src/components/AreaDetail/AreaDetail.tsx @@ -872,7 +872,8 @@ const AreaDetail = ({properties}: IAreaDetailProps) => { {/* Send Feedback button */} diff --git a/client/src/components/DatasetContainer/index.tsx b/client/src/components/DatasetContainer/index.tsx index 0da736d4c..95fe3ea2d 100644 --- a/client/src/components/DatasetContainer/index.tsx +++ b/client/src/components/DatasetContainer/index.tsx @@ -8,7 +8,7 @@ import {hyphenizeString} from '../../../cypress/integration/common/helpers'; import * as styles from './dsContainer.module.scss'; import * as METHODOLOGY_COPY from '../../data/copy/methodology'; -import {PAGES_ENDPOINTS} from '../../data/constants'; +import {PAGES_ENDPOINTS, DATA_SURVEY_LINKS} from '../../data/constants'; import DatasetsButton from '../DatasetsButton'; @@ -35,7 +35,7 @@ const DatasetContainer = () => { - + diff --git a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap index 4f14f5aeb..cd01e52e5 100644 --- a/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap +++ b/client/src/components/DatasetContainer/tests/__snapshots__/datasetContainer.test.tsx.snap @@ -51,7 +51,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" > diff --git a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap index 054df625b..f835f6458 100644 --- a/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap +++ b/client/src/components/HowYouCanHelp/tests/__snapshots__/howYouCanHelp.test.tsx.snap @@ -12,7 +12,7 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl @@ -25,7 +25,7 @@ exports[`rendering of the HowYouCanHelp checks if various text fields are visibl diff --git a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap index 9e8df8361..9e41a4d89 100644 --- a/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap +++ b/client/src/components/J40Footer/__snapshots__/J40Footer.spec.tsx.snap @@ -211,7 +211,7 @@ exports[`J40Footer renders correctly 1`] = ` data-testid="gridContainer" > diff --git a/client/src/components/SurveyButton/SurveyButton.tsx b/client/src/components/SurveyButton/SurveyButton.tsx index 9cad9e144..a40f57b29 100644 --- a/client/src/components/SurveyButton/SurveyButton.tsx +++ b/client/src/components/SurveyButton/SurveyButton.tsx @@ -5,6 +5,7 @@ import {Button} from '@trussworks/react-uswds'; import * as styles from './SurveyButton.module.scss'; import * as CONTACT_COPY from '../../data/copy/contact'; import J40MainGridContainer from '../J40MainGridContainer'; +import {SITE_SATISFACTION_SURVEY_LINKS} from '../../data/constants'; // @ts-ignore import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg'; @@ -12,8 +13,8 @@ import launchIcon from '/node_modules/uswds/dist/img/usa-icons/launch.svg'; const SurveyButton = () => { const intl = useIntl(); const href = intl.locale === 'es' ? - `https://www.surveymonkey.com/r/ZH36CYV` : - `https://www.surveymonkey.com/r/P3LWTSB`; + SITE_SATISFACTION_SURVEY_LINKS.ES : + SITE_SATISFACTION_SURVEY_LINKS.EN; return ( diff --git a/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap b/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap index 6b2c455b7..eecdc93d2 100644 --- a/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap +++ b/client/src/components/SurveyButton/__snapshots__/SurveyButton.test.tsx.snap @@ -7,7 +7,7 @@ exports[`rendering of the SurveyButton checks if component renders 1`] = ` data-testid="gridContainer" > diff --git a/client/src/data/constants.tsx b/client/src/data/constants.tsx index a30194fc3..e5ec2a42d 100644 --- a/client/src/data/constants.tsx +++ b/client/src/data/constants.tsx @@ -357,3 +357,25 @@ export const USWDS_BREAKPOINTS = { MOBILE_LG: 480, DESKTOP: 1024, }; + +// ********** SURVEY LINKS *************** + +export const DATA_SURVEY_LINKS = { + EN: 'https://eop.gov1.qualtrics.com/jfe/form/SV_51EPev2O6jHiaJ8', + ES: 'https://eop.gov1.qualtrics.com/jfe/form/SV_0GTIoUJZu7ywY8S', +}; + +export const SITE_SATISFACTION_SURVEY_LINKS = { + EN: 'https://eop.gov1.qualtrics.com/jfe/form/SV_eA0ZLaxP8gxLfoO', + ES: 'https://eop.gov1.qualtrics.com/jfe/form/SV_bpI7Dn1SBXGOSTY', +}; + +export const CONTACT_SURVEY_LINKS = { + EN: 'https://eop.gov1.qualtrics.com/jfe/form/SV_cCNgWW4OsfaBlTo', + ES: 'https://eop.gov1.qualtrics.com/jfe/form/SV_2n0EWXynD1AZyT4', +}; + +export const CENSUS_TRACT_SURVEY_LINKS = { + EN: 'https://eop.gov1.qualtrics.com/jfe/form/SV_8J5wGa8Ya4dMP9c', + ES: 'https://eop.gov1.qualtrics.com/jfe/form/SV_eJXos5X4yekq6cC', +}; diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx index e00aca289..4326ef4ba 100644 --- a/client/src/data/copy/about.tsx +++ b/client/src/data/copy/about.tsx @@ -5,7 +5,7 @@ import {FormattedMessage} from 'gatsby-plugin-intl'; import {italicFn, linkFn} from './common'; import {VERSION_NUMBER} from './methodology'; -import {PAGES_ENDPOINTS} from '../constants'; +import {PAGES_ENDPOINTS, DATA_SURVEY_LINKS, SITE_SATISFACTION_SURVEY_LINKS, CONTACT_SURVEY_LINKS} from '../constants'; export const EXEC_ORDER_LINK = 'https://www.federalregister.gov/documents/2021/02/01/2021-02177/tackling-the-climate-crisis-at-home-and-abroad#:~:text=Sec.%20223.%20Justice40,40-percent%20goal.'; export const FAQS_LINK = 'https://www.whitehouse.gov/wp-content/uploads/2022/02/CEQ-CEJST-QandA.pdf'; @@ -251,8 +251,8 @@ export const HOW_YOU_CAN_HELP_LIST_ITEMS = { defaultMessage={`Provide general feedback on the CEJST website`} description={`Navigate to the about page. You will see How you can help list item 1`} values={{ - link1: linkFn('https://www.surveymonkey.com/r/P3LWTSB', false, true), - link1es: linkFn('https://www.surveymonkey.com/r/ZH36CYV', false, true), + link1: linkFn(SITE_SATISFACTION_SURVEY_LINKS.EN, false, true), + link1es: linkFn(SITE_SATISFACTION_SURVEY_LINKS.ES, false, true), }} />, LIST_ITEM_2: data sources.`} description={`Navigate to the about page. You will see How you can help list item 2`} values={{ - link1: linkFn('https://www.surveymonkey.com/r/6G9TQJ8', false, true), - link1es: linkFn('https://www.surveymonkey.com/r/ZPKY8G9', false, true), + link1: linkFn(DATA_SURVEY_LINKS.EN, false, true), + link1es: linkFn(DATA_SURVEY_LINKS.ES, false, true), }} />, LIST_ITEM_3: , PARA1: , - // PARAGRAPH3: this form. - // `} - // description={'Navigate to the survey. Spanish should substitute to get Spanish link! Already coded to support'} - // values={{ - // link1: COMMON_COPY.linkFn('https://www.surveymonkey.com/r/5LZ7MNB', false, true), - // link1es: COMMON_COPY.linkFn('https://www.surveymonkey.com/r/CGTH5P7', false, true), - // }} - // />, + PARAGRAPH3: this form. + `} + description={'Navigate to the survey. Spanish should substitute to get Spanish link! Already coded to support'} + values={{ + link1: COMMON_COPY.linkFn(CONTACT_SURVEY_LINKS.EN, false, true), + link1es: COMMON_COPY.linkFn(CONTACT_SURVEY_LINKS.ES, false, true), + }} + />, }; diff --git a/client/src/data/copy/faqs.tsx b/client/src/data/copy/faqs.tsx index 459fda130..abd60fd8d 100644 --- a/client/src/data/copy/faqs.tsx +++ b/client/src/data/copy/faqs.tsx @@ -6,7 +6,7 @@ import LinkTypeWrapper from '../../components/LinkTypeWrapper'; import {EJSCREEN, EXEC_ORDER_LINK, FED_RECOGNIZED_INDIAN_ENTITIES, CEJST_INSTRUCT, CEJST_MEMO, CEJST_INSTRUCT_ES, CEJST_MEMO_ES} from './about'; import {boldFn, linkFn, FEEDBACK_EMAIL} from './common'; -import {PAGES_ENDPOINTS} from '../constants'; +import {PAGES_ENDPOINTS, DATA_SURVEY_LINKS, SITE_SATISFACTION_SURVEY_LINKS} from '../constants'; import {EXPLORE_PAGE_LINKS} from './explore'; import {DOWNLOAD_FILES} from './downloads'; @@ -579,7 +579,7 @@ export const FAQ_ANSWERS = { defaultMessage={ `The public can also submit data sources or ideas for consideration.`} description={ 'Navigate to the FAQs page, this will be an answer, Q15_P1_2'} values={{ - link1: linkFn('https://www.surveymonkey.com/r/6G9TQJ8', false, true), + link1: linkFn(DATA_SURVEY_LINKS.EN, false, true), }} />, Q15_P1_3: short survey to help improve the experience of using the tool.`} description={ 'Navigate to the FAQs page, this will be an answer, Q15_P1_3'} values={{ - link1: linkFn('https://www.surveymonkey.com/r/P3LWTSB', false, true), + link1: linkFn(SITE_SATISFACTION_SURVEY_LINKS.EN, false, true), }} />, Q15_P1_4: this form.", + "description": "Navigate to the survey. Spanish should substitute to get Spanish link! Already coded to support" + }, "contact.page.fab.survey.text": { "defaultMessage": "Help improve the tool", "description": "Navigate to the contact page, this is the text for floating action button" diff --git a/client/src/pages/about.tsx b/client/src/pages/about.tsx index 3d020f5b8..9a69e5983 100644 --- a/client/src/pages/about.tsx +++ b/client/src/pages/about.tsx @@ -13,7 +13,7 @@ import SubPageNav from '../components/SubPageNav'; import * as ABOUT_COPY from '../data/copy/about'; import {FEEDBACK_EMAIL} from '../data/copy/common'; -import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; +import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS, DATA_SURVEY_LINKS} from '../data/constants'; import accountBalanceIcon // @ts-ignore from '/node_modules/uswds/dist/img/usa-icons/account_balance.svg'; @@ -46,7 +46,7 @@ const AboutPage = ({location}: IAboutPageProps) => {

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

- +
diff --git a/client/src/pages/contact.tsx b/client/src/pages/contact.tsx index b363af74d..dd7b1e752 100644 --- a/client/src/pages/contact.tsx +++ b/client/src/pages/contact.tsx @@ -9,6 +9,7 @@ import DatasetsButton from '../components/DatasetsButton'; import * as CONTACT_COPY from '../data/copy/contact'; import {FEEDBACK_EMAIL} from '../data/copy/common'; +import {DATA_SURVEY_LINKS} from '../data/constants'; interface IContactPageProps { location: Location; @@ -24,7 +25,7 @@ const ContactPage = ({location}: IContactPageProps) => {

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

- +
@@ -34,6 +35,7 @@ const ContactPage = ({location}: IContactPageProps) => {

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

+

{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.PARAGRAPH3}

{

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

- +
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx index 95f0ffac7..171e4c820 100644 --- a/client/src/pages/frequently-asked-questions.tsx +++ b/client/src/pages/frequently-asked-questions.tsx @@ -9,7 +9,7 @@ import Layout from '../components/layout'; import DatasetsButton from '../components/DatasetsButton'; import SubPageNav from '../components/SubPageNav'; -import {USWDS_BREAKPOINTS} from '../data/constants'; +import {USWDS_BREAKPOINTS, DATA_SURVEY_LINKS} from '../data/constants'; import * as FAQS_COPY from '../data/copy/faqs'; import {PAGES_ENDPOINTS} from '../data/constants'; import {SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT} from '../data/copy/explore'; @@ -237,7 +237,7 @@ const FAQPage = ({location}: IFAQPageProps) => {

{intl.formatMessage(FAQS_COPY.PAGE_INTRO.PAGE_TILE)}

- +
diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx index a7ee63288..33bd6db7d 100644 --- a/client/src/pages/index.tsx +++ b/client/src/pages/index.tsx @@ -9,6 +9,7 @@ import Layout from '../components/layout'; import DatasetsButton from '../components/DatasetsButton'; import * as EXPLORE_COPY from '../data/copy/explore'; +import {DATA_SURVEY_LINKS} from '../data/constants'; interface IMapPageProps { location: Location; @@ -26,7 +27,7 @@ const ExporeToolPage = ({location}: IMapPageProps) => {

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

- +
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx index 3c2a0a979..703ca79bf 100644 --- a/client/src/pages/methodology.tsx +++ b/client/src/pages/methodology.tsx @@ -10,7 +10,7 @@ import Layout from '../components/layout'; import SubPageNav from '../components/SubPageNav'; import DatasetsButton from '../components/DatasetsButton'; -import {USWDS_BREAKPOINTS} from '../data/constants'; +import {USWDS_BREAKPOINTS, DATA_SURVEY_LINKS} from '../data/constants'; import * as METHODOLOGY_COPY from '../data/copy/methodology'; import {PAGES_ENDPOINTS} from '../data/constants'; @@ -29,7 +29,7 @@ const IndexPage = ({location}: MethodPageProps) => {

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

- +
diff --git a/client/src/pages/previous-versions.tsx b/client/src/pages/previous-versions.tsx index d1564d69d..75e4038f6 100644 --- a/client/src/pages/previous-versions.tsx +++ b/client/src/pages/previous-versions.tsx @@ -10,7 +10,7 @@ import DatasetsButton from '../components/DatasetsButton'; import SubPageNav from '../components/SubPageNav'; import * as PREV_VER_COPY from '../data/copy/previousVer'; -import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; +import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS, DATA_SURVEY_LINKS} from '../data/constants'; import {getDownloadFileUrl} from '../data/copy/downloads'; interface IPreviousVersionsProps { @@ -33,7 +33,7 @@ const PreviousVersions = ({location}: IPreviousVersionsProps) => {

{intl.formatMessage(PREV_VER_COPY.PAGE.TITLE)}

- +
diff --git a/client/src/pages/tests/__snapshots__/about.test.tsx.snap b/client/src/pages/tests/__snapshots__/about.test.tsx.snap index 4278b7c6e..c9391b5ba 100644 --- a/client/src/pages/tests/__snapshots__/about.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/about.test.tsx.snap @@ -405,7 +405,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis About
@@ -847,7 +847,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis @@ -860,7 +860,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis @@ -1097,7 +1097,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="gridContainer" > diff --git a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap index fb4051c42..183e47785 100644 --- a/client/src/pages/tests/__snapshots__/contact.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/contact.test.tsx.snap @@ -403,7 +403,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis Contact @@ -432,6 +432,21 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis Contact us

+ + The best way to contact the Council on Environmental Quality (CEQ) is by filling out + + this form + + . + +

+

Email CEQ at: diff --git a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap index d3acacc37..f0f2c0d82 100644 --- a/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/downloads.test.tsx.snap @@ -403,7 +403,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis Downloads @@ -976,7 +976,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="gridContainer" > diff --git a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap index 7e0ce7d03..a337eaa55 100644 --- a/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/freqAskedQuestions.test.tsx.snap @@ -403,7 +403,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis Frequently asked questions @@ -1059,7 +1059,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis @@ -1072,7 +1072,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis @@ -1510,7 +1510,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="gridContainer" > diff --git a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap index 82c727d8b..5862755ed 100644 --- a/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/methodology.test.tsx.snap @@ -403,7 +403,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis Methodology @@ -1072,7 +1072,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="grid" > @@ -3357,7 +3357,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="gridContainer" > diff --git a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap index 899be8a5f..076a44ef5 100644 --- a/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/publicEng.test.tsx.snap @@ -1417,7 +1417,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="gridContainer" > diff --git a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap index 6df089087..8ada66397 100644 --- a/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap +++ b/client/src/pages/tests/__snapshots__/techSupportDoc.test.tsx.snap @@ -616,7 +616,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis data-testid="gridContainer" >