Skip to content

Commit

Permalink
Merge pull request #1362 from hanboyu/update-our-team-page
Browse files Browse the repository at this point in the history
Update "Our Team" page
  • Loading branch information
mertbagt authored Oct 27, 2023
2 parents 7c82b3b + 9241446 commit 5c7ca3e
Show file tree
Hide file tree
Showing 16 changed files with 577 additions and 128 deletions.
4 changes: 2 additions & 2 deletions components/AboutPagesCard/AboutPagesCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import styles from "./AboutPagesCard.module.css"

const AboutPagesCard = ({ title, children }) => {
return (
<Card className={styles.card}>
<Card.Header as="h3" className={`fw-bold ${styles.header}`}>
<Card className={"m-5 " + styles.card}>
<Card.Header as="h3" className={`${styles.header}`}>
{title}
</Card.Header>
<Card.Body>{children}</Card.Body>
Expand Down
37 changes: 19 additions & 18 deletions components/AboutPagesCard/AboutPagesCard.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,49 +8,50 @@
color: white;
width: max-content;
padding-top: 1.1rem;
padding-right: 5.75rem;
padding-left: 3.875rem;
padding-right: 3rem;
padding-left: 3rem;
height: 4.875rem;
transform: translate(-8rem, -40%);
transform: translate(-3rem, -50%);
overflow: hidden;
}

.card {
margin: 3rem 2rem 6rem 2.5rem;
padding-left: 4rem;
padding-right: 4rem;
padding-bottom: 2.875rem;
/* margin: 3rem 2rem 6rem 3rem; */
border-radius: 10px;
}

/* Bootstrap sm */
@media (max-width: 48em) {
/* @media (max-width: 48em) {
.header {
font-size: 1.5rem;
height: 3rem;
padding-top: 0.6rem;
padding-right: 3rem;
padding-left: 2.5rem;
transform: translate(-5.5rem, -40%);
transform: translate(0, 0);
text-align: center;
width: 100%;
}
.card {
padding-bottom: 1rem;
}
}
} */

/*Bootstrap xs */
@media (max-width: 36em) {
/*Bootstrap sm */
@media (max-width: 48em) {
.header {
font-size: 1.125rem;
height: 2.4375rem;
font-size: 25px;
height: 3.5rem;
padding-top: 0.6rem;
padding-right: 2.5rem;
padding-left: 2rem;
transform: translate(-2rem, -40%);
transform: translate(0);
width: 100%;
}
.header:first-child {
border-radius: 10px 10px 0 0;
}
.card {
padding-left: 0.8125rem;
padding-right: 0.8125rem;
padding-bottom: 0;
margin-top: 2rem;
}
}
54 changes: 0 additions & 54 deletions components/OurPartners/OurPartners.js

This file was deleted.

27 changes: 0 additions & 27 deletions components/OurPartners/OurPartners.module.css

This file was deleted.

17 changes: 0 additions & 17 deletions components/OurPartners/OurPartnersTextContent.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
.content {
font-size: 1.5rem;
font-family: Nunito;
font-size: 16px;
font-weight: 500;
line-height: 20px;
letter-spacing: 0.015em;
text-align: left;
}
.content a {
text-decoration: none;
color: var(--bs-blue);
}

/* Responsive Queries */
Expand Down
41 changes: 34 additions & 7 deletions components/OurPartnersCardContent/OurPartnersCardContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ const NuLawLabCardContent = () => {
return (
<>
<Row className="mb-5">
<Col className="text-center align-self-center" md={6}>
<Col className="text-center align-self-center" md={3}>
<Image
fluid
src="/nu_school_of_law.png"
src="/northeastern_school_of_law_logo.svg"
alt="Northeatern School of Law icon"
/>
</Col>
<Col className="align-self-center" md={6}>
<Col className="align-self-center" md={9}>
<p className={styles.content}>
The{" "}
<a
Expand All @@ -31,7 +31,10 @@ const NuLawLabCardContent = () => {
>
Northeastern University School of Law
</a>
. The Lab is a leader in the{" "}
.
</p>
<p className={styles.content}>
The Lab is a leader in the{" "}
<a
href="https://dl.designresearchsociety.org/drs-conference-papers/drs2022/editorials/32/"
target="_blank"
Expand All @@ -51,14 +54,14 @@ const CodeForBostonCardContent = () => {
return (
<>
<Row className="mb-3">
<Col className="text-center align-self-center" md={6}>
<Col className="text-center align-self-center" md={3}>
<Image
fluid
src="/codeforbostonicon.png"
alt="Code for Boston icon"
/>
</Col>
<Col className="align-self-center" md={6}>
<Col className="align-self-center" md={9}>
<p className={styles.content}>
Code for Boston addresses local social and civic challenges through
creative uses of technology. Despite the name, they are not solely
Expand Down Expand Up @@ -90,4 +93,28 @@ const CodeForBostonCardContent = () => {
)
}

export { NuLawLabCardContent, CodeForBostonCardContent }
const OpenCollectiveContent = () => {
return (
<>
<Row className="mb-3">
<Col className="text-center align-self-center" md={3}>
<Image
fluid
src="/open_collective_logo.png"
alt="open_collective_logo"
/>
</Col>
<Col className="align-self-center" md={9}>
<p className={styles.content}>
MAPLE is a fiscally sponsored initiative of the 501(c)(3), the Open
Collective Foundation (OCF). You can see a full list of our donors
and expenditures on our Open Collective webpage. You can also join
the list and make a donation through the sit.
</p>
</Col>
</Row>
</>
)
}

export { NuLawLabCardContent, CodeForBostonCardContent, OpenCollectiveContent }
63 changes: 63 additions & 0 deletions components/OurTeam/AdvisoryBoard.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { Col, Row, Container } from "../bootstrap"
import {
MemberItem,
PageTitle,
PageDescr,
SectionContainer,
Divider
} from "./CommonComponents"

export const AdvisoryBoard = () => {
return (
<Container>
<Row>
<Col>
<PageTitle>Advisory Board</PageTitle>
</Col>
</Row>
<Row>
<Col className="py-3">
<PageDescr>
The Advisory Board provides strategic advice and domain expertise to
the MAPLE project. We are grateful to have the support of:
</PageDescr>
</Col>
</Row>
<Row>
<Col className="my-3">
<SectionContainer className="py-1">
<MemberItem
name="Danielle Allen"
descr="Danielle is the James Bryant Conant University Professor at Harvard University, Director of the Allen Lab for Democracy Renovation at Harvard Kennedy School's Ash Center for Democratic Governance and Innovation, and President of Partners in Democracy. She is a professor of political philosophy, ethics, and public policy. She is also a seasoned nonprofit leader, democracy advocate, tech ethicist, distinguished author, and mom."
/>
<Divider />
<MemberItem
name="Marci Harris"
descr="As founder and CEO of POPVOX.com and the Executive Director of the nonprofit POPVOX Foundation, Marci is passionate about the responsible use of technology to improve government and benefit humanity. She is a lawyer and former congressional staffer, who worked on the House Ways and Means committee's Affordable Care Act team. She has held fellowships with Harvard Kennedy School's Ash Center for Democracy and the New America Foundation, and is currently an adjunct professor at the University of San Francisco and a political science lecturer at San Jose State University."
/>
<Divider />
<MemberItem
name="Beth Noveck"
descr="Beth Simone Noveck is a professor at Northeastern University, where she directs the Burnes Center for Social Change and its partner project, The Governance Lab (The GovLab) and its MacArthur Research Network on Opening Governance. The author of Solving Public Problems: How to Fix Our Government and Change Our World (Yale Press 2021), named a Best Book of 2021 by Stanford Social Innovation Review, she is a member of the faculty at Northeastern’s Institute for Experiential AI. New Jersey governor Phil Murphy appointed her as the state’s first Chief Innovation Officer and Chancellor Angela Merkel named her to her Digital Council in 2018."
/>
<Divider />
<MemberItem
name="Matt Prewitt"
descr="Matt Prewitt is President of RadicalxChange Foundation, a nonprofit dedicated to improving the basic institutions of democracy and markets. He is also a former federal law clerk and antitrust litigator, and a writer and advisor on emerging technologies."
/>
<Divider />
<MemberItem
name="James Turk"
descr="James has spent his career working in Civic Tech. While at the Sunlight Foundation, he launched the Open States project, which curates a freely available repository of state legislative information across all 50 states, the District of Columbia, and Puerto Rico. James served as the lead of the Open States project for 13 years. James has also worked at PBS as a Director of Technology, as Principal Engineer of the Princeton Gerrymandering Project, and as Director of Public Data at Civic Eagle. James is currently an Assistant Clinical Professor at the University of Chicago, teaching in the Computational Analysis & Public Policy Program."
/>
<Divider />
<MemberItem
name="Harlan Weber"
descr="Harlan is the founder of Code for Boston, a civic technology volunteer group and the incubator of MAPLE. He is an experienced UX design leader, having spent 10 years in the government technology space. Harlan is currently a Principal Designer at Nava Public Benefit Corporation where he focuses on leading projects for Federal government clients. He has also served the Commonwealth of Massachusetts as an Innovation Fellow, as a founding member and design director of the Massachusetts Digital Service, and as the director of design for the Customer Technology Department at the MBTA."
/>
</SectionContainer>
</Col>
</Row>
</Container>
)
}
Loading

1 comment on commit 5c7ca3e

@vercel
Copy link

@vercel vercel bot commented on 5c7ca3e Oct 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.