Skip to content

Commit f7dabf9

Browse files
committed
Merge branch 'dev' into novemberUpdateFinnish
2 parents 837bd0a + 934ab05 commit f7dabf9

File tree

39 files changed

+176
-223
lines changed

39 files changed

+176
-223
lines changed

.all-contributorsrc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9599,6 +9599,42 @@
95999599
"contributions": [
96009600
"doc"
96019601
]
9602+
},
9603+
{
9604+
"login": "dgcoffman",
9605+
"name": "Daniel Coffman",
9606+
"avatar_url": "https://avatars.githubusercontent.com/u/1711204?v=4",
9607+
"profile": "http://dancoffman.com",
9608+
"contributions": [
9609+
"doc"
9610+
]
9611+
},
9612+
{
9613+
"login": "Amit0617",
9614+
"name": "AMIT KUMAR MISHRA",
9615+
"avatar_url": "https://avatars.githubusercontent.com/u/71893015?v=4",
9616+
"profile": "https://github.com/Amit0617",
9617+
"contributions": [
9618+
"doc"
9619+
]
9620+
},
9621+
{
9622+
"login": "Saksham010",
9623+
"name": "Saksham Thapa",
9624+
"avatar_url": "https://avatars.githubusercontent.com/u/56692835?v=4",
9625+
"profile": "https://github.com/Saksham010",
9626+
"contributions": [
9627+
"bug"
9628+
]
9629+
},
9630+
{
9631+
"login": "vjgaur",
9632+
"name": "Vijayendra Gaur",
9633+
"avatar_url": "https://avatars.githubusercontent.com/u/1871257?v=4",
9634+
"profile": "https://github.com/vjgaur",
9635+
"contributions": [
9636+
"doc"
9637+
]
96029638
}
96039639
],
96049640
"contributorsPerLine": 7,

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,6 +1510,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
15101510
<tr>
15111511
<td align="center"><a href="https://github.com/owenHwang"><img src="https://avatars.githubusercontent.com/u/112543777?v=4?s=100" width="100px;" alt="Owen Hwang"/><br /><sub><b>Owen Hwang</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=owenHwang" title="Documentation">📖</a></td>
15121512
<td align="center"><a href="https://github.com/florath"><img src="https://avatars.githubusercontent.com/u/11856543?v=4?s=100" width="100px;" alt="Andreas Florath"/><br /><sub><b>Andreas Florath</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=florath" title="Documentation">📖</a></td>
1513+
<td align="center"><a href="http://dancoffman.com"><img src="https://avatars.githubusercontent.com/u/1711204?v=4?s=100" width="100px;" alt="Daniel Coffman"/><br /><sub><b>Daniel Coffman</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=dgcoffman" title="Documentation">📖</a></td>
1514+
<td align="center"><a href="https://github.com/Amit0617"><img src="https://avatars.githubusercontent.com/u/71893015?v=4?s=100" width="100px;" alt="AMIT KUMAR MISHRA"/><br /><sub><b>AMIT KUMAR MISHRA</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Amit0617" title="Documentation">📖</a></td>
1515+
<td align="center"><a href="https://github.com/Saksham010"><img src="https://avatars.githubusercontent.com/u/56692835?v=4?s=100" width="100px;" alt="Saksham Thapa"/><br /><sub><b>Saksham Thapa</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ASaksham010" title="Bug reports">🐛</a></td>
1516+
<td align="center"><a href="https://github.com/vjgaur"><img src="https://avatars.githubusercontent.com/u/1871257?v=4?s=100" width="100px;" alt="Vijayendra Gaur"/><br /><sub><b>Vijayendra Gaur</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vjgaur" title="Documentation">📖</a></td>
15131517
</tr>
15141518
</tbody>
15151519
</table>

docs/deploy-and-review-process.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Deploy and review process
2+
3+
This documentation outlines our current processes for how we deploy the latest changes to ethereum.org, and how we prioritize items in our review process.
4+
5+
## Deploy process
6+
7+
Anything merged into the `dev` branch of [ethereum.org](http://ethereum.org) will go live on ethereum.org at the next release. Currently, we deploy the latest changes to [ethereum.org](http://ethereum.org) twice per week (Monday and Thursday). When deploying, we merge the `dev` branch into the `master` branch. The `master` branch is the latest live version of [ethereum.org](https://ethereum.org).
8+
9+
Occasionally, we’ll also do a patch deploy to fix an urgent or widespread issue.
10+
11+
## Review process
12+
13+
### General review process
14+
15+
We use a first-in, first-out system for reviewing pull requests. The longer a pull request has been open, the higher priority it is for our team to review. In some cases—for example, fixing a high-priority issue or merging low-hanging fruit for a deploy—we will stray from this process and use our best judgement to get higher-impact changes deployed more quickly.
16+
17+
We aim to have every new PR merged or closed within 30 days of opening. As outlined in the following sections, different types of pull requests do have different levels of priority, and this may influence how promptly a pull request is acted on.
18+
19+
### Translations
20+
21+
Translation pull requests are considered high priority. These are when the translated and reviewed files from our translation management platform are submitted as a pull request. They are important to our core value of bringing Ethereum education to as many languages as possible. They also are the accumulation of months of work by translators and reviewers, and any delay to this already long process is undesirable.
22+
23+
**Timeline:** PRs should be merged within 1-4 days of opening (by the next release).
24+
25+
### Feature and bug fixes
26+
27+
Any new feature correlated to an approved issue or bug fix is high-priority. Similar to translators, code contributors dedicate a large amount of their time to improving [ethereum.org](http://ethereum.org) as a resource and addressing their efforts quickly is desirable. All bug fixes should be handled swiftly, but new features that were not discussed, requested or approved do not fall under this timeline.
28+
29+
**Timeline:** Features or bug fixes should be reviewed within 1-12 days. In the case of bugs, more severe bugs will be reviewed more promptly.
30+
31+
### Content
32+
33+
Content PRs are considered medium-priority. Depending on their content, they can be very high-impact but also a high effort to go through the various stages of content review to ensure the content meets the standards we aim for. Content PRs can be broken into two categories: major content (e.g. a new page) and minor content changes (e.g. a new section to an existing page). Typo or grammar fixes are considered separately.
34+
35+
**Timeline:** Major content should be merged within 15-30 days of opening. Minor content changes within 5-15 days of opening.
36+
37+
### Typographical and grammatical errors
38+
39+
Typographical and grammatical errors are medium-priority as small errors of this kind can have second-order ramifications for the linguists of the ~50 languages we currently translate to. Though technically a subgroup of ‘content PRs’, typos and grammar errors take significantly less time to review and, as a result, are treated differently.
40+
41+
**Timeline:** Typo or grammar pull requests should be merged within 1-8 days of opening.
42+
43+
### Adding products
44+
45+
Adding new products is currently a low-to-medium priority (depending on the type of product). These pull requests often take a long time to review as we must extensively research products to ensure we not sending our users to any dubious or unsafe products.
46+
47+
**Timeline:** PRs should be closed or merged within 30 days of opening.
48+
49+
### Adding tutorials
50+
51+
Adding new tutorials to [ethereum.org](http://ethereum.org) is currently low-priority. We are currently in the middle of an epic to revamp our tutorials. As part of this, we’ll be reviewing our existing tutorials, purging outdated or low-quality tutorials, and refining our listing criteria for future tutorials to meet our increased standards. Please always create an issue to discuss the usefulness of your proposed tutorial before opening a PR.
52+
53+
**Timeline:** PRs should be closed or merged within 30 days of opening.

docs/stack.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- [Gatsby Docs](https://www.gatsbyjs.org/docs/)
1010
- [React](https://reactjs.org/) - A JavaScript library for building component-based user interfaces
1111
- [Typescript](https://www.typescriptlang.org/) - TypeScript is a strongly typed programming language that builds on JavaScript
12+
- [Chakra UI](https://chakra-ui.com/) - A UI library (Migration in progress)
1213
- [GraphQL](https://graphql.org/) - A query language for APIs
1314
- [Algolia](https://www.algolia.com/) - Site indexing, rapid intra-site search results, and search analytics. [Learn more on how we implement Algolia for site search](./docs/ALGOLIA_DOCSEARCH.md).
1415
- Primary implementation: `/src/components/Search/index.ts`

src/components/FeedbackWidget.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ const FeedbackWidget: React.FC<FeedbackWidgetProps> = ({ location = "" }) => {
104104

105105
const handleClose = (): void => {
106106
setIsOpen(false)
107-
setIsExpanded(false)
108107
trackCustomEvent({
109108
eventCategory: `FeedbackWidget toggled`,
110109
eventAction: `Clicked`,
@@ -113,6 +112,7 @@ const FeedbackWidget: React.FC<FeedbackWidgetProps> = ({ location = "" }) => {
113112
}
114113
const handleOpen = (): void => {
115114
setIsOpen(true)
115+
setIsExpanded(false)
116116
trackCustomEvent({
117117
eventCategory: `FeedbackWidget toggled`,
118118
eventAction: `Clicked`,
@@ -171,7 +171,7 @@ const FeedbackWidget: React.FC<FeedbackWidgetProps> = ({ location = "" }) => {
171171
alignItems="center"
172172
display={{ base: "none", lg: isExpanded ? "flex" : "none" }}
173173
>
174-
<Translation id="feedback-card-prompt-page" />
174+
<Translation id="feedback-widget-prompt" />
175175
</Text>
176176
</ScaleFade>
177177
)}

src/components/TranslationChartImage.tsx

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,41 @@
11
import React from "react"
2-
import { Flex, Image } from "@chakra-ui/react"
3-
import { useColorMode } from "@chakra-ui/react"
2+
import { Image, useColorModeValue } from "@chakra-ui/react"
43
import { useStaticQuery, graphql } from "gatsby"
54
import { GatsbyImage } from "gatsby-plugin-image"
65
import { getImage } from "../utils/image"
76

87
export interface IProps {}
98

109
const TranslationChartImage: React.FC<IProps> = () => {
11-
const { colorMode } = useColorMode()
12-
const isDarkTheme = colorMode === "dark"
13-
1410
const data = useStaticQuery(graphql`
1511
{
1612
pageviewsLight: file(
1713
relativePath: { eq: "translation-program/pageviews-light.png" }
1814
) {
1915
childImageSharp {
20-
gatsbyImageData(
21-
height: 500
22-
layout: FIXED
23-
placeholder: BLURRED
24-
quality: 100
25-
)
16+
gatsbyImageData(height: 500, placeholder: BLURRED, quality: 100)
2617
}
2718
}
2819
pageviewsDark: file(
2920
relativePath: { eq: "translation-program/pageviews-dark.png" }
3021
) {
3122
childImageSharp {
32-
gatsbyImageData(
33-
height: 500
34-
layout: FIXED
35-
placeholder: BLURRED
36-
quality: 100
37-
)
23+
gatsbyImageData(height: 500, placeholder: BLURRED, quality: 100)
3824
}
3925
}
4026
}
4127
`)
4228

43-
const ethImage = isDarkTheme ? data.pageviewsDark : data.pageviewsLight
29+
const ethImage = useColorModeValue(data.pageviewsLight, data.pageviewsDark)
4430

4531
return (
46-
<Flex justifyContent="center" objectFit="contain">
47-
<Image
48-
as={GatsbyImage}
49-
image={getImage(ethImage)!}
50-
alt=""
51-
fit="contain"
52-
minW="263px"
53-
/>
54-
</Flex>
32+
<Image
33+
as={GatsbyImage}
34+
image={getImage(ethImage)!}
35+
alt=""
36+
fit="contain"
37+
minW="263px"
38+
/>
5539
)
5640
}
5741

src/content/developers/docs/nodes-and-clients/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Each client has unique use cases and advantages, so you should choose one based
155155

156156
Hyperledger Besu is an enterprise-grade Ethereum client for public and permissioned networks. It runs all of the Ethereum Mainnet features, from tracing to GraphQL, has extensive monitoring and is supported by ConsenSys, both in open community channels and through commercial SLAs for enterprises. It is written in Java and is Apache 2.0 licensed.
157157

158-
Besu's extensive [documentation](https://besu.hyperledger.org/en/stable/) will guide you trough all details on its features and setups.
158+
Besu's extensive [documentation](https://besu.hyperledger.org/en/stable/) will guide you through all details on its features and setups.
159159

160160
### Erigon {#erigon}
161161

src/content/developers/docs/programming-languages/rust/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Need a more basic primer first? Check out [ethereum.org/learn](/learn/) or [ethe
3838
- [pwasm_ethereum externs library to interact with Ethereum-like network](https://github.com/openethereum/pwasm-ethereum)
3939
- [Build A Decentralized Chat Using JavaScript and Rust](https://medium.com/perlin-network/build-a-decentralized-chat-using-javascript-rust-webassembly-c775f8484b52)
4040
- [Build a Decentralized Todo App Using Vue.js & Rust](https://medium.com/@jjmace01/build-a-decentralized-todo-app-using-vue-js-rust-webassembly-5381a1895beb)
41-
- [Getting Started with Enigma - In Rust Programming Language](https://blog.enigma.co/getting-started-with-discovery-the-rust-programming-language-4d1e0b06de15)
41+
4242
- [An Intro to Secret Contracts](https://blog.enigma.co/getting-started-with-enigma-an-intro-to-secret-contracts-cdba4fe501c2)
4343
- [Build a blockchain in Rust](https://blog.logrocket.com/how-to-build-a-blockchain-in-rust/)
4444

0 commit comments

Comments
 (0)