From 34a6f08d6fd3ae9334db40b4f5ccd58021cf6762 Mon Sep 17 00:00:00 2001 From: Bl20052005 <88120481+Bl20052005@users.noreply.github.com> Date: Sat, 2 Nov 2024 10:53:14 -0700 Subject: [PATCH] formatting and style changes --- .../(home)/sections/Countdown/Countdown.tsx | 19 +++++++++--------- .../(home)/sections/Countdown/useWindow.tsx | 2 +- apps/site/src/assets/icons/boat.png | Bin 5956 -> 0 bytes apps/site/src/assets/icons/boat.svg | 15 ++++++++++++++ 4 files changed, 26 insertions(+), 10 deletions(-) delete mode 100644 apps/site/src/assets/icons/boat.png create mode 100644 apps/site/src/assets/icons/boat.svg diff --git a/apps/site/src/app/(home)/sections/Countdown/Countdown.tsx b/apps/site/src/app/(home)/sections/Countdown/Countdown.tsx index 07d67487..46575812 100644 --- a/apps/site/src/app/(home)/sections/Countdown/Countdown.tsx +++ b/apps/site/src/app/(home)/sections/Countdown/Countdown.tsx @@ -1,14 +1,15 @@ "use client"; -import bg_map from "@/assets/images/maps/countdown.svg"; import Image from "next/image"; -import useWindow from "./useWindow"; +import { useEffect, useState } from "react"; -import styles from "./Countdown.module.scss"; +import useWindow from "./useWindow"; import CountdownClock from "./CountdownClock"; -import { useEffect, useState } from "react"; -import boat from "@/assets/icons/boat.png"; +import bg_map from "@/assets/images/maps/countdown.svg"; +import boat from "@/assets/icons/boat.svg"; + +import styles from "./Countdown.module.scss"; interface CountdownProps { schedule: { @@ -63,12 +64,12 @@ const Countdown: React.FC = ({ schedule }) => { before.endTime.getTime() > 0 ? curTime.getTime() < before.startTime.getTime() ? 0 - : ((before.endTime.getTime() - curTime.getTime()) / + : 100 - ((before.endTime.getTime() - curTime.getTime()) / (before.endTime.getTime() - before.startTime.getTime())) * 100 : 100; - const [w, h] = useWindow(); + const [w, ] = useWindow(); const totalLines = Math.floor(w / 66) > 7 ? Math.floor(w / 66) : 7; @@ -90,7 +91,7 @@ const Countdown: React.FC = ({ schedule }) => { if (curTime > hackEndTime) { return (
- bg_map + background map for countdown

Hacking has ended!

@@ -100,7 +101,7 @@ const Countdown: React.FC = ({ schedule }) => { return (
- bg_map + background map for countdown {w > 0 && (
{curTime >= hackStartTime ? ( diff --git a/apps/site/src/app/(home)/sections/Countdown/useWindow.tsx b/apps/site/src/app/(home)/sections/Countdown/useWindow.tsx index 8988f639..d67fa2d9 100644 --- a/apps/site/src/app/(home)/sections/Countdown/useWindow.tsx +++ b/apps/site/src/app/(home)/sections/Countdown/useWindow.tsx @@ -3,10 +3,10 @@ import { useEffect, useState } from "react"; export default function useWindow() { const [size, setSize] = useState([0, 0]); useEffect(() => { - setSize([window.innerWidth, window.innerHeight]); function setWindowSize() { setSize([window.innerWidth, window.innerHeight]); } + setWindowSize(); window.addEventListener("resize", setWindowSize); return () => window.removeEventListener("resize", setWindowSize); }, []); diff --git a/apps/site/src/assets/icons/boat.png b/apps/site/src/assets/icons/boat.png deleted file mode 100644 index 98ef637f479b2c044290bb2352fd8b16ba361c28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5956 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 + + + + + + + + + + + + + +