Skip to content

Commit

Permalink
Merge branch 'dev' into shadcn-feedback-card
Browse files Browse the repository at this point in the history
  • Loading branch information
wackerow committed Aug 13, 2024
2 parents b9c37d5 + a3b6413 commit bbb3ca9
Show file tree
Hide file tree
Showing 66 changed files with 5,602 additions and 3,165 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -12389,6 +12389,15 @@
"contributions": [
"bug"
]
},
{
"login": "zaryab2000",
"name": "Zaryab",
"avatar_url": "https://avatars.githubusercontent.com/u/42082608?v=4",
"profile": "https://www.zaryabs.com/",
"contributions": [
"content"
]
}
],
"contributorsPerLine": 7,
Expand Down
55 changes: 12 additions & 43 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@
"env": {
"es6": true
},
"plugins": [
"simple-import-sort",
"@typescript-eslint",
"unused-imports"
],
"plugins": ["simple-import-sort", "@typescript-eslint", "unused-imports"],
"parser": "@typescript-eslint/parser",
"rules": {
"simple-import-sort/imports": [
Expand All @@ -26,55 +22,29 @@
],
// Packages. `react` related packages come first.
// Also, put `react-icons` in sorting order not with `react`
[
"^react(?!-.)$",
"^\\w",
"^@\\w"
],
["^react(?!-.)$", "^\\w", "^@\\w"],
// The Chakra theme directory if imported to story file or other places
[
"^@/@chakra-ui"
],
["^@/@chakra-ui"],
// From the `types` directory.
[
"^@/lib/types",
"^@/lib/interfaces"
],
["^@/lib/types", "^@/lib/interfaces"],
// From the `components` directory.
[
"^@/components"
],
["^@/components"],
// From the `utils` directory.
[
"^@/lib/utils"
],
["^@/lib/utils"],
// From the `data` directory.
[
"^@/data"
],
["^@/data"],
// From the `constants` directory.
["^@/lib/constants"],
// From the `.storybook/utils` file
["^@/storybook-utils"],
// Parent imports. Put `..` last.
[
"^\\.\\.(?!/?$)",
"^\\.\\./?$"
],
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
// Other relative imports. Put same-folder imports and `.` last.
[
"^\\./(?=.*/)(?!/?$)",
"^\\.(?!/?$)",
"^\\./?$"
],
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
// Style imports.
[
"^.+\\.s?css$"
],
["^.+s?css$"],
// Side effect imports.
[
"^\\u0000"
]
["^\\u0000"]
]
}
],
Expand All @@ -89,7 +59,7 @@
],
"unused-imports/no-unused-vars": [
"error",
{
{
"args": "all",
"argsIgnorePattern": "^_$",
"varsIgnorePattern": "^_$"
Expand All @@ -98,4 +68,3 @@
"unused-imports/no-unused-imports-ts": "warn"
}
}

2 changes: 2 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import ThemeProvider from "@/components/ThemeProvider"

import i18n, { baseLocales } from "./i18next"

import "@docsearch/css"
import "../src/styles/global.css"
import "../src/styles/fonts.css"
import "../src/styles/docsearch.css"

MotionGlobalConfig.skipAnimations = isChromatic()

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1894,6 +1894,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tr1sm0s1n"><img src="https://avatars.githubusercontent.com/u/47410557?v=4?s=100" width="100px;" alt="Mobin Mohanan"/><br /><sub><b>Mobin Mohanan</b></sub></a><br /><a href="#content-tr1sm0s1n" title="Content">🖋</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Baystef"><img src="https://avatars.githubusercontent.com/u/36106823?v=4?s=100" width="100px;" alt="Adebayo Steve"/><br /><sub><b>Adebayo Steve</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Baystef" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sanjanaynvsdl"><img src="https://avatars.githubusercontent.com/u/142678317?v=4?s=100" width="100px;" alt="Sanjana"/><br /><sub><b>Sanjana</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asanjanaynvsdl" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.zaryabs.com/"><img src="https://avatars.githubusercontent.com/u/42082608?v=4?s=100" width="100px;" alt="Zaryab"/><br /><sub><b>Zaryab</b></sub></a><br /><a href="#content-zaryab2000" title="Content">🖋</a></td>
</tr>
</tbody>
</table>
Expand Down
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,23 @@
"@next/bundle-analyzer": "^14.2.5",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-checkbox": "^1.1.1",
"@radix-ui/react-compose-refs": "^1.1.0",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-navigation-menu": "^1.2.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-portal": "^1.1.1",
"@radix-ui/react-progress": "^1.1.0",
"@radix-ui/react-radio-group": "^1.2.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-visually-hidden": "^1.1.0",
"@sentry/nextjs": "^8.19.0",
"@socialgouv/matomo-next": "^1.8.0",
"chart.js": "^4.4.2",
"chartjs-plugin-datalabels": "^2.2.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"embla-carousel-react": "^7.0.0",
"ethereum-blockies-base64": "^1.0.2",
"framer-motion": "^10.13.0",
Expand Down
4 changes: 0 additions & 4 deletions public/_redirects
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,3 @@
/*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!

/*/deprecated-software /:splat/dapps/ 301!

/*/developers/docs/smart-contracts/languages/ /:splat/developers/docs/smart-contracts/languages/

/*/languages /:splat/developers/docs/programming-languages/ 301!
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ There are several light clients in development, including execution, consensus a

- [Lodestar](https://github.com/ChainSafe/lodestar/tree/unstable/packages/light-client): consensus light client in TypeScript
- [Helios](https://github.com/a16z/helios): combined execution and consensus light client in Rust
- [Geth](https://github.com/ethereum/go-ethereum/tree/master/light): light mode for execution client (in development) in Go
- [Geth](https://github.com/ethereum/go-ethereum/tree/master/beacon/light): light mode for execution client (in development) in Go
- [Nimbus](https://nimbus.guide/el-light-client.html): consensus light client in Nim

To our knowledge none of these are considered production-ready yet.
Expand Down
2 changes: 1 addition & 1 deletion public/content/nft/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ This website also has an alternative domain name powered by NFTs, **ethereum.eth

## How do NFTs work? {#how-nfts-work}

NFTs, like any digital items on the Ethereum blockchain, are created through a special Ethereum based computer program called a "smart contract." These contracts follow certain rules, like the [ERC-721](/glossary/#erc-721) or [ERC-1155](/glossary/#erc-1155) standards, which determine what the contract can do.
NFTs, like any digital items on the Ethereum blockchain, are created through a special Ethereum based computer program called a "smart contract". These contracts follow certain rules, like the [ERC-721](/glossary/#erc-721) or [ERC-1155](/glossary/#erc-1155) standards, which determine what the contract can do.

The NFT smart contract can do a few key things:

Expand Down
6 changes: 3 additions & 3 deletions public/content/roadmap/verkle-trees/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ Verkle trees are `(key,value)` pairs where the keys are 32-byte elements compose

Verkle tree testnets are already up and running, but there are still substantial outstanding updates to clients that are required to support Verkle trees. You can help accelerate progress by deploying contracts to the testnets or running testnet clients.

[Explore the Verkle Gen Devnet 2 testnet](https://verkle-gen-devnet-2.ethpandaops.io/)
[Explore the Verkle Gen Devnet 6 testnet](https://verkle-gen-devnet-6.ethpandaops.io/)

[Watch Guillaume Ballet explain the Condrieu Verkle testnet](https://www.youtube.com/watch?v=cPLHFBeC0Vg) (note that the Condrieu testnet was proof-of-work and has now been superseded by the Verkle Gen Devnet 2 testnet).
[Watch Guillaume Ballet explain the Condrieu Verkle testnet](https://www.youtube.com/watch?v=cPLHFBeC0Vg) (note that the Condrieu testnet was proof-of-work and has now been superseded by the Verkle Gen Devnet 6 testnet).

## Further reading {#further-reading}

- [Verkle Trees for Statelessness](https://verkle.info/)
- [Dankrad Feist explain Verkle trees on PEEPanEIP](https://www.youtube.com/watch?v=RGJOQHzg3UQ)
- [Guillaume Ballet explain verkle trees at ETHGlobal](https://www.youtube.com/watch?v=f7bEtX3Z57o)
- [Guillaume Ballet explain Verkle trees at ETHGlobal](https://www.youtube.com/watch?v=f7bEtX3Z57o)
- ["How Verkle trees make Ethereum lean and mean" by Guillaume Ballet at Devcon 6](https://www.youtube.com/watch?v=Q7rStTKwuYs)
- [Piper Merriam on stateless clients from ETHDenver 2020](https://www.youtube.com/watch?v=0yiZJNciIJ4)
- [Dankrad Fiest explains Verkle trees and statelessness on Zero Knowledge podcast](https://zeroknowledge.fm/episode-202-stateless-ethereum-verkle-tries-with-dankrad-feist/)
Expand Down
Binary file added public/images/events/event-placeholder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
136 changes: 0 additions & 136 deletions src/components/Buttons/Button.stories.tsx

This file was deleted.

34 changes: 0 additions & 34 deletions src/components/Buttons/ButtonTwoLines/ButtonTwoLines.stories.tsx

This file was deleted.

Loading

0 comments on commit bbb3ca9

Please sign in to comment.