Merge remote-tracking branch 'upstream/dev' into Migrate-StakingHierarchy-to-Shadcn/Tailwind

Author: ashiskumar-1999

.all-contributorsrc

@@ -12670,6 +12670,24 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "itzVarsha",
+      "name": "Varshitha",
+      "avatar_url": "https://avatars.githubusercontent.com/u/138134029?v=4",
+      "profile": "https://github.com/itzVarsha",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "alexandriaroberts",
+      "name": "Alexandria Roberts",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31341867?v=4",
+      "profile": "https://alexandriaroberts.dev/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1939,6 +1939,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://growthepie.xyz"><img src="https://avatars.githubusercontent.com/u/32496674?v=4?s=100" width="100px;" alt="Matthias Seidl"/><br /><sub><b>Matthias Seidl</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=mseidlx" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/JoeChenJ"><img src="https://avatars.githubusercontent.com/u/171761102?v=4?s=100" width="100px;" alt="JoeChenJ"/><br /><sub><b>JoeChenJ</b></sub></a><br /><a href="#content-JoeChenJ" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/itzVarsha"><img src="https://avatars.githubusercontent.com/u/138134029?v=4?s=100" width="100px;" alt="Varshitha"/><br /><sub><b>Varshitha</b></sub></a><br /><a href="#maintenance-itzVarsha" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://alexandriaroberts.dev/"><img src="https://avatars.githubusercontent.com/u/31341867?v=4?s=100" width="100px;" alt="Alexandria Roberts"/><br /><sub><b>Alexandria Roberts</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=alexandriaroberts" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

src/components/DocLink/DocLink.stories.tsx

@@ -0,0 +1,57 @@
+import * as React from "react"
+import { VStack } from "@chakra-ui/react"
+import { Meta, StoryObj } from "@storybook/react"
+
+import DocLink from "."
+
+const meta = {
+  title: "Molecules / Navigation / DocLink",
+  component: DocLink,
+  tags: ["autodocs"],
+} satisfies Meta<typeof DocLink>
+
+export default meta
+
+type Story = StoryObj<typeof meta>
+
+export const Default: Story = {
+  args: {
+    href: "/history/",
+    children: "History of Ethereum",
+  },
+  render: (args) => (
+    <VStack spacing={4} align="stretch">
+      <DocLink {...args} />
+    </VStack>
+  ),
+}
+
+export const ExternalLink: Story = {
+  args: {
+    href: "https://ethereum.org",
+    children: "Ethereum Website",
+    isExternal: true,
+  },
+  render: (args) => (
+    <VStack spacing={4} align="stretch">
+      <DocLink {...args} />
+    </VStack>
+  ),
+}
+
+export const MultipleLinks: Story = {
+  args: {
+    href: "#",
+  },
+  render: () => (
+    <VStack spacing={4} align="stretch">
+      <DocLink href="/history/">History of Ethereum</DocLink>
+      <DocLink href="https://ethereum.org" isExternal>
+        Ethereum Website
+      </DocLink>
+      <DocLink href="/developers/docs/intro-to-ethereum/">
+        Introduction to Ethereum
+      </DocLink>
+    </VStack>
+  ),
+}

src/components/DocLink.tsx renamed to src/components/DocLink/index.tsx

@@ -2,9 +2,9 @@ import { AiOutlineArrowRight } from "react-icons/ai"
 
 import { cn } from "@/lib/utils/cn"
 
-import { Center, Flex, Stack } from "./ui/flex"
-import { LinkBox, LinkOverlay } from "./ui/link-box"
-import Emoji from "./Emoji"
+import Emoji from "../Emoji"
+import { Center, Flex, Stack } from "../ui/flex"
+import { LinkBox, LinkOverlay } from "../ui/link-box"
 
 import { useRtlFlip } from "@/hooks/useRtlFlip"
 

src/data/community-meetups.json

@@ -14,7 +14,7 @@
   {
     "title": "CryptoCanal",
     "emoji": ":netherlands:",
-    "location": "Amsterdam",
+    "location": "Amsterdam, Rotterdam",
     "link": "https://www.cryptocanal.org/agenda"
   },
   {
@@ -23,12 +23,6 @@
     "location": "Zurich",
     "link": "https://www.cryptocanal.org/agenda"
   },
-  {
-    "title": "Web3.NE",
-    "emoji": ":united_states:",
-    "location": "Omaha",
-    "link": "https://www.meetup.com/web3-ne/"
-  },
   {
     "title": "ETH Belgrade Community",
     "emoji": ":serbia:",
@@ -66,39 +60,39 @@
     "link": "https://kyivethereum.com/"
   },
   {
-    "title": "Ethereum Bogota",
+    "title": "Ethereum Bogotá",
     "emoji": ":colombia:",
-    "location": "Colombia",
+    "location": "Bogotá",
     "link": "https://www.meetup.com/ethereum-bogota"
   },
     {
     "title": "Ethereum Eje Cafetero",
     "emoji": ":colombia:",
-    "location": "Colombia",
+    "location": "Armenia, Pereira, Manizales",
     "link": "https://www.meetup.com/ethereum-eje-cafetero"
   },
     {
     "title": "Ethereum Medellin",
     "emoji": ":colombia:",
-    "location": "Colombia",
+    "location": "Medellín",
     "link": "https://www.meetup.com/ethereum-medellin"
   },
     {
     "title": "Ethereum Caribe",
     "emoji": ":colombia:",
-    "location": "Colombia",
+    "location": "Barranquilla",
     "link": "https://www.meetup.com/ethereum-caribe"
   },
     {
     "title": "Ethereum Cali",
     "emoji": ":colombia:",
-    "location": "Colombia",
+    "location": "Cali",
     "link": "https://www.meetup.com/ethereumcali"
   },
     {
     "title": "Ethereum Arauca",
     "emoji": ":colombia:",
-    "location": "Colombia",
+    "location": "Saravena",
     "link": "https://www.meetup.com/ethereum-arauca"
   },
   {
@@ -201,13 +195,7 @@
     "title": "Ethereum Jakarta",
     "emoji": ":indonesia:",
     "location": "Jakarta",
-    "link": "https://ethereum-jkt.github.io/"
-  },
-  {
-    "title": "Italian Ethereum Meetup",
-    "emoji": ":italy:",
-    "location": "Milan",
-    "link": "https://www.meetup.com/it-IT/Italian-Ethereum-Meetup/"
+    "link": "https://www.meetup.com/ethereum-jkt/"
   },
   {
     "title": "Ethereum Italia Hub (Telegram Group)",
@@ -219,7 +207,7 @@
     "title": "Ethereum Venezia Meetup",
     "emoji": ":italy:",
     "location": "Venice",
-    "link": "https://discord.gg/VMzVjCHN8k"
+    "link": "https://x.com/ethvenice"
   },
   {
     "title": "Ethereum Japan",
@@ -273,7 +261,7 @@
     "title": "BCN Ethereum Dev",
     "emoji": ":spain:",
     "location": "Barcelona",
-    "link": "https://www.meetup.com/ethereumbcn"
+    "link": "https://x.com/ethdevbcn"
   },
   {
     "title": "Ethereum Spain",
@@ -363,7 +351,7 @@
     "title": "ETH SD",
     "emoji": ":united_states:",
     "location": "San Diego",
-    "link": "https://withkoji.com/@ethsd"
+    "link": "https://www.ethsd.org/"
   },
   {
     "title": "SF Ethereum Developers",
@@ -411,7 +399,7 @@
     "title": "Chicago Ethereum Meetup",
     "emoji": ":united_states:",
     "location": "Chicago",
-    "link": "https://www.meetup.com/Chicago-Ethereum-Meetup/"
+    "link": "https://x.com/chicagoethereum"
   },
   {
     "title": "Matos Cryptobar",
@@ -431,12 +419,6 @@
     "location": "Dubai",
     "link": "https://www.meetup.com/defi-dubai/"
   },
-  {
-    "title": "ETHAnglia",
-    "emoji": ":united_kingdom:",
-    "location": "Norwich",
-    "link": "https://www.ethanglia.org/"
-  },
   {
     "title": "CryptoSD",
     "emoji": ":united_states:",
@@ -452,13 +434,13 @@
   {
     "title": "Ethereum Costa Rica",
     "emoji": ":costa_rica:",
-    "location": "Costa Rica",
+    "location": "San José",
     "link": "https://twitter.com/EthereumCR"
   },
   {
     "title": "Hash House Medellín",
     "emoji": ":colombia:",
-    "location": "Colombia",
+    "location": "Medellín",
     "link": "https://www.meetup.com/hash-house-medellin/"
   },
   {
@@ -483,7 +465,7 @@
     "title": "Ethereum Edmonton Meetup",
     "emoji": ":canada:",
     "location": "Edmonton",
-    "link": "https://www.meetup.com/ethereum-edmonton-meetup/"
+    "link": "https://lu.ma/user/usr-zgxbPuCTyKGBQq6"
   },
   {
     "title": "BeerFi Prague - Web3 on-chain dev Meetup",
@@ -497,6 +479,66 @@
     "location": "Naples",
     "link": "https://www.eventbrite.it/e/863744451907/"
   },
+  {
+    "title": "Ethereum Minnesota",
+    "emoji": ":us:",
+    "location": "Minnesota",
+    "link": "https://www.meetup.com/ethereum-minnesota/"
+  },
+  {
+    "title": "Ethereum Slovenia",
+    "emoji": ":slovenia:",
+    "location": "Ljubljana",
+    "link": "https://www.meetup.com/ethereum-slovenia/"
+  },
+  {
+    "title": "Michigan Ethereum Meetup",
+    "emoji": ":us:",
+    "location": "Michigan",
+    "link": "https://www.meetup.com/michigan-ethereum-meetup/"
+  },
+  {
+    "title": "udinETH",
+    "emoji": ":italy:",
+    "location": "Udine",
+    "link": "https://www.meetup.com/udineth/"
+  },
+  {
+    "title": "Helsinki Ethereum Meetup",
+    "emoji": ":finland:",
+    "location": "Helsinki",
+    "link": "https://www.meetup.com/helsinki-ethereum-meetup/"
+  },
+  {
+    "title": "ETHManila",
+    "emoji": ":philippines:",
+    "location": "Manila",
+    "link": "https://www.meetup.com/ethmanila/"
+  },
+  {
+    "title": "Braga.Blockchain",
+    "emoji": ":portugal:",
+    "location": "Braga",
+    "link": "https://www.meetup.com/braga-blockchain/"
+  },
+  {
+    "title": "Ethereum Melbourne",
+    "emoji": ":australia:",
+    "location": "Melbourne",
+    "link": "https://lu.ma/user/usr-VEFqG8hvMFtTjmx"
+  },
+  {
+    "title": "Glasgow Ethereum Meetup",
+    "emoji": ":scotland:",
+    "location": "Glasgow",
+    "link": "https://www.meetup.com/glasgow-ethereum-meetup/"
+  },
+  {
+    "title": "Ethereum Hungary",
+    "emoji": ":hungary:",
+    "location": "Budapest",
+    "link": "https://www.meetup.com/ethereum-hungary/"
+  },
   {
     "title": "Decaffeth",
     "emoji": ":iran:",

src/lib/api/fetchRSS.ts

@@ -42,6 +42,10 @@ export const fetchRSS = async (xmlUrl: string | string[]) => {
         // Map to RSSItem object
         .map((item) => {
           const getImgSrc = () => {
+            if (url.includes("medium.com/feed/"))
+              return item["content:encoded"]?.[0].match(
+                /https?:\/\/[^"]*?\.(jpe?g|png|webp)/g
+              )
             if (item.enclosure) return item.enclosure[0].$.url
             if (item["media:content"]) return item["media:content"][0].$.url
             return channelImage