Skip to content

Commit 2a15980

Browse files
committed
Merge branch 'main' into hackbot-server-core
2 parents 3e4a8ff + 0f8ca03 commit 2a15980

8 files changed

Lines changed: 17 additions & 23 deletions

File tree

app/(pages)/(hackers)/(hub)/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default function Page() {
2424
return (
2525
<main id="home">
2626
<TableNumberContextProvider>
27-
<ClientTimeProtectedDisplay featureId="hero-judging">
27+
<ClientTimeProtectedDisplay featureId="hero-hacking">
2828
<HeroHacking rolloutTime={rolloutTime} loading={loading} />
2929
<ScheduleSneakPeek />
3030
<BeginnersSection />

app/(pages)/(hackers)/_components/HomeHacking/HeroHacking.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,46 +97,46 @@ export default function HeroHacking({
9797
{/* 2x2 animals */}
9898
<div className="grid grid-cols-2 gap-2">
9999
{/* Cow */}
100-
<div className="relative rounded-[20px] bg-[#93F5F3] overflow-hidden flex items-end justify-center">
100+
<div className="relative aspect-[5/3] rounded-[20px] bg-[#CCFFFE] overflow-hidden flex items-end justify-center">
101101
<Image
102102
src={peepingCow}
103103
alt="Peeking cow"
104104
width={520}
105105
height={320}
106-
className="w-[100%] h-auto pointer-events-none select-none"
106+
className="h-full w-auto max-w-none pointer-events-none select-none"
107107
/>
108108
</div>
109109

110110
{/* Duck */}
111-
<div className="relative rounded-[20px] bg-[#FFF3B6] overflow-hidden flex items-end justify-center">
111+
<div className="relative aspect-[5/3] rounded-[20px] bg-[#FFF3B6] overflow-hidden flex items-end justify-center">
112112
<Image
113113
src={peepingDuck}
114114
alt="Peeking duck"
115115
width={520}
116116
height={320}
117-
className="w-[100%] h-auto pointer-events-none select-none"
117+
className="h-full w-auto max-w-none pointer-events-none select-none"
118118
/>
119119
</div>
120120

121121
{/* Frog */}
122-
<div className="relative rounded-[20px] bg-[#E9FBBA] overflow-hidden flex items-end justify-center">
122+
<div className="relative aspect-[5/3] rounded-[20px] bg-[#E9FBBA] overflow-hidden flex items-end justify-center">
123123
<Image
124124
src={peepingFrog}
125125
alt="Peeking frog"
126126
width={520}
127127
height={320}
128-
className="w-[100%] h-auto pointer-events-none select-none"
128+
className="h-full w-auto max-w-none pointer-events-none select-none"
129129
/>
130130
</div>
131131

132132
{/* Bunny */}
133-
<div className="relative rounded-[20px] bg-[#FFD2D2] overflow-hidden flex items-end justify-center">
133+
<div className="relative aspect-[5/3] rounded-[20px] bg-[#FFD2D2] overflow-hidden flex items-end justify-center">
134134
<Image
135135
src={peepingBunny}
136136
alt="Peeking bunny"
137137
width={520}
138138
height={320}
139-
className="w-[100%] h-auto pointer-events-none select-none"
139+
className="h-full w-auto max-w-none pointer-events-none select-none"
140140
/>
141141
</div>
142142
</div>
@@ -174,13 +174,13 @@ export default function HeroHacking({
174174
{/* Row 1: 3 tiles */}
175175
<div className="min-h-0 grid grid-cols-[50fr_30fr_20fr] gap-5">
176176
{/* Cow */}
177-
<div className="min-h-0 relative rounded-[28px] bg-[#93F5F3] backdrop-blur-xl overflow-hidden flex items-end justify-center">
177+
<div className="min-h-0 relative rounded-[28px] bg-[#CCFFFE] backdrop-blur-xl overflow-hidden flex items-end justify-center">
178178
<Image
179179
src={peepingCow}
180180
alt="Peeking cow"
181181
width={520}
182182
height={320}
183-
className="w-[100%] max-h-full h-auto pointer-events-none select-none"
183+
className="h-full w-auto max-w-none pointer-events-none select-none"
184184
/>
185185
</div>
186186

@@ -191,7 +191,7 @@ export default function HeroHacking({
191191
alt="Peeking duck"
192192
width={520}
193193
height={320}
194-
className="w-[100%] max-h-full h-auto pointer-events-none select-none"
194+
className="h-full w-auto max-w-none pointer-events-none select-none"
195195
/>
196196
</div>
197197

@@ -202,7 +202,7 @@ export default function HeroHacking({
202202
alt="Peeking frog"
203203
width={520}
204204
height={320}
205-
className="w-[100%] max-h-full h-auto pointer-events-none select-none"
205+
className="h-full w-auto max-w-none pointer-events-none select-none"
206206
/>
207207
</div>
208208
</div>
@@ -216,7 +216,7 @@ export default function HeroHacking({
216216
alt="Peeking bunny"
217217
width={520}
218218
height={320}
219-
className="w-[100%] max-h-full h-auto pointer-events-none select-none"
219+
className="h-full w-auto max-w-none pointer-events-none select-none"
220220
/>
221221
</div>
222222

app/(pages)/judges/(app)/_components/Landing/ViewProjects.module.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
.container {
2-
background-color: #f2f2f7;
3-
padding: 24px 20px 0px;
42
color: var(--text-dark);
53

6-
74
h1 {
85
font-size: 1.75rem;
96
font-weight: 700;

app/(pages)/judges/_components/AuthForms/CheckInForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default function CheckInForm({ id }: any) {
3636
<AuthForm
3737
role="judge"
3838
fields={formFields}
39-
buttonText="Check in"
39+
buttonText="Check in"
4040
initialValues={{
4141
code: '',
4242
opted_into_panels: false,

app/(pages)/judges/_components/AuthForms/DetailForm.module.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
width: 100%;
33
height: 60vh;
44
max-height: 100vh;
5-
background-color: #F2F2F7;
65
border-radius: var(--b-radius);
76
display: flex;
87
flex-direction: column;

app/(pages)/judges/_components/AuthForms/RegisterForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default function RegisterForm({ data }: any) {
5757
<AuthForm
5858
role="judge"
5959
fields={formFields}
60-
buttonText="Next"
60+
buttonText="Next"
6161
initialValues={{
6262
email: data?.email ?? '',
6363
password: '',

app/_data/db_validation_data.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"business",
55
"aiml",
66
"hardware",
7-
"design",
8-
"medtech"
7+
"design"
98
],
109
"tracks": [
1110
"Best Hack for Social Good",

scripts/generateData.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ function weightedShuffleSpecialties(specialties) {
2525
aiml: 0.1,
2626
hardware: 0.039,
2727
design: 0.158,
28-
medtech: 0.015,
2928
};
3029
const availableWeighted = specialties.filter(
3130
(s) => weightMap[s.toLowerCase()] !== undefined

0 commit comments

Comments
 (0)