Skip to content

Commit cb50787

Browse files
authored
temp add judging state (#454)
1 parent 6937f65 commit cb50787

4 files changed

Lines changed: 18 additions & 12 deletions

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import HeroJudging from '../_components/HomeJudging/HeroJudging';
1313
import HackerChoiceAward from '../_components/HomeJudging/HackersChoiceAwards';
1414
import HeroHacking from '../_components/HomeHacking/HeroHacking';
1515
import { useRollout } from '@pages/_hooks/useRollout';
16+
import HeroWaiting from '../_components/HomeJudging/HeroWaiting';
1617

1718
export default function Page() {
1819
const { rolloutRes, loading } = useRollout('hacking-starts');
@@ -31,10 +32,11 @@ export default function Page() {
3132
</ClientTimeProtectedDisplay>
3233
{/* temporarilty set featureId below to "hero-hacking" to test */}
3334
<ClientTimeProtectedDisplay featureId="hero-hacking">
35+
<HeroWaiting />
3436
<HeroJudging />
3537
<HackerChoiceAward />
3638
</ClientTimeProtectedDisplay>
37-
<ClientTimeProtectedDisplay featureId="table-number-checkin">
39+
<ClientTimeProtectedDisplay featureId="hero-hacking">
3840
<TableNumberCheckin />
3941
</ClientTimeProtectedDisplay>
4042
</TableNumberContextProvider>

app/(pages)/(hackers)/_components/HomeJudging/HeroJudging.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { LuEye, LuEyeOff } from 'react-icons/lu';
88

99
import useTableNumberContext from '@pages/_hooks/useTableNumberContext';
1010
import JudgeBanners from './_components/JudgeBanners';
11-
import HeroWaiting from './HeroWaiting';
11+
// import HeroWaiting from './HeroWaiting';
1212
import DoneJudgingModal from './_components/DoneJudgingModal';
1313

1414
import clouds from '@public/hackers/hero/Clouds.svg';
@@ -25,9 +25,9 @@ export default function HeroJudging() {
2525
}
2626
}, [hasDismissedModal]);
2727

28-
if (!tableNumber) {
29-
return <HeroWaiting />;
30-
}
28+
// if (!tableNumber) {
29+
// return <HeroWaiting />;
30+
// }
3131

3232
return (
3333
<div className="w-full h-screen p-4 md:p-10">

app/(pages)/(hackers)/_components/TableNumberCheckin/TableNumberCheckin.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default function TableNumberCheckin() {
2525
const { loading, tableNumber, fetchTableNumber, setTableNumber, error } =
2626
useTableNumber();
2727

28-
if (localStorageLoading || storedValue) {
28+
if (localStorageLoading || storedValue !== null) {
2929
return null;
3030
}
3131

@@ -134,8 +134,8 @@ export default function TableNumberCheckin() {
134134
className={styles.yes_button}
135135
disabled={!hasTeamNumber}
136136
onClick={() => {
137-
if (tableNumber !== null) {
138-
setValue(String(tableNumber));
137+
if (tableNumber) {
138+
setValue(tableNumber);
139139
}
140140
}}
141141
>

app/(pages)/_hooks/useTableNumber.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { getManyTeams } from '@actions/teams/getTeams';
44
import { useState } from 'react';
55

66
export function useTableNumber() {
7-
const [tableNumber, setTableNumber] = useState<null | number>(null);
7+
const [tableNumber, setTableNumber] = useState<null | string>(null);
88
const [loading, setLoading] = useState<boolean>(false);
99
const [error, setError] = useState<string | null>(null);
1010

@@ -16,9 +16,13 @@ export function useTableNumber() {
1616
setError(teamsRes.error);
1717
} else {
1818
// grab first team that matches teamNumber, get tableNumber back
19-
const tableNumber = teamsRes.body?.[0]?.tableNumber ?? null;
20-
setTableNumber(tableNumber);
21-
if (!tableNumber) {
19+
const tableNumber = teamsRes.body?.[0]?.tableNumber;
20+
const normalizedTableNumber =
21+
tableNumber === null || tableNumber === undefined
22+
? null
23+
: String(tableNumber);
24+
setTableNumber(normalizedTableNumber);
25+
if (!normalizedTableNumber) {
2226
setError('No team with given teamNumber');
2327
} else {
2428
setError(null);

0 commit comments

Comments
 (0)