Skip to content

Commit 283b8f1

Browse files
committed
Team based requests.
1 parent cef7ff2 commit 283b8f1

34 files changed

Lines changed: 776 additions & 231 deletions

components/Footer/Footer.tsx

Lines changed: 22 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import styles from "./Footer.module.scss";
2-
import {Button, Text} from '@primer/react-brand'
2+
import { Button, Text } from "@primer/react-brand";
33

44
export const Footer = () => {
55
return (
6-
76
<footer className={styles.footer}>
8-
97
<div className="py-5 p-10">
108
<div className={styles.footer__container}>
119
<div className={styles.github}>
@@ -24,9 +22,7 @@ export const Footer = () => {
2422
aria-hidden="true"
2523
fill="white"
2624
>
27-
<path
28-
d="M18.53 12.03h-.02c.009 0 .015.01.024.011h.006l-.01-.01zm.004.011c-.093.001-.327.05-.574.05-.78 0-1.05-.36-1.05-.83V8.13h1.59c.09 0 .16-.08.16-.19v-1.7c0-.09-.08-.17-.16-.17h-1.59V3.96c0-.08-.05-.13-.14-.13h-2.16c-.09 0-.14.05-.14.13v2.17s-1.09.27-1.16.28c-.08.02-.13.09-.13.17v1.36c0 .11.08.19.17.19h1.11v3.28c0 2.44 1.7 2.69 2.86 2.69.53 0 1.17-.17 1.27-.22.06-.02.09-.09.09-.16v-1.5a.177.177 0 00-.146-.18zM42.23 9.84c0-1.81-.73-2.05-1.5-1.97-.6.04-1.08.34-1.08.34v3.52s.49.34 1.22.36c1.03.03 1.36-.34 1.36-2.25zm2.43-.16c0 3.43-1.11 4.41-3.05 4.41-1.64 0-2.52-.83-2.52-.83s-.04.46-.09.52c-.03.06-.08.08-.14.08h-1.48c-.1 0-.19-.08-.19-.17l.02-11.11c0-.09.08-.17.17-.17h2.13c.09 0 .17.08.17.17v3.77s.82-.53 2.02-.53l-.01-.02c1.2 0 2.97.45 2.97 3.88zm-8.72-3.61h-2.1c-.11 0-.17.08-.17.19v5.44s-.55.39-1.3.39-.97-.34-.97-1.09V6.25c0-.09-.08-.17-.17-.17h-2.14c-.09 0-.17.08-.17.17v5.11c0 2.2 1.23 2.75 2.92 2.75 1.39 0 2.52-.77 2.52-.77s.05.39.08.45c.02.05.09.09.16.09h1.34c.11 0 .17-.08.17-.17l.02-7.47c0-.09-.08-.17-.19-.17zm-23.7-.01h-2.13c-.09 0-.17.09-.17.2v7.34c0 .2.13.27.3.27h1.92c.2 0 .25-.09.25-.27V6.23c0-.09-.08-.17-.17-.17zm-1.05-3.38c-.77 0-1.38.61-1.38 1.38 0 .77.61 1.38 1.38 1.38.75 0 1.36-.61 1.36-1.38 0-.77-.61-1.38-1.36-1.38zm16.49-.25h-2.11c-.09 0-.17.08-.17.17v4.09h-3.31V2.6c0-.09-.08-.17-.17-.17h-2.13c-.09 0-.17.08-.17.17v11.11c0 .09.09.17.17.17h2.13c.09 0 .17-.08.17-.17V8.96h3.31l-.02 4.75c0 .09.08.17.17.17h2.13c.09 0 .17-.08.17-.17V2.6c0-.09-.08-.17-.17-.17zM8.81 7.35v5.74c0 .04-.01.11-.06.13 0 0-1.25.89-3.31.89-2.49 0-5.44-.78-5.44-5.92S2.58 1.99 5.1 2c2.18 0 3.06.49 3.2.58.04.05.06.09.06.14L7.94 4.5c0 .09-.09.2-.2.17-.36-.11-.9-.33-2.17-.33-1.47 0-3.05.42-3.05 3.73s1.5 3.7 2.58 3.7c.92 0 1.25-.11 1.25-.11v-2.3H4.88c-.11 0-.19-.08-.19-.17V7.35c0-.09.08-.17.19-.17h3.74c.11 0 .19.08.19.17z"
29-
></path>
25+
<path d="M18.53 12.03h-.02c.009 0 .015.01.024.011h.006l-.01-.01zm.004.011c-.093.001-.327.05-.574.05-.78 0-1.05-.36-1.05-.83V8.13h1.59c.09 0 .16-.08.16-.19v-1.7c0-.09-.08-.17-.16-.17h-1.59V3.96c0-.08-.05-.13-.14-.13h-2.16c-.09 0-.14.05-.14.13v2.17s-1.09.27-1.16.28c-.08.02-.13.09-.13.17v1.36c0 .11.08.19.17.19h1.11v3.28c0 2.44 1.7 2.69 2.86 2.69.53 0 1.17-.17 1.27-.22.06-.02.09-.09.09-.16v-1.5a.177.177 0 00-.146-.18zM42.23 9.84c0-1.81-.73-2.05-1.5-1.97-.6.04-1.08.34-1.08.34v3.52s.49.34 1.22.36c1.03.03 1.36-.34 1.36-2.25zm2.43-.16c0 3.43-1.11 4.41-3.05 4.41-1.64 0-2.52-.83-2.52-.83s-.04.46-.09.52c-.03.06-.08.08-.14.08h-1.48c-.1 0-.19-.08-.19-.17l.02-11.11c0-.09.08-.17.17-.17h2.13c.09 0 .17.08.17.17v3.77s.82-.53 2.02-.53l-.01-.02c1.2 0 2.97.45 2.97 3.88zm-8.72-3.61h-2.1c-.11 0-.17.08-.17.19v5.44s-.55.39-1.3.39-.97-.34-.97-1.09V6.25c0-.09-.08-.17-.17-.17h-2.14c-.09 0-.17.08-.17.17v5.11c0 2.2 1.23 2.75 2.92 2.75 1.39 0 2.52-.77 2.52-.77s.05.39.08.45c.02.05.09.09.16.09h1.34c.11 0 .17-.08.17-.17l.02-7.47c0-.09-.08-.17-.19-.17zm-23.7-.01h-2.13c-.09 0-.17.09-.17.2v7.34c0 .2.13.27.3.27h1.92c.2 0 .25-.09.25-.27V6.23c0-.09-.08-.17-.17-.17zm-1.05-3.38c-.77 0-1.38.61-1.38 1.38 0 .77.61 1.38 1.38 1.38.75 0 1.36-.61 1.36-1.38 0-.77-.61-1.38-1.36-1.38zm16.49-.25h-2.11c-.09 0-.17.08-.17.17v4.09h-3.31V2.6c0-.09-.08-.17-.17-.17h-2.13c-.09 0-.17.08-.17.17v11.11c0 .09.09.17.17.17h2.13c.09 0 .17-.08.17-.17V8.96h3.31l-.02 4.75c0 .09.08.17.17.17h2.13c.09 0 .17-.08.17-.17V2.6c0-.09-.08-.17-.17-.17zM8.81 7.35v5.74c0 .04-.01.11-.06.13 0 0-1.25.89-3.31.89-2.49 0-5.44-.78-5.44-5.92S2.58 1.99 5.1 2c2.18 0 3.06.49 3.2.58.04.05.06.09.06.14L7.94 4.5c0 .09-.09.2-.2.17-.36-.11-.9-.33-2.17-.33-1.47 0-3.05.42-3.05 3.73s1.5 3.7 2.58 3.7c.92 0 1.25-.11 1.25-.11v-2.3H4.88c-.11 0-.19-.08-.19-.17V7.35c0-.09.08-.17.19-.17h3.74c.11 0 .19.08.19.17z"></path>
3026
</svg>
3127
</a>
3228

@@ -35,13 +31,10 @@ export const Footer = () => {
3531
Subscribe to <em>The GitHub Insider</em>
3632
</Text>
3733
<Text size="100" as="p">
38-
Discover tips, technical guides, and best practices in our monthly newsletter for developers.
34+
Discover tips, technical guides, and best practices in our monthly newsletter for
35+
developers.
3936
</Text>
40-
<Button
41-
as="a"
42-
href="https://resources.github.com/newsletter/"
43-
hasArrow={false}
44-
>
37+
<Button as="a" href="https://resources.github.com/newsletter/" hasArrow={false}>
4538
Subscribe
4639
</Button>
4740
</div>
@@ -59,9 +52,7 @@ export const Footer = () => {
5952
<a href="https://github.com/enterprise">Enterprise</a>
6053
</li>
6154
<li>
62-
<a href="https://github.com/customer-stories?type=enterprise">
63-
Customer Stories
64-
</a>
55+
<a href="https://github.com/customer-stories?type=enterprise">Customer Stories</a>
6556
</li>
6657
<li>
6758
<a href="https://github.com/pricing">Pricing</a>
@@ -101,9 +92,7 @@ export const Footer = () => {
10192
<a href="https://github.community">Community Forum</a>
10293
</li>
10394
<li>
104-
<a href="https://services.github.com/">
105-
Professional Services
106-
</a>
95+
<a href="https://services.github.com/">Professional Services</a>
10796
</li>
10897
<li>
10998
<a href="https://lab.github.com/">Learning Lab</a>
@@ -148,11 +137,12 @@ export const Footer = () => {
148137
title="GitHub on Twitter"
149138
aria-label="GitHub on Twitter"
150139
>
151-
<svg
152-
xmlns="http://www.w3.org/2000/svg"
153-
viewBox="0 0 24 24"
154-
height="20">
155-
<path d="M18.2048 2.25H21.5128L14.2858 10.51L22.7878 21.75H16.1308L10.9168 14.933L4.95084 21.75H1.64084L9.37084 12.915L1.21484 2.25H8.04084L12.7538 8.481L18.2048 2.25ZM17.0438 19.77H18.8768L7.04484 4.126H5.07784L17.0438 19.77Z" fill="currentColor"></path></svg>
140+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="20">
141+
<path
142+
d="M18.2048 2.25H21.5128L14.2858 10.51L22.7878 21.75H16.1308L10.9168 14.933L4.95084 21.75H1.64084L9.37084 12.915L1.21484 2.25H8.04084L12.7538 8.481L18.2048 2.25ZM17.0438 19.77H18.8768L7.04484 4.126H5.07784L17.0438 19.77Z"
143+
fill="currentColor"
144+
></path>
145+
</svg>
156146
</a>
157147
</li>
158148
<li>
@@ -162,11 +152,7 @@ export const Footer = () => {
162152
title="GitHub on Facebook"
163153
aria-label="GitHub on Facebook"
164154
>
165-
<svg
166-
xmlns="http://www.w3.org/2000/svg"
167-
viewBox="0 0 15.3 15.4"
168-
height="18"
169-
>
155+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15.3 15.4" height="18">
170156
<path
171157
d="M14.5 0H.8a.88.88 0 0 0-.8.9v13.6a.88.88 0 0 0 .8.9h7.3v-6h-2V7.1h2V5.4a2.87 2.87 0 0 1 2.5-3.1h.5a10.87 10.87 0 0 1 1.8.1v2.1h-1.3c-1 0-1.1.5-1.1 1.1v1.5h2.3l-.3 2.3h-2v5.9h3.9a.88.88 0 0 0 .9-.8V.8a.86.86 0 0 0-.8-.8z"
172158
fill="currentColor"
@@ -181,11 +167,7 @@ export const Footer = () => {
181167
title="GitHub on YouTube"
182168
aria-label="GitHub on YouTube"
183169
>
184-
<svg
185-
xmlns="http://www.w3.org/2000/svg"
186-
viewBox="0 0 19.17 13.6"
187-
height="16"
188-
>
170+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.17 13.6" height="16">
189171
<path
190172
d="M18.77 2.13A2.4 2.4 0 0 0 17.09.42C15.59 0 9.58 0 9.58 0a57.55 57.55 0 0 0-7.5.4A2.49 2.49 0 0 0 .39 2.13 26.27 26.27 0 0 0 0 6.8a26.15 26.15 0 0 0 .39 4.67 2.43 2.43 0 0 0 1.69 1.71c1.52.42 7.5.42 7.5.42a57.69 57.69 0 0 0 7.51-.4 2.4 2.4 0 0 0 1.68-1.71 25.63 25.63 0 0 0 .4-4.67 24 24 0 0 0-.4-4.69zM7.67 9.71V3.89l5 2.91z"
191173
fill="currentColor"
@@ -200,11 +182,7 @@ export const Footer = () => {
200182
title="GitHub on Linkedin"
201183
aria-label="GitHub on LinkedIn"
202184
>
203-
<svg
204-
xmlns="http://www.w3.org/2000/svg"
205-
viewBox="0 0 19 18"
206-
height="18"
207-
>
185+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 18" height="18">
208186
<path
209187
d="M3.94 2A2 2 0 1 1 2 0a2 2 0 0 1 1.94 2zM4 5.48H0V18h4zm6.32 0H6.34V18h3.94v-6.57c0-3.66 4.77-4 4.77 0V18H19v-7.93c0-6.17-7.06-5.94-8.72-2.91z"
210188
fill="currentColor"
@@ -238,17 +216,18 @@ export const Footer = () => {
238216
<ul className={styles.socials__left}>
239217
<li>© 2023 Github, Inc.</li>
240218
<li>
241-
<a href="https://docs.github.com/site-policy/github-terms/github-terms-of-service">Terms</a>
219+
<a href="https://docs.github.com/site-policy/github-terms/github-terms-of-service">
220+
Terms
221+
</a>
242222
</li>
243223
<li>
244-
<a href="https://docs.github.com/site-policy/privacy-policies/github-privacy-statement">Privacy</a>
224+
<a href="https://docs.github.com/site-policy/privacy-policies/github-privacy-statement">
225+
Privacy
226+
</a>
245227
</li>
246228
</ul>
247229
</div>
248230
</div>
249-
250-
251-
252231
</footer>
253232
);
254233
};

components/HappyCommitsInfo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ type FilterProps = {
44
setFilter: (filter: string) => void;
55
};
66

7-
export const HappyCommitsInfo = ({filter, setFilter}: FilterProps) => {
7+
export const HappyCommitsInfo = ({ filter, setFilter }: FilterProps) => {
88
return (
99
<div className="search-wrap">
1010
<GeneralFilter

components/HappyContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ type FilterProps = {
55
setFilter: (filter: string) => void;
66
};
77

8-
export const HappyContainer = ({filter, setFilter}: FilterProps) => {
8+
export const HappyContainer = ({ filter, setFilter }: FilterProps) => {
99
return (
1010
<>
1111
<HappyCommitsInfo filter={filter} setFilter={setFilter} />

components/Header/Header.module.scss

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
display: flex;
88
justify-content: space-between;
99
align-items: center;
10-
grid-gap: 36px;
10+
gap: 36px;
1111
max-width: 1440px;
1212
width: 90%;
1313
margin: 0 auto;
@@ -20,7 +20,7 @@
2020

2121
a:not(.homeLink) {
2222
padding: 8px 12px;
23-
grid-gap: 4px;
23+
gap: 4px;
2424
}
2525

2626
.btnText {
@@ -30,3 +30,33 @@
3030
}
3131
}
3232
}
33+
34+
.pageTabs {
35+
display: flex;
36+
align-items: stretch;
37+
gap: 0;
38+
flex: 1;
39+
height: 72px;
40+
}
41+
42+
.pageTab {
43+
display: flex;
44+
align-items: center;
45+
padding: 0 16px;
46+
font-size: 14px;
47+
font-weight: 500;
48+
color: rgba(255, 255, 255, 0.65);
49+
text-decoration: none;
50+
border-bottom: 2px solid transparent;
51+
transition: color 0.2s ease, border-color 0.2s ease;
52+
white-space: nowrap;
53+
54+
&:hover {
55+
color: #ffffff;
56+
}
57+
}
58+
59+
.pageTabActive {
60+
color: #ffffff;
61+
border-bottom-color: #67bd41;
62+
}

components/Header/Header.tsx

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import styles from "./Header.module.scss";
2-
import Link from 'next/link';
3-
import Image from 'next/image';
4-
import {Button} from '@primer/react-brand';
2+
import Link from "next/link";
3+
import Image from "next/image";
4+
import { useRouter } from "next/router";
5+
import { Button } from "@primer/react-brand";
56

67
export const Header = () => {
8+
const router = useRouter();
9+
const isTeams = router.pathname === "/teams";
10+
711
return (
812
<>
913
<header className={styles.siteHeader} data-color-mode="dark">
@@ -17,6 +21,17 @@ export const Header = () => {
1721
style={{ height: "auto" }}
1822
/>
1923
</Link>
24+
<nav className={styles.pageTabs}>
25+
<Link href="/" className={`${styles.pageTab} ${!isTeams ? styles.pageTabActive : ""}`}>
26+
For Individuals
27+
</Link>
28+
<Link
29+
href="/teams"
30+
className={`${styles.pageTab} ${isTeams ? styles.pageTabActive : ""}`}
31+
>
32+
For Teams
33+
</Link>
34+
</nav>
2035
<Button
2136
variant="primary"
2237
as="a"

components/HeroContainer.tsx

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1-
import {Hero} from '@primer/react-brand';
1+
import { Hero } from "@primer/react-brand";
22

33
export const HeroContainer = () => {
44
return (
55
<>
66
<Hero className="hero" data-color-mode="dark">
77
<Hero.Heading size="display">Committing to a better&nbsp;future</Hero.Heading>
88
<Hero.Description size="300">
9-
Lend your skills to an open source project focused on the <a href="https://digitalpublicgoods.net/digital-public-goods/" target="_blank" rel="noopener noreferrer">Digital Public Goods (DPGs)</a>. From fighting climate change, to solving world hunger, your efforts will contribute to creating a better future for everyone. Together, we can drive positive and lasting contributions to the world, one commit at a time.
10-
<br /><br />
9+
Lend your skills to an open source project focused on the{" "}
10+
<a
11+
href="https://digitalpublicgoods.net/digital-public-goods/"
12+
target="_blank"
13+
rel="noopener noreferrer"
14+
>
15+
Digital Public Goods (DPGs)
16+
</a>
17+
. From fighting climate change, to solving world hunger, your efforts will contribute to
18+
creating a better future for everyone. Together, we can drive positive and lasting
19+
contributions to the world, one commit at a time.
20+
<br />
21+
<br />
1122
Explore a DPG repo below to get started.
1223
</Hero.Description>
1324
</Hero>

components/IssueItem.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ export const IssueItem = ({ issue }: IssueItemProps) => {
88
return (
99
<li key={issue.url}>
1010
<span>#{issue.number}</span>
11-
<a
12-
href={issue.url}
13-
rel="noopener noreferrer"
14-
target="_blank"
15-
title="Open issue on GitHub"
16-
>
11+
<a href={issue.url} rel="noopener noreferrer" target="_blank" title="Open issue on GitHub">
1712
{issue.title}
1813
</a>
1914
</li>

components/IssueList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export const IssuesList = ({ issues }: IssueListProps) => {
1414
<li>
1515
This project does not appear to have any issues marked Help Wanted or Good First Issue. If
1616
this project speaks to you, consider seeing if there are other ways to help contribute!
17-
You can find more information on the project&apos;s GitHub page. It is also possible that they
18-
are not using issue labels or GitHub issues to track their work.
17+
You can find more information on the project&apos;s GitHub page. It is also possible that
18+
they are not using issue labels or GitHub issues to track their work.
1919
</li>
2020
)}
2121
</ol>

components/LanguageFilter.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,5 @@ export const LanguageFilter = ({ setSelectedLanguages, languageOptions }: Langua
2323
/>
2424
</div>
2525
</>
26-
2726
);
2827
};

components/Layout.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ type LayoutProps = {
77
export const Layout = ({ children }: LayoutProps) => (
88
<div>
99
<main>
10-
<section>
11-
{children}
12-
</section>
10+
<section>{children}</section>
1311
</main>
1412
</div>
1513
);

0 commit comments

Comments
 (0)