From fcd79aedea606ad1f001c35515185a9f8f4fc76a Mon Sep 17 00:00:00 2001 From: Cooper Werner Date: Fri, 22 Mar 2024 17:20:54 -0400 Subject: [PATCH 1/7] Minor update to above the fold - Added Minor Description of the text --- components/title-components/desktop-title.tsx | 4 ++-- components/title-components/timer.tsx | 2 +- components/title-components/title-text.tsx | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/components/title-components/desktop-title.tsx b/components/title-components/desktop-title.tsx index ca34f16..0c9725c 100644 --- a/components/title-components/desktop-title.tsx +++ b/components/title-components/desktop-title.tsx @@ -3,8 +3,8 @@ import TitleText from "./title-text"; export default function DesktopTitleComponent() { return ( -
-
+
+
diff --git a/components/title-components/timer.tsx b/components/title-components/timer.tsx index 4352b70..2ba6345 100644 --- a/components/title-components/timer.tsx +++ b/components/title-components/timer.tsx @@ -94,7 +94,7 @@ export default function Timer() { function Circle({ bgColor, textColor, children }: { bgColor: string; textColor: string; children: React.ReactNode }) { return (
{children} diff --git a/components/title-components/title-text.tsx b/components/title-components/title-text.tsx index 490c5ee..8b15e64 100644 --- a/components/title-components/title-text.tsx +++ b/components/title-components/title-text.tsx @@ -29,10 +29,15 @@ export default function TitleText() { return (

HACKRPI

-

Urban Upgrades

-

+

Urban Upgrades

+

November 9-10, setYear(1824)}>{year}

+

+ HackRPI is Rensselaer Polytechnic Institute's flagship annual hackathon. This year we are bringing together + innovators, creators, and problem-solvers to tackle the challenges of urban living. Join us this November for a + weekend of free food, networking, and the opportunity to our enhance cities and communities! +

From 2f517d9f6575581c04913f192a68c20ac5d6eb20 Mon Sep 17 00:00:00 2001 From: Cooper Werner Date: Fri, 22 Mar 2024 17:25:57 -0400 Subject: [PATCH 2/7] increasing timer text size --- components/title-components/timer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/title-components/timer.tsx b/components/title-components/timer.tsx index 2ba6345..4352b70 100644 --- a/components/title-components/timer.tsx +++ b/components/title-components/timer.tsx @@ -94,7 +94,7 @@ export default function Timer() { function Circle({ bgColor, textColor, children }: { bgColor: string; textColor: string; children: React.ReactNode }) { return (
{children} From 951b065b4c7c642971dec2c1daf09d82a653e089 Mon Sep 17 00:00:00 2001 From: Cooper Werner Date: Tue, 26 Mar 2024 16:47:23 -0400 Subject: [PATCH 3/7] Finishing off the above the fold improvements --- components/title-components/desktop-title.tsx | 2 +- components/title-components/timer.tsx | 4 ++-- components/title-components/title-text.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/title-components/desktop-title.tsx b/components/title-components/desktop-title.tsx index 0c9725c..996b26e 100644 --- a/components/title-components/desktop-title.tsx +++ b/components/title-components/desktop-title.tsx @@ -3,7 +3,7 @@ import TitleText from "./title-text"; export default function DesktopTitleComponent() { return ( -
+
diff --git a/components/title-components/timer.tsx b/components/title-components/timer.tsx index 4352b70..329697f 100644 --- a/components/title-components/timer.tsx +++ b/components/title-components/timer.tsx @@ -50,7 +50,7 @@ export default function Timer() { } return ( -
+
{hackathonStarted && !hackathonEnded ?

SUBMISSIONS DUE:

: null} {hackathonEnded ?

THANKS FOR JOINING US!

: null}
@@ -94,7 +94,7 @@ export default function Timer() { function Circle({ bgColor, textColor, children }: { bgColor: string; textColor: string; children: React.ReactNode }) { return (
{children} diff --git a/components/title-components/title-text.tsx b/components/title-components/title-text.tsx index 8b15e64..2a40c3d 100644 --- a/components/title-components/title-text.tsx +++ b/components/title-components/title-text.tsx @@ -38,7 +38,7 @@ export default function TitleText() { innovators, creators, and problem-solvers to tackle the challenges of urban living. Join us this November for a weekend of free food, networking, and the opportunity to our enhance cities and communities!

- + {/* TODO: Replace this with the themed button when that PR is merged in. */}
); From d04a2c686c7967eb842979729858c693dff7bcdb Mon Sep 17 00:00:00 2001 From: Cooper Werner Date: Tue, 26 Mar 2024 17:08:08 -0400 Subject: [PATCH 4/7] remove annoying horizontal scroll bar on chrome --- components/footer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/footer.tsx b/components/footer.tsx index 72a44d0..4c88c54 100644 --- a/components/footer.tsx +++ b/components/footer.tsx @@ -48,7 +48,7 @@ const links: CardProps[] = [ export default function Footer() { return ( -
+

From 0c6744f69cb4889672871fa263fdcea3857da48d Mon Sep 17 00:00:00 2001 From: Cooper Werner Date: Tue, 26 Mar 2024 17:12:37 -0400 Subject: [PATCH 5/7] fixing build --- components/title-components/title-text.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/title-components/title-text.tsx b/components/title-components/title-text.tsx index 2a40c3d..f6bfeab 100644 --- a/components/title-components/title-text.tsx +++ b/components/title-components/title-text.tsx @@ -34,7 +34,7 @@ export default function TitleText() { November 9-10, setYear(1824)}>{year}

- HackRPI is Rensselaer Polytechnic Institute's flagship annual hackathon. This year we are bringing together + HackRPI is Rensselaer Polytechnic Institute's flagship annual hackathon. This year we are bringing together innovators, creators, and problem-solvers to tackle the challenges of urban living. Join us this November for a weekend of free food, networking, and the opportunity to our enhance cities and communities!

From f9e2d851682f126ecde2d0c869f8aef88e8db993 Mon Sep 17 00:00:00 2001 From: Cooper Werner Date: Sun, 21 Apr 2024 22:56:15 -0400 Subject: [PATCH 6/7] updating the design for the above the fold --- components/footer/footer.tsx | 2 +- components/nav-bar/nav-bar-desktop.tsx | 8 +++----- .../hackrpi-link.tsx | 0 components/themed-components/registration-link.tsx | 7 +++++++ components/title-components/mobile-title.tsx | 2 +- components/title-components/timer.tsx | 4 ++-- components/title-components/title-text.tsx | 12 +++--------- 7 files changed, 17 insertions(+), 18 deletions(-) rename components/{themed_components => themed-components}/hackrpi-link.tsx (100%) create mode 100644 components/themed-components/registration-link.tsx diff --git a/components/footer/footer.tsx b/components/footer/footer.tsx index 17c66c8..daca80b 100644 --- a/components/footer/footer.tsx +++ b/components/footer/footer.tsx @@ -1,6 +1,6 @@ import NextImage from "next/image"; import logo from "@/public/HackRPI_Logo_Yellow_Arrow.png"; -import HackRPILink from "../themed_components/hackrpi-link"; +import HackRPILink from "../themed-components/hackrpi-link"; import SocialLinks from "../socials-links/social-links"; export default function Footer() { diff --git a/components/nav-bar/nav-bar-desktop.tsx b/components/nav-bar/nav-bar-desktop.tsx index be71cde..25cd423 100644 --- a/components/nav-bar/nav-bar-desktop.tsx +++ b/components/nav-bar/nav-bar-desktop.tsx @@ -2,7 +2,7 @@ import NextImg from "next/image"; import { NavBarLinkType } from "@/types/nav-bar-links"; import NavBarLink from "./nav-bar-link"; import logo from "@/public/HackRPI-logo-blue.png"; -import RegistrationButton from "./registration-button"; +import RegistrationButton from "@/components/themed-components/registration-link"; export default function DesktopNavBar({ links }: { links: NavBarLinkType[] }) { return ( @@ -13,16 +13,14 @@ export default function DesktopNavBar({ links }: { links: NavBarLinkType[] }) {

-
+
{links.map((link) => ( {link.children} ))}
-
- -
+
); diff --git a/components/themed_components/hackrpi-link.tsx b/components/themed-components/hackrpi-link.tsx similarity index 100% rename from components/themed_components/hackrpi-link.tsx rename to components/themed-components/hackrpi-link.tsx diff --git a/components/themed-components/registration-link.tsx b/components/themed-components/registration-link.tsx new file mode 100644 index 0000000..54ba680 --- /dev/null +++ b/components/themed-components/registration-link.tsx @@ -0,0 +1,7 @@ +import HackRPILink from "./hackrpi-link"; + +export default function RegistrationLink() { + return ( + Register Now + ); +} \ No newline at end of file diff --git a/components/title-components/mobile-title.tsx b/components/title-components/mobile-title.tsx index 1e48e94..7954817 100644 --- a/components/title-components/mobile-title.tsx +++ b/components/title-components/mobile-title.tsx @@ -3,7 +3,7 @@ import TitleText from "./title-text"; export default function MobileTitleComponent() { return ( -
+
diff --git a/components/title-components/timer.tsx b/components/title-components/timer.tsx index b0494a7..2d44c5c 100644 --- a/components/title-components/timer.tsx +++ b/components/title-components/timer.tsx @@ -50,7 +50,7 @@ export default function Timer() { } return ( -
+
{hackathonStarted && !hackathonEnded ?

SUBMISSIONS DUE:

: null} {hackathonEnded ?

THANKS FOR JOINING US!

: null}
@@ -94,7 +94,7 @@ export default function Timer() { function Circle({ bgColor, textColor, children }: { bgColor: string; textColor: string; children: React.ReactNode }) { return (
{children} diff --git a/components/title-components/title-text.tsx b/components/title-components/title-text.tsx index f6bfeab..3b30498 100644 --- a/components/title-components/title-text.tsx +++ b/components/title-components/title-text.tsx @@ -1,5 +1,5 @@ import { useState, useEffect } from "react"; -import RegistrationButton from "./registration-button"; +import RegistrationButton from "@/components/themed-components/registration-link"; export default function TitleText() { const [year, setYear] = useState(1824); @@ -30,15 +30,9 @@ export default function TitleText() {

HACKRPI

Urban Upgrades

-

- November 9-10, setYear(1824)}>{year} +

+ November 9-10, setYear(1824)} className={year < 2024 ? "text-[#d6001c]": "text-base-content"} >{year}

-

- HackRPI is Rensselaer Polytechnic Institute's flagship annual hackathon. This year we are bringing together - innovators, creators, and problem-solvers to tackle the challenges of urban living. Join us this November for a - weekend of free food, networking, and the opportunity to our enhance cities and communities! -

- {/* TODO: Replace this with the themed button when that PR is merged in. */}
); From a8da56ee0312fe9cabef892093ec8b35f1890c46 Mon Sep 17 00:00:00 2001 From: CooperW824 Date: Mon, 22 Apr 2024 02:56:49 +0000 Subject: [PATCH 7/7] Prettified Code! --- components/themed-components/registration-link.tsx | 11 +++++++---- components/title-components/title-text.tsx | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/components/themed-components/registration-link.tsx b/components/themed-components/registration-link.tsx index 54ba680..a159496 100644 --- a/components/themed-components/registration-link.tsx +++ b/components/themed-components/registration-link.tsx @@ -1,7 +1,10 @@ import HackRPILink from "./hackrpi-link"; export default function RegistrationLink() { - return ( - Register Now - ); -} \ No newline at end of file + return ( + + {" "} + Register Now{" "} + + ); +} diff --git a/components/title-components/title-text.tsx b/components/title-components/title-text.tsx index 3b30498..30fe204 100644 --- a/components/title-components/title-text.tsx +++ b/components/title-components/title-text.tsx @@ -31,7 +31,10 @@ export default function TitleText() {

HACKRPI

Urban Upgrades

- November 9-10, setYear(1824)} className={year < 2024 ? "text-[#d6001c]": "text-base-content"} >{year} + November 9-10,{" "} + setYear(1824)} className={year < 2024 ? "text-[#d6001c]" : "text-base-content"}> + {year} +