Skip to content

Commit bebc7b9

Browse files
minimalsmminimalsm
committed
Fix conflicts
2 parents 3dd7ce5 + ffba6a8 commit bebc7b9

File tree

608 files changed

+29241
-18926
lines changed

Some content is hidden

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

608 files changed

+29241
-18926
lines changed

‎.all-contributorsrc

Lines changed: 153 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7767,7 +7767,8 @@
77677767
"avatar_url": "https://avatars.githubusercontent.com/u/98348072?v=4",
77687768
"profile": "https://www.linkedin.com/in/lcalixxto/",
77697769
"contributions": [
7770-
"doc"
7770+
"doc",
7771+
"content"
77717772
]
77727773
},
77737774
{
@@ -8287,9 +8288,160 @@
82878288
"name": "Samuel Akinosho",
82888289
"avatar_url": "https://avatars.githubusercontent.com/u/39565075?v=4",
82898290
"profile": "http://www.samuelakinosho.com",
8291+
"contributions": [
8292+
"doc",
8293+
"code"
8294+
]
8295+
},
8296+
{
8297+
"login": "OdairTrujillo",
8298+
"name": "Odair Augusto Trujillo Orozco",
8299+
"avatar_url": "https://avatars.githubusercontent.com/u/45074733?v=4",
8300+
"profile": "https://odair.dev",
8301+
"contributions": [
8302+
"doc",
8303+
"ideas"
8304+
]
8305+
},
8306+
{
8307+
"login": "Unforkable",
8308+
"name": "Unforkable",
8309+
"avatar_url": "https://avatars.githubusercontent.com/u/86481149?v=4",
8310+
"profile": "https://github.com/Unforkable",
8311+
"contributions": [
8312+
"doc"
8313+
]
8314+
},
8315+
{
8316+
"login": "Rodrigolvc",
8317+
"name": "Rodrigo vasquez",
8318+
"avatar_url": "https://avatars.githubusercontent.com/u/108540208?v=4",
8319+
"profile": "https://github.com/Rodrigolvc",
8320+
"contributions": [
8321+
"doc",
8322+
"ideas"
8323+
]
8324+
},
8325+
{
8326+
"login": "michaelmccallam",
8327+
"name": "Michael McCallam",
8328+
"avatar_url": "https://avatars.githubusercontent.com/u/3510607?v=4",
8329+
"profile": "https://github.com/michaelmccallam",
8330+
"contributions": [
8331+
"doc"
8332+
]
8333+
},
8334+
{
8335+
"login": "PolinaShanti",
8336+
"name": "Polina G.",
8337+
"avatar_url": "https://avatars.githubusercontent.com/u/110098268?v=4",
8338+
"profile": "https://nownodes.io/",
8339+
"contributions": [
8340+
"doc"
8341+
]
8342+
},
8343+
{
8344+
"login": "Cerebro92",
8345+
"name": "Neeraj Gahlot",
8346+
"avatar_url": "https://avatars.githubusercontent.com/u/13215478?v=4",
8347+
"profile": "https://github.com/Cerebro92",
8348+
"contributions": [
8349+
"doc",
8350+
"bug"
8351+
]
8352+
},
8353+
{
8354+
"login": "vrinek",
8355+
"name": "Kostas",
8356+
"avatar_url": "https://avatars.githubusercontent.com/u/81346?v=4",
8357+
"profile": "https://github.com/vrinek",
8358+
"contributions": [
8359+
"doc"
8360+
]
8361+
},
8362+
{
8363+
"login": "rogueassasin1729",
8364+
"name": "rogueassasin1729",
8365+
"avatar_url": "https://avatars.githubusercontent.com/u/92800000?v=4",
8366+
"profile": "https://github.com/rogueassasin1729",
8367+
"contributions": [
8368+
"doc"
8369+
]
8370+
},
8371+
{
8372+
"login": "Pandapip1",
8373+
"name": "Pandapip1",
8374+
"avatar_url": "https://avatars.githubusercontent.com/u/45835846?v=4",
8375+
"profile": "https://pandapip1.com/",
8376+
"contributions": [
8377+
"doc"
8378+
]
8379+
},
8380+
{
8381+
"login": "Aldizh",
8382+
"name": "Aldi Zhupani",
8383+
"avatar_url": "https://avatars.githubusercontent.com/u/2282120?v=4",
8384+
"profile": "http://aldizh.github.io/",
8385+
"contributions": [
8386+
"bug",
8387+
"code"
8388+
]
8389+
},
8390+
{
8391+
"login": "linhuatan",
8392+
"name": "linhuatan",
8393+
"avatar_url": "https://avatars.githubusercontent.com/u/94831627?v=4",
8394+
"profile": "https://github.com/linhuatan",
8395+
"contributions": [
8396+
"doc"
8397+
]
8398+
},
8399+
{
8400+
"login": "hughcrt",
8401+
"name": "Hugh",
8402+
"avatar_url": "https://avatars.githubusercontent.com/u/24587702?v=4",
8403+
"profile": "http://hugh.sh",
82908404
"contributions": [
82918405
"doc"
82928406
]
8407+
},
8408+
{
8409+
"login": "z3zzz",
8410+
"name": "Kim Kwangtae",
8411+
"avatar_url": "https://avatars.githubusercontent.com/u/91174156?v=4",
8412+
"profile": "https://github.com/z3zzz",
8413+
"contributions": [
8414+
"content"
8415+
]
8416+
},
8417+
{
8418+
"login": "tobi4021",
8419+
"name": "tobi4021",
8420+
"avatar_url": "https://avatars.githubusercontent.com/u/84390698?v=4",
8421+
"profile": "https://github.com/tobi4021",
8422+
"contributions": [
8423+
"doc"
8424+
]
8425+
},
8426+
{
8427+
"login": "lonelyotter",
8428+
"name": "Haochen Song",
8429+
"avatar_url": "https://avatars.githubusercontent.com/u/57280827?v=4",
8430+
"profile": "https://github.com/lonelyotter",
8431+
"contributions": [
8432+
"doc",
8433+
"translation"
8434+
]
8435+
},
8436+
{
8437+
"login": "opensourcex123",
8438+
"name": "N Fx",
8439+
"avatar_url": "https://avatars.githubusercontent.com/u/73230562?v=4",
8440+
"profile": "https://github.com/opensourcex123",
8441+
"contributions": [
8442+
"doc",
8443+
"translation"
8444+
]
82938445
}
82948446
],
82958447
"contributorsPerLine": 7,

‎README.md

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
12521252
<td align="center"><a href="https://www.youtube.com/c/Cryptoversidad"><img src="https://avatars.githubusercontent.com/u/107050863?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cryptoversidad</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=cryptoversidad" title="Documentation">📖</a></td>
12531253
<td align="center"><a href="https://disconnect3d.pl/"><img src="https://avatars.githubusercontent.com/u/10009354?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Disconnect3d</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=disconnect3d" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Adisconnect3d" title="Bug reports">🐛</a></td>
12541254
<td align="center"><a href="http://setharielgreen.com"><img src="https://avatars.githubusercontent.com/u/9850322?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Seth Ariel Green</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=setgree" title="Documentation">📖</a></td>
1255-
<td align="center"><a href="https://www.linkedin.com/in/lcalixxto/"><img src="https://avatars.githubusercontent.com/u/98348072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luisa Calixto</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lcalixxto" title="Documentation">📖</a></td>
1255+
<td align="center"><a href="https://www.linkedin.com/in/lcalixxto/"><img src="https://avatars.githubusercontent.com/u/98348072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Luisa Calixto</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lcalixxto" title="Documentation">📖</a> <a href="#content-lcalixxto" title="Content">🖋</a></td>
12561256
</tr>
12571257
<tr>
12581258
<td align="center"><a href="https://github.com/theanneli"><img src="https://avatars.githubusercontent.com/u/106612248?v=4?s=100" width="100px;" alt=""/><br /><sub><b>theanneli</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=theanneli" title="Documentation">📖</a></td>
@@ -1324,7 +1324,29 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
13241324
<td align="center"><a href="https://github.com/gorondan"><img src="https://avatars.githubusercontent.com/u/97026899?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gorondan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=gorondan" title="Documentation">📖</a></td>
13251325
<td align="center"><a href="https://github.com/pruthvirajjadhav1"><img src="https://avatars.githubusercontent.com/u/73253354?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pruthviraj Jadhav</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=pruthvirajjadhav1" title="Documentation">📖</a></td>
13261326
<td align="center"><a href="https://gndx.io"><img src="https://avatars.githubusercontent.com/u/10554486?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Oscar Barajas Tavares</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=gndx" title="Documentation">📖</a></td>
1327-
<td align="center"><a href="http://www.samuelakinosho.com"><img src="https://avatars.githubusercontent.com/u/39565075?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Samuel Akinosho</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=LucidSamuel" title="Documentation">📖</a></td>
1327+
<td align="center"><a href="http://www.samuelakinosho.com"><img src="https://avatars.githubusercontent.com/u/39565075?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Samuel Akinosho</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=LucidSamuel" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=LucidSamuel" title="Code">💻</a></td>
1328+
</tr>
1329+
<tr>
1330+
<td align="center"><a href="https://odair.dev"><img src="https://avatars.githubusercontent.com/u/45074733?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Odair Augusto Trujillo Orozco</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=OdairTrujillo" title="Documentation">📖</a> <a href="#ideas-OdairTrujillo" title="Ideas, Planning, & Feedback">🤔</a></td>
1331+
<td align="center"><a href="https://github.com/Unforkable"><img src="https://avatars.githubusercontent.com/u/86481149?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Unforkable</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Unforkable" title="Documentation">📖</a></td>
1332+
<td align="center"><a href="https://github.com/Rodrigolvc"><img src="https://avatars.githubusercontent.com/u/108540208?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rodrigo vasquez</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Rodrigolvc" title="Documentation">📖</a> <a href="#ideas-Rodrigolvc" title="Ideas, Planning, & Feedback">🤔</a></td>
1333+
<td align="center"><a href="https://github.com/michaelmccallam"><img src="https://avatars.githubusercontent.com/u/3510607?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michael McCallam</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=michaelmccallam" title="Documentation">📖</a></td>
1334+
<td align="center"><a href="https://nownodes.io/"><img src="https://avatars.githubusercontent.com/u/110098268?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Polina G.</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=PolinaShanti" title="Documentation">📖</a></td>
1335+
<td align="center"><a href="https://github.com/Cerebro92"><img src="https://avatars.githubusercontent.com/u/13215478?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neeraj Gahlot</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Cerebro92" title="Documentation">📖</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ACerebro92" title="Bug reports">🐛</a></td>
1336+
<td align="center"><a href="https://github.com/vrinek"><img src="https://avatars.githubusercontent.com/u/81346?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kostas</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vrinek" title="Documentation">📖</a></td>
1337+
</tr>
1338+
<tr>
1339+
<td align="center"><a href="https://github.com/rogueassasin1729"><img src="https://avatars.githubusercontent.com/u/92800000?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rogueassasin1729</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=rogueassasin1729" title="Documentation">📖</a></td>
1340+
<td align="center"><a href="https://pandapip1.com/"><img src="https://avatars.githubusercontent.com/u/45835846?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pandapip1</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Pandapip1" title="Documentation">📖</a></td>
1341+
<td align="center"><a href="http://aldizh.github.io/"><img src="https://avatars.githubusercontent.com/u/2282120?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aldi Zhupani</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AAldizh" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=Aldizh" title="Code">💻</a></td>
1342+
<td align="center"><a href="https://github.com/linhuatan"><img src="https://avatars.githubusercontent.com/u/94831627?v=4?s=100" width="100px;" alt=""/><br /><sub><b>linhuatan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=linhuatan" title="Documentation">📖</a></td>
1343+
<td align="center"><a href="http://hugh.sh"><img src="https://avatars.githubusercontent.com/u/24587702?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hugh</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=hughcrt" title="Documentation">📖</a></td>
1344+
<td align="center"><a href="https://github.com/z3zzz"><img src="https://avatars.githubusercontent.com/u/91174156?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kim Kwangtae</b></sub></a><br /><a href="#content-z3zzz" title="Content">🖋</a></td>
1345+
<td align="center"><a href="https://github.com/tobi4021"><img src="https://avatars.githubusercontent.com/u/84390698?v=4?s=100" width="100px;" alt=""/><br /><sub><b>tobi4021</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=tobi4021" title="Documentation">📖</a></td>
1346+
</tr>
1347+
<tr>
1348+
<td align="center"><a href="https://github.com/lonelyotter"><img src="https://avatars.githubusercontent.com/u/57280827?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Haochen Song</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=lonelyotter" title="Documentation">📖</a> <a href="#translation-lonelyotter" title="Translation">🌍</a></td>
1349+
<td align="center"><a href="https://github.com/opensourcex123"><img src="https://avatars.githubusercontent.com/u/73230562?v=4?s=100" width="100px;" alt=""/><br /><sub><b>N Fx</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=opensourcex123" title="Documentation">📖</a> <a href="#translation-opensourcex123" title="Translation">🌍</a></td>
13281350
</tr>
13291351
</table>
13301352

‎docs/best-practices.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ export default ComponentName
104104
## Styling
105105

106106
- `src/theme.ts` - Declares site color themes, breakpoints and other constants (try to utilize these colors first)
107-
- We use [styled-components](https://styled-components.com/)
107+
- We use [emotion](https://emotion.sh/)
108108

109109
- Tagged template literals are used to style custom components
110110

111111
```tsx
112-
// Example of styling syntax using styled-components
112+
// Example of styling syntax using emotion
113113
114-
import styled from "styled-components"
114+
import styled from "@emotion/styled"
115115
116116
const GenericButton = styled.div`
117117
width: 200px;
@@ -128,14 +128,12 @@ export default ComponentName
128128
// ie: <PrimaryButton>Text</PrimaryButton>
129129
```
130130

131-
- Recommended VS Code Plugin: `vscode-styled-components` <br>To install: Open VS Code > `Ctrl+P` / `Cmd+P` > Run: <br>`ext install vscode-styled-components`
132-
133131
- Values from `src/theme.ts` are automatically passed as a prop object to styled components
134132

135133
```tsx
136134
// Example of theme.ts usage
137135
138-
import styled from "styled-components"
136+
import styled from "@emotion/styled"
139137
140138
const Container = styled.div`
141139
background: ${(props) => props.theme.colors.background};

‎docs/chakra-migration-guide.md

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Chakra migration guide
2+
3+
This is a reference for migrating our current `styled` components from `emotion` to [Chakra](https://chakra-ui.com/) components.
4+
5+
This is part of our [UI library implementation epic](https://github.com/ethereum/ethereum-org-website/issues/6374).
6+
7+
## Replace styled components with Chakra components
8+
9+
All `styled` components need to be removed and replaced with the corresponded Chakra component. [See the list of components](https://chakra-ui.com/docs/components).
10+
11+
## Override styles using style props
12+
13+
- You can see how to use the different style props here: [https://chakra-ui.com/docs/styled-system/style-props](https://chakra-ui.com/docs/styled-system/style-props#margin-and-padding)
14+
- Chakra default values are documented here: [https://chakra-ui.com/docs/styled-system/theme](https://chakra-ui.com/docs/styled-system/theme)
15+
16+
```tsx
17+
// before
18+
const Paragraph = styled.p`
19+
font-size: 1rem;
20+
margin: 1rem;
21+
`
22+
23+
// now
24+
<Text fontSize="md" margin={4} />
25+
```
26+
27+
## Theme colors
28+
29+
All the previous colors defined in the old theme `src/theme.ts` were ported into the new theme as well. Use the same color variables.
30+
31+
```tsx
32+
// before
33+
const Text = styled.p`
34+
color: ${({ theme }) => theme.colors.primary};
35+
background-color: ${({ theme }) => theme.colors.background};
36+
`
37+
38+
// now
39+
<Text color="primary" bg="background" />
40+
```
41+
42+
<aside>
43+
💡 In the **next iteration** we will refactor all the colors with the correct color from the new Design System
44+
</aside>
45+
46+
## Update dependencies
47+
48+
- [Deprecated] `src/components/Icon` - use the [Chakra Icon](https://chakra-ui.com/docs/components/icon/usage) instead.
49+
50+
```tsx
51+
import { Icon } from "@chakra-ui/react"
52+
import { BsQuestionSquareFill } from "react-icons/bs"
53+
;<Icon as={BsQuestionSquareFill} />
54+
```
55+
56+
- [Deprecated]`src/components/SharedStyledComponents` - we are not using this anymore, use Chakra components instead.
57+
58+
## Do you have any other question?
59+
60+
Ping us in Discord, in the `#ui-library-migration` channel, or leave a comment here or in your opened PR, and we can help you out 💪

‎docs/typescript.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,24 @@ When we reach the moment where the entire codebase is in TS, we will enable `noI
99

1010
This is just starting, any suggestion is always welcomed and appreciated.
1111

12+
## Declaring types for variables
13+
14+
When declaring types for variables, you should only declare a type when it isn't obvious and the type can't be inferred.
15+
16+
```
17+
// Do not use
18+
const someVar: string = 'string'
19+
20+
// Use
21+
const someVar = 'string'
22+
```
23+
24+
Do declare a type for an unassigned variable when a type can not be inferred.
25+
26+
```
27+
const someVar: string
28+
```
29+
1230
## Migration guide & contribution opportunity 🎉
1331

1432
We'd love your help in migrating our codebase!

‎gatsby-config.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,19 @@ const config: GatsbyConfig = {
185185
},
186186
},
187187
// CSS in JS
188-
`gatsby-plugin-styled-components`,
188+
{
189+
resolve: `gatsby-plugin-emotion`,
190+
options: {
191+
labelFormat: "[filename]--[local]",
192+
},
193+
},
194+
{
195+
resolve: "@chakra-ui/gatsby-plugin",
196+
options: {
197+
resetCSS: false,
198+
isUsingColorMode: true,
199+
},
200+
},
189201
// Source assets
190202
{
191203
resolve: `gatsby-source-filesystem`,

‎gatsby-node.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -435,14 +435,11 @@ export const onPostBootstrap: GatsbyNode["onPostBootstrap"] = ({ actions }) => {
435435
}
436436

437437
export const createSchemaCustomization: GatsbyNode["createSchemaCustomization"] =
438-
({ actions, schema }) => {
438+
({ actions }) => {
439439
const { createTypes } = actions
440-
const { sdls, builders } = Schema
440+
const { sdls } = Schema
441441

442-
createTypes([
443-
...Object.keys(sdls).map((sdlKey) => sdls[sdlKey]),
444-
schema.buildObjectType(builders.WalletsCsv),
445-
])
442+
createTypes([...Object.keys(sdls).map((sdlKey) => sdls[sdlKey])])
446443
}
447444

448445
export const onPreBootstrap: GatsbyNode["onPreBootstrap"] = ({ reporter }) => {

0 commit comments

Comments
 (0)