Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/(pages)/(hackers)/(hub)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import HeroJudging from '../_components/HomeJudging/HeroJudging';
import HackerChoiceAward from '../_components/HomeJudging/HackersChoiceAwards';
import HeroHacking from '../_components/HomeHacking/HeroHacking';
import { useRollout } from '@pages/_hooks/useRollout';
import HeroWaiting from '../_components/HomeJudging/HeroWaiting';

export default function Page() {
const { rolloutRes, loading } = useRollout('hacking-starts');
Expand All @@ -31,10 +32,11 @@ export default function Page() {
</ClientTimeProtectedDisplay>
{/* temporarilty set featureId below to "hero-hacking" to test */}
<ClientTimeProtectedDisplay featureId="hero-hacking">
<HeroWaiting />
<HeroJudging />
<HackerChoiceAward />
</ClientTimeProtectedDisplay>
<ClientTimeProtectedDisplay featureId="table-number-checkin">
<ClientTimeProtectedDisplay featureId="hero-hacking">
<TableNumberCheckin />
</ClientTimeProtectedDisplay>
</TableNumberContextProvider>
Expand Down
8 changes: 4 additions & 4 deletions app/(pages)/(hackers)/_components/HomeJudging/HeroJudging.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { LuEye, LuEyeOff } from 'react-icons/lu';

import useTableNumberContext from '@pages/_hooks/useTableNumberContext';
import JudgeBanners from './_components/JudgeBanners';
import HeroWaiting from './HeroWaiting';
// import HeroWaiting from './HeroWaiting';
import DoneJudgingModal from './_components/DoneJudgingModal';

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

if (!tableNumber) {
return <HeroWaiting />;
}
// if (!tableNumber) {
// return <HeroWaiting />;
// }

return (
<div className="w-full h-screen p-4 md:p-10">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function TableNumberCheckin() {
const { loading, tableNumber, fetchTableNumber, setTableNumber, error } =
useTableNumber();

if (localStorageLoading || storedValue) {
if (localStorageLoading || storedValue !== null) {
return null;
}

Expand Down Expand Up @@ -134,8 +134,8 @@ export default function TableNumberCheckin() {
className={styles.yes_button}
disabled={!hasTeamNumber}
onClick={() => {
if (tableNumber !== null) {
setValue(String(tableNumber));
if (tableNumber) {
setValue(tableNumber);
}
}}
>
Expand Down
12 changes: 8 additions & 4 deletions app/(pages)/_hooks/useTableNumber.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { getManyTeams } from '@actions/teams/getTeams';
import { useState } from 'react';

export function useTableNumber() {
const [tableNumber, setTableNumber] = useState<null | number>(null);
const [tableNumber, setTableNumber] = useState<null | string>(null);
const [loading, setLoading] = useState<boolean>(false);
const [error, setError] = useState<string | null>(null);

Expand All @@ -16,9 +16,13 @@ export function useTableNumber() {
setError(teamsRes.error);
} else {
// grab first team that matches teamNumber, get tableNumber back
const tableNumber = teamsRes.body?.[0]?.tableNumber ?? null;
setTableNumber(tableNumber);
if (!tableNumber) {
const tableNumber = teamsRes.body?.[0]?.tableNumber;
const normalizedTableNumber =
tableNumber === null || tableNumber === undefined
? null
: String(tableNumber);
setTableNumber(normalizedTableNumber);
if (!normalizedTableNumber) {
setError('No team with given teamNumber');
} else {
setError(null);
Expand Down
Loading