From 3c562917da69bcfb1638b54edf0c5155324bac82 Mon Sep 17 00:00:00 2001 From: Divyank Shah Date: Sun, 12 Nov 2023 22:55:17 -0800 Subject: [PATCH 1/2] update --- src/app/api/judging/route.js | 8 ++------ src/components/dynamic/ProtectedPage.jsx | 6 +++++- src/components/dynamic/admin/services/judging/Judging.jsx | 8 +------- src/components/dynamic/admin/services/judging/Toolbar.jsx | 4 +++- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/app/api/judging/route.js b/src/app/api/judging/route.js index fd361d49b..8ae1aa549 100644 --- a/src/app/api/judging/route.js +++ b/src/app/api/judging/route.js @@ -28,7 +28,7 @@ export async function GET() { try { const teamsSnapshot = await getDocs( - query(collection(db, "teams"), where("status", "==", "qualify")) + query(collection(db, "teams"), where("status", "==", 1)) ); teamsSnapshot.forEach((doc) => { const { links, name, rounds, table } = doc.data(); @@ -50,11 +50,7 @@ export async function GET() { }); const judgesSnapshot = await getDocs( - query( - collection(db, "users"), - where("role", "array-contains", "judges"), - where("status", "==", "accept") - ) + query(collection(db, "users"), where("roles.judges", "==", 1)) ); judgesSnapshot.forEach((doc) => { const { affiliation, name } = doc.data(); diff --git a/src/components/dynamic/ProtectedPage.jsx b/src/components/dynamic/ProtectedPage.jsx index d2490e4bc..8f2146be2 100644 --- a/src/components/dynamic/ProtectedPage.jsx +++ b/src/components/dynamic/ProtectedPage.jsx @@ -18,6 +18,10 @@ const ProtectedPage = ({ children }) => { const bypass = ROUTES[pathName].bypass; useEffect(() => { + if (bypass) { + setConfirmed(true); + return; + } if (RELEASES.DYNAMIC[pathName] > new Date()) { setError({ code: 423, @@ -65,7 +69,7 @@ const ProtectedPage = ({ children }) => { {error && ( )} - {(confirmed || bypass) && ( + {confirmed && ( <> {title}
diff --git a/src/components/dynamic/admin/services/judging/Judging.jsx b/src/components/dynamic/admin/services/judging/Judging.jsx index 6acd82596..c3ea4e9de 100644 --- a/src/components/dynamic/admin/services/judging/Judging.jsx +++ b/src/components/dynamic/admin/services/judging/Judging.jsx @@ -6,17 +6,11 @@ import Toolbar from "./Toolbar.jsx"; const Judging = () => { const [data, setData] = useState(null); - const [judges, setJudges] = useState(null); return (
- <Toolbar - data={data} - setData={setData} - judges={judges} - setJudges={setJudges} - /> + <Toolbar data={data} setData={setData} /> <Table data={data} /> </div> ); diff --git a/src/components/dynamic/admin/services/judging/Toolbar.jsx b/src/components/dynamic/admin/services/judging/Toolbar.jsx index 41e9ac974..b48d6d776 100644 --- a/src/components/dynamic/admin/services/judging/Toolbar.jsx +++ b/src/components/dynamic/admin/services/judging/Toolbar.jsx @@ -11,9 +11,10 @@ import axios from "axios"; const tags = ["professor", "industry", "student"]; -const Toolbar = ({ data, setData, judges, setJudges }) => { +const Toolbar = ({ data, setData }) => { const router = useRouter(); + const [judges, setJudges] = useState(null); const [popup, setPopup] = useState({ title: "", text: "", @@ -160,6 +161,7 @@ const Toolbar = ({ data, setData, judges, setJudges }) => { const load = () => { axios.get("/api/judging").then((response) => { + console.log(response.data.items); setData(response.data.items.teams); setJudges(response.data.items.judges); From 3987867f7802cc82633604504df5fbfde2a7d54f Mon Sep 17 00:00:00 2001 From: Divyank Shah <divyank.shah.2016@gmail.com> Date: Sun, 12 Nov 2023 22:56:30 -0800 Subject: [PATCH 2/2] remove console log --- src/components/dynamic/admin/services/judging/Toolbar.jsx | 1 - src/components/dynamic/user/Team.jsx | 1 - 2 files changed, 2 deletions(-) diff --git a/src/components/dynamic/admin/services/judging/Toolbar.jsx b/src/components/dynamic/admin/services/judging/Toolbar.jsx index b48d6d776..5df7b73a4 100644 --- a/src/components/dynamic/admin/services/judging/Toolbar.jsx +++ b/src/components/dynamic/admin/services/judging/Toolbar.jsx @@ -161,7 +161,6 @@ const Toolbar = ({ data, setData }) => { const load = () => { axios.get("/api/judging").then((response) => { - console.log(response.data.items); setData(response.data.items.teams); setJudges(response.data.items.judges); diff --git a/src/components/dynamic/user/Team.jsx b/src/components/dynamic/user/Team.jsx index e1129a78d..892165c67 100644 --- a/src/components/dynamic/user/Team.jsx +++ b/src/components/dynamic/user/Team.jsx @@ -42,7 +42,6 @@ const Team = ({ user, setUser }) => { }; const handleJoin = () => { - console.log(id); if (id.team === "") { toast("❌ Enter a Valid Team ID"); return;