Skip to content

Commit 2231780

Browse files
committed
Merge branch 'dev' into yt/migrate-product-card
2 parents 14ab785 + dfe8d57 commit 2231780

33 files changed

+345
-122
lines changed

.eslintrc.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@
6565
"varsIgnorePattern": "^_$"
6666
}
6767
],
68-
"unused-imports/no-unused-imports-ts": "warn"
68+
"unused-imports/no-unused-imports-ts": "warn",
69+
"no-restricted-imports": [
70+
"warn",
71+
{
72+
"paths": [
73+
{
74+
"name": "react-i18next",
75+
"message": "Please use next-i18next instead of react-i18next."
76+
}
77+
]
78+
}
79+
]
6980
}
7081
}

.storybook/i18next.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import i18n, { Resource } from "i18next"
2+
// eslint-disable-next-line no-restricted-imports
23
import { initReactI18next } from "react-i18next"
34

45
export const baseLocales = {

.storybook/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// eslint-disable-next-line no-restricted-imports
12
import { getI18n } from "react-i18next"
23

34
import { ns as exposedNs } from "./i18next"

CODE_OF_CONDUCT.md

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Code of conduct
2+
3+
## Mission
4+
5+
To develop and maintain the most comprehensive and accessible knowledge hub for Ethereum.
6+
7+
## Values
8+
9+
The ethereum.org community strives to be:
10+
11+
- educational, intended to help everyone to understand Ethereum
12+
- inclusive
13+
- accessible
14+
- community-driven
15+
- focused on Ethereum’s underlying technology and use-cases
16+
- focused on Ethereum concepts and design principles
17+
18+
## What we are not
19+
20+
- The Ethereum Foundation website
21+
- A platform for promoting investments or profiteering of any kind
22+
- A platform for elevating or endorsing individual projects or organizations
23+
- A DEX, CEX or any other form of financial platform
24+
- A platform that gives financial or legal advice of any kind
25+
26+
## Code of conduct
27+
28+
### Pledge
29+
30+
Open participation is core to the ethereum.org ethos. We are a website and community maintained by thousands of contributors, and this is only possible if we maintain a welcoming, participatory environment. To this end, contributors to this site pledge to maintain a harassment-free environment for all participants across all ethereum.org platforms and community spaces. The ethereum.org community welcomes and values anyone who wants to participate in a constructive and friendly way, regardless of age, disability, ethnicity, sex characteristics, gender identity, level of experience, area of expertise, education, socio-economic status, nationality, personal appearance, race, religion or any other dimension of diversity.
31+
32+
### Scope
33+
34+
This Code of Conduct applies to all ethereum.org spaces (such as GitHub, Discord, Figma, Crowdin, Twitter and other online platforms), and it also applies when the community is represented in real-world public spaces such as at meetups, conferences and events.
35+
36+
### Our standards
37+
38+
Examples of behavior that contributes to creating a positive environment include:
39+
40+
- Using welcoming and inclusive language
41+
- Being respectful of differing viewpoints and experiences
42+
- Gracefully accepting and/or empathetically providing constructive criticism
43+
- Acting calmly and professionally when resolving conflicts or disagreements
44+
- Showing empathy and tolerance towards other community members
45+
- Encouraging and amplifying new voices in the community
46+
47+
Examples of unacceptable behavior by participants include:
48+
49+
- Physical violence, threatening physical violence or encouraging of physical violence of any kind
50+
- Using sexualized language or imagery or imposing unwelcome sexual attention
51+
- Impersonating another individual or otherwise dishonestly claiming affiliation with some individual or organization
52+
- Trolling, insulting/derogatory comments, and personal or political attacks
53+
- Harassing other community members in public or private channels
54+
- Publishing others’ private information, such as a physical or electronic address, without explicit permission
55+
- Social engineering, scamming or otherwise manipulating other community members
56+
- Promoting investments, tokens, projects or anything else for personal monetary or non-monetary gain
57+
- Spamming servers with off-topic content
58+
- Disregarding requests or warnings from community moderators
59+
- Engaging in other conduct which could reasonably be considered inappropriate in a professional setting
60+
61+
### Reporting
62+
63+
Violations of the code of conduct will normally be visible to the community as we try to do everything in open, public channels, allowing community members to self-police.
64+
65+
However, if something happens that you feel needs attention, you can raise it with someone who has a moderation role (e.g. discord guide) so that they can help investigate and execute the appropriate response.
66+
67+
When reporting, please include as much detail as possible, including specific examples and timestamps. This will help to ensure a fair outcome.
68+
69+
### Enforcement
70+
71+
Depending on the severity, people who violate the code of conduct can receive warnings, temporary bans or permanent bans from ethereum.org communities.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "9.0.0",
3+
"version": "9.0.1",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

public/content/developers/docs/ides/index.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ Most established IDEs have built plugins to enhance the Ethereum development exp
4141
- [Code samples](https://github.com/Azure-Samples/blockchain/blob/master/blockchain-workbench/application-and-smart-contract-samples/readme.md)
4242
- [GitHub](https://github.com/microsoft/vscode)
4343

44-
**Atom -** **_A hackable text editor for the 21st Century_**
45-
46-
- [Atom](https://atom.io/)
47-
- [GitHub](https://github.com/atom)
48-
- [Ethereum packages](https://atom.io/packages/search?utf8=%E2%9C%93&q=keyword%3Aethereum&commit=Search)
49-
5044
**JetBrains IDEs (IntelliJ IDEA, etc.) -** **_Essential tools for software developers and teams_**
5145

5246
- [JetBrains](https://www.jetbrains.com/)

src/components/Banners/BugBountyBanner/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Libraries
22
import React from "react"
3-
import { Center, Text } from "@chakra-ui/react"
43

54
// Components
65
import BannerNotification from "@/components/Banners/BannerNotification"
6+
import { Center } from "@/components/ui/flex"
77

88
const BugBountyBanner = () => (
99
<BannerNotification shouldShow>
1010
<Center>
11-
<Text m={0} p={0}>
11+
<p>
1212
All Dencun-related bounties currently receive a 2x bonus multiplier (up
1313
to 500,000 USD) up to two weeks before the scheduled mainnet hardfork.
14-
</Text>
14+
</p>
1515
</Center>
1616
</BannerNotification>
1717
)

src/components/Banners/UpgradeBannerNotification.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
import { Box } from "@chakra-ui/react"
2-
31
import Emoji from "../Emoji"
4-
import InlineLink from "../Link"
2+
import InlineLink from "../ui/Link"
53

64
import BannerNotification from "./BannerNotification"
75

86
const UpgradeBannerNotification = () => (
97
<BannerNotification shouldShow>
108
<Emoji text=":megaphone:" className="me-4 flex-shrink-0 text-2xl" />
11-
<Box>
9+
<div>
1210
<b>
1311
We&apos;ve deprecated our use of &apos;Eth1&apos; and &apos;Eth2&apos;
1412
terms.
1513
</b>{" "}
1614
<InlineLink href="https://blog.ethereum.org/2022/01/24/the-great-eth2-renaming/">
1715
Read the full announcement
1816
</InlineLink>
19-
</Box>
17+
</div>
2018
</BannerNotification>
2119
)
2220

src/components/CopyToClipboard.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import { Box, useClipboard } from "@chakra-ui/react"
1+
import { cn } from "@/lib/utils/cn"
2+
3+
import { useClipboard } from "@/hooks/useClipboard"
24

35
export type CopyToClipboardProps = {
46
text: string
@@ -11,16 +13,15 @@ const CopyToClipboard = ({
1113
text,
1214
inline = false,
1315
}: CopyToClipboardProps) => {
14-
const { onCopy, hasCopied } = useClipboard(text, { timeout: 1500 })
16+
const { onCopy, hasCopied } = useClipboard({ timeout: 1500 })
1517

1618
return (
17-
<Box
18-
cursor="pointer"
19-
onClick={onCopy}
20-
display={inline ? "inline" : "block"}
19+
<div
20+
className={cn("cursor-pointer", inline ? "inline" : "block")}
21+
onClick={() => onCopy(text)}
2122
>
2223
{children(hasCopied)}
23-
</Box>
24+
</div>
2425
)
2526
}
2627

src/components/DevconGrantsBanner.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { Text } from "@chakra-ui/react"
2-
31
import DismissableBanner from "@/components/Banners/DismissableBanner"
42
import Emoji from "@/components/Emoji"
5-
import Link from "@/components/Link"
3+
4+
import { BaseLink } from "./ui/Link"
65

76
type DevconGrantsBannerProps = {
87
pathname: string
@@ -12,14 +11,14 @@ const DevconGrantsBanner = ({ pathname }: DevconGrantsBannerProps) => {
1211
if (pathname.includes("community") && pathname.includes("events")) {
1312
return (
1413
<DismissableBanner storageKey="devconGrants">
15-
<Text m={0}>
14+
<p>
1615
The Road to Devcon Grants support Ethereum education initiatives in
1716
and close to Southeast Asia <Emoji text="🦄" /> <Emoji text="🌏" />{" "}
1817
Learn more{" "}
19-
<Link href="https://esp.ethereum.foundation/devcon-grants">
18+
<BaseLink href="https://esp.ethereum.foundation/devcon-grants">
2019
here.
21-
</Link>
22-
</Text>
20+
</BaseLink>
21+
</p>
2322
</DismissableBanner>
2423
)
2524
}

0 commit comments

Comments
 (0)