Merge branch 'dev' into feat/bump-storybook-to-v8

Author: pettinarip

.all-contributorsrc

@@ -12132,6 +12132,42 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "jacobjelen",
+      "name": "jacobjelen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6750124?v=4",
+      "profile": "http://www.jacobjelen.com",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "Dennayz",
+      "name": "Dennis Zhang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58843979?v=4",
+      "profile": "https://github.com/Dennayz",
+      "contributions": [
+        "tool"
+      ]
+    },
+    {
+      "login": "JanetMo",
+      "name": "Marlene Marz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42071757?v=4",
+      "profile": "https://github.com/JanetMo",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "mahnunchik",
+      "name": "Evgeny",
+      "avatar_url": "https://avatars.githubusercontent.com/u/780935?v=4",
+      "profile": "https://github.com/mahnunchik",
+      "contributions": [
+        "tool"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.storybook/manager.ts

@@ -1,6 +1,6 @@
 import { addons } from "@storybook/manager-api"
 import theme from "./theme"
-import favicon from "../public/favicon.png"
+import favicon from "../public/images/favicon.png"
 
 addons.setConfig({
   theme,

README.md

@@ -1856,6 +1856,12 @@ 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/alex1092"><img src="https://avatars.githubusercontent.com/u/59183749?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=alex1092" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/kyndrawynne"><img src="https://avatars.githubusercontent.com/u/108100622?v=4?s=100" width="100px;" alt="kyndrawynne"/><br /><sub><b>kyndrawynne</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Akyndrawynne" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/stolab"><img src="https://avatars.githubusercontent.com/u/144235139?v=4?s=100" width="100px;" alt="stolab"/><br /><sub><b>stolab</b></sub></a><br /><a href="#content-stolab" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.jacobjelen.com"><img src="https://avatars.githubusercontent.com/u/6750124?v=4?s=100" width="100px;" alt="jacobjelen"/><br /><sub><b>jacobjelen</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Ajacobjelen" title="Bug reports">🐛</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Dennayz"><img src="https://avatars.githubusercontent.com/u/58843979?v=4?s=100" width="100px;" alt="Dennis Zhang"/><br /><sub><b>Dennis Zhang</b></sub></a><br /><a href="#tool-Dennayz" title="Tools">🔧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JanetMo"><img src="https://avatars.githubusercontent.com/u/42071757?v=4?s=100" width="100px;" alt="Marlene Marz"/><br /><sub><b>Marlene Marz</b></sub></a><br /><a href="#content-JanetMo" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mahnunchik"><img src="https://avatars.githubusercontent.com/u/780935?v=4?s=100" width="100px;" alt="Evgeny"/><br /><sub><b>Evgeny</b></sub></a><br /><a href="#tool-mahnunchik" title="Tools">🔧</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "private": true,
   "scripts": {
     "dev": "next dev",

public/content/community/language-resources/index.md

@@ -99,6 +99,14 @@ If you are bilingual and want to help us reach more people, you can also get inv
 - [Microsoft Learn (Smart contracts)](https://docs.microsoft.com/it-it/learn/modules/blockchain-solidity-ethereum-smart-contracts/) - learn about writing smart contracts using Solidity
 - [Microsoft Learn (dapps)](https://docs.microsoft.com/it-it/learn/modules/blockchain-create-ui-decentralized-apps/) - create a user interface with decentralized applications
 
+### Japanese {#ja}
+
+- [Japan Virtual and Crypto assets Exchange Association](https://jvcea.or.jp/)
+- [Japan Cryptoasset Business Association](https://cryptocurrency-association.org/)
+- [Get started with blockchain development - Learn | Microsoft Docs](https://docs.microsoft.com/ja-jp/learn/paths/ethereum-blockchain-development/) - This learning path introduces you to blockchain and development on the Ethereum platform
+- [Mastering Ethereum](https://www.oreilly.co.jp/books/9784873118963/) - Mastering Ethereum in Japanese
+- [Hands-On Smart Contract Development with Solidity and Ethereum](https://www.oreilly.co.jp/books/9784873119342/) - Hands-On Smart Contract Development with Solidity and Ethereum in Japanese
+
 ### Russian {#ru}
 
 - [Cyber Academy](https://cyberacademy.dev) - educational space for web3 builders
@@ -123,11 +131,3 @@ If you are bilingual and want to help us reach more people, you can also get inv
 - [Tino Group](https://wiki.tino.org/ethereum-la-gi/) - overview of Ethereum, dapps, wallets and FAQs
 - [Tap Chi Bitcoin](https://tapchibitcoin.io/tap-chi/tin-tuc-ethereum-eth) - web platform with subpages for Ethereum news and education
 - [Coin68](https://coin68.com/ethereum-tieu-diem/) - cryptocurrency portal with Ethereum news and educational content
-
-### Japanese {#ja}
-
-- [Japan Virtual and Crypto assets Exchange Association](https://jvcea.or.jp/)
-- [Japan Cryptoasset Business Association](https://cryptocurrency-association.org/)
-- [Get started with blockchain development - Learn | Microsoft Docs](https://docs.microsoft.com/ja-jp/learn/paths/ethereum-blockchain-development/) - This learning path introduces you to blockchain and development on the Ethereum platform
-- [Mastering Ethereum](https://www.oreilly.co.jp/books/9784873118963/) - Mastering Ethereum in Japanese
-- [Hands-On Smart Contract Development with Solidity and Ethereum](https://www.oreilly.co.jp/books/9784873119342/) - Hands-On Smart Contract Development with Solidity and Ethereum in Japanese

public/content/contributing/index.md

@@ -88,7 +88,7 @@ We have low barrier to entry issues on our GitHub repository specifically design
 
 ## Claim your Onchain Achievement Token (OAT) {#oat}
 
-If your contribution gets merged into ethereum.org, you will have a change to claim a special badge on [Galxe](https://galxe.com/ethereumorg/). An Onchain Achievement Token (OAT) is a proof that you helped make the ecosystem a little more awesome.
+If your contribution gets merged into ethereum.org, you will have a chance to claim a special badge on [Galxe](https://app.galxe.com/quest/ethereumorg). An Onchain Achievement Token (OAT) is a proof that you helped make the ecosystem a little more awesome.
 
 [More on OATs](https://help.galxe.com/en/articles/7067290-galxe-oats-reward-and-celebrate-achievements)
 

public/content/dao/index.md

@@ -5,7 +5,7 @@ lang: en
 template: use-cases
 emoji: ":handshake:"
 sidebarDepth: 2
-image: /use-cases/dao-2.png
+image: /images/use-cases/dao-2.png
 alt: A representation of a DAO voting on a proposal.
 summaryPoint1: Member-owned communities without centralized leadership.
 summaryPoint2: A safe way to collaborate with internet strangers.
@@ -160,3 +160,7 @@ _Typically used for decentralized development and governance of protocols and [d
 
 - [What is a DAO in crypto?](https://youtu.be/KHm0uUPqmVE)
 - [Can a DAO Build a City?](https://www.ted.com/talks/scott_fitsimones_could_a_dao_build_the_next_great_city) – [TED](https://www.ted.com/)
+
+<Divider />
+
+<QuizWidget quizKey="daos" />

public/content/decentralized-identity/index.md

@@ -5,7 +5,7 @@ lang: en
 template: use-cases
 emoji: ":id:"
 sidebarDepth: 2
-image: /eth-gif-cat.png
+image: /images/eth-gif-cat.png
 summaryPoint1: Traditional identity systems have centralized the issuance, maintenance and control of your identifiers.
 summaryPoint2: Decentralized identity removes reliance on centralized third parties.
 summaryPoint3: Thanks to crypto, users now have the tools to issue, hold and control their own identifiers and attestations once again.
@@ -163,7 +163,7 @@ There are many ambitious projects using Ethereum as a foundation for decentraliz
 - **[Proof of Humanity](https://www.proofofhumanity.id)** - _Proof of Humanity (or PoH) is a social identity verification system built on Ethereum._
 - **[BrightID](https://www.brightid.org/)** - _A decentralized, open-source social identity network seeking to reform identity verification through the creation and analysis of a social graph._
 - **[walt.id](https://walt.id)** — _Open source decentralized identity and wallet infrastructure that enables developers and organizations to leverage self-sovereign identity and NFTs/SBTs._
-- **[Masca](https://masca.io/)** — _Open source decentralized identity wallet implemented as MetaMask Snap that enables users and developers to leverage DIDs and VCs._
+- **[Veramo](https://veramo.io/)** - _A JavaScript framework that makes it easy for anyone to use cryptographically verifiable data in their applications._
 
 ## Further reading {#further-reading}
 

public/content/defi/index.md

@@ -4,7 +4,7 @@ description: An overview of DeFi on Ethereum
 lang: en
 template: use-cases
 emoji: ":money_with_wings:"
-image: /use-cases/defi.png
+image: /images/use-cases/defi.png
 alt: An Eth logo made of lego bricks.
 sidebarDepth: 2
 summaryPoint1: A global, open alternative to the current financial system.

public/content/desci/index.md

@@ -5,7 +5,7 @@ lang: en
 template: use-cases
 emoji: ":microscope:"
 sidebarDepth: 2
-image: /future_transparent.png
+image: /images/future_transparent.png
 alt: ""
 summaryPoint1: A global, open alternative to the current scientific system.
 summaryPoint2: Technology that enables scientists to raise funding, run experiments, share data, distribute insights, and more.
@@ -105,10 +105,10 @@ Explore projects and join the DeSci community.
 - [Bio.xyz: get funded for your biotech DAO or desci project](https://www.bio.xyz/)
 - [Fleming Protocol: open-source data economy that fuels collaborative biomedical discovery](http://flemingprotocol.io/)
 - [Active Inference Institute](https://www.activeinference.org/)
-- [CureDAO: Community-Owned Precision Health Platform](https://docs.curedao.org/)
 - [IdeaMarkets: enabling decentralized scientific credibility](https://ideamarket.io/)
 - [DeSci Labs](https://www.desci.com/)
 - [ValleyDAO: an open, global community offering funding and translational support for synthetic biology research](https://www.valleydao.bio)
+- [Cerebrum DAO: sourcing and nurturing solutions to advance brain health and prevent neurodegeneration](https://www.cerebrumdao.com/)
 - [CryoDAO: funding moonshot research in the field of cryopreservation](https://www.cryodao.org)
 
 We welcome suggestions for new projects to list - please look at our [listing policy](/contributing/adding-desci-projects/) to get started!