From a83ca5915018061a7729187a11651f3599993f8b Mon Sep 17 00:00:00 2001 From: Kevin Yu Date: Fri, 6 Dec 2024 17:12:15 -0500 Subject: [PATCH 1/3] Update AnimatedListbox to headless v2, remove modal effect --- components/AnimatedListbox.tsx | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/components/AnimatedListbox.tsx b/components/AnimatedListbox.tsx index 76a29eb..1b7dc6b 100644 --- a/components/AnimatedListbox.tsx +++ b/components/AnimatedListbox.tsx @@ -1,24 +1,23 @@ 'use client' -import { Fragment, ReactNode } from 'react'; -import { Listbox, Transition } from '@headlessui/react'; +import type { ReactNode } from 'react'; +import { ListboxOptions } from '@headlessui/react'; -// A reusable component to wrap a dropdown animation around a `Listbox.Options`. -export default function AnimatedListbox(props: { children: ReactNode, className?: string }) { +// A reusable component to wrap a dropdown animation around a `ListboxOptions`. +type AnimatedListboxProps = { + children: ReactNode, + modal?: boolean, + className?: string +} +export default function AnimatedListbox(props: AnimatedListboxProps) { return ( - - - {props.children} - - + {props.children} + ) } From f18a9eb9e7d0a03fdc9462ceabe80edbe77ec130 Mon Sep 17 00:00:00 2001 From: Kevin Yu Date: Sat, 15 Feb 2025 00:21:31 -0500 Subject: [PATCH 2/3] New start, end time --- conf.d/02-ctf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.d/02-ctf.yaml b/conf.d/02-ctf.yaml index 8213903..5657fa5 100644 --- a/conf.d/02-ctf.yaml +++ b/conf.d/02-ctf.yaml @@ -12,5 +12,5 @@ divisionACLs: value: '' divisions: - open -startTime: 1712962800000 -endTime: 1713135600000 +startTime: 1745020800000 +endTime: 1745193600000 From 4bee9370fdbbc67f249a4b0e7a53ed32e078c769 Mon Sep 17 00:00:00 2001 From: Kevin Yu Date: Sat, 15 Feb 2025 14:46:08 -0500 Subject: [PATCH 3/3] Fix double decode problem affecting tokens with `+` --- app/login/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/login/page.tsx b/app/login/page.tsx index a8d3a63..0260c29 100644 --- a/app/login/page.tsx +++ b/app/login/page.tsx @@ -14,7 +14,7 @@ export default async function Login({ searchParams }: { searchParams: Promise<{ const error = (await searchParams).error; // Automatically sign in if the `token` search parameter is set. - if (token) return redirect(`/login-handler?token=${token}`) + if (token) return redirect(`/login-handler?token=${encodeURIComponent(token)}`) return (