Skip to content

Commit 0cf695f

Browse files
authored
Merge branch 'dev' into stablecoins-page
2 parents 10d3809 + 830cf8e commit 0cf695f

File tree

5 files changed

+7
-165
lines changed

5 files changed

+7
-165
lines changed

netlify.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
[functions]
2121
included_files = [
22-
"!./src/data/**/*",
22+
"./src/intl/**/*",
2323
"!./public/**/*",
24-
24+
"!./node_modules/@swc/core-linux-x64-musl/**/*",
2525
]

src/components/Contributors.tsx

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import { useEffect, useState } from "react"
21
import { shuffle } from "lodash"
32
import { Box, Flex, Image, LinkBox, LinkOverlay } from "@chakra-ui/react"
43

54
import InlineLink from "@/components/Link"
65
import Text from "@/components/OldText"
76

8-
// TODO: Re-import once Crowdin scripts are functional and data available
9-
// import data from "../data/contributors.json"
7+
import data from "!!raw-loader!@/../.all-contributorsrc"
108

119
export interface Contributor {
1210
login: string
@@ -17,15 +15,7 @@ export interface Contributor {
1715
}
1816

1917
const Contributors = () => {
20-
const [contributorsList, setContributorsList] = useState<Array<Contributor>>(
21-
[]
22-
)
23-
24-
// TODO: Re-enable once Crowdin scripts are functional and data available
25-
// useEffect(() => {
26-
// const list = shuffle(data.contributors)
27-
// setContributorsList(list)
28-
// }, [])
18+
const contributorsList = shuffle(JSON.parse(data).contributors)
2919

3020
return (
3121
<>

src/components/ReleaseBanner.tsx

Lines changed: 0 additions & 142 deletions
This file was deleted.

src/layouts/Roadmap.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ const HeroContainer = (props: ChildOnlyProp) => (
4848
mb={{ base: 8, lg: 0 }}
4949
maxH={{ base: "100%", lg: "none" }}
5050
{...props}
51+
justify="space-between"
5152
/>
5253
)
5354

5455
const TitleCard = (props: ChildOnlyProp) => (
55-
<Flex p={8} direction="column" justify="flex-start" {...props} />
56+
<Flex w="full" p={8} direction="column" justify="flex-start" {...props} />
5657
)
5758

5859
// Roadmap layout components
@@ -140,11 +141,6 @@ export const RoadmapLayout: React.FC<IProps> = ({
140141
/>
141142
) : (
142143
<HeroContainer>
143-
<Flex
144-
w="full"
145-
flexDirection={{ base: "column", lg: "row" }}
146-
justify="space-between"
147-
>
148144
<TitleCard>
149145
{/* TODO: Double check this slug works */}
150146
<Breadcrumbs slug={slug} mb="8" />
@@ -186,12 +182,11 @@ export const RoadmapLayout: React.FC<IProps> = ({
186182
src={frontmatter.image}
187183
alt={frontmatter.alt ?? ""}
188184
style={{ objectFit: "contain" }}
189-
width={700}
185+
width={1504}
190186
height={345}
191187
priority
192188
/>
193189
</Center>
194-
</Flex>
195190
</HeroContainer>
196191
)}
197192
<Page>

tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
"./src/components/Modal.tsx",
7575
"./src/components/Morpher.tsx",
7676
"./src/components/OrderedList.tsx",
77-
"./src/components/ReleaseBanner.tsx",
7877
"./src/components/RollupProductDevDoc.tsx",
7978
"./src/components/Search/SearchButton.tsx",
8079
"./src/components/Search/SearchModal.tsx",

0 commit comments

Comments
 (0)