Skip to content

Commit 8b8ff20

Browse files
corwintinescorwintines
committed
Add MainContent to pages
1 parent 1f064bc commit 8b8ff20

27 files changed

+162
-118
lines changed

‎src/pages/404.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ import { Box, Flex, Heading, Text } from "@chakra-ui/react"
44

55
import { BasePageProps } from "@/lib/types"
66

7+
import InlineLink from "@/components/Link"
8+
import MainArticle from "@/components/MainArticle"
9+
import Translation from "@/components/Translation"
10+
711
import { existsNamespace } from "@/lib/utils/existsNamespace"
812
import { getLastDeployDate } from "@/lib/utils/getLastDeployDate"
913
import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
1014

11-
import InlineLink from "../components/Link"
12-
import Translation from "../components/Translation"
13-
1415
export const getStaticProps = (async ({ locale }) => {
1516
const requiredNamespaces = getRequiredNamespacesForPage("/")
1617

@@ -29,7 +30,7 @@ export const getStaticProps = (async ({ locale }) => {
2930

3031
const NotFoundPage = () => (
3132
<Flex flexDir="column" align="center" w="full" mt={16} mb={0} mx="auto">
32-
<Box py={4} px={8} w="full">
33+
<Box as={MainArticle} py={4} px={8} w="full">
3334
<Heading as="h1" size="2xl" my={8}>
3435
<Translation id="we-couldnt-find-that-page" />
3536
</Heading>

‎src/pages/assets.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import AssetDownload from "@/components/AssetDownload"
1818
import FeedbackCard from "@/components/FeedbackCard"
1919
import { Image } from "@/components/Image"
2020
import InlineLink from "@/components/Link"
21+
import MainArticle from "@/components/MainArticle"
2122
import OldHeading from "@/components/OldHeading"
2223
import PageMetadata from "@/components/PageMetadata"
2324

@@ -144,7 +145,7 @@ const AssetsPage = () => {
144145
title={t("page-assets-meta-title")}
145146
description={t("page-assets-meta-desc")}
146147
/>
147-
<Box py="4" px="8">
148+
<Box as={MainArticle} py="4" px="8">
148149
<Flex direction="column" px="8" py="4">
149150
<Center>
150151
<Image

‎src/pages/bug-bounty.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import FeedbackCard from "@/components/FeedbackCard"
2323
import { Image, type ImageProps } from "@/components/Image"
2424
import Leaderboard from "@/components/Leaderboard"
2525
import InlineLink from "@/components/Link"
26+
import MainArticle from "@/components/MainArticle"
2627
import OldHeading from "@/components/OldHeading"
2728
import Text from "@/components/OldText"
2829
import PageMetadata from "@/components/PageMetadata"
@@ -49,6 +50,7 @@ import tekuLight from "@/public/upgrades/teku-light.png"
4950

5051
const Page = (props: ChildOnlyProp) => (
5152
<Box
53+
as={MainArticle}
5254
display="flex"
5355
flexDirection="column"
5456
alignItems="center"

‎src/pages/community.tsx

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@ import {
1313
import { BasePageProps, ChildOnlyProp, CommonHeroProps } from "@/lib/types"
1414
import { ICard, IGetInvolvedCard } from "@/lib/interfaces"
1515

16+
import ActionCard from "@/components/ActionCard"
17+
import ButtonLink, { ButtonLinkProps } from "@/components/Buttons/ButtonLink"
18+
import Callout from "@/components/Callout"
19+
import Card from "@/components/Card"
20+
import FeedbackCard from "@/components/FeedbackCard"
21+
import { HubHero } from "@/components/Hero"
22+
import { Image } from "@/components/Image"
23+
import MainArticle from "@/components/MainArticle"
24+
import OldHeading from "@/components/OldHeading"
25+
import PageMetadata from "@/components/PageMetadata"
26+
1627
import { existsNamespace } from "@/lib/utils/existsNamespace"
1728
import { getLastDeployDate } from "@/lib/utils/getLastDeployDate"
1829
import { getRequiredNamespacesForPage } from "@/lib/utils/translations"
1930

20-
import ActionCard from "../components/ActionCard"
21-
import ButtonLink, { ButtonLinkProps } from "../components/Buttons/ButtonLink"
22-
import Callout from "../components/Callout"
23-
import Card from "../components/Card"
24-
import FeedbackCard from "../components/FeedbackCard"
25-
import { HubHero } from "../components/Hero"
26-
import { Image } from "../components/Image"
27-
import OldHeading from "../components/OldHeading"
28-
import PageMetadata from "../components/PageMetadata"
29-
3031
// Static assets
3132
import developersEthBlockImg from "@/public/developers-eth-blocks.png"
3233
import dogeComputerImg from "@/public/doge-computer.png"
@@ -78,7 +79,7 @@ const Divider = () => {
7879

7980
const Page = ({ children }: ChildOnlyProp) => {
8081
return (
81-
<Flex direction="column" alignItems="center" w="full" mx="auto">
82+
<Flex as={MainArticle} direction="column" alignItems="center" w="full" mx="auto">
8283
{children}
8384
</Flex>
8485
)

‎src/pages/contributing/translation-program/acknowledgements.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import Breadcrumbs from "@/components/Breadcrumbs"
1919
import FeedbackCard from "@/components/FeedbackCard"
2020
import { Image } from "@/components/Image"
2121
import InlineLink from "@/components/Link"
22+
import MainArticle from "@/components/MainArticle"
2223
import OldHeading from "@/components/OldHeading"
2324
import Text from "@/components/OldText"
2425
import PageMetadata from "@/components/PageMetadata"
@@ -37,7 +38,8 @@ import lightThemeCertificateImg from "@/public/certificates/light-certificate.pn
3738
import dogeComputerImg from "@/public/doge-computer.png"
3839
import whatIsEthereumImg from "@/public/what-is-ethereum.png"
3940

40-
const Content = (props: BoxProps) => <Box py={4} px={10} w="full" {...props} />
41+
42+
const Content = (props: BoxProps) => <Box as={MainArticle} py={4} px={10} w="full" {...props} />
4143

4244
const ContentHeading = (props: HeadingProps) => (
4345
<OldHeading lineHeight={1.4} {...props} />

‎src/pages/contributing/translation-program/contributors.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { BasePageProps } from "@/lib/types"
1717
import Breadcrumbs from "@/components/Breadcrumbs"
1818
import FeedbackCard from "@/components/FeedbackCard"
1919
import InlineLink from "@/components/Link"
20+
import MainArticle from "@/components/MainArticle"
2021
import OldHeading from "@/components/OldHeading"
2122
import Text from "@/components/OldText"
2223
import PageMetadata from "@/components/PageMetadata"
@@ -49,7 +50,7 @@ export const getStaticProps = (async ({ locale }) => {
4950
}
5051
}) satisfies GetStaticProps<BasePageProps>
5152

52-
const Content = (props: BoxProps) => <Box py={4} px={10} w="full" {...props} />
53+
const Content = (props: BoxProps) => <Box as={MainArticle} py={4} px={10} w="full" {...props} />
5354
const ContentHeading = (props: HeadingProps) => (
5455
<OldHeading lineHeight={1.4} {...props} />
5556
)

‎src/pages/dapps.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import GlossaryTooltip from "@/components/Glossary/GlossaryTooltip"
3333
import { Image } from "@/components/Image"
3434
import InfoBanner from "@/components/InfoBanner"
3535
import InlineLink, { BaseLink } from "@/components/Link"
36+
import MainArticle from "@/components/MainArticle"
3637
import OldHeading from "@/components/OldHeading"
3738
import Text from "@/components/OldText"
3839
import PageHero from "@/components/PageHero"
@@ -121,7 +122,7 @@ import magicians from "@/public/magicians.png"
121122
import wallet from "@/public/wallet.png" // width=300
122123

123124
const Page = (props: ChildOnlyProp & FlexProps) => (
124-
<Flex direction="column" align="center" mx="auto" w="full" {...props} />
125+
<Flex as={MainArticle} direction="column" align="center" mx="auto" w="full" {...props} />
125126
)
126127

127128
const Divider = (props: DividerProps) => (

‎src/pages/developers/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import FeedbackCard from "@/components/FeedbackCard"
2020
import HubHero from "@/components/Hero/HubHero"
2121
import { Image } from "@/components/Image"
2222
import InlineLink from "@/components/Link"
23+
import MainArticle from "@/components/MainArticle"
2324
import OldHeading from "@/components/OldHeading"
2425
import Text from "@/components/OldText"
2526
import PageMetadata from "@/components/PageMetadata"
@@ -57,7 +58,7 @@ const GrayContainer = (props: ChildOnlyProp) => (
5758
)
5859

5960
const Content = (props: ChildOnlyProp) => (
60-
<Box py={4} px={8} w="full" {...props} />
61+
<Box as={MainArticle} py={4} px={8} w="full" {...props} />
6162
)
6263

6364
const Subtitle = (props: TextProps) => (

‎src/pages/developers/learning-tools.tsx

Lines changed: 71 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import CalloutBanner from "@/components/CalloutBanner"
1111
import FeedbackCard from "@/components/FeedbackCard"
1212
import InfoBanner from "@/components/InfoBanner"
1313
import LearningToolsCardGrid from "@/components/LearningToolsCardGrid"
14+
import MainArticle from "@/components/MainArticle"
1415
import Heading from "@/components/OldHeading"
1516
import Text from "@/components/OldText"
1617
import PageMetadata from "@/components/PageMetadata"
@@ -62,6 +63,7 @@ const Header = (props: ChildOnlyProp) => (
6263
maxW="896px"
6364
py={0}
6465
px={8}
66+
m="auto"
6567
{...props}
6668
/>
6769
)
@@ -403,70 +405,75 @@ const LearningToolsPage = () => {
403405
"page-developers-learning-tools:page-learning-tools-meta-desc"
404406
)}
405407
/>
406-
<Header>
407-
<H1>
408-
<Translation id="page-developers-learning-tools:page-learning-tools-coding" />
409-
</H1>
410-
<Subtitle>
411-
<Translation id="page-developers-learning-tools:page-learning-tools-coding-subtitle" />
412-
</Subtitle>
413-
</Header>
414-
<StackContainer>
415-
<SubtitleTwo>
416-
<Translation id="page-developers-learning-tools:page-learning-tools-sandbox" />
417-
</SubtitleTwo>
418-
<Text>
419-
<Translation id="page-developers-learning-tools:page-learning-tools-sandbox-desc" />
420-
</Text>
421-
<LearningToolsCardGrid category={randomizedSandboxes} />
422-
<InfoBanner emoji=":point_up:" shouldCenter>
423-
<Translation id="page-developers-learning-tools:page-learning-tools-remix-description-2" />
424-
</InfoBanner>
425-
</StackContainer>
426-
<StackContainer>
427-
<SubtitleTwo>
428-
<Translation id="page-developers-learning-tools:page-learning-tools-game-tutorials" />
429-
</SubtitleTwo>
430-
<Text>
431-
<Translation id="page-developers-learning-tools:page-learning-tools-game-tutorials-desc" />
432-
</Text>
433-
<LearningToolsCardGrid category={games} />
434-
</StackContainer>
435-
<StackContainer>
436-
<SubtitleTwo>
437-
<Translation id="page-developers-learning-tools:page-learning-tools-bootcamps" />
438-
</SubtitleTwo>
439-
<Text>
440-
<Translation id="page-developers-learning-tools:page-learning-tools-bootcamps-desc" />
441-
</Text>
442-
<LearningToolsCardGrid category={bootcamps} />
443-
</StackContainer>
444-
<ContentBox>
445-
<CalloutBanner
446-
mx={4}
447-
mt={24}
448-
mb={40}
449-
image={EnterpriseEth}
450-
alt={t(
451-
"page-developers-learning-tools:page-index-tout-enterprise-image-alt"
452-
)}
453-
titleKey={
454-
"page-developers-learning-tools:page-learning-tools-documentation"
455-
}
456-
descriptionKey={
457-
"page-developers-learning-tools:page-learning-tools-documentation-desc"
458-
}
459-
>
460-
<Box>
461-
<ButtonLink to="/developers/docs/">
462-
<Translation id="page-developers-learning-tools:page-learning-tools-browse-docs" />
463-
</ButtonLink>
464-
</Box>
465-
</CalloutBanner>
466-
</ContentBox>
467-
<ContentBox>
468-
<FeedbackCard />
469-
</ContentBox>
408+
<MainArticle w="full">
409+
<Box w="full">
410+
<Header>
411+
<H1>
412+
<Translation id="page-developers-learning-tools:page-learning-tools-coding" />
413+
</H1>
414+
<Subtitle>
415+
<Translation id="page-developers-learning-tools:page-learning-tools-coding-subtitle" />
416+
</Subtitle>
417+
</Header>
418+
</Box>
419+
<StackContainer>
420+
<SubtitleTwo>
421+
<Translation id="page-developers-learning-tools:page-learning-tools-sandbox" />
422+
</SubtitleTwo>
423+
<Text>
424+
<Translation id="page-developers-learning-tools:page-learning-tools-sandbox-desc" />
425+
</Text>
426+
<LearningToolsCardGrid category={randomizedSandboxes} />
427+
<InfoBanner emoji=":point_up:" shouldCenter>
428+
<Translation id="page-developers-learning-tools:page-learning-tools-remix-description-2" />
429+
</InfoBanner>
430+
</StackContainer>
431+
<StackContainer>
432+
<SubtitleTwo>
433+
<Translation id="page-developers-learning-tools:page-learning-tools-game-tutorials" />
434+
</SubtitleTwo>
435+
<Text>
436+
<Translation id="page-developers-learning-tools:page-learning-tools-game-tutorials-desc" />
437+
</Text>
438+
<LearningToolsCardGrid category={games} />
439+
</StackContainer>
440+
<StackContainer>
441+
<SubtitleTwo>
442+
<Translation id="page-developers-learning-tools:page-learning-tools-bootcamps" />
443+
</SubtitleTwo>
444+
<Text>
445+
<Translation id="page-developers-learning-tools:page-learning-tools-bootcamps-desc" />
446+
</Text>
447+
<LearningToolsCardGrid category={bootcamps} />
448+
</StackContainer>
449+
<ContentBox>
450+
<CalloutBanner
451+
mx={4}
452+
mt={24}
453+
mb={40}
454+
image={EnterpriseEth}
455+
alt={t(
456+
"page-developers-learning-tools:page-index-tout-enterprise-image-alt"
457+
)}
458+
titleKey={
459+
"page-developers-learning-tools:page-learning-tools-documentation"
460+
}
461+
descriptionKey={
462+
"page-developers-learning-tools:page-learning-tools-documentation-desc"
463+
}
464+
>
465+
<Box>
466+
<ButtonLink to="/developers/docs/">
467+
<Translation id="page-developers-learning-tools:page-learning-tools-browse-docs" />
468+
</ButtonLink>
469+
</Box>
470+
</CalloutBanner>
471+
</ContentBox>
472+
<ContentBox>
473+
<FeedbackCard />
474+
</ContentBox>
475+
</MainArticle>
476+
470477
</Page>
471478
)
472479
}

‎src/pages/developers/local-environment.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { Framework } from "@/lib/interfaces"
1414

1515
import FeedbackCard from "@/components/FeedbackCard"
1616
import { Image } from "@/components/Image"
17+
import MainArticle from "@/components/MainArticle"
1718
import Heading from "@/components/OldHeading"
1819
import Text from "@/components/OldText"
1920
import PageMetadata from "@/components/PageMetadata"
@@ -30,7 +31,7 @@ import EthBlocksImage from "@/public/developers-eth-blocks.png"
3031

3132
const Content = ({ children }: ChildOnlyProp) => {
3233
return (
33-
<Box py={4} px={8} w="full">
34+
<Box as={MainArticle} py={4} px={8} w="full">
3435
{children}
3536
</Box>
3637
)

0 commit comments

Comments
 (0)