Deploy v10.20.0

.all-contributorsrc

@@ -13943,6 +13943,24 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "mikhaildobs",
+      "name": "Mikhail",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4770810?v=4",
+      "profile": "http://linkdrop.io",
+      "contributions": [
+        "tool"
+      ]
+    },
+    {
+      "login": "Sshadow84",
+      "name": "shadow",
+      "avatar_url": "https://avatars.githubusercontent.com/u/96975661?v=4",
+      "profile": "https://github.com/Sshadow84",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/playwright.yml

@@ -21,8 +21,6 @@ jobs:
 
       - name: Get Netlify Deploy URL for branch
         id: netlify_deploy
-        if: |
-          github.ref_name == 'dev' || github.ref_name == 'staging' || github.ref_name == 'master'
         run: |
           npx ts-node -O '{ "module": "commonjs" }' src/scripts/get-netlify-branch-deploy.ts
         env:

README.md

@@ -2156,6 +2156,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://www.ivanmanchev.com"><img src="https://avatars.githubusercontent.com/u/15030734?v=4?s=100" width="100px;" alt="Ivan Manchev"/><br /><sub><b>Ivan Manchev</b></sub></a><br /><a href="#maintenance-dmngdsm" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cypherpepe"><img src="https://avatars.githubusercontent.com/u/125112044?v=4?s=100" width="100px;" alt="Cypher Pepe"/><br /><sub><b>Cypher Pepe</b></sub></a><br /><a href="#maintenance-cypherpepe" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/codebyankita"><img src="https://avatars.githubusercontent.com/u/139675749?v=4?s=100" width="100px;" alt="Ankita Virani (ankita.eth)"/><br /><sub><b>Ankita Virani (ankita.eth)</b></sub></a><br /><a href="#content-codebyankita" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://linkdrop.io"><img src="https://avatars.githubusercontent.com/u/4770810?v=4?s=100" width="100px;" alt="Mikhail"/><br /><sub><b>Mikhail</b></sub></a><br /><a href="#tool-mikhaildobs" title="Tools">🔧</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Sshadow84"><img src="https://avatars.githubusercontent.com/u/96975661?v=4?s=100" width="100px;" alt="shadow"/><br /><sub><b>shadow</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ASshadow84" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>

app/[locale]/10years/page-jsonld.tsx

@@ -4,6 +4,10 @@ import { FileContributor } from "@/lib/types"
 
 import PageJsonLD from "@/components/PageJsonLD"
 
+import {
+  ethereumCommunityOrganization,
+  ethereumFoundationOrganization,
+} from "@/lib/utils/jsonld"
 import { normalizeUrlForJsonLd } from "@/lib/utils/url"
 
 export default async function TenYearJsonLD({
@@ -25,89 +29,57 @@ export default async function TenYearJsonLD({
     url: contributor.html_url,
   }))
 
-  const webPageJsonLd = {
+  const jsonLd = {
     "@context": "https://schema.org",
-    "@type": "WebPage",
-    "@id": url,
-    name: t("page-10-year-anniversary-meta-title"),
-    description: t("page-10-year-anniversary-meta-description"),
-    url: url,
-    inLanguage: locale,
-    author: [
+    "@graph": [
       {
-        "@type": "Organization",
-        name: "ethereum.org",
-        url: "https://ethereum.org",
-      },
-    ],
-    contributor: contributorList,
-    breadcrumb: {
-      "@type": "BreadcrumbList",
-      itemListElement: [
-        {
-          "@type": "ListItem",
-          position: 1,
-          name: "Home",
-          item: normalizeUrlForJsonLd(locale, "/"),
+        "@type": "WebPage",
+        "@id": url,
+        name: t("page-10-year-anniversary-meta-title"),
+        description: t("page-10-year-anniversary-meta-description"),
+        url: url,
+        inLanguage: locale,
+        author: [ethereumCommunityOrganization],
+        contributor: contributorList,
+        isPartOf: {
+          "@type": "WebSite",
+          name: "ethereum.org",
+          url: "https://ethereum.org",
         },
-        {
-          "@type": "ListItem",
-          position: 2,
-          name: t("page-10-year-anniversary-meta-title"),
-          item: url,
+        breadcrumb: {
+          "@type": "BreadcrumbList",
+          itemListElement: [
+            {
+              "@type": "ListItem",
+              position: 1,
+              name: "Home",
+              item: normalizeUrlForJsonLd(locale, "/"),
+            },
+            {
+              "@type": "ListItem",
+              position: 2,
+              name: t("page-10-year-anniversary-meta-title"),
+              item: url,
+            },
+          ],
         },
-      ],
-    },
-    publisher: {
-      "@type": "Organization",
-      name: "ethereum.org",
-      url: "https://ethereum.org",
-      logo: {
-        "@type": "ImageObject",
-        url: "https://ethereum.org/assets/eth-logo.png",
-        width: "256",
-        height: "417",
+        publisher: ethereumFoundationOrganization,
+        reviewedBy: ethereumFoundationOrganization,
+        mainEntity: { "@id": `${url}#video` },
       },
-    },
-    reviewedBy: {
-      "@type": "Organization",
-      name: "ethereum.org",
-      url: "https://ethereum.org",
-      logo: {
-        "@type": "ImageObject",
-        url: "https://ethereum.org/images/eth-home-icon.png",
-      },
-    },
-    mainEntity: {
-      "@type": "Event",
-      "@id": `${url}#ethereum-10-year-anniversary`,
-    },
-  }
-
-  const videoJsonLd = {
-    "@context": "https://schema.org",
-    "@type": "VideoObject",
-    name: "Ethereum: 10 Years Anniversary",
-    description: t("page-10-year-anniversary-meta-description"),
-    thumbnailUrl: "https://i.ytimg.com/vi/gjwr-7PgpTC/maxresdefault.jpg",
-    uploadDate: "2024-07-30T00:00:00Z",
-    duration: "PT5M30S",
-    embedUrl: "https://www.youtube.com/embed/gjwr-7PgpTC",
-    publisher: {
-      "@type": "Organization",
-      name: "Ethereum Foundation",
-      url: "https://ethereum.org",
-    },
-    reviewedBy: {
-      "@type": "Organization",
-      name: "ethereum.org",
-      url: "https://ethereum.org",
-      logo: {
-        "@type": "ImageObject",
-        url: "https://ethereum.org/images/eth-home-icon.png",
+      {
+        "@type": "VideoObject",
+        name: "Ethereum: 10 Years Anniversary",
+        description: t("page-10-year-anniversary-meta-description"),
+        thumbnailUrl: "https://i.ytimg.com/vi/gjwr-7PgpTC/maxresdefault.jpg",
+        uploadDate: "2024-07-30T00:00:00Z",
+        duration: "PT5M30S",
+        embedUrl: "https://www.youtube.com/embed/gjwr-7PgpTC",
+        publisher: ethereumFoundationOrganization,
+        reviewedBy: ethereumFoundationOrganization,
       },
-    },
+    ],
   }
 
-  return <PageJsonLD structuredData={[webPageJsonLd, videoJsonLd]} />
+  return <PageJsonLD structuredData={jsonLd} />
 }

app/[locale]/10years/page.tsx

@@ -13,6 +13,7 @@ import { Image } from "@/components/Image"
 import MainArticle from "@/components/MainArticle"
 import Translation from "@/components/Translation"
 import { ButtonLink } from "@/components/ui/buttons/Button"
+import InlineLink from "@/components/ui/Link"
 import { LinkBox, LinkOverlay } from "@/components/ui/link-box"
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
 import YouTube from "@/components/YouTube"
@@ -406,6 +407,12 @@ const Page = async ({ params }: { params: PageParams }) => {
             <Stories stories={stories} />
           </I18nProvider>
         </div>
+
+        <div className="w-full px-8 py-4 text-center text-sm text-body-medium">
+          <InlineLink href="/10years/terms-and-conditions">
+            {t("page-10-year-terms-and-conditions")}
+          </InlineLink>
+        </div>
       </MainArticle>
     </>
   )

app/[locale]/[...slug]/page-jsonld.tsx

@@ -2,6 +2,10 @@ import { FileContributor, Frontmatter } from "@/lib/types"
 
 import PageJsonLD from "@/components/PageJsonLD"
 
+import {
+  ethereumCommunityOrganization,
+  ethereumFoundationOrganization,
+} from "@/lib/utils/jsonld"
 import { normalizeUrlForJsonLd } from "@/lib/utils/url"
 
 export default async function SlugJsonLD({
@@ -48,87 +52,54 @@ export default async function SlugJsonLD({
     url: contributor.html_url,
   }))
 
-  // JSON-LD structured data for the slug page
-  const webPageJsonLd = {
+  const jsonLd = {
     "@context": "https://schema.org",
-    "@type": "WebPage",
-    "@id": url,
-    name: frontmatter.title,
-    description: frontmatter.description,
-    url: url,
-    inLanguage: locale,
-    author: [
+    "@graph": [
       {
-        "@type": "Organization",
-        name: "ethereum.org",
-        url: "https://ethereum.org",
+        "@type": "WebPage",
+        "@id": url,
+        name: frontmatter.title,
+        description: frontmatter.description,
+        url: url,
+        inLanguage: locale,
+        author: [ethereumCommunityOrganization],
+        contributor: contributorList,
+        isPartOf: {
+          "@type": "WebSite",
+          "@id": "https://ethereum.org/#website",
+          name: "ethereum.org",
+          url: "https://ethereum.org",
+        },
+        breadcrumb: {
+          "@type": "BreadcrumbList",
+          itemListElement: breadcrumbItems,
+        },
+        publisher: ethereumFoundationOrganization,
+        reviewedBy: ethereumFoundationOrganization,
+        mainEntity: { "@id": `${url}#article` },
       },
-    ],
-    contributor: contributorList,
-    isPartOf: {
-      "@type": "WebSite",
-      name: "ethereum.org",
-      url: "https://ethereum.org",
-    },
-    breadcrumb: {
-      "@type": "BreadcrumbList",
-      itemListElement: breadcrumbItems,
-    },
-    publisher: {
-      "@type": "Organization",
-      name: "ethereum.org",
-      url: "https://ethereum.org",
-    },
-    reviewedBy: {
-      "@type": "Organization",
-      name: "ethereum.org",
-      url: "https://ethereum.org",
-      logo: {
-        "@type": "ImageObject",
-        url: "https://ethereum.org/images/eth-home-icon.png",
-      },
-    },
-  }
-
-  // JSON-LD for the article content
-  const articleJsonLd = {
-    "@context": "https://schema.org",
-    "@type": "Article",
-    headline: frontmatter.title,
-    description: frontmatter.description,
-    image: frontmatter.image
-      ? `https://ethereum.org${frontmatter.image}`
-      : undefined,
-    author: [
       {
-        "@type": "Organization",
-        name: "ethereum.org",
-        url: "https://ethereum.org",
+        "@type": "Article",
+        "@id": `${url}#article`,
+        headline: frontmatter.title,
+        description: frontmatter.description,
+        image: frontmatter.image
+          ? `https://ethereum.org${frontmatter.image}`
+          : undefined,
+        author: [ethereumCommunityOrganization],
+        contributor: contributorList,
+        publisher: ethereumFoundationOrganization,
+        reviewedBy: ethereumFoundationOrganization,
+        dateModified: frontmatter.published,
+        mainEntityOfPage: url,
+        about: {
+          "@type": "Thing",
+          name: frontmatter.title,
+          description: frontmatter.description,
+        },
       },
     ],
-    contributor: contributorList,
-    publisher: {
-      "@type": "Organization",
-      name: "ethereum.org",
-      url: "https://ethereum.org",
-    },
-    reviewedBy: {
-      "@type": "Organization",
-      name: "ethereum.org",
-      url: "https://ethereum.org",
-      logo: {
-        "@type": "ImageObject",
-        url: "https://ethereum.org/images/eth-home-icon.png",
-      },
-    },
-    dateModified: frontmatter.published,
-    mainEntityOfPage: url,
-    about: {
-      "@type": "Thing",
-      name: frontmatter.title,
-      description: frontmatter.description,
-    },
   }
 
-  return <PageJsonLD structuredData={[webPageJsonLd, articleJsonLd]} />
+  return <PageJsonLD structuredData={jsonLd} />
 }