fix contact fix footer (#511)

* Fix footer
* Remove one contact
* Fix some spacing issues
* Update J40Footer.spec.tsx.snap
* Fixes suggested in code review
This commit is contained in:
TomNUSDS 2021-08-16 09:08:54 -07:00 committed by GitHub
commit 2af9d6dcd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 42 deletions

View file

@ -28,7 +28,7 @@ const J40Footer = () => {
},
moreinfoheader: {
id: 'footer.moreinfoheader',
defaultMessage: 'More Information',
defaultMessage: 'More information',
description: 'Footer column header',
},
foia: {
@ -70,7 +70,7 @@ const J40Footer = () => {
aria-label={intl.formatMessage(messages.arialabelfooter)}
size="big" // fyi you leave this off and it silently fails...
links={[
['Contacts',
['Contact',
<Address
key={'footeraddress'}
className={'j40-footer-address'}

View file

@ -32,7 +32,7 @@ exports[`J40Footer renders correctly 1`] = `
<h4
class="usa-footer__primary-link"
>
Contacts
Contact
</h4>
<ul
class="usa-list usa-list--unstyled"
@ -76,7 +76,7 @@ exports[`J40Footer renders correctly 1`] = `
<h4
class="usa-footer__primary-link"
>
More Information
More information
</h4>
<ul
class="usa-list usa-list--unstyled"

View file

@ -11,53 +11,36 @@ interface ContactPageProps {
}
const ContactPage = ({location}: ContactPageProps) => {
const generalemail = 'screeningtool.feedback@usds.gov';
const techemail = 'screeningtool.support@usds.gov';
const generalEmail = 'screeningtool.feedback@usds.gov';
return (
<Layout location={location}>
<J40MainGridContainer fullWidth={true}>
<AlertWrapper />
<AlertWrapper/>
</J40MainGridContainer>
<J40MainGridContainer>
<J40MainGridContainer className={'usa-prose'}>
<Grid row><Grid col>
<section className={'usa-prose'}>
<h2><FormattedMessage
id={'contact.pageheader'}
description={'H2 header for contact page'}
defaultMessage={'Contact'}/></h2>
<h3><FormattedMessage
id={'contact.sectionheader'}
description={'Heading for page to allow users to contact project maintainers'}
defaultMessage={'Email us'}/></h3>
<h2><FormattedMessage
id={'contact.pageheader'}
description={'H2 header for contact page'}
defaultMessage={'Contact'}/></h2>
<h3><FormattedMessage
id={'contact.sectionheader'}
description={'Heading for page to allow users to contact project maintainers'}
defaultMessage={'Email us'}/></h3>
<p>
<FormattedMessage
id={'contact.general'}
description={'Contact page body text'}
defaultMessage={`
For general feedback, email {general_email_address}
`}
values={{
general_email_address:
<a href={`mailto:${generalemail}`}>{generalemail}</a>,
}}/>
</p>
<p>
<FormattedMessage
id={'contact.general'}
description={'Contact page body text'}
defaultMessage={`
For technical support, email {tech_email_address}
`}
values={{
tech_email_address:
<a href={`mailto:${techemail}`}>{techemail}</a>,
}}/>
</p>
</section>
<p>
<FormattedMessage
id={'contact.general'}
description={'Contact page body text'}
defaultMessage={`For general feedback, email {general_email_address}`}
values={{
general_email_address:
<a href={`mailto:${generalEmail}`}>{generalEmail}</a>,
}}/>
</p>
</Grid></Grid>
</J40MainGridContainer>
</Layout>