diff --git a/apps/site/src/views/Schedule/sections/ClipboardSchedule/ClipboardSchedule.module.scss b/apps/site/src/app/schedule/ClipboardSchedule/ClipboardSchedule.module.scss similarity index 100% rename from apps/site/src/views/Schedule/sections/ClipboardSchedule/ClipboardSchedule.module.scss rename to apps/site/src/app/schedule/ClipboardSchedule/ClipboardSchedule.module.scss diff --git a/apps/site/src/views/Schedule/sections/ClipboardSchedule/ClipboardSchedule.tsx b/apps/site/src/app/schedule/ClipboardSchedule/ClipboardSchedule.tsx similarity index 96% rename from apps/site/src/views/Schedule/sections/ClipboardSchedule/ClipboardSchedule.tsx rename to apps/site/src/app/schedule/ClipboardSchedule/ClipboardSchedule.tsx index 7782b7f2..c294708a 100644 --- a/apps/site/src/views/Schedule/sections/ClipboardSchedule/ClipboardSchedule.tsx +++ b/apps/site/src/app/schedule/ClipboardSchedule/ClipboardSchedule.tsx @@ -1,31 +1,17 @@ "use client"; import Image from "next/image"; -import { cubicBezier, motion, Variants } from "framer-motion"; - import Accordion from "react-bootstrap/Accordion"; import Col from "react-bootstrap/Col"; import Container from "react-bootstrap/Container"; import Row from "react-bootstrap/Row"; +import { cubicBezier, motion, Variants } from "framer-motion"; import { utcToZonedTime } from "date-fns-tz"; import clip from "@/assets/images/clip.svg"; import styles from "./ClipboardSchedule.module.scss"; -import Countdown from "../../components/Countdown/Countdown"; - -interface ClipboardScheduleProps { - schedule: { - title: string; - location?: string | undefined; - virtual?: string | undefined; - startTime: Date; - endTime: Date; - organization?: string | undefined; - hosts?: string[] | undefined; - description: JSX.Element; - }[][]; -} +import Countdown from "./Countdown"; const dateTimeFormat = new Intl.DateTimeFormat("en", { hour: "numeric", @@ -57,7 +43,20 @@ const variant: Variants = { }, }; -function ClipboardSchedule({ schedule }: ClipboardScheduleProps) { +interface ClipboardScheduleProps { + schedule: { + title: string; + location?: string | undefined; + virtual?: string | undefined; + startTime: Date; + endTime: Date; + organization?: string | undefined; + hosts?: string[] | undefined; + description: JSX.Element; + }[][]; +} + +const ClipboardSchedule: React.FC = ({ schedule }) => { return (
@@ -139,6 +138,6 @@ function ClipboardSchedule({ schedule }: ClipboardScheduleProps) {
); -} +}; export default ClipboardSchedule; diff --git a/apps/site/src/views/Schedule/components/Countdown/Countdown.module.scss b/apps/site/src/app/schedule/ClipboardSchedule/Countdown.module.scss similarity index 100% rename from apps/site/src/views/Schedule/components/Countdown/Countdown.module.scss rename to apps/site/src/app/schedule/ClipboardSchedule/Countdown.module.scss diff --git a/apps/site/src/views/Schedule/components/Countdown/Countdown.tsx b/apps/site/src/app/schedule/ClipboardSchedule/Countdown.tsx similarity index 95% rename from apps/site/src/views/Schedule/components/Countdown/Countdown.tsx rename to apps/site/src/app/schedule/ClipboardSchedule/Countdown.tsx index 3ed856b8..042deb6f 100644 --- a/apps/site/src/views/Schedule/components/Countdown/Countdown.tsx +++ b/apps/site/src/app/schedule/ClipboardSchedule/Countdown.tsx @@ -8,7 +8,7 @@ import styles from "./Countdown.module.scss"; // 10/4/23 10AM in UTC const hackingStarts = new Date(Date.UTC(2023, 10, 4, 17, 0, 0)); -export default function Countdown() { +const Countdown = () => { const [remainingSeconds, setRemainingSeconds] = useState(NaN); useEffect(() => { @@ -50,4 +50,6 @@ export default function Countdown() { Until Hacking Begins ); -} +}; + +export default Countdown; diff --git a/apps/site/src/app/schedule/ClipboardSchedule/index.ts b/apps/site/src/app/schedule/ClipboardSchedule/index.ts new file mode 100644 index 00000000..7e9e66b2 --- /dev/null +++ b/apps/site/src/app/schedule/ClipboardSchedule/index.ts @@ -0,0 +1 @@ +export { default } from "./ClipboardSchedule"; diff --git a/apps/site/src/views/Schedule/getSchedule.ts b/apps/site/src/app/schedule/getSchedule.ts similarity index 100% rename from apps/site/src/views/Schedule/getSchedule.ts rename to apps/site/src/app/schedule/getSchedule.ts diff --git a/apps/site/src/views/Schedule/Schedule.module.scss b/apps/site/src/app/schedule/page.module.scss similarity index 100% rename from apps/site/src/views/Schedule/Schedule.module.scss rename to apps/site/src/app/schedule/page.module.scss diff --git a/apps/site/src/app/schedule/page.tsx b/apps/site/src/app/schedule/page.tsx index 77093744..422000a5 100644 --- a/apps/site/src/app/schedule/page.tsx +++ b/apps/site/src/app/schedule/page.tsx @@ -1,11 +1,25 @@ -import { Schedule } from "@/views"; -import { Maintenance } from "@/views"; +import { PortableText } from "@portabletext/react"; +import ClipboardSchedule from "./ClipboardSchedule"; +import { getSchedule } from "./getSchedule"; export const revalidate = 60; -// When set to any value -const Component = process.env.MAINTENANCE_MODE_SCHEDULE - ? Maintenance - : Schedule; +import styles from "./page.module.scss"; -export default Component; +export default async function Schedule() { + const days = await getSchedule(); + + const schedule = days.map((events) => + events.map(({ description, ...event }) => ({ + ...event, + description: , + })), + ); + + return ( +
+

Schedule

+ +
+ ); +} diff --git a/apps/site/src/views/Schedule/Schedule.tsx b/apps/site/src/views/Schedule/Schedule.tsx deleted file mode 100644 index a7fb2af9..00000000 --- a/apps/site/src/views/Schedule/Schedule.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import ClipboardSchedule from "./sections/ClipboardSchedule/ClipboardSchedule"; -import { getSchedule } from "./getSchedule"; -import { PortableText } from "@portabletext/react"; - -import styles from "./Schedule.module.scss"; - -export default async function Schedule() { - const days = await getSchedule(); - - const schedule = days.map((events) => - events.map(({ description, ...event }) => ({ - ...event, - description: , - })), - ); - - return ( -
-

Schedule

- -
- ); -} diff --git a/apps/site/src/views/index.ts b/apps/site/src/views/index.ts index f5c33fea..8b365f63 100644 --- a/apps/site/src/views/index.ts +++ b/apps/site/src/views/index.ts @@ -1,3 +1,2 @@ export { default as Maintenance } from "./Maintenance/Maintenance"; export { default as Resources } from "./Resources/Resources"; -export { default as Schedule } from "./Schedule/Schedule";