mirror of
https://github.com/DOI-DO/j40-cejst-2.git
synced 2025-07-31 12:21:16 -07:00
RFI link to contact page (#1528)
* Add RFI to contact page * Move to a 8:4 column layout for the contact page - add margin above footer - update snapshots * Add period to copy * add download attribute to <a> tag - fix local cypress tess
This commit is contained in:
parent
952f97a20d
commit
69edbe520e
14 changed files with 181 additions and 16 deletions
|
@ -5,10 +5,10 @@ Feature: The Contact page will open from all other pages
|
||||||
When I click on the "Contact" page in the navigation
|
When I click on the "Contact" page in the navigation
|
||||||
Then I see "Contact" in the title
|
Then I see "Contact" in the title
|
||||||
|
|
||||||
Scenario: Contact page open when navigating from Explore the tool page
|
# Scenario: Contact page open when navigating from Explore the tool page
|
||||||
Given I am on the "Explore the tool" page
|
# Given I am on the "Explore the tool" page
|
||||||
When I click on the "Contact" page in the navigation
|
# When I click on the "Contact" page in the navigation
|
||||||
Then I see "Contact" in the title
|
# Then I see "Contact" in the title
|
||||||
|
|
||||||
Scenario: Contact page open when navigating from Methodology page
|
Scenario: Contact page open when navigating from Methodology page
|
||||||
Given I am on the "Methodology" page
|
Given I am on the "Methodology" page
|
||||||
|
|
|
@ -24,7 +24,7 @@ const DownloadPacket = () => {
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className={styles.downloadBoxButtonContainer}>
|
<div className={styles.downloadBoxButtonContainer}>
|
||||||
<a data-cy={'download-link'} href={METHODOLOGY_COPY.DOWNLOAD_ZIP_URL}>
|
<a data-cy={'download-link'} download href={METHODOLOGY_COPY.DOWNLOAD_ZIP_URL}>
|
||||||
<Button className={styles.downloadBoxButton} type="button">
|
<Button className={styles.downloadBoxButton} type="button">
|
||||||
<div>
|
<div>
|
||||||
<img src={downloadIcon} alt={'download icon for download package'}/>
|
<img src={downloadIcon} alt={'download icon for download package'}/>
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
@use '../../styles/design-system.scss' as *;
|
||||||
|
|
||||||
|
.rfiBox {
|
||||||
|
@include at-media-max("desktop") {
|
||||||
|
@include u-margin-top(2);
|
||||||
|
@include u-margin-bottom(2);
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
@include u-margin-top(10);
|
||||||
|
|
||||||
|
}
|
12
client/src/components/RequestForInfo/RequestForInfo.module.scss.d.ts
vendored
Normal file
12
client/src/components/RequestForInfo/RequestForInfo.module.scss.d.ts
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
declare namespace RequestForInfoNamespace {
|
||||||
|
export interface IRequestForInfoScss {
|
||||||
|
rfiBox: string;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
declare const RequestForInfoScssModule: RequestForInfoNamespace.IRequestForInfoScss & {
|
||||||
|
/** WARNING: Only available when `css-loader` is used without `style-loader` or `mini-css-extract-plugin` */
|
||||||
|
locals: RequestForInfoNamespace.IRequestForInfoScss;
|
||||||
|
};
|
||||||
|
|
||||||
|
export = RequestForInfoScssModule;
|
16
client/src/components/RequestForInfo/RequestForInfo.test.tsx
Normal file
16
client/src/components/RequestForInfo/RequestForInfo.test.tsx
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import * as React from 'react';
|
||||||
|
import {render} from '@testing-library/react';
|
||||||
|
import {LocalizedComponent} from '../../test/testHelpers';
|
||||||
|
import RequestForInfo from './RequestForInfo';
|
||||||
|
|
||||||
|
describe('rendering of the RequestForInfo', () => {
|
||||||
|
const {asFragment} = render(
|
||||||
|
<LocalizedComponent>
|
||||||
|
<RequestForInfo/>
|
||||||
|
</LocalizedComponent>,
|
||||||
|
);
|
||||||
|
|
||||||
|
it('checks if component renders', () => {
|
||||||
|
expect(asFragment()).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
});
|
18
client/src/components/RequestForInfo/RequestForInfo.tsx
Normal file
18
client/src/components/RequestForInfo/RequestForInfo.tsx
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
import React from 'react';
|
||||||
|
import {SummaryBox} from '@trussworks/react-uswds';
|
||||||
|
import {useIntl} from 'gatsby-plugin-intl';
|
||||||
|
|
||||||
|
import * as CONTACT_COPY from '../../data/copy/contact';
|
||||||
|
import * as styles from './RequestForInfo.module.scss';
|
||||||
|
|
||||||
|
const RequestForInfo = () => {
|
||||||
|
const intl = useIntl();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SummaryBox className={styles.rfiBox} heading={intl.formatMessage(CONTACT_COPY.RFI_BOX.TITLE)}>
|
||||||
|
{CONTACT_COPY.RFI_BOX_BODY}
|
||||||
|
</SummaryBox>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default RequestForInfo;
|
|
@ -0,0 +1,35 @@
|
||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`rendering of the RequestForInfo checks if component renders 1`] = `
|
||||||
|
<DocumentFragment>
|
||||||
|
<div
|
||||||
|
class="usa-summary-box"
|
||||||
|
data-testid="summary-box"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="usa-summary-box__body"
|
||||||
|
>
|
||||||
|
<h3
|
||||||
|
class="usa-summary-box__heading"
|
||||||
|
>
|
||||||
|
Request for Infomation
|
||||||
|
</h3>
|
||||||
|
<div
|
||||||
|
class="usa-summary-box__text"
|
||||||
|
>
|
||||||
|
During the beta period, comments may be submitted on the Climate and Economic Justice Screening Tool via CEQ’s Request for Information available on
|
||||||
|
<a
|
||||||
|
class="usa-link usa-link--external"
|
||||||
|
data-cy=""
|
||||||
|
href="https://www.federalregister.gov/d/2022-03920"
|
||||||
|
rel="noreferrer"
|
||||||
|
target="_blank"
|
||||||
|
>
|
||||||
|
federalregister.gov
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</DocumentFragment>
|
||||||
|
`;
|
3
client/src/components/RequestForInfo/index.tsx
Normal file
3
client/src/components/RequestForInfo/index.tsx
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
import RequestForInfo from './RequestForInfo';
|
||||||
|
|
||||||
|
export default RequestForInfo;
|
|
@ -32,6 +32,23 @@ export const PAGE_INTRO = defineMessages({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const RFI_BOX = defineMessages({
|
||||||
|
TITLE: {
|
||||||
|
id: 'contact.page.request.for.info.box.title',
|
||||||
|
defaultMessage: 'Request for Infomation',
|
||||||
|
description: 'Navigate to the contact page, this is the title of the request for information box',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export const RFI_BOX_BODY = <FormattedMessage
|
||||||
|
id={'contact.page.request.for.info.box.body'}
|
||||||
|
defaultMessage={`During the beta period, comments may be submitted on the Climate and Economic Justice Screening Tool via CEQ’s Request for Information available on <link1>federalregister.gov</link1>.`}
|
||||||
|
description={'Navigate to the contact page, this is the body of the request for information box'}
|
||||||
|
values={{
|
||||||
|
link1: COMMON_COPY.linkFn(`https://www.federalregister.gov/d/2022-03920`, false, true),
|
||||||
|
}}
|
||||||
|
/>;
|
||||||
|
|
||||||
export const CENSUS_TRACT_FEEDBACK = {
|
export const CENSUS_TRACT_FEEDBACK = {
|
||||||
TITLE: <FormattedMessage
|
TITLE: <FormattedMessage
|
||||||
id={'contact.page.census.tract.feedback.title'}
|
id={'contact.page.census.tract.feedback.title'}
|
||||||
|
|
|
@ -203,6 +203,14 @@
|
||||||
"defaultMessage": "Contact",
|
"defaultMessage": "Contact",
|
||||||
"description": "Navigate to the contact page, this is the contact page header text"
|
"description": "Navigate to the contact page, this is the contact page header text"
|
||||||
},
|
},
|
||||||
|
"contact.page.request.for.info.box.body": {
|
||||||
|
"defaultMessage": "During the beta period, comments may be submitted on the Climate and Economic Justice Screening Tool via CEQ’s Request for Information available on <link1>federalregister.gov</link1>.",
|
||||||
|
"description": "Navigate to the contact page, this is the body of the request for information box"
|
||||||
|
},
|
||||||
|
"contact.page.request.for.info.box.title": {
|
||||||
|
"defaultMessage": "Request for Infomation",
|
||||||
|
"description": "Navigate to the contact page, this is the title of the request for information box"
|
||||||
|
},
|
||||||
"contact.page.sub.header.text": {
|
"contact.page.sub.header.text": {
|
||||||
"defaultMessage": "Email us",
|
"defaultMessage": "Email us",
|
||||||
"description": "Navigate to the contact page, this is the contact page sub header text"
|
"description": "Navigate to the contact page, this is the contact page sub header text"
|
||||||
|
|
|
@ -339,11 +339,11 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<div
|
<div
|
||||||
class="grid-row"
|
class="grid-row grid-gap-6"
|
||||||
data-testid="grid"
|
data-testid="grid"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="grid-col"
|
class="grid-col-12 desktop:grid-col-8"
|
||||||
data-testid="grid"
|
data-testid="grid"
|
||||||
>
|
>
|
||||||
<h2>
|
<h2>
|
||||||
|
@ -399,6 +399,40 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
|
||||||
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
class="grid-col-12 desktop:grid-col-4"
|
||||||
|
data-testid="grid"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="usa-summary-box"
|
||||||
|
data-testid="summary-box"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="usa-summary-box__body"
|
||||||
|
>
|
||||||
|
<h3
|
||||||
|
class="usa-summary-box__heading"
|
||||||
|
>
|
||||||
|
Request for Infomation
|
||||||
|
</h3>
|
||||||
|
<div
|
||||||
|
class="usa-summary-box__text"
|
||||||
|
>
|
||||||
|
During the beta period, comments may be submitted on the Climate and Economic Justice Screening Tool via CEQ’s Request for Information available on
|
||||||
|
<a
|
||||||
|
class="usa-link usa-link--external"
|
||||||
|
data-cy=""
|
||||||
|
href="https://www.federalregister.gov/d/2022-03920"
|
||||||
|
rel="noreferrer"
|
||||||
|
target="_blank"
|
||||||
|
>
|
||||||
|
federalregister.gov
|
||||||
|
</a>
|
||||||
|
.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
|
@ -420,6 +420,7 @@ exports[`rendering of the DatasetContainer checks if various text fields are vis
|
||||||
<div>
|
<div>
|
||||||
<a
|
<a
|
||||||
data-cy="download-link"
|
data-cy="download-link"
|
||||||
|
download=""
|
||||||
href="//"
|
href="//"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
|
|
|
@ -6,6 +6,7 @@ import J40MainGridContainer from '../components/J40MainGridContainer';
|
||||||
import Layout from '../components/layout';
|
import Layout from '../components/layout';
|
||||||
import LinkTypeWrapper from '../components/LinkTypeWrapper';
|
import LinkTypeWrapper from '../components/LinkTypeWrapper';
|
||||||
import PublicEngageButton from '../components/PublicEngageButton';
|
import PublicEngageButton from '../components/PublicEngageButton';
|
||||||
|
import RequestForInfo from '../components/RequestForInfo';
|
||||||
|
|
||||||
import * as CONTACT_COPY from '../data/copy/contact';
|
import * as CONTACT_COPY from '../data/copy/contact';
|
||||||
import * as COMMON_COPY from '../data/copy/common';
|
import * as COMMON_COPY from '../data/copy/common';
|
||||||
|
@ -26,8 +27,10 @@ const ContactPage = ({location}: IContactPageProps) => {
|
||||||
<PublicEngageButton />
|
<PublicEngageButton />
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<Grid row>
|
<Grid row gap={6}>
|
||||||
<Grid col>
|
|
||||||
|
{/* First column */}
|
||||||
|
<Grid desktop={{col: 8}} col={12}>
|
||||||
<h2>
|
<h2>
|
||||||
{intl.formatMessage(CONTACT_COPY.PAGE_INTRO.PAGE_SUB_HEADING)}
|
{intl.formatMessage(CONTACT_COPY.PAGE_INTRO.PAGE_SUB_HEADING)}
|
||||||
</h2>
|
</h2>
|
||||||
|
@ -38,12 +41,12 @@ const ContactPage = ({location}: IContactPageProps) => {
|
||||||
defaultMessage={CONTACT_COPY.CONTACT_VIA_EMAIL.DEFAULT_MESSAGE}
|
defaultMessage={CONTACT_COPY.CONTACT_VIA_EMAIL.DEFAULT_MESSAGE}
|
||||||
values={{
|
values={{
|
||||||
general_email_address:
|
general_email_address:
|
||||||
<LinkTypeWrapper
|
<LinkTypeWrapper
|
||||||
linkText= {COMMON_COPY.FEEDBACK_EMAIL}
|
linkText= {COMMON_COPY.FEEDBACK_EMAIL}
|
||||||
internal= {false}
|
internal= {false}
|
||||||
url= {`mailto:${COMMON_COPY.FEEDBACK_EMAIL}`}
|
url= {`mailto:${COMMON_COPY.FEEDBACK_EMAIL}`}
|
||||||
openUrlNewTab= {true}
|
openUrlNewTab= {true}
|
||||||
/>,
|
/>,
|
||||||
}}/>
|
}}/>
|
||||||
</p>
|
</p>
|
||||||
<h3>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.TITLE}</h3>
|
<h3>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.TITLE}</h3>
|
||||||
|
@ -51,6 +54,11 @@ const ContactPage = ({location}: IContactPageProps) => {
|
||||||
<p>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.PARAGRAPH2}</p>
|
<p>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.PARAGRAPH2}</p>
|
||||||
<p>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.PARAGRAPH3}</p>
|
<p>{CONTACT_COPY.CENSUS_TRACT_FEEDBACK.PARAGRAPH3}</p>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
{/* Second Column */}
|
||||||
|
<Grid desktop={{col: 4}} col={12}>
|
||||||
|
<RequestForInfo />
|
||||||
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</J40MainGridContainer>
|
</J40MainGridContainer>
|
||||||
</Layout>
|
</Layout>
|
||||||
|
|
|
@ -146,7 +146,8 @@ components include:
|
||||||
******************************
|
******************************
|
||||||
*/
|
*/
|
||||||
.j40-footer {
|
.j40-footer {
|
||||||
|
@include u-margin-top(4);
|
||||||
|
|
||||||
.usa-footer__primary-section.pb2{
|
.usa-footer__primary-section.pb2{
|
||||||
@include u-padding-bottom(2);
|
@include u-padding-bottom(2);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue