mirror of
https://github.com/DOI-DO/j40-cejst-2.git
synced 2025-08-24 18:51:40 -07:00
Basic Layout (#80)
* Basic Layout - Merge with main into new branch - Most of main content and footer working. - Could not get fixed branch of trussworks to `npm install` correctly, so reverted back to public version. (`trussworks/react-uswds#kh-serverside-rendering-fix-1250"`) TODO: - stack sgv warning+cloud icons - get timeline image (which as text that needs to scale) - localization support - move icon includes out of header? - start converting elements over to trussworks * Cleanup - removed unused styles - added some better comments * Revert trussworks to fixed branch * Update package-lock.json * Temporarily pointing toward personal fork until SSR issue has been addressed * Update J40Footer.spec.tsx.snap * setting jestEnvironment to the proper 'jsdom' value, needed for snapshot tests * lingering prettier fix * small version bump Co-authored-by: Nat Hillard <Nathaniel.K.Hillard@omb.eop.gov>
This commit is contained in:
TomNUSDS
GitHub
parent
ce7245b1a2
commit
3ca4ca9e6d
8 changed files with 2679 additions and 194 deletions
|
|
@ -1,15 +1,66 @@
|
|||
import React from 'react';
|
||||
import {Footer} from '@trussworks/react-uswds';
|
||||
import {Link} from 'gatsby-plugin-intl';
|
||||
|
||||
const footerLinks = [
|
||||
<Link to="/" key="/">Home</Link>,
|
||||
];
|
||||
import {Footer, Logo, FooterNav, Address} from '@trussworks/react-uswds';
|
||||
// @ts-ignore
|
||||
import whitehouseIcon from '../images/eop-seal.svg';
|
||||
|
||||
const J40Footer = () => {
|
||||
return (
|
||||
<>
|
||||
<Footer primary={[]} secondary={footerLinks} />
|
||||
<Footer
|
||||
size="big"
|
||||
primary={<></>}
|
||||
secondary={<FooterNav
|
||||
aria-label="Footer navigation"
|
||||
size="big" // fyi you leave this off and it silently fails... lovely
|
||||
className={'nobreak'}
|
||||
links={[
|
||||
[
|
||||
'Agency Partners',
|
||||
<a href="https://www.epa.gov/" target="_blank" rel="noreferrer"
|
||||
key={'epalink'}>Environmental Protection Agency</a>,
|
||||
<a href="https://www.whitehouse.gov/omb" target="_blank"
|
||||
rel="noreferrer" key={'whitehouselink'}>Office of Management
|
||||
and Budget</a>,
|
||||
<a href="https://www.energy.gov/" target="_blank" rel="noreferrer"
|
||||
key={'energylink'}>Department of Energy</a>,
|
||||
<a href="https://www.hud.gov/" target="_blank" rel="noreferrer"
|
||||
key={'hudlink'}>Department of Housing and Urban
|
||||
Development</a>,
|
||||
],
|
||||
[
|
||||
'More Information',
|
||||
<a href="https://www.whitehouse.gov/" target="_blank"
|
||||
rel="noreferrer"
|
||||
key={'whitehouselink2'}>Whitehouse.gov</a>,
|
||||
<a href="#" key={'accessibilitylink'}>Accessibility Statement</a>,
|
||||
<a href="#" key={'privacylink'}>Privacy, Policies, and Legal
|
||||
Information</a>,
|
||||
],
|
||||
// eslint-disable-next-line react/jsx-key
|
||||
[<br/>,
|
||||
<Logo
|
||||
size="medium"
|
||||
key={'logoimg'}
|
||||
image={
|
||||
<img className={'usa-footer__logo-img'} src={whitehouseIcon}
|
||||
alt="Whitehouse logo"/>
|
||||
}
|
||||
/>,
|
||||
],
|
||||
[
|
||||
<>Council on Environmental Quality<br/></>,
|
||||
<Address className={'footerAddressReadability'}
|
||||
key={'footeraddress'}
|
||||
items={[
|
||||
'730 Jackson Pl NW',
|
||||
'Washington, D.C. 20506',
|
||||
'(202) 395-5750',
|
||||
]}
|
||||
/>,
|
||||
],
|
||||
]}
|
||||
/>}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
exports[`J40Footer renders correctly 1`] = `
|
||||
Array [
|
||||
<footer
|
||||
className="usa-footer"
|
||||
className="usa-footer usa-footer--big"
|
||||
>
|
||||
<div
|
||||
className="usa-footer__primary-section"
|
||||
|
|
@ -14,12 +14,202 @@ Array [
|
|||
<div
|
||||
className="grid-container"
|
||||
>
|
||||
<a
|
||||
href="/en/"
|
||||
onClick={[Function]}
|
||||
<nav
|
||||
aria-label="Footer navigation"
|
||||
className="usa-footer__nav nobreak"
|
||||
>
|
||||
Home
|
||||
</a>
|
||||
<div
|
||||
className="grid-row grid-gap-4"
|
||||
>
|
||||
<div
|
||||
className="mobile-lg:grid-col-6 desktop:grid-col-3"
|
||||
>
|
||||
<section
|
||||
className="usa-footer__primary-content usa-footer__primary-content--collapsible"
|
||||
>
|
||||
<h4
|
||||
className="usa-footer__primary-link"
|
||||
>
|
||||
Agency Partners
|
||||
</h4>
|
||||
<ul
|
||||
className="usa-list usa-list--unstyled"
|
||||
>
|
||||
<li
|
||||
className="usa-footer__secondary-link"
|
||||
>
|
||||
<a
|
||||
href="https://www.epa.gov/"
|
||||
rel="noreferrer"
|
||||
target="_blank"
|
||||
>
|
||||
Environmental Protection Agency
|
||||
</a>
|
||||
</li>
|
||||
<li
|
||||
className="usa-footer__secondary-link"
|
||||
>
|
||||
<a
|
||||
href="https://www.whitehouse.gov/omb"
|
||||
rel="noreferrer"
|
||||
target="_blank"
|
||||
>
|
||||
Office of Management and Budget
|
||||
</a>
|
||||
</li>
|
||||
<li
|
||||
className="usa-footer__secondary-link"
|
||||
>
|
||||
<a
|
||||
href="https://www.energy.gov/"
|
||||
rel="noreferrer"
|
||||
target="_blank"
|
||||
>
|
||||
Department of Energy
|
||||
</a>
|
||||
</li>
|
||||
<li
|
||||
className="usa-footer__secondary-link"
|
||||
>
|
||||
<a
|
||||
href="https://www.hud.gov/"
|
||||
rel="noreferrer"
|
||||
target="_blank"
|
||||
>
|
||||
Department of Housing and Urban Development
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
</div>
|
||||
<div
|
||||
className="mobile-lg:grid-col-6 desktop:grid-col-3"
|
||||
>
|
||||
<section
|
||||
className="usa-footer__primary-content usa-footer__primary-content--collapsible"
|
||||
>
|
||||
<h4
|
||||
className="usa-footer__primary-link"
|
||||
>
|
||||
More Information
|
||||
</h4>
|
||||
<ul
|
||||
className="usa-list usa-list--unstyled"
|
||||
>
|
||||
<li
|
||||
className="usa-footer__secondary-link"
|
||||
>
|
||||
<a
|
||||
href="https://www.whitehouse.gov/"
|
||||
rel="noreferrer"
|
||||
target="_blank"
|
||||
>
|
||||
Whitehouse.gov
|
||||
</a>
|
||||
</li>
|
||||
<li
|
||||
className="usa-footer__secondary-link"
|
||||
>
|
||||
<a
|
||||
href="#"
|
||||
>
|
||||
Accessibility Statement
|
||||
</a>
|
||||
</li>
|
||||
<li
|
||||
className="usa-footer__secondary-link"
|
||||
>
|
||||
<a
|
||||
href="#"
|
||||
>
|
||||
Privacy, Policies, and Legal Information
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
</div>
|
||||
<div
|
||||
className="mobile-lg:grid-col-6 desktop:grid-col-3"
|
||||
>
|
||||
<section
|
||||
className="usa-footer__primary-content usa-footer__primary-content--collapsible"
|
||||
>
|
||||
<h4
|
||||
className="usa-footer__primary-link"
|
||||
>
|
||||
<br />
|
||||
</h4>
|
||||
<ul
|
||||
className="usa-list usa-list--unstyled"
|
||||
>
|
||||
<li
|
||||
className="usa-footer__secondary-link"
|
||||
>
|
||||
<div
|
||||
className="usa-footer__logo grid-row mobile-lg:grid-col-6 mobile-lg:grid-gap-2"
|
||||
data-testid="footerLogo"
|
||||
>
|
||||
<div
|
||||
className="mobile-lg:grid-col-auto"
|
||||
>
|
||||
<img
|
||||
alt="Whitehouse logo"
|
||||
className="usa-footer__logo-img"
|
||||
src="test-file-stub"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
</div>
|
||||
<div
|
||||
className="mobile-lg:grid-col-6 desktop:grid-col-3"
|
||||
>
|
||||
<section
|
||||
className="usa-footer__primary-content usa-footer__primary-content--collapsible"
|
||||
>
|
||||
<h4
|
||||
className="usa-footer__primary-link"
|
||||
>
|
||||
Council on Environmental Quality
|
||||
<br />
|
||||
</h4>
|
||||
<ul
|
||||
className="usa-list usa-list--unstyled"
|
||||
>
|
||||
<li
|
||||
className="usa-footer__secondary-link"
|
||||
>
|
||||
<address
|
||||
className="usa-footer__address footerAddressReadability"
|
||||
>
|
||||
<div
|
||||
className="usa-footer__contact-info grid-row grid-gap"
|
||||
>
|
||||
<div
|
||||
className=""
|
||||
>
|
||||
730 Jackson Pl NW
|
||||
</div>
|
||||
<div
|
||||
className=""
|
||||
>
|
||||
Washington, D.C. 20506
|
||||
</div>
|
||||
<div
|
||||
className=""
|
||||
>
|
||||
(202) 395-5750
|
||||
</div>
|
||||
</div>
|
||||
</address>
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
</div>
|
||||
</footer>,
|
||||
|
|
|
|||
2036
client/src/images/eop-seal.svg
Normal file
2036
client/src/images/eop-seal.svg
Normal file
File diff suppressed because it is too large
Load diff
|
After Width: | Height: | Size: 201 KiB |
|
|
@ -1,11 +1,227 @@
|
|||
import * as React from 'react';
|
||||
import Layout from '../components/layout';
|
||||
// import {GridContainer, Grid} from '@trussworks/react-uswds';
|
||||
|
||||
// this section seems too verbose? must be a more readable way to do this.
|
||||
// this inlines the svg as data:image/svg+xml For larger images this
|
||||
// can cause page bloat, but it should be fine here.
|
||||
// @ts-ignore
|
||||
import publicIcon from '/node_modules/uswds/dist/img/usa-icons/public.svg';
|
||||
// @ts-ignore
|
||||
import chatIcon from '/node_modules/uswds/dist/img/usa-icons/chat.svg';
|
||||
// @ts-ignore
|
||||
import githubIcon from '/node_modules/uswds/dist/img/usa-icons/github.svg';
|
||||
// @ts-ignore
|
||||
import ecoIcon from '/node_modules/uswds/dist/img/usa-icons/eco.svg';
|
||||
// @ts-ignore
|
||||
import busIcon from '/node_modules/uswds/dist/img/usa-icons/directions_bus.svg';
|
||||
// @ts-ignore
|
||||
import homeIcon from '/node_modules/uswds/dist/img/usa-icons/home.svg';
|
||||
// @ts-ignore
|
||||
import groupsIcon from '/node_modules/uswds/dist/img/usa-icons/groups.svg';
|
||||
// todo: fix svg overlay
|
||||
// @ts-ignore
|
||||
import pollutionIcon from '/node_modules/uswds/dist/img/usa-icons/warning.svg';
|
||||
// @ts-ignore
|
||||
// eslint-disable-next-line max-len
|
||||
import washIcon from '/node_modules/uswds/dist/img/usa-icons/wash.svg';
|
||||
|
||||
|
||||
// markup
|
||||
const IndexPage = () => {
|
||||
const readMoreList: (any | string)[][] = [
|
||||
[publicIcon, 'Climate change'],
|
||||
[ecoIcon, 'Clean energy and energy efficiency'],
|
||||
[busIcon, 'Clean transit'],
|
||||
[homeIcon, 'Affordable and sustainable housing'],
|
||||
[groupsIcon, 'Training and workforce development'],
|
||||
[pollutionIcon, 'Remediation of legacy pollution'],
|
||||
[washIcon, 'Clean water infrastructure'],
|
||||
];
|
||||
|
||||
return (
|
||||
<Layout>
|
||||
<main>
|
||||
<h2>Subheader</h2>
|
||||
|
||||
<main id="main-content" role="main">
|
||||
<section className="grid-container">
|
||||
<div className="grid-row grid-gap">
|
||||
|
||||
<div className="desktop:grid-col">
|
||||
<div className="grid-row grid-gap">
|
||||
<div
|
||||
className="desktop:grid-col-10 \
|
||||
usa-prose text-asset-container">
|
||||
<h2>Our Team</h2>
|
||||
<p>
|
||||
In an effort to address historical environmental injustices,
|
||||
President Biden created the Justice40 Initiative on January
|
||||
27, 2021. The Justice40 Initiative directs 40% of the
|
||||
benefits from federal investments in seven key areas to
|
||||
overburdened and underserved communities.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Federal agencies will prioritize benefits using a new
|
||||
climate and economic justice screening tool. This screening
|
||||
tool will be a map that visualizes data to compare the
|
||||
cumulative impacts of environmental, climate, and economic
|
||||
factors. It is being developed by the Council on
|
||||
Environmental Quality (CEQ) with guidance from environmental
|
||||
justice leaders and communities affected by environmental
|
||||
injustices. The first version of the screening tool will be
|
||||
released in July 2021. However, the screening tool and data
|
||||
being used will be continuously updated to better reflect
|
||||
the lived experiences of community members.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Read more about the Justice40 Initiative in President
|
||||
Biden’s Executive Order on Tackling the Climate Crisis at
|
||||
Home and Abroad.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="tablet:grid-col-10">
|
||||
<ul className="usa-icon-list j40-two-column">
|
||||
{readMoreList.map((item, index) => {
|
||||
return (
|
||||
<li
|
||||
key={`readmore_li_${index}`}
|
||||
className="usa-icon-list__item">
|
||||
<div className="usa-icon-list__icon">
|
||||
<img
|
||||
className="j40-two-column-icons-spacing"
|
||||
key={`readmore_img_${index}`}
|
||||
src={item[0]} alt={item[1] + ' icon'}/>
|
||||
</div>
|
||||
<div
|
||||
className="usa-icon-list__content"> {item[1]} </div>
|
||||
</li>
|
||||
);
|
||||
})
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
||||
<div className="grid-row grid-gap">
|
||||
<div
|
||||
className="desktop:grid-col-10 \
|
||||
usa-prose text-asset-container">
|
||||
<h3>A Transparent, Community-First Approach</h3>
|
||||
|
||||
<p>
|
||||
Successful initiatives are guided by direct input from the
|
||||
communities they are serving. CEQ
|
||||
commits
|
||||
to transparency, inclusivity, and iteration in building this
|
||||
screening tool.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Transparent: The code and data behind the screening tool are
|
||||
open source, meaning it is available
|
||||
for the public to review and contribute to. This tool is
|
||||
being developed publicly so that
|
||||
communities,
|
||||
academic experts, and anyone who’s interested can be
|
||||
involved in the tool-building process.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Inclusive: Many areas which lack investments also lack
|
||||
environmental data and would be overlooked
|
||||
using available environmental data. CEQ is actively reaching
|
||||
out to groups that have historically
|
||||
been excluded from decision-making, such as groups in rural
|
||||
and tribal areas, to understand their
|
||||
needs
|
||||
and ask for their input.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Iterative: The initial community prioritization list
|
||||
provided by the screening tool is the
|
||||
beginning
|
||||
of a collaborative process in score refinement, rather than
|
||||
a final answer. CEQ has received
|
||||
recommendations on data sets from community interviews, the
|
||||
White House Environmental Justice
|
||||
Advisory Council, and through public comment, but
|
||||
establishing a score that is truly
|
||||
representative
|
||||
will be a long-term, ongoing process. As communities submit
|
||||
feedback and recommendations, CEQ will
|
||||
continue to improve the tools being built and the processes
|
||||
for stakeholder and public engagement.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid-row grid-gap">
|
||||
<div
|
||||
className="desktop:grid-col-10 \
|
||||
usa-prose text-asset-container">
|
||||
<h3>Timeline</h3>
|
||||
<p>
|
||||
[timeline image here]
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Continuously engage with stakeholders and community members
|
||||
to get feedback on the screening tool,
|
||||
scoring, and overall process.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Continuously source data that meets data principles as
|
||||
defined through community input.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{/* aside*/}
|
||||
<aside
|
||||
aria-labelledby="left-sidebar"
|
||||
className="desktop:grid-col-2 usa-prose"
|
||||
id="left-sidebar">
|
||||
<h2 className={'usa-graphic-list__heading'}>Get Involved</h2>
|
||||
<h3>
|
||||
<img
|
||||
className={'flex-align-self-center width-5'} src={chatIcon}
|
||||
alt={'chat icon'}/>
|
||||
<br/>
|
||||
Send Feedback
|
||||
</h3>
|
||||
<p>Have ideas about how to
|
||||
acknowledge the on-the-ground
|
||||
experiences of your community?
|
||||
</p>
|
||||
Email: <a href="mailto: justice40open@usds.gov">
|
||||
justice40open@usds.gov</a>
|
||||
<p> </p>
|
||||
<h3>
|
||||
<img
|
||||
className={'flex-align-self-center width-5'}
|
||||
src={githubIcon} alt={'github icon'}/>
|
||||
<br/>
|
||||
Join the open source community</h3>
|
||||
<p>
|
||||
Justice40’s code is open source, which means it is available for
|
||||
the public to view and contribute.
|
||||
Anyone can view and contribute on GitHub.
|
||||
</p>
|
||||
<p>
|
||||
<a href={'https://github.com/usds/justice40-tool'}>Check it out
|
||||
on GitHub</a></p>
|
||||
|
||||
</aside>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
</main>
|
||||
</Layout>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,2 +1,20 @@
|
|||
@import "~@trussworks/react-uswds/lib/uswds.css";
|
||||
@import "~@trussworks/react-uswds/lib/index.css";
|
||||
@import "~@trussworks/react-uswds/lib/uswds.css";
|
||||
|
||||
.j40-two-column {
|
||||
overflow: hidden;
|
||||
column-count: 2;
|
||||
column-gap: 1em;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.j40-two-column > * {
|
||||
display: inline-flex;
|
||||
width: 90%;
|
||||
padding-bottom: 1.5em;
|
||||
padding-left: 1em;
|
||||
}
|
||||
|
||||
.j40-two-column-icons-spacing {
|
||||
padding-right: 1em;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue