From 5e3e6ff8581e61f65d1b8d85595a2a527806a1da Mon Sep 17 00:00:00 2001 From: hanboyu Date: Wed, 25 Oct 2023 15:47:24 -0400 Subject: [PATCH 1/8] Update Our Team page --- components/OurTeam/AdvisoryBoard.tsx | 37 ++++++++++++ components/OurTeam/CommonComponents.tsx | 71 ++++++++++++++++++++++++ components/OurTeam/OurTeam.tsx | 54 ++++++++++++++++++ components/OurTeam/SteeringCommittee.tsx | 47 ++++++++++++++++ pages/about/our-team.tsx | 3 +- styles/globals.css | 15 +++++ 6 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 components/OurTeam/AdvisoryBoard.tsx create mode 100644 components/OurTeam/CommonComponents.tsx create mode 100644 components/OurTeam/OurTeam.tsx create mode 100644 components/OurTeam/SteeringCommittee.tsx diff --git a/components/OurTeam/AdvisoryBoard.tsx b/components/OurTeam/AdvisoryBoard.tsx new file mode 100644 index 000000000..6fe6340b9 --- /dev/null +++ b/components/OurTeam/AdvisoryBoard.tsx @@ -0,0 +1,37 @@ +import styled from "styled-components" +import { Col, Row, Container } from "../bootstrap" +import { MemberItem, PageTitle, PageDescr, SectionContainer, Divider } from "./CommonComponents" + +export const AdvisoryBoard = () => { + return ( + + + + Advisory Board + + + + + The Steering Committee directs the overall operations of MAPLE, which includes the management of volunteers, establishing project direction, and making decisions about development and communications. + + + + + + + + + + + + + + + + + + + + + ); +} \ No newline at end of file diff --git a/components/OurTeam/CommonComponents.tsx b/components/OurTeam/CommonComponents.tsx new file mode 100644 index 000000000..247b60db6 --- /dev/null +++ b/components/OurTeam/CommonComponents.tsx @@ -0,0 +1,71 @@ +import styled from "styled-components" +import { Container } from "../bootstrap" + +export const MemberItem = ({name, email, descr} : {name: string, email?: string, descr: string}) => { + return ( + + {name} + {email ? {email} : null} + {descr} + + ); +} + +const StyledContainer = styled(Container)` + //border-top: 1px solid #979797; + background: white; + border-radius: 0 0 10px 10px; +` +const EmailContainer = styled.div` + color: #1A3185; + font-size: 20px; + font-weight: 600; + line-height: 25px; + letter-spacing: 0em; + text-align: left; + text-decoration: underline; +` +const NameContainer = styled.div` + color: #1A3185; + font-size: 25px; + font-weight: 600; + line-height: 31px; + letter-spacing: 0em; + text-align: left; +` +const DescrContainer = styled.div` + font-size: 16px; + font-weight: 500; + line-height: 20px; + letter-spacing: 0.015em; + text-align: left; + + +` + +export const Divider = styled.hr` + border: 1px solid #979797; + margin: 0; +` + +export const PageDescr= styled.div` + font-weight: 700; + font-size: 25px; +` + +export const PageTitle = styled.div` + font-weight: 600; + font-size: 60px; +` +export const SectionContainer = styled.div` + border-radius: 10px; + background: white; +` + +export const SectionTitle = styled.div` + color: #FFFFFF; + background: #1A3185; + font-weight: 500; + font-size: 26px; + border-radius: 10px 10px 0 0; +` \ No newline at end of file diff --git a/components/OurTeam/OurTeam.tsx b/components/OurTeam/OurTeam.tsx new file mode 100644 index 000000000..5db1de6f2 --- /dev/null +++ b/components/OurTeam/OurTeam.tsx @@ -0,0 +1,54 @@ +import styled from "styled-components" +import { Col, Row, Container } from "../bootstrap" +import Tab from 'react-bootstrap/Tab'; +import Tabs from 'react-bootstrap/Tabs'; +import Nav from 'react-bootstrap/Nav'; +import { SteeringCommittee } from "./SteeringCommittee" +import { AdvisoryBoard } from "./AdvisoryBoard" +import OurPartners from "../OurPartners/OurPartners" + +export const OurTeam = () => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + ); +} + +const StyledContainer = styled(Container)` + font-family: "Nunito"; +` + diff --git a/components/OurTeam/SteeringCommittee.tsx b/components/OurTeam/SteeringCommittee.tsx new file mode 100644 index 000000000..a9d631885 --- /dev/null +++ b/components/OurTeam/SteeringCommittee.tsx @@ -0,0 +1,47 @@ +import styled from "styled-components" +import { Col, Row, Container } from "../bootstrap" +import { MemberItem, Divider, PageTitle, PageDescr, SectionContainer, SectionTitle } from "./CommonComponents" + +export const SteeringCommittee = () => { + return ( + + + + Steering Committee + + + + + The Steering Committee directs the overall operations of MAPLE, which includes the management of volunteers, establishing project direction, and making decisions about development and communications. + + + + + + Product Management & Leadership + + + + + + + + + + + + + + User Experience Design & Engineering Leads + + + + + + + + + + ) +} + diff --git a/pages/about/our-team.tsx b/pages/about/our-team.tsx index a20f6c69b..ea6fb7a1b 100644 --- a/pages/about/our-team.tsx +++ b/pages/about/our-team.tsx @@ -1,13 +1,14 @@ import { createPage } from "../../components/page" import OurPartners from "../../components/OurPartners/OurPartners" import { createGetStaticTranslationProps } from "components/translations" +import { OurTeam } from "../../components/OurTeam/OurTeam" export default createPage({ title: "Our Team", Page: () => { return (
- +
) } diff --git a/styles/globals.css b/styles/globals.css index de0002b64..28ae2f416 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -92,3 +92,18 @@ background-color: inherit; } } + +/* Custom tabs style in "Our Team" Page */ +.our-team-tab .nav-item .nav-link { + color: black; + font-weight: 600; + border-bottom: 3px solid; + border-color: #0000001A +} +.our-team-tab .nav-item .nav-link:hover { + color: #C71E32; +} +.our-team-tab .nav-item .nav-link.active { + color: #C71E32; + border-color: #C71E32; +} \ No newline at end of file From 7e3e53a2ba26d5aa7ee75c0514865245dc13a8db Mon Sep 17 00:00:00 2001 From: hanboyu Date: Wed, 25 Oct 2023 22:44:27 -0400 Subject: [PATCH 2/8] Combined and updated OurPartners with OurTeam --- components/AboutPagesCard/AboutPagesCard.js | 2 +- .../AboutPagesCard/AboutPagesCard.module.css | 37 ++++++------ components/OurPartners/OurPartners.js | 54 ----------------- .../OurPartners/OurPartnersTextContent.json | 17 ------ .../OurPartnersCardContent.module.css | 11 +++- .../OurPartnersCardContent.tsx | 40 ++++++++++--- .../OurPartners.module.css | 0 components/OurTeam/OurTeam.tsx | 2 +- components/OurTeam/Partners.tsx | 55 ++++++++++++++++++ pages/about/our-team.tsx | 1 - public/northeastern_school_of_law_logo.svg | 9 +++ public/open_collective_logo.png | Bin 0 -> 6295 bytes 12 files changed, 128 insertions(+), 100 deletions(-) delete mode 100644 components/OurPartners/OurPartners.js delete mode 100644 components/OurPartners/OurPartnersTextContent.json rename components/{OurPartners => OurTeam}/OurPartners.module.css (100%) create mode 100644 components/OurTeam/Partners.tsx create mode 100644 public/northeastern_school_of_law_logo.svg create mode 100644 public/open_collective_logo.png diff --git a/components/AboutPagesCard/AboutPagesCard.js b/components/AboutPagesCard/AboutPagesCard.js index a244a624f..85728e90a 100644 --- a/components/AboutPagesCard/AboutPagesCard.js +++ b/components/AboutPagesCard/AboutPagesCard.js @@ -4,7 +4,7 @@ import styles from "./AboutPagesCard.module.css" const AboutPagesCard = ({ title, children }) => { return ( - + {title} {children} diff --git a/components/AboutPagesCard/AboutPagesCard.module.css b/components/AboutPagesCard/AboutPagesCard.module.css index 92396b79f..41b581a9c 100644 --- a/components/AboutPagesCard/AboutPagesCard.module.css +++ b/components/AboutPagesCard/AboutPagesCard.module.css @@ -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; } } diff --git a/components/OurPartners/OurPartners.js b/components/OurPartners/OurPartners.js deleted file mode 100644 index 22c56ea39..000000000 --- a/components/OurPartners/OurPartners.js +++ /dev/null @@ -1,54 +0,0 @@ -import AboutPagesCard from "../AboutPagesCard/AboutPagesCard" -import { Col, Container, Row } from "../bootstrap" -import { - CodeForBostonCardContent, - NuLawLabCardContent -} from "../OurPartnersCardContent/OurPartnersCardContent.tsx" -import styles from "./OurPartners.module.css" - -import Partners from "./OurPartnersTextContent.json" - -const OurPartners = () => { - const { title, team, hosts, supporters } = Partners.partners - - return ( - - - -

{team.title}

-

- {team.bodytext} -

-

- {hosts.bodytext} -

- - - - - - - - - - - - - - - - - - - - -

{supporters.bodytext}

- - - - - - ) -} - -export default OurPartners diff --git a/components/OurPartners/OurPartnersTextContent.json b/components/OurPartners/OurPartnersTextContent.json deleted file mode 100644 index d6b309b0b..000000000 --- a/components/OurPartners/OurPartnersTextContent.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "partners": { - "title": "Our Team and Supporters", - "team": { - "title": "Our Team", - "bodytext": "We are a collective of open source developers, legal scholars, and policy analysts & advocates seeking to leverage digital technology to improve our capacity and ability to self-govern." - }, - "hosts": { - "title": "none", - "bodytext": "MAPLE platform is a project of the NuLawLab developed with Code for Boston." - }, - "supporters": { - "title": "Our Supporters + How to Support Us", - "bodytext": "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 site." - } - } -} diff --git a/components/OurPartnersCardContent/OurPartnersCardContent.module.css b/components/OurPartnersCardContent/OurPartnersCardContent.module.css index 3614637a6..2e8f0d25b 100644 --- a/components/OurPartnersCardContent/OurPartnersCardContent.module.css +++ b/components/OurPartnersCardContent/OurPartnersCardContent.module.css @@ -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 */ diff --git a/components/OurPartnersCardContent/OurPartnersCardContent.tsx b/components/OurPartnersCardContent/OurPartnersCardContent.tsx index db27e357c..6088e06ab 100644 --- a/components/OurPartnersCardContent/OurPartnersCardContent.tsx +++ b/components/OurPartnersCardContent/OurPartnersCardContent.tsx @@ -6,14 +6,14 @@ const NuLawLabCardContent = () => { return ( <> - + Northeatern School of Law icon - +

The{" "} { > Northeastern University School of Law - . The Lab is a leader in the{" "} + . +

+

+ The Lab is a leader in the{" "} { return ( <> - + Code for Boston icon - +

Code for Boston addresses local social and civic challenges through creative uses of technology. Despite the name, they are not solely @@ -90,4 +93,27 @@ const CodeForBostonCardContent = () => { ) } -export { NuLawLabCardContent, CodeForBostonCardContent } +const OpenCollectiveContent = () => { + return ( + <> + + + open_collective_logo + + +

+ 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. +

+ + + + ) +} + + + +export { NuLawLabCardContent, CodeForBostonCardContent, OpenCollectiveContent } diff --git a/components/OurPartners/OurPartners.module.css b/components/OurTeam/OurPartners.module.css similarity index 100% rename from components/OurPartners/OurPartners.module.css rename to components/OurTeam/OurPartners.module.css diff --git a/components/OurTeam/OurTeam.tsx b/components/OurTeam/OurTeam.tsx index 5db1de6f2..1657b4c63 100644 --- a/components/OurTeam/OurTeam.tsx +++ b/components/OurTeam/OurTeam.tsx @@ -5,7 +5,7 @@ import Tabs from 'react-bootstrap/Tabs'; import Nav from 'react-bootstrap/Nav'; import { SteeringCommittee } from "./SteeringCommittee" import { AdvisoryBoard } from "./AdvisoryBoard" -import OurPartners from "../OurPartners/OurPartners" +import { OurPartners } from "./Partners" export const OurTeam = () => { return ( diff --git a/components/OurTeam/Partners.tsx b/components/OurTeam/Partners.tsx new file mode 100644 index 000000000..6bf131c8c --- /dev/null +++ b/components/OurTeam/Partners.tsx @@ -0,0 +1,55 @@ +import styled from "styled-components" +import AboutPagesCard from "../AboutPagesCard/AboutPagesCard" +import { Col, Container, Row } from "../bootstrap" +import { + CodeForBostonCardContent, + NuLawLabCardContent, + OpenCollectiveContent +} from "../OurPartnersCardContent/OurPartnersCardContent" +// import styles from "./OurPartners.module.css" +import { MemberItem, Divider, PageTitle, PageDescr, SectionContainer, SectionTitle } from "./CommonComponents" + +export const OurPartners = () => { + return ( + + + + Our Partners + + + + + The project is developed in partnership between the NuLawLab and scholars at Boston College Law School and Harvard University's Berkman Klein Center for Internet & Society. + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +} + +const StyleLink = styled.a` + text-decoration: none; + color: var(--bs-blue); +` \ No newline at end of file diff --git a/pages/about/our-team.tsx b/pages/about/our-team.tsx index ea6fb7a1b..96f6a4c15 100644 --- a/pages/about/our-team.tsx +++ b/pages/about/our-team.tsx @@ -1,5 +1,4 @@ import { createPage } from "../../components/page" -import OurPartners from "../../components/OurPartners/OurPartners" import { createGetStaticTranslationProps } from "components/translations" import { OurTeam } from "../../components/OurTeam/OurTeam" diff --git a/public/northeastern_school_of_law_logo.svg b/public/northeastern_school_of_law_logo.svg new file mode 100644 index 000000000..b018364f1 --- /dev/null +++ b/public/northeastern_school_of_law_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/open_collective_logo.png b/public/open_collective_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c63f1fba857a329cf7388dd9da9ca16d42d4037b GIT binary patch literal 6295 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 literal 0 HcmV?d00001 From e213bc4ada088365d1aee42bb85e1f2d069bd970 Mon Sep 17 00:00:00 2001 From: hanboyu Date: Thu, 26 Oct 2023 15:03:00 -0400 Subject: [PATCH 3/8] Added dropdown menu for mobile view --- components/OurTeam/OurTeam.tsx | 84 ++++++++++++++++++++++++---------- styles/globals.css | 74 +++++++++++++++++++++++++++++- 2 files changed, 134 insertions(+), 24 deletions(-) diff --git a/components/OurTeam/OurTeam.tsx b/components/OurTeam/OurTeam.tsx index 1657b4c63..3859a2957 100644 --- a/components/OurTeam/OurTeam.tsx +++ b/components/OurTeam/OurTeam.tsx @@ -1,39 +1,24 @@ import styled from "styled-components" +import { useState } from 'react'; import { Col, Row, Container } from "../bootstrap" import Tab from 'react-bootstrap/Tab'; import Tabs from 'react-bootstrap/Tabs'; import Nav from 'react-bootstrap/Nav'; +import NavDropdown from 'react-bootstrap/NavDropdown'; +import Dropdown from 'react-bootstrap/Dropdown'; +import DropdownButton from 'react-bootstrap/DropdownButton'; +import Navbar from 'react-bootstrap/Navbar'; import { SteeringCommittee } from "./SteeringCommittee" import { AdvisoryBoard } from "./AdvisoryBoard" import { OurPartners } from "./Partners" +import { useMediaQuery } from "usehooks-ts" export const OurTeam = () => { + const isMobile = useMediaQuery("(max-width: 768px)") return ( - - - - - - - - - - - + {isMobile? : } @@ -48,6 +33,59 @@ export const OurTeam = () => { ); } +const TabGroup = () => { + return ( + + + + + + + + + + + + ); +} + +const TabDropdown = () => { + const [selectedTab, setSelectedTab] = useState('Steering Committee'); + + const handleTabClick = (tabTitle: string) => { + setSelectedTab(tabTitle); + }; + + return ( + + + + {selectedTab} + + handleTabClick('Steering Committee')}>Steering Committee + + handleTabClick('Advisory Board')}>Advisory Board + + handleTabClick('Partners')}>Partners + + + + + ); +} + const StyledContainer = styled(Container)` font-family: "Nunito"; ` diff --git a/styles/globals.css b/styles/globals.css index 28ae2f416..8d7f96e56 100644 --- a/styles/globals.css +++ b/styles/globals.css @@ -93,7 +93,7 @@ } } -/* Custom tabs style in "Our Team" Page */ +/* Custom style in "Our Team" Page */ .our-team-tab .nav-item .nav-link { color: black; font-weight: 600; @@ -106,4 +106,76 @@ .our-team-tab .nav-item .nav-link.active { color: #C71E32; border-color: #C71E32; +} + +.our-team-dropdown-button { + width: 100%; + padding: 7px, 8px, 7px, 8px; + border-radius: 8px; + background: #12266F; + color: white; + border-color: #12266F; + font-family: Nunito; + font-size: 16px; + font-weight: 500; + line-height: 20px; + letter-spacing: 0.015em; + text-align: right; +} +/* .our-team-dropdown-button::after { + display: none !important; +} */ +.our-team-dropdown-button.btn-primary:focus { + width: 100%; + padding: 7px, 8px, 7px, 8px; + border-radius: 8px; + background: #12266F; + color: white; + border-color: #12266F; + box-shadow: none; +} + +.our-team-dropdown-button.btn-primary:checked { + width: 100%; + padding: 7px, 8px, 7px, 8px; + border-radius: 8px; + background: #12266F; + color: white; + border-color: #12266F; +} +.our-team-dropdown-button.btn-primary:active { + width: 100%; + padding: 7px, 8px, 7px, 8px; + border-radius: 8px; + background: #12266F; + color: white; + border-color: #12266F; +} +.our-team-dropdown-button.btn-primary:hover { + width: 100%; + padding: 7px, 8px, 7px, 8px; + border-radius: 8px; + background: #12266F; + color: white; + border-color: #12266F; +} + +.our-team-dropdown .dropdown-menu{ + width: 100%; + border-radius: 8px; + background: #12266F; + color: white; +} + +.our-team-dropdown .dropdown-item { + width: 100%; + border-radius: 8px; + background: #12266F; + color: white; + font-family: Nunito; + font-size: 16px; + font-weight: 500; + line-height: 20px; + letter-spacing: 0.015em; + padding: 7px, 8px, 7px, 8px; } \ No newline at end of file From 353e45444d61806c3a3e95e07c0acf7b2d775b03 Mon Sep 17 00:00:00 2001 From: hanboyu Date: Thu, 26 Oct 2023 15:13:18 -0400 Subject: [PATCH 4/8] Minor adjust to style --- components/AboutPagesCard/AboutPagesCard.js | 2 +- .../AboutPagesCard/AboutPagesCard.module.css | 2 +- components/OurTeam/AdvisoryBoard.tsx | 1 - components/OurTeam/CommonComponents.tsx | 2 +- components/OurTeam/OurPartners.module.css | 27 ------------------- components/OurTeam/OurTeam.tsx | 5 ---- components/OurTeam/Partners.tsx | 3 +-- components/OurTeam/SteeringCommittee.tsx | 1 - 8 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 components/OurTeam/OurPartners.module.css diff --git a/components/AboutPagesCard/AboutPagesCard.js b/components/AboutPagesCard/AboutPagesCard.js index 85728e90a..58cd8df55 100644 --- a/components/AboutPagesCard/AboutPagesCard.js +++ b/components/AboutPagesCard/AboutPagesCard.js @@ -3,7 +3,7 @@ import styles from "./AboutPagesCard.module.css" const AboutPagesCard = ({ title, children }) => { return ( - + {title} diff --git a/components/AboutPagesCard/AboutPagesCard.module.css b/components/AboutPagesCard/AboutPagesCard.module.css index 41b581a9c..c31dfc75d 100644 --- a/components/AboutPagesCard/AboutPagesCard.module.css +++ b/components/AboutPagesCard/AboutPagesCard.module.css @@ -16,7 +16,7 @@ } .card { - margin: 3rem 2rem 6rem 3rem; + /* margin: 3rem 2rem 6rem 3rem; */ border-radius: 10px; } diff --git a/components/OurTeam/AdvisoryBoard.tsx b/components/OurTeam/AdvisoryBoard.tsx index 6fe6340b9..ae62ca2c0 100644 --- a/components/OurTeam/AdvisoryBoard.tsx +++ b/components/OurTeam/AdvisoryBoard.tsx @@ -1,4 +1,3 @@ -import styled from "styled-components" import { Col, Row, Container } from "../bootstrap" import { MemberItem, PageTitle, PageDescr, SectionContainer, Divider } from "./CommonComponents" diff --git a/components/OurTeam/CommonComponents.tsx b/components/OurTeam/CommonComponents.tsx index 247b60db6..41c38d637 100644 --- a/components/OurTeam/CommonComponents.tsx +++ b/components/OurTeam/CommonComponents.tsx @@ -3,7 +3,7 @@ import { Container } from "../bootstrap" export const MemberItem = ({name, email, descr} : {name: string, email?: string, descr: string}) => { return ( - + {name} {email ? {email} : null} {descr} diff --git a/components/OurTeam/OurPartners.module.css b/components/OurTeam/OurPartners.module.css deleted file mode 100644 index 9f6866dd5..000000000 --- a/components/OurTeam/OurPartners.module.css +++ /dev/null @@ -1,27 +0,0 @@ -.container { - font-family: Nunito; -} - -.header { - font-size: 3.75rem; - transform: translate(-5.25rem); -} - -.subheader { - font-size: 1.5rem; - transform: translate(-5.25rem); - padding-bottom: 4rem; -} - -/* Responsive Queries */ - -/* bootstrap: medium > 768px */ -@media (max-width: 48em) { - .header { - font-size: 2.25rem; - transform: translate(-2rem); - } - .subheader { - transform: translate(-2rem); - } -} diff --git a/components/OurTeam/OurTeam.tsx b/components/OurTeam/OurTeam.tsx index 3859a2957..13d088df0 100644 --- a/components/OurTeam/OurTeam.tsx +++ b/components/OurTeam/OurTeam.tsx @@ -2,12 +2,8 @@ import styled from "styled-components" import { useState } from 'react'; import { Col, Row, Container } from "../bootstrap" import Tab from 'react-bootstrap/Tab'; -import Tabs from 'react-bootstrap/Tabs'; import Nav from 'react-bootstrap/Nav'; -import NavDropdown from 'react-bootstrap/NavDropdown'; import Dropdown from 'react-bootstrap/Dropdown'; -import DropdownButton from 'react-bootstrap/DropdownButton'; -import Navbar from 'react-bootstrap/Navbar'; import { SteeringCommittee } from "./SteeringCommittee" import { AdvisoryBoard } from "./AdvisoryBoard" import { OurPartners } from "./Partners" @@ -89,4 +85,3 @@ const TabDropdown = () => { const StyledContainer = styled(Container)` font-family: "Nunito"; ` - diff --git a/components/OurTeam/Partners.tsx b/components/OurTeam/Partners.tsx index 6bf131c8c..00fc7ec93 100644 --- a/components/OurTeam/Partners.tsx +++ b/components/OurTeam/Partners.tsx @@ -6,8 +6,7 @@ import { NuLawLabCardContent, OpenCollectiveContent } from "../OurPartnersCardContent/OurPartnersCardContent" -// import styles from "./OurPartners.module.css" -import { MemberItem, Divider, PageTitle, PageDescr, SectionContainer, SectionTitle } from "./CommonComponents" +import { PageTitle, PageDescr } from "./CommonComponents" export const OurPartners = () => { return ( diff --git a/components/OurTeam/SteeringCommittee.tsx b/components/OurTeam/SteeringCommittee.tsx index a9d631885..8ee3eadb3 100644 --- a/components/OurTeam/SteeringCommittee.tsx +++ b/components/OurTeam/SteeringCommittee.tsx @@ -1,4 +1,3 @@ -import styled from "styled-components" import { Col, Row, Container } from "../bootstrap" import { MemberItem, Divider, PageTitle, PageDescr, SectionContainer, SectionTitle } from "./CommonComponents" From a402937a1435be77c729899b73f1c88e3acef81d Mon Sep 17 00:00:00 2001 From: hanboyu Date: Thu, 26 Oct 2023 15:56:31 -0400 Subject: [PATCH 5/8] Run prettier --- components/AboutPagesCard/AboutPagesCard.js | 2 +- .../OurPartnersCardContent.tsx | 13 +- components/OurTeam/AdvisoryBoard.tsx | 95 +++++++---- components/OurTeam/CommonComponents.tsx | 88 +++++----- components/OurTeam/OurTeam.tsx | 160 ++++++++++-------- components/OurTeam/Partners.tsx | 33 +++- components/OurTeam/SteeringCommittee.tsx | 122 ++++++++----- 7 files changed, 317 insertions(+), 196 deletions(-) diff --git a/components/AboutPagesCard/AboutPagesCard.js b/components/AboutPagesCard/AboutPagesCard.js index 58cd8df55..66792db1b 100644 --- a/components/AboutPagesCard/AboutPagesCard.js +++ b/components/AboutPagesCard/AboutPagesCard.js @@ -3,7 +3,7 @@ import styles from "./AboutPagesCard.module.css" const AboutPagesCard = ({ title, children }) => { return ( - + {title} diff --git a/components/OurPartnersCardContent/OurPartnersCardContent.tsx b/components/OurPartnersCardContent/OurPartnersCardContent.tsx index 6088e06ab..723674ff3 100644 --- a/components/OurPartnersCardContent/OurPartnersCardContent.tsx +++ b/components/OurPartnersCardContent/OurPartnersCardContent.tsx @@ -31,9 +31,9 @@ const NuLawLabCardContent = () => { > Northeastern University School of Law - . -

-

+ . +

+

The Lab is a leader in the{" "} {

- 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. + 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.

@@ -114,6 +117,4 @@ const OpenCollectiveContent = () => { ) } - - export { NuLawLabCardContent, CodeForBostonCardContent, OpenCollectiveContent } diff --git a/components/OurTeam/AdvisoryBoard.tsx b/components/OurTeam/AdvisoryBoard.tsx index ae62ca2c0..9eef9128a 100644 --- a/components/OurTeam/AdvisoryBoard.tsx +++ b/components/OurTeam/AdvisoryBoard.tsx @@ -1,36 +1,65 @@ import { Col, Row, Container } from "../bootstrap" -import { MemberItem, PageTitle, PageDescr, SectionContainer, Divider } from "./CommonComponents" +import { + MemberItem, + PageTitle, + PageDescr, + SectionContainer, + Divider +} from "./CommonComponents" export const AdvisoryBoard = () => { - return ( - - - - Advisory Board - - - - - The Steering Committee directs the overall operations of MAPLE, which includes the management of volunteers, establishing project direction, and making decisions about development and communications. - - - - - - - - - - - - - - - - - - - - - ); -} \ No newline at end of file + return ( + + + + Advisory Board + + + + + + The Steering Committee directs the overall operations of MAPLE, + which includes the management of volunteers, establishing project + direction, and making decisions about development and + communications. + + + + + + + + + + + + + + + + + + + + + + ) +} diff --git a/components/OurTeam/CommonComponents.tsx b/components/OurTeam/CommonComponents.tsx index 41c38d637..529c3a8f2 100644 --- a/components/OurTeam/CommonComponents.tsx +++ b/components/OurTeam/CommonComponents.tsx @@ -1,14 +1,22 @@ import styled from "styled-components" import { Container } from "../bootstrap" -export const MemberItem = ({name, email, descr} : {name: string, email?: string, descr: string}) => { - return ( - - {name} - {email ? {email} : null} - {descr} - - ); +export const MemberItem = ({ + name, + email, + descr +}: { + name: string + email?: string + descr: string +}) => { + return ( + + {name} + {email ? {email} : null} + {descr} + + ) } const StyledContainer = styled(Container)` @@ -17,30 +25,28 @@ const StyledContainer = styled(Container)` border-radius: 0 0 10px 10px; ` const EmailContainer = styled.div` - color: #1A3185; - font-size: 20px; - font-weight: 600; - line-height: 25px; - letter-spacing: 0em; - text-align: left; - text-decoration: underline; + color: #1a3185; + font-size: 20px; + font-weight: 600; + line-height: 25px; + letter-spacing: 0em; + text-align: left; + text-decoration: underline; ` const NameContainer = styled.div` - color: #1A3185; - font-size: 25px; - font-weight: 600; - line-height: 31px; - letter-spacing: 0em; - text-align: left; + color: #1a3185; + font-size: 25px; + font-weight: 600; + line-height: 31px; + letter-spacing: 0em; + text-align: left; ` const DescrContainer = styled.div` - font-size: 16px; - font-weight: 500; - line-height: 20px; - letter-spacing: 0.015em; - text-align: left; - - + font-size: 16px; + font-weight: 500; + line-height: 20px; + letter-spacing: 0.015em; + text-align: left; ` export const Divider = styled.hr` @@ -48,24 +54,24 @@ export const Divider = styled.hr` margin: 0; ` -export const PageDescr= styled.div` - font-weight: 700; - font-size: 25px; +export const PageDescr = styled.div` + font-weight: 700; + font-size: 25px; ` export const PageTitle = styled.div` - font-weight: 600; - font-size: 60px; + font-weight: 600; + font-size: 60px; ` export const SectionContainer = styled.div` - border-radius: 10px; - background: white; + border-radius: 10px; + background: white; ` export const SectionTitle = styled.div` - color: #FFFFFF; - background: #1A3185; - font-weight: 500; - font-size: 26px; - border-radius: 10px 10px 0 0; -` \ No newline at end of file + color: #ffffff; + background: #1a3185; + font-weight: 500; + font-size: 26px; + border-radius: 10px 10px 0 0; +` diff --git a/components/OurTeam/OurTeam.tsx b/components/OurTeam/OurTeam.tsx index 13d088df0..18530dd7d 100644 --- a/components/OurTeam/OurTeam.tsx +++ b/components/OurTeam/OurTeam.tsx @@ -1,85 +1,113 @@ import styled from "styled-components" -import { useState } from 'react'; +import { useState } from "react" import { Col, Row, Container } from "../bootstrap" -import Tab from 'react-bootstrap/Tab'; -import Nav from 'react-bootstrap/Nav'; -import Dropdown from 'react-bootstrap/Dropdown'; +import Tab from "react-bootstrap/Tab" +import Nav from "react-bootstrap/Nav" +import Dropdown from "react-bootstrap/Dropdown" import { SteeringCommittee } from "./SteeringCommittee" import { AdvisoryBoard } from "./AdvisoryBoard" import { OurPartners } from "./Partners" import { useMediaQuery } from "usehooks-ts" export const OurTeam = () => { - const isMobile = useMediaQuery("(max-width: 768px)") - return ( - - - {isMobile? : } - - - - - - - - - - - - ); + const isMobile = useMediaQuery("(max-width: 768px)") + return ( + + + {isMobile ? : } + + + + + + + + + + + + + + + + + + ) } const TabGroup = () => { - return ( - - - - - - - - - - - - ); + return ( + + + + + + + + + + + + ) } const TabDropdown = () => { - const [selectedTab, setSelectedTab] = useState('Steering Committee'); + const [selectedTab, setSelectedTab] = useState("Steering Committee") - const handleTabClick = (tabTitle: string) => { - setSelectedTab(tabTitle); - }; + const handleTabClick = (tabTitle: string) => { + setSelectedTab(tabTitle) + } - return ( - - - - {selectedTab} - - handleTabClick('Steering Committee')}>Steering Committee - - handleTabClick('Advisory Board')}>Advisory Board - - handleTabClick('Partners')}>Partners - - - - - ); + return ( + + + + + {selectedTab} + + + handleTabClick("Steering Committee")} + > + Steering Committee + + + handleTabClick("Advisory Board")} + > + Advisory Board + + + handleTabClick("Partners")} + > + Partners + + + + + + ) } const StyledContainer = styled(Container)` diff --git a/components/OurTeam/Partners.tsx b/components/OurTeam/Partners.tsx index 00fc7ec93..4830c1baa 100644 --- a/components/OurTeam/Partners.tsx +++ b/components/OurTeam/Partners.tsx @@ -3,7 +3,7 @@ import AboutPagesCard from "../AboutPagesCard/AboutPagesCard" import { Col, Container, Row } from "../bootstrap" import { CodeForBostonCardContent, - NuLawLabCardContent, + NuLawLabCardContent, OpenCollectiveContent } from "../OurPartnersCardContent/OurPartnersCardContent" import { PageTitle, PageDescr } from "./CommonComponents" @@ -13,12 +13,31 @@ export const OurPartners = () => { - Our Partners + Our Partners - The project is developed in partnership between the NuLawLab and scholars at Boston College Law School and Harvard University's Berkman Klein Center for Internet & Society. + + The project is developed in partnership between the NuLawLab and + scholars at{" "} + + Boston College Law School + {" "} + and{" "} + + Harvard University's Berkman Klein Center for Internet & Society + + . + @@ -45,10 +64,10 @@ export const OurPartners = () => { - ); + ) } const StyleLink = styled.a` - text-decoration: none; - color: var(--bs-blue); -` \ No newline at end of file + text-decoration: none; + color: var(--bs-blue); +` diff --git a/components/OurTeam/SteeringCommittee.tsx b/components/OurTeam/SteeringCommittee.tsx index 8ee3eadb3..b5fa5aa39 100644 --- a/components/OurTeam/SteeringCommittee.tsx +++ b/components/OurTeam/SteeringCommittee.tsx @@ -1,46 +1,84 @@ import { Col, Row, Container } from "../bootstrap" -import { MemberItem, Divider, PageTitle, PageDescr, SectionContainer, SectionTitle } from "./CommonComponents" +import { + MemberItem, + Divider, + PageTitle, + PageDescr, + SectionContainer, + SectionTitle +} from "./CommonComponents" export const SteeringCommittee = () => { - return ( - - - - Steering Committee - - - - - The Steering Committee directs the overall operations of MAPLE, which includes the management of volunteers, establishing project direction, and making decisions about development and communications. - - - - - - Product Management & Leadership - - - - - - - - - - - - - - User Experience Design & Engineering Leads - - - - - - - - - - ) + return ( + + + + Steering Committee + + + + + + The Steering Committee directs the overall operations of MAPLE, + which includes the management of volunteers, establishing project + direction, and making decisions about development and + communications. + + + + + + + + Product Management & Leadership + + + + + + + + + + + + + + + + User Experience Design & Engineering Leads + + + + + + + + + + + ) } - From 97e91aa5e9941e7012afbb7502d5a4876d44d4b9 Mon Sep 17 00:00:00 2001 From: hanboyu Date: Thu, 26 Oct 2023 15:59:59 -0400 Subject: [PATCH 6/8] Fixed build issue --- components/OurTeam/OurTeam.tsx | 6 +-- styles/globals.css | 78 +++++++++++++++++----------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/components/OurTeam/OurTeam.tsx b/components/OurTeam/OurTeam.tsx index 18530dd7d..668a4a485 100644 --- a/components/OurTeam/OurTeam.tsx +++ b/components/OurTeam/OurTeam.tsx @@ -39,7 +39,7 @@ const TabGroup = () => { return ( -