update types

JoeChenJ · JoeChenJ · commit 0319ac9caf1a · 2025-03-31T15:55:10.000+08:00
diff --git a/app/[locale]/bug-bounty/_components/bug-bounty.tsx b/app/[locale]/bug-bounty/_components/bug-bounty.tsx
@@ -2,7 +2,7 @@
 
 import { HTMLAttributes } from "react"
 
-import type { ChildOnlyProp } from "@/lib/types"
+import type { ChildOnlyProp, PageWithContributorsProps } from "@/lib/types"
 
 /* Uncomment for Bug Bounty Banner: */
 import BugBountyBanner from "@/components/Banners/BugBountyBanner"
@@ -225,7 +225,10 @@ const sortBountyHuntersFn = (a: BountyHuntersArg, b: BountyHuntersArg) => {
   return b.score - a.score
 }
 
-const BugBountiesPage = ({ contributors, lastEditLocaleTimestamp }) => {
+const BugBountiesPage = ({
+  contributors,
+  lastEditLocaleTimestamp,
+}: PageWithContributorsProps) => {
   const pathname = usePathname()
   const { t } = useTranslation("page-bug-bounty")
 
diff --git a/app/[locale]/dapps/_components/dapps.tsx b/app/[locale]/dapps/_components/dapps.tsx
@@ -11,7 +11,7 @@ import React, {
 import { useSearchParams } from "next/navigation"
 import { useLocale } from "next-intl"
 
-import type { ChildOnlyProp } from "@/lib/types"
+import type { ChildOnlyProp, PageWithContributorsProps } from "@/lib/types"
 
 import BoxGrid from "@/components/BoxGrid"
 import Callout from "@/components/Callout"
@@ -285,7 +285,10 @@ interface Categories {
   [key: string]: Category
 }
 
-const DappsPage = ({ contributors, lastEditLocaleTimestamp }) => {
+const DappsPage = ({
+  contributors,
+  lastEditLocaleTimestamp,
+}: PageWithContributorsProps) => {
   const { t } = useTranslation(["page-dapps", "common"])
   const searchParams = useSearchParams()
   const locale = useLocale()
diff --git a/app/[locale]/eth/_components/eth.tsx b/app/[locale]/eth/_components/eth.tsx
@@ -2,7 +2,7 @@
 
 import type { ComponentProps, HTMLAttributes } from "react"
 
-import type { ChildOnlyProp } from "@/lib/types"
+import type { ChildOnlyProp, PageWithContributorsProps } from "@/lib/types"
 
 import ActionCard from "@/components/ActionCard"
 import CalloutBanner from "@/components/CalloutBanner"
@@ -169,7 +169,10 @@ const CentralActionCard = (props: ComponentProps<typeof ActionCard>) => (
   <ActionCard className="my-8" imageWidth={260} {...props} />
 )
 
-const EthPage = ({ contributors, lastEditLocaleTimestamp }) => {
+const EthPage = ({
+  contributors,
+  lastEditLocaleTimestamp,
+}: PageWithContributorsProps) => {
   const { t } = useTranslation("page-eth")
   const pathname = usePathname()
 
diff --git a/app/[locale]/gas/_components/gas.tsx b/app/[locale]/gas/_components/gas.tsx
@@ -2,6 +2,8 @@
 
 import { BaseHTMLAttributes, ComponentPropsWithRef } from "react"
 
+import { PageWithContributorsProps } from "@/lib/types"
+
 import Callout from "@/components/Callout"
 import Card from "@/components/Card"
 import Emoji from "@/components/Emoji"
@@ -78,7 +80,10 @@ const H3 = ({
   <h3 className={cn("mb-8 mt-10 text-xl md:text-2xl", className)} {...props} />
 )
 
-const GasPage = ({ contributors, lastEditLocaleTimestamp }) => {
+const GasPage = ({
+  contributors,
+  lastEditLocaleTimestamp,
+}: PageWithContributorsProps) => {
   const { t } = useTranslation("page-gas")
 
   const benefits = [
diff --git a/app/[locale]/get-eth/_components/get-eth.tsx b/app/[locale]/get-eth/_components/get-eth.tsx
@@ -2,7 +2,7 @@
 
 import type { ReactNode } from "react"
 
-import type { ChildOnlyProp, FileContributor } from "@/lib/types"
+import type { ChildOnlyProp, PageWithContributorsProps } from "@/lib/types"
 
 import CalloutBanner from "@/components/CalloutBanner"
 import CardList, {
@@ -65,10 +65,8 @@ const TwoColumnContent = (props: ChildOnlyProp) => (
   <div className="grid grid-cols-1 gap-16 lg:grid-cols-2" {...props} />
 )
 
-type Props = {
+type Props = PageWithContributorsProps & {
   lastDataUpdateDate: string
-  contributors: FileContributor[]
-  lastEditLocaleTimestamp: string
 }
 
 const GetEthPage = ({
diff --git a/app/[locale]/layer-2/learn/_components/learn.tsx b/app/[locale]/layer-2/learn/_components/learn.tsx
@@ -1,5 +1,7 @@
 "use client"
 
+import { PageWithContributorsProps } from "@/lib/types"
+
 import Callout from "@/components/Callout"
 import Card from "@/components/Card"
 import FileContributors from "@/components/FileContributors"
@@ -20,7 +22,10 @@ import Callout1Image from "@/public/images/man-and-dog-playing.png"
 import DAOImage from "@/public/images/use-cases/dao-2.png"
 import WhatIsEthereumImage from "@/public/images/what-is-ethereum.png"
 
-const Layer2Learn = ({ contributors, lastEditLocaleTimestamp }) => {
+const Layer2Learn = ({
+  contributors,
+  lastEditLocaleTimestamp,
+}: PageWithContributorsProps) => {
   const { t } = useTranslation("page-layer-2-learn")
   const pathname = usePathname()
 
diff --git a/app/[locale]/learn/_components/learn.tsx b/app/[locale]/learn/_components/learn.tsx
@@ -2,7 +2,11 @@
 
 import type { HTMLAttributes, ReactNode } from "react"
 
-import type { ChildOnlyProp, ToCItem } from "@/lib/types"
+import type {
+  ChildOnlyProp,
+  PageWithContributorsProps,
+  ToCItem,
+} from "@/lib/types"
 
 import OriginalCard, {
   type CardProps as OriginalCardProps,
@@ -112,7 +116,10 @@ const ImageHeight200 = ({ src, alt }: ImageProps) => (
   <Image className="h-[200px] w-auto" src={src} alt={alt} />
 )
 
-const LearnPage = ({ contributors, lastEditLocaleTimestamp }) => {
+const LearnPage = ({
+  contributors,
+  lastEditLocaleTimestamp,
+}: PageWithContributorsProps) => {
   const { t } = useTranslation("page-learn")
 
   const tocItems = [
diff --git a/app/[locale]/roadmap/vision/_components/vision.tsx b/app/[locale]/roadmap/vision/_components/vision.tsx
@@ -2,7 +2,7 @@
 
 import type { ComponentProps, ComponentPropsWithRef } from "react"
 
-import type { ChildOnlyProp } from "@/lib/types"
+import type { ChildOnlyProp, PageWithContributorsProps } from "@/lib/types"
 
 import Breadcrumbs from "@/components/Breadcrumbs"
 import Card from "@/components/Card"
@@ -91,7 +91,10 @@ const TrilemmaContent = (props: ChildOnlyProp) => (
   />
 )
 
-const VisionPage = ({ contributors, lastEditLocaleTimestamp }) => {
+const VisionPage = ({
+  contributors,
+  lastEditLocaleTimestamp,
+}: PageWithContributorsProps) => {
   const { t } = useTranslation(["page-roadmap-vision", "page-upgrades-index"])
   const pathname = usePathname()
 
diff --git a/app/[locale]/run-a-node/_components/run-a-node.tsx b/app/[locale]/run-a-node/_components/run-a-node.tsx
@@ -4,7 +4,7 @@ import { HTMLAttributes } from "react"
 import type { ReactNode } from "react"
 import { FaDiscord } from "react-icons/fa"
 
-import type { ChildOnlyProp } from "@/lib/types"
+import type { ChildOnlyProp, PageWithContributorsProps } from "@/lib/types"
 
 import Emoji from "@/components/Emoji"
 import ExpandableCard from "@/components/ExpandableCard"
@@ -205,7 +205,10 @@ type RunANodeCard = {
   alt: string
 }
 
-const RunANodePage = ({ contributors, lastEditLocaleTimestamp }) => {
+const RunANodePage = ({
+  contributors,
+  lastEditLocaleTimestamp,
+}: PageWithContributorsProps) => {
   const { t } = useTranslation("page-run-a-node")
   const heroContent = {
     title: t("page-run-a-node-title"),
diff --git a/app/[locale]/staking/_components/staking.tsx b/app/[locale]/staking/_components/staking.tsx
@@ -4,7 +4,7 @@ import { type HTMLAttributes, ReactNode } from "react"
 
 import type {
   ChildOnlyProp,
-  FileContributor,
+  PageWithContributorsProps,
   StakingStatsData,
 } from "@/lib/types"
 
@@ -105,10 +105,8 @@ const StyledCard = (props: {
   </Card>
 )
 
-type Props = {
+type Props = PageWithContributorsProps & {
   data: StakingStatsData
-  contributors: FileContributor[]
-  lastEditLocaleTimestamp: string
 }
 
 const StakingPage = ({
diff --git a/app/[locale]/wallets/_components/wallets.tsx b/app/[locale]/wallets/_components/wallets.tsx
@@ -3,6 +3,8 @@
 import { ComponentPropsWithRef } from "react"
 import { useLocale } from "next-intl"
 
+import { PageWithContributorsProps } from "@/lib/types"
+
 import Callout from "@/components/Callout"
 import Card from "@/components/Card"
 import CardList from "@/components/CardList"
@@ -36,7 +38,10 @@ export const StyledCard = (props: ComponentPropsWithRef<typeof Card>) => (
   />
 )
 
-const WalletsPage = ({ contributors, lastEditLocaleTimestamp }) => {
+const WalletsPage = ({
+  contributors,
+  lastEditLocaleTimestamp,
+}: PageWithContributorsProps) => {
   const pathname = usePathname()
   const locale = useLocale()
   const { t } = useTranslation("page-wallets")
diff --git a/app/[locale]/what-is-ethereum/_components/what-is-ethereum.tsx b/app/[locale]/what-is-ethereum/_components/what-is-ethereum.tsx
@@ -7,9 +7,9 @@ import { MdInfoOutline } from "react-icons/md"
 
 import type {
   ChildOnlyProp,
-  FileContributor,
   Lang,
   MetricReturnData,
+  PageWithContributorsProps,
 } from "@/lib/types"
 
 import AdoptionChart from "@/components/AdoptionChart"
@@ -166,10 +166,8 @@ const Image400 = ({ src }: Pick<ImageProps, "src">) => (
   <Image src={src} alt="" width={400} />
 )
 
-type Props = {
+type Props = PageWithContributorsProps & {
   data: MetricReturnData
-  contributors: FileContributor[]
-  lastEditLocaleTimestamp: string
 }
 
 const WhatIsEthereumPage = ({
diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -972,6 +972,11 @@ export type EventCardProps = {
   imageUrl?: string
 }
 
+export type PageWithContributorsProps = {
+  contributors: FileContributor[]
+  lastEditLocaleTimestamp: string
+}
+
 export type BreakpointKey = keyof typeof screens
 
 export type MaturityLevel =
