Merge branch 'dev' into shadcn-footer-link

Author: pettinarip

.all-contributorsrc

@@ -12298,6 +12298,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Ekam-Bitt",
+      "name": "Ekam Bitt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74407205?v=4",
+      "profile": "https://ekam-bitt.github.io",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "iankressin",
+      "name": "Ian K. Guimarães",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29215044?v=4",
+      "profile": "http://iankguimaraes.com",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "jncrabb",
+      "name": "jncrabb",
+      "avatar_url": "https://avatars.githubusercontent.com/u/27811684?v=4",
+      "profile": "https://github.com/jncrabb",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -16,6 +16,9 @@
 # GOOGLE_API_KEY=
 # GOOGLE_CALENDAR_ID=
 
+# Dune Analytics API key (required for total eth staked)
+# DUNE_API_KEY=
+
 # Matomo environment (URL and site ID required for analytics)
 NEXT_PUBLIC_MATOMO_URL=
 NEXT_PUBLIC_MATOMO_SITE_ID=

.github/workflows/chromatic.yml

@@ -17,6 +17,8 @@ on:
       - "src/layouts/**/*"
       - "src/@chakra-ui/**/*"
       - ".storybook/**/*"
+      - "tailwind.config.ts"
+      - "src/styles/**/*"
 
 # List of jobs
 jobs:

.storybook/preview.tsx

@@ -42,7 +42,6 @@ const preview: Preview = {
   ],
   parameters: {
     i18n,
-    actions: { argTypesRegex: "^on[A-Z].*" },
     controls: {
       matchers: {
         color: /(background|color)$/i,

README.md

@@ -1880,6 +1880,9 @@ 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/yorkerhodes3"><img src="https://avatars.githubusercontent.com/u/17415717?v=4?s=100" width="100px;" alt="Yorke E. Rhodes III"/><br /><sub><b>Yorke E. Rhodes III</b></sub></a><br /><a href="#content-yorkerhodes3" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/sandeepV2"><img src="https://avatars.githubusercontent.com/u/52043035?v=4?s=100" width="100px;" alt="Sandeep Belagavi"/><br /><sub><b>Sandeep Belagavi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AsandeepV2" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/codingmickey"><img src="https://avatars.githubusercontent.com/u/42518907?v=4?s=100" width="100px;" alt="Kartik Jolapara"/><br /><sub><b>Kartik Jolapara</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=codingmickey" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://ekam-bitt.github.io"><img src="https://avatars.githubusercontent.com/u/74407205?v=4?s=100" width="100px;" alt="Ekam Bitt"/><br /><sub><b>Ekam Bitt</b></sub></a><br /><a href="#maintenance-Ekam-Bitt" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://iankguimaraes.com"><img src="https://avatars.githubusercontent.com/u/29215044?v=4?s=100" width="100px;" alt="Ian K. Guimarães"/><br /><sub><b>Ian K. Guimarães</b></sub></a><br /><a href="#maintenance-iankressin" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jncrabb"><img src="https://avatars.githubusercontent.com/u/27811684?v=4?s=100" width="100px;" alt="jncrabb"/><br /><sub><b>jncrabb</b></sub></a><br /><a href="#content-jncrabb" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -1,6 +1,7 @@
 {
   "name": "ethereum-org-website",
   "version": "8.7.1",
+  "license": "MIT",
   "private": true,
   "scripts": {
     "dev": "next dev",

public/content/about/index.md

@@ -95,7 +95,7 @@ This means the website needs to handle many different user journeys, from “a d
 
 To make our work more accessible and to foster more community collaboration, the ethereum.org core team publishes an overview of our quarterly roadmap goals.
 
-[View our 2024 Q1 product roadmap](https://github.com/ethereum/ethereum-org-website/issues/12005)
+[View our 2024 Q3 product roadmap](https://github.com/ethereum/ethereum-org-website/issues/13399)
 
 **How's that sound?** We always appreciate feedback on our roadmap - if there's something you think we should work on, please let us know! We welcome ideas and PRs from anyone in the community.