Skip to content

Commit 690e43d

Browse files
committed
Merge branch 'staging' into translatathon-updates
2 parents 2bc23be + adef7de commit 690e43d

File tree

4 files changed

+39
-13
lines changed

4 files changed

+39
-13
lines changed

src/components/Search/index.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,8 @@ const Search = forwardRef<Props, "button">(
117117
items.map((item: DocSearchHit) => {
118118
const newItem: DocSearchHit = structuredClone(item)
119119
newItem.url = sanitizeHitUrl(item.url)
120-
const newTitle = sanitizeHitTitle(
121-
item._highlightResult.hierarchy.lvl0?.value || ""
122-
)
123-
newItem._highlightResult.hierarchy.lvl0.value = newTitle
120+
const newTitle = sanitizeHitTitle(item.hierarchy.lvl0 || "")
121+
newItem.hierarchy.lvl0 = newTitle
124122
return newItem
125123
})
126124
}

src/components/Translatathon/DatesAndTimeline.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const dates = [
5252
description:
5353
"We will announce the results and winners on the ethereum.org community Call",
5454
startDate: new Date("2024-08-29T12:00:00Z"),
55-
endDate: new Date("2024-09-30T12:00:00Z"),
55+
endDate: null,
5656
link: null,
5757
linkText: null,
5858
},
@@ -65,7 +65,8 @@ export const DatesAndTimeline = () => {
6565
<Flex direction="column" p={4} mb={16}>
6666
{dates.map((date, index) => {
6767
const isLive =
68-
todaysDate >= date.startDate && todaysDate <= date.endDate
68+
todaysDate >= date.startDate &&
69+
(date.endDate ? todaysDate <= date.endDate : true)
6970
return (
7071
<Flex
7172
key={index}
@@ -96,8 +97,8 @@ export const DatesAndTimeline = () => {
9697
color={isLive ? "background.base" : "body.base"}
9798
>
9899
<Text>
99-
{date.startDate.toDateString()} -{" "}
100-
{date.endDate.toDateString()}
100+
{date.startDate.toDateString()}{" "}
101+
{date.endDate ? `- ${date.endDate.toDateString()}` : ""}
101102
</Text>
102103
</Flex>
103104
<Flex direction="column">

src/components/Translatathon/LocalCommunitiesList.tsx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,24 @@ const localCommunitiesData = [
5353
location: "Rio de Janeiro, Brazil",
5454
eventName: "Ethereum Translathon 📜🔍 hosted by EthSamba & BambaLabs",
5555
},
56+
{
57+
emojiString: "🇲🇾",
58+
lumaLink: "https://www.meetup.com/ethmalaysia/events/302654952/",
59+
location: "Kuala Lumpur, Malaysia",
60+
eventName: "Lepak and Join Translatathon",
61+
},
62+
{
63+
emojiString: "🇮🇳",
64+
lumaLink: "https://lu.ma/9eajbv89",
65+
location: "Kerala, India",
66+
eventName: "Ethereum.org - TRANSLATATHON INDIA - Jñāna",
67+
},
68+
{
69+
emojiString: "🇬🇭",
70+
lumaLink: "https://lu.ma/qvzlo7nc",
71+
location: "Accra, Ghana",
72+
eventName: "Ghana Ethereum Translatathon 2024",
73+
},
5674
]
5775

5876
export const LocalCommunitiesList = () => {

src/components/Translatathon/TranslatathonPrizes.tsx

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ const TranslatathonPrizes = () => {
1111
<Emoji text="🥇" fontSize={64} />
1212
</div>
1313
</div>
14-
<div className="flex flex-col items-center justify-center">
14+
<div className="flex max-w-48 flex-col items-center justify-center text-center">
1515
<p className="text-2xl font-bold">1st place</p>
1616
<p className="text-4xl font-bold">$5000</p>
17+
<Link href="https://devcon.org">+ Devcon SEA ticket</Link>
1718
</div>
1819
</div>
1920
</div>
@@ -29,9 +30,10 @@ const TranslatathonPrizes = () => {
2930
/>
3031
</div>
3132
</div>
32-
<div className="flex flex-col items-center justify-center">
33+
<div className="flex max-w-48 flex-col items-center justify-center text-center">
3334
<p className="text-lg font-bold">2nd place</p>
3435
<p className="text-3xl font-bold">$3000</p>
36+
<Link href="https://devcon.org">+ Devcon SEA ticket</Link>
3537
</div>
3638
</div>
3739
<div className="justify-left flex flex-1 items-center gap-4 sm:justify-center">
@@ -40,9 +42,10 @@ const TranslatathonPrizes = () => {
4042
<Emoji text="🥉" fontSize={44} />
4143
</div>
4244
</div>
43-
<div className="flex flex-col items-center justify-center">
45+
<div className="flex max-w-48 flex-col items-center justify-center text-center">
4446
<p className="text-lg font-bold">3rd place</p>
4547
<p className="text-3xl font-bold">$1500</p>
48+
<Link href="https://devcon.org">+ Devcon SEA ticket</Link>
4649
</div>
4750
</div>
4851
</div>
@@ -53,9 +56,12 @@ const TranslatathonPrizes = () => {
5356
<Emoji text="🌟" fontSize={36} />
5457
</div>
5558
</div>
56-
<div className="flex flex-col items-center justify-center">
59+
<div className="flex max-w-48 flex-col items-center justify-center text-center">
5760
<p className="text-md font-bold">4th & 5th</p>
5861
<p className="text-2xl font-bold">$500</p>
62+
<Link href="https://devcon.org">
63+
+ 50% Devcon SEA ticket discount
64+
</Link>
5965
</div>
6066
</div>
6167
<div className="justify-left flex flex-1 items-center gap-4 sm:justify-center">
@@ -64,9 +70,12 @@ const TranslatathonPrizes = () => {
6470
<Emoji text=":scroll:" fontSize={36} />
6571
</div>
6672
</div>
67-
<div className="flex flex-col items-center justify-center">
73+
<div className="flex max-w-48 flex-col items-center justify-center text-center">
6874
<p className="text-md font-bold">6th to 10th</p>
6975
<p className="text-2xl font-bold">$200</p>
76+
<Link href="https://devcon.org">
77+
+ 50% Devcon SEA ticket discount
78+
</Link>
7079
</div>
7180
</div>
7281
</div>

0 commit comments

Comments
 (0)