Skip to content

Commit 7a757e7

Browse files
pettinarippettinarip
authored
Merge branch 'dev' into walletsPage
2 parents 3f58c67 + 696cb76 commit 7a757e7

17 files changed

+1620
-320
lines changed

‎next.config.js

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@ const { PHASE_DEVELOPMENT_SERVER } = require("next/constants")
22

33
const { i18n } = require("./next-i18next.config")
44

5-
const experimental = (process.env.LIMIT_CPU || "").toLowerCase() === "true"
6-
? {
7-
// This option could be enabled in the future when flagged as stable, to speed up builds
8-
// (see https://nextjs.org/docs/pages/building-your-application/configuring/mdx#using-the-rust-based-mdx-compiler-experimental)
9-
// mdxRs: true,
5+
const experimental =
6+
(process.env.LIMIT_CPU || "").toLowerCase() === "true"
7+
? {
8+
// This option could be enabled in the future when flagged as stable, to speed up builds
9+
// (see https://nextjs.org/docs/pages/building-your-application/configuring/mdx#using-the-rust-based-mdx-compiler-experimental)
10+
// mdxRs: true,
1011

11-
// Reduce the number of cpus and disable parallel threads in prod envs to consume less memory
12-
workerThreads: false,
13-
cpus: 2,
14-
}
15-
: {}
12+
// Reduce the number of cpus and disable parallel threads in prod envs to consume less memory
13+
workerThreads: false,
14+
cpus: 2,
15+
}
16+
: {}
1617

1718
/** @type {import('next').NextConfig} */
1819
module.exports = (phase, { defaultConfig }) => {
@@ -22,14 +23,14 @@ module.exports = (phase, { defaultConfig }) => {
2223
webpack: (config) => {
2324
config.module.rules.push({
2425
test: /\.ya?ml$/,
25-
use: 'yaml-loader',
26-
});
26+
use: "yaml-loader",
27+
})
2728
config.module.rules.push({
2829
test: /\.svg$/,
29-
use: '@svgr/webpack',
30+
use: "@svgr/webpack",
3031
})
3132

32-
return config;
33+
return config
3334
},
3435
i18n,
3536
}

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"@emotion/react": "^11.11.1",
2323
"@emotion/styled": "^11.11.0",
2424
"clipboard": "^2.0.11",
25+
"ethereum-blockies-base64": "^1.0.2",
2526
"focus-trap-react": "^10.2.3",
2627
"framer-motion": "^10.13.0",
2728
"gray-matter": "^4.0.3",

‎public/_redirects

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
/discord https://discord.gg/ethereum-org 301!
2+
3+
/*/discord https://discord.gg/ethereum-org 301!
4+
5+
/pdfs/* /en/ 301!
6+
7+
/brand /en/assets/ 301!
8+
9+
/ether /en/eth/ 301!
10+
11+
/token /en/developers/ 301!
12+
13+
/crowdsale /en/developers/ 301!
14+
15+
/cli /en/developers/ 301!
16+
17+
/greeter /en/developers/ 301!
18+
19+
/search /en/ 301!
20+
21+
/use /en/dapps/ 301!
22+
23+
/beginners /en/what-is-ethereum/ 301!
24+
25+
/eth2/ /en/roadmap/ 301!
26+
27+
/build/ /en/developers/learning-tools/ 301!
28+
29+
/nfts/ /en/nft/ 301!
30+
31+
/daos/ /en/dao/ 301!
32+
33+
/layer2/ /en/layer-2/ 301!
34+
35+
/*/layer2/ /:splat/layer-2/ 301!
36+
37+
/grants/ /en/community/grants/ 301!
38+
39+
/no/* /nb/:splat 301!
40+
41+
/ph/* /fil/:splat 301!
42+
43+
/java/ /en/developers/docs/programming-languages/java/ 301!
44+
45+
/en/java/ /en/developers/docs/programming-languages/java/ 301!
46+
47+
/python/ /en/developers/docs/programming-languages/python/ 301!
48+
49+
/en/python/ /en/developers/docs/programming-languages/python/ 301!
50+
51+
/javascript/ /en/developers/docs/programming-languages/javascript/ 301!
52+
53+
/en/javascript/ /en/developers/docs/programming-languages/javascript/ 301!
54+
55+
/golang/ /en/developers/docs/programming-languages/golang/ 301!
56+
57+
/en/golang/ /en/developers/docs/programming-languages/golang/ 301!
58+
59+
/rust/ /en/developers/docs/programming-languages/rust/ 301!
60+
61+
/en/rust/ /en/developers/docs/programming-languages/rust/ 301!
62+
63+
/dot-net/ /en/developers/docs/programming-languages/dot-net/ 301!
64+
65+
/en/dot-net/ /en/developers/docs/programming-languages/dot-net/ 301!
66+
67+
/delphi/ /en/developers/docs/programming-languages/delphi/ 301!
68+
69+
/en/delphi/ /en/developers/docs/programming-languages/delphi/ 301!
70+
71+
/dart/ /en/developers/docs/programming-languages/dart/ 301!
72+
73+
/en/dart/ /en/developers/docs/programming-languages/dart/ 301!
74+
75+
/developers/docs/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
76+
77+
/en/developers/docs/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
78+
79+
/*/beginners /:splat/what-is-ethereum/ 301!
80+
81+
/*/build /:splat/developers/learning-tools/ 301!
82+
83+
/*/eth2/beacon-chain/ /:splat/upgrades/beacon-chain/ 301!
84+
85+
/*/eth2/the-beacon-chain/ /:splat/upgrades/beacon-chain/ 301!
86+
87+
/*/upgrades/the-beacon-chain/ /:splat/upgrades/beacon-chain/ 301!
88+
89+
/*/eth2/merge /:splat/upgrades/merge/ 301!
90+
91+
/*/eth2/the-merge /:splat/upgrades/merge/ 301!
92+
93+
/*/upgrades/the-merge /:splat/upgrades/merge/ 301!
94+
95+
/*/eth2/docking /:splat/upgrades/merge/ 301!
96+
97+
/*/upgrades/docking /:splat/upgrades/merge/ 301!
98+
99+
/*/eth2/the-docking /:splat/upgrades/merge/ 301!
100+
101+
/*/upgrades/the-docking /:splat/upgrades/merge/ 301!
102+
103+
/*/eth2/shard-chains/ /:splat/roadmap/danksharding/ 301!
104+
105+
/*/upgrades/shard-chains/ /:splat/roadmap/danksharding/ 301!
106+
107+
/upgrades/sharding/ /en/roadmap/danksharding/ 301!
108+
109+
/*/upgrades/sharding/ /:splat/roadmap/danksharding/ 301!
110+
111+
/upgrades/shard-chains/ /en/roadmap/danksharding/ 301!
112+
113+
/upgrades/merge /en/roadmap/merge/ 301!
114+
115+
/*/upgrades/merge /:splat/roadmap/merge/ 301!
116+
117+
/upgrades/merge/issuance /en/roadmap/merge/issuance 301!
118+
119+
/*/upgrades/merge/issuance /:splat/roadmap/merge/issuance 301!
120+
121+
/upgrades/beacon-chain /en/roadmap/beacon-chain 301!
122+
123+
/*/upgrades/beacon-chain /:splat/roadmap/beacon-chain 301!
124+
125+
/upgrades/vision/ /en/roadmap/vision/ 301!
126+
127+
/*/upgrades/vision/ /:splat/roadmap/vision/ 301!
128+
129+
/upgrades /en/roadmap 301!
130+
131+
/*/upgrades /:splat/roadmap 301!
132+
133+
/upgrades/get-involved /contributing 301!
134+
135+
/*/upgrades/get-involved /:splat/contributing 301!
136+
137+
/*/eth2/staking/ /:splat/staking/ 301!
138+
139+
/*/eth2/vision/ /:splat/roadmap/vision/ 301!
140+
141+
/*/eth2/get-involved/ /:splat/upgrades/get-involved/ 301!
142+
143+
/*/eth2/get-involved/bug-bounty/ /:splat/bug-bounty/ 301!
144+
145+
/*/upgrades/get-involved/bug-bounty/ /:splat/bug-bounty/ 301!
146+
147+
/*/eth2/deposit-contract/ /:splat/staking/deposit-contract/ 301!
148+
149+
/*/eth2 /:splat/upgrades/ 301!
150+
151+
/*/developers/docs/layer-2-scaling /:splat/developers/docs/scaling 301!
152+
153+
/*/developers/docs/scaling/layer-2-rollups /:splat/developers/docs/scaling 301!
154+
155+
/*/about/web-developer /:splat/about/#open-jobs 301!
156+
157+
/*/about/product-designer /:splat/about/#open-jobs 301!
158+
159+
/*/use /:splat/dapps/ 301!
160+
161+
/*/contributing/translation-program/translation-guide/ /:splat/contributing/translation-program/faq/ 301!
162+
163+
/*/contributing/translation-program/content-versions/ /:splat/contributing/translation-program/content-buckets/ 301!
164+
165+
/*/developers/docs/smart-contracts/source-code-verification/ /:splat/developers/docs/smart-contracts/verifying/ 301!
166+
167+
/*/developers/docs/smart-contracts/upgrading-smart-contracts/ /:splat/developers/docs/smart-contracts/upgrading/ 301!
168+
169+
/staking/withdraws /en/staking/withdrawals/ 301!
170+
171+
/*/writing-cohort https://ethereumwriterscohort.carrd.co/ 301!
172+
173+
/*/staking/withdraws /:splat/staking/withdrawals/ 301!
174+
175+
/*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!

‎src/components/LeftNavBar/index.tsx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import React from "react"
2-
import { calc, Flex, FlexProps, HeadingProps } from "@chakra-ui/react"
1+
import { calc, Flex, type FlexProps, type HeadingProps } from "@chakra-ui/react"
2+
3+
import type { ToCItem } from "@/lib/types"
34

45
import ButtonDropdown, {
56
IProps as ButtonDropdownProps,
67
List as ButtonDropdownList,
7-
} from "../ButtonDropdown"
8-
import OldHeading from "../OldHeading"
9-
import Translation from "../Translation"
10-
import UpgradeTableOfContents from "../UpgradeTableOfContents"
8+
} from "@/components/ButtonDropdown"
9+
import OldHeading from "@/components/OldHeading"
10+
import Translation from "@/components/Translation"
11+
import UpgradeTableOfContents from "@/components/UpgradeTableOfContents"
1112

1213
export const H2 = (props: HeadingProps) => (
1314
<OldHeading
@@ -29,13 +30,13 @@ export const StyledButtonDropdown = ({
2930
</Flex>
3031
)
3132

32-
interface IProps extends FlexProps {
33+
type LeftNavBarProps = FlexProps & {
3334
dropdownLinks?: ButtonDropdownList
3435
maxDepth?: number
35-
tocItems: any[]
36+
tocItems: ToCItem[]
3637
}
3738

38-
const LeftNavBar: React.FC<IProps> = ({
39+
const LeftNavBar: React.FC<LeftNavBarProps> = ({
3940
dropdownLinks,
4041
maxDepth = 1,
4142
tocItems,

‎src/components/Nav/Dropdown.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ import { Box, Fade, Flex, Icon, ListItem } from "@chakra-ui/react"
44

55
import { BaseLink, type LinkProps } from "../Link"
66

7-
// TODO
8-
// import { useOnClickOutside } from "../../hooks/useOnClickOutside"
9-
// import { getDirection } from "../../utils/translations"
10-
// import { Lang } from "../../utils/languages"
117
import { ISection } from "./types"
128

9+
import { useOnClickOutside } from "@/hooks/useOnClickOutside"
10+
1311
const NavLink = (props: LinkProps) => (
1412
<BaseLink
1513
color="text200"
@@ -54,14 +52,12 @@ const NavDropdown: React.FC<IProps> & {
5452
} = ({ children, section, hasSubNav }) => {
5553
const [isOpen, setIsOpen] = useState(false)
5654

57-
// const { locale } = useRouter()
5855
const ref = createRef<HTMLLIElement>()
5956

6057
const toggle = () => setIsOpen((isOpen) => !isOpen)
6158
const close = () => setIsOpen(false)
6259

63-
// TODO
64-
// useOnClickOutside(ref, () => setIsOpen(false))
60+
useOnClickOutside(ref, () => setIsOpen(false))
6561

6662
// Toggle on `enter` key
6763
const onKeyDownHandler = (e: React.KeyboardEvent<HTMLElement>): void => {

‎src/components/Nav/index.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ const Nav: FC<IProps> = ({ path }) => {
3838
<Flex
3939
ref={navWrapperRef}
4040
as="nav"
41-
// TODO
42-
// aria-label={t("nav-primary")}
41+
aria-label={t("nav-primary")}
4342
bg="background.base"
4443
borderBottom="1px"
4544
borderColor="rgba(0, 0, 0, 0.1)"
@@ -56,8 +55,7 @@ const Nav: FC<IProps> = ({ path }) => {
5655
>
5756
<BaseLink
5857
to="/"
59-
// TODO
60-
// aria-label={t("home")}
58+
aria-label={t("home")}
6159
display="inline-flex"
6260
alignItems="center"
6361
textDecor="none"
@@ -127,8 +125,7 @@ const Nav: FC<IProps> = ({ path }) => {
127125
{shouldShowSubNav && (
128126
<Flex
129127
as="nav"
130-
// TODO
131-
// aria-label={t("nav-developers")}
128+
aria-label={t("nav-developers")}
132129
display={{ base: "none", lg: "flex" }}
133130
bg="ednBackground"
134131
borderBottom="1px"

‎src/components/Nav/useNav.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ import { cloneDeep } from "lodash"
33
import { useTranslation } from "next-i18next"
44
import { useColorMode } from "@chakra-ui/react"
55

6-
import { IItem, ISections } from "./types"
6+
import { trackCustomEvent } from "@/lib/utils/matomo"
77

8-
// TODO: add trackCustomEvent when util is migrated
9-
// import { trackCustomEvent } from "../../utils/matomo"
8+
import { IItem, ISections } from "./types"
109

1110
export const useNav = ({ path }: { path: string }) => {
1211
const [isMenuOpen, setIsMenuOpen] = useState(false)
@@ -294,12 +293,11 @@ export const useNav = ({ path }: { path: string }) => {
294293

295294
const changeColorMode = () => {
296295
toggleColorMode()
297-
// TODO: add trackCustomEvent when util is migrated
298-
// trackCustomEvent({
299-
// eventCategory: "nav bar",
300-
// eventAction: "click",
301-
// eventName: isDarkTheme ? "light mode" : "dark mode", // This will be inverted as the state is changing
302-
// })
296+
trackCustomEvent({
297+
eventCategory: "nav bar",
298+
eventAction: "click",
299+
eventName: isDarkTheme ? "light mode" : "dark mode", // This will be inverted as the state is changing
300+
})
303301
}
304302

305303
const mobileNavProps = {

0 commit comments

Comments
 (0)