Skip to content

Commit 73a047f

Browse files
committed
Merge branch 'dev' into quiz-types
2 parents 757c4bd + acd8e2f commit 73a047f

File tree

155 files changed

+597
-657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+597
-657
lines changed

.all-contributorsrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10700,7 +10700,7 @@
1070010700
"login": "g0rbe",
1070110701
"name": "Dániel Görbe",
1070210702
"avatar_url": "https://avatars.githubusercontent.com/u/36860942?v=4",
10703-
"profile": "http://www.danielgorbe.com",
10703+
"profile": "https://www.gorbe.io",
1070410704
"contributions": [
1070510705
"doc"
1070610706
]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1673,7 +1673,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
16731673
<td align="center" valign="top" width="14.28%"><a href="https://github.com/costgallo"><img src="https://avatars.githubusercontent.com/u/49433698?v=4?s=100" width="100px;" alt="Costanza"/><br /><sub><b>Costanza</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=costgallo" title="Documentation">📖</a></td>
16741674
<td align="center" valign="top" width="14.28%"><a href="https://github.com/joaolago1113"><img src="https://avatars.githubusercontent.com/u/22820692?v=4?s=100" width="100px;" alt="joao"/><br /><sub><b>joao</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=joaolago1113" title="Documentation">📖</a></td>
16751675
<td align="center" valign="top" width="14.28%"><a href="http://p2p.org"><img src="https://avatars.githubusercontent.com/u/3310192?v=4?s=100" width="100px;" alt="Eugene"/><br /><sub><b>Eugene</b></sub></a><br /><a href="#content-rgb2hsl" title="Content">🖋</a></td>
1676-
<td align="center" valign="top" width="14.28%"><a href="http://www.danielgorbe.com"><img src="https://avatars.githubusercontent.com/u/36860942?v=4?s=100" width="100px;" alt="Dániel Görbe"/><br /><sub><b>Dániel Görbe</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=g0rbe" title="Documentation">📖</a></td>
1676+
<td align="center" valign="top" width="14.28%"><a href="https://www.gorbe.io"><img src="https://avatars.githubusercontent.com/u/36860942?v=4?s=100" width="100px;" alt="Dániel Görbe"/><br /><sub><b>Dániel Görbe</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=g0rbe" title="Documentation">📖</a></td>
16771677
<td align="center" valign="top" width="14.28%"><a href="https://blog.insubli.me"><img src="https://avatars.githubusercontent.com/u/41712656?v=4?s=100" width="100px;" alt="s-crypt"/><br /><sub><b>s-crypt</b></sub></a><br /><a href="#content-s-crypt" title="Content">🖋</a></td>
16781678
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tudorpintea999"><img src="https://avatars.githubusercontent.com/u/87604944?v=4?s=100" width="100px;" alt="iwantanode"/><br /><sub><b>iwantanode</b></sub></a><br /><a href="#content-tudorpintea999" title="Content">🖋</a></td>
16791679
<td align="center" valign="top" width="14.28%"><a href="https://github.com/shak58"><img src="https://avatars.githubusercontent.com/u/150069539?v=4?s=100" width="100px;" alt="shak58"/><br /><sub><b>shak58</b></sub></a><br /><a href="#content-shak58" title="Content">🖋</a></td>

docs/api-keys.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ We recommend setting this up when running the project locally, as we use the Git
1111
1212
```sh
1313
# .env Example:
14-
GITHUB_TOKEN_READ_ONLY=48f84de812090000demo00000000697cf6e6a059
14+
NEXT_PUBLIC_GITHUB_TOKEN_READ_ONLY=48f84de812090000demo00000000697cf6e6a059
1515
```
1616

1717
2. Add Etherscan API token (free)

docs/best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Markdown will be translated as whole pages of content, so no specific action is
8585
// Example
8686
import React, { useState, useEffect } from "react"
8787
88-
const ComponentName: React.FC = (props) => {
88+
const ComponentName = () => {
8989
// useState hook for managing state variables
9090
const [greeting, setGreeting] = useState("")
9191

docs/code-conventions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ For the props type signature use the naming convention `<ComponentName>Props` to
6161

6262
**Do not use `React.FC`** and instead annotate the props object directly. `React.FC` implies the `children` prop, but this is not always desired when there is a component that should not accept this prop. `React.FC` also does not allow for use of Generic types, or use of Generic type when doing type guarding like function overloading. It is also not generally recommended to use and [was removed from the create-react-app template](https://github.com/facebook/create-react-app/pull/8177).
6363

64-
A positive side-effect to directly annoting the props object is for IDE intellisense where you can view the props when hovering over the component name to see it's signature.
64+
A positive side-effect to directly annotating the props object is for IDE intellisense where you can view the props when hovering over the component name to see it's signature.
6565

6666
i.e. `const Component: ({ label, title, ...props }: ComponentProps) => React.JSX.Element`
6767

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"markdown-checker": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/markdownChecker.ts"
2121
},
2222
"dependencies": {
23-
"@chakra-ui/next-js": "^2.1.5",
2423
"@chakra-ui/react": "^2.8.0",
2524
"@crowdin/crowdin-api-client": "^1.25.0",
2625
"@docsearch/react": "^3.5.2",

public/content/about/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ This means the website needs to handle many different user journeys, from “a d
9595

9696
To make our work more accessible and to foster more community collaboration, the ethereum.org core team publishes an overview of our quarterly roadmap goals.
9797

98-
[View our 2023 Q1 product roadmap](https://github.com/ethereum/ethereum-org-website/issues/9090)
98+
[View our 2024 Q1 product roadmap](https://github.com/ethereum/ethereum-org-website/issues/12005)
9999

100100
**How's that sound?** We always appreciate feedback on our roadmap - if there's something you think we should work on, please let us know! We welcome ideas and PRs from anyone in the community.
101101

public/content/developers/docs/nodes-and-clients/nodes-as-a-service/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Here is a list of some of the most popular Ethereum node providers, feel free to
110110
- Analytics
111111
- [**BlockPI**](https://blockpi.io/)
112112
- [Docs](https://docs.blockpi.io/)
113-
- Fetures
113+
- Features
114114
- Robust & distributed node structure
115115
- Up to 40 HTTPS and WSS endpoints
116116
- Free signup package and monthly package

src/components/BannerGrid/index.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import React from "react"
22
import { Box, Flex, Grid, useToken } from "@chakra-ui/react"
33

4-
export type Props = {
5-
children: React.ReactNode
6-
}
4+
import { ChildOnlyProp } from "@/lib/types"
75

8-
export const Banner: React.FC<Props> = ({ children }) => {
6+
export const Banner = ({ children }: ChildOnlyProp) => {
97
return (
108
<Flex
119
w="full"
@@ -26,23 +24,23 @@ export const Banner: React.FC<Props> = ({ children }) => {
2624
)
2725
}
2826

29-
export const BannerBody: React.FC<Props> = ({ children }) => {
27+
export const BannerBody = ({ children }: ChildOnlyProp) => {
3028
return (
3129
<Box flex={4} p={10}>
3230
{children}
3331
</Box>
3432
)
3533
}
3634

37-
export const BannerImage: React.FC<Props> = ({ children }) => {
35+
export const BannerImage = ({ children }: ChildOnlyProp) => {
3836
return (
3937
<Flex justifyContent="end" flex={2} alignSelf="end">
4038
{children}
4139
</Flex>
4240
)
4341
}
4442

45-
export const BannerGrid: React.FC<Props> = ({ children }) => {
43+
export const BannerGrid = ({ children }: ChildOnlyProp) => {
4644
return (
4745
<Grid
4846
templateColumns={{
@@ -62,7 +60,7 @@ export const BannerGrid: React.FC<Props> = ({ children }) => {
6260
)
6361
}
6462

65-
export const BannerGridCell: React.FC<Props> = ({ children }) => {
63+
export const BannerGridCell = ({ children }: ChildOnlyProp) => {
6664
const [medBp, lgBp] = useToken("breakpoints", ["md", "lg"])
6765

6866
return (

src/components/BannerNotification/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import { Center, FlexProps, useMediaQuery } from "@chakra-ui/react"
33

44
import { lightTheme as oldTheme } from "../../theme"
55

6-
export interface IProps extends FlexProps {
6+
export type BannerNotificationProps = FlexProps & {
77
shouldShow?: boolean
88
}
99

10-
const BannerNotification: React.FC<IProps> = ({
10+
const BannerNotification = ({
1111
children,
1212
shouldShow = false,
1313
...props
14-
}) => {
14+
}: BannerNotificationProps) => {
1515
const [isLGScreen] = useMediaQuery(`min-width: ${oldTheme.breakpoints.l}`)
1616
return (
1717
<>

0 commit comments

Comments
 (0)