Feat/about (#17)

acmutsa · Sep 18, 2024 · d82155d · d82155d
1 parent 6531bfc
commit d82155d
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 23 deletions.
diff --git a/apps/web/src/app/favicon.ico b/apps/web/src/app/favicon.ico
diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
@@ -22,13 +22,13 @@ const oswald = Oswald({
 export default function Home() {
 	return (
 		<div
-			className={`${oswald.variable} w-full overflow-x-hidden bg-[#1A3A9E]`}
+			className={`${oswald.variable} -z-20 w-full overflow-x-hidden bg-[#1A3A9E]`}
 		>
 			<Suspense fallback={<Skeleton className="h-16 w-screen" />}>
 				<Navbar />
 			</Suspense>
 			<MLHBadge />
-			<main className="relative flex min-h-full flex-col overflow-x-hidden bg-[#1A3A9E]">
+			<main className="relative z-10 flex min-h-full flex-col gap-16 overflow-x-hidden">
 				<div className="fixed inset-0 -z-10 h-screen w-screen overflow-hidden">
 					<WavyBackground
 						backgroundFill="#1A3A9E"

diff --git a/apps/web/src/components/landing/About.tsx b/apps/web/src/components/landing/About.tsx
@@ -24,12 +24,12 @@ export default function About() {
 
 	return (
 		<section
-			className="relative z-10 min-h-screen w-full bg-cover bg-no-repeat px-5 py-20"
+			className="relative z-10 min-h-screen w-full bg-cover bg-no-repeat"
 			id="About"
 		>
-			<div className="container mx-auto grid grid-cols-1 gap-x-10 gap-y-16 md:grid-cols-2">
+			<div className="container mx-auto grid grid-cols-1 gap-x-10 gap-y-16 py-4 md:grid-cols-2">
 				{/* ABOUT US Section */}
-				<div className="flex transform flex-col justify-center gap-y-6 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 hover:scale-105">
+				<div className="flex transform flex-col justify-center gap-y-6 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 md:hover:scale-105">
 					<h1 className="text-center font-oswald text-3xl font-bold italic text-[#ea580c] sm:text-4xl md:text-5xl lg:text-6xl xl:text-7xl">
 						ABOUT US
 					</h1>
@@ -45,7 +45,7 @@ export default function About() {
 				</div>
 
 				{/* WHO CAN ATTEND Section */}
-				<div className="flex transform flex-col justify-center gap-y-6 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 hover:scale-105">
+				<div className="flex transform flex-col justify-center gap-y-6 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 md:hover:scale-105">
 					<h1 className="text-center font-oswald text-3xl font-bold italic text-[#ea580c] sm:text-4xl md:text-5xl lg:text-6xl xl:text-7xl">
 						WHO CAN ATTEND?
 					</h1>
@@ -62,7 +62,7 @@ export default function About() {
 
 			{/* Celebrating 10 Years Section */}
 			<div className="container mx-auto mt-16 grid grid-cols-1 gap-y-16 md:grid-cols-1">
-				<div className="flex transform flex-col justify-center gap-y-10 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 hover:scale-105">
+				<div className="flex transform flex-col justify-center gap-y-10 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 md:hover:scale-105">
 					<h1 className="text-center font-oswald text-3xl font-bold italic text-[#ea580c] sm:text-4xl md:text-5xl lg:text-6xl xl:text-7xl">
 						CELEBRATING 10 YEARS
 						<br />
@@ -71,9 +71,7 @@ export default function About() {
 					{/* Mobile: Truncated content with read more */}
 					<div className="block text-center font-mono text-lg font-bold text-[#ea580c] md:hidden">
 						{/* Animation for scrolling. Has to have exact heights so it knows where to animate to and from*/}
-						<Balancer
-							className={`transition-all duration-300 ${isExpanded ? "max-h-[2250px]" : "max-h-[330px]"} overflow-hidden`}
-						>
+						<Balancer>
 							<>
 								{isExpanded
 									? "This year marks a significant milestone for RowdyHacks, as we celebrate 10 years of fostering creativity, collaboration, and mentorship right here at UTSA! Since our inception, RowdyHacks has brought together students, developers, and tech enthusiasts from all walks of life to engage in healthy competition, collaborate on innovative projects, and learn new skills they might not encounter in a traditional classroom setting. Over the past decade, we've witnessed incredible growth. We take pride in our inclusive community-building and empowering the next generation of tech leaders. Together, we've created an ecosystem where innovation thrives, friendships are formed, and the future is built, one hack at a time. As we celebrate this remarkable journey, we look forward to what the next 10 years hold for RowdyHacks. Whether you've been with us from the start or are joining us for the first time, let's make this milestone year one to remember. Let's hack, create, and shape the future—together!"

diff --git a/apps/web/src/components/landing/Hero.tsx b/apps/web/src/components/landing/Hero.tsx
@@ -16,9 +16,12 @@ export default function Home() {
 					{"&future>"}
 				</h1>
 			</div>
-			<p className="z-20 mx-2 mb-6 text-center font-mono text-xl font-bold italic text-orange-400 md:mx-0 xl:mb-8 2xl:text-3xl">
+			<p className="z-20 mx-2 mb-4 text-center font-mono text-xl font-bold italic text-orange-400 md:mx-0 2xl:text-3xl">
 				October 26th - 27th 2024
 			</p>
+			<h1 className="w-full text-center font-mono text-orange-400 md:text-lg">
+				SAN PEDRO I, UTSA
+			</h1>
 			<div className="relative w-full duration-150 ease-in-out hover:scale-125">
 				<Link href={"/register"}>
 					<div className="relative mx-auto my-10 max-w-[250px] lg:max-w-[475px]">
@@ -28,10 +31,10 @@ export default function Home() {
 							</h2>
 						</div>
 						<div className="register-clip absolute mx-auto flex h-[64px] w-full max-w-[500px] translate-y-2 items-center justify-center bg-orange-400 hover:cursor-pointer"></div>
+						<div className="register-clip absolute mx-auto flex h-[64px] w-full max-w-[500px] translate-y-2 items-center justify-center bg-orange-400 hover:cursor-pointer"></div>
 					</div>
 				</Link>
 			</div>
-			<Overlay />
 		</main>
 	);
 }

diff --git a/apps/web/src/components/landing/WorkWithUs.tsx b/apps/web/src/components/landing/WorkWithUs.tsx
@@ -4,9 +4,9 @@ import Link from "next/link";
 
 export default function WorkWithUs() {
 	return (
-		<section className="flex min-h-screen w-full flex-col items-center justify-center">
-			<div className="container mx-auto grid grid-cols-1 gap-x-10 gap-y-8 py-4 md:grid-cols-2">
-				<div className="flex transform flex-col justify-center gap-y-6 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 hover:scale-105">
+		<section className="my-2 w-full lg:my-32">
+			<div className="container mx-auto grid grid-cols-1 gap-x-10 gap-y-16 md:grid-cols-2">
+				<div className="flex transform flex-col justify-center gap-y-6 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 md:hover:scale-105">
 					<h1 className="text-center font-oswald text-3xl font-bold italic text-[#ea580c] sm:text-4xl md:text-5xl lg:text-6xl xl:text-7xl">
 						Volunteers/Mentors
 					</h1>
@@ -40,7 +40,7 @@ export default function WorkWithUs() {
 					</div>
 				</div>
 
-				<div className="flex transform flex-col justify-center gap-y-6 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 hover:scale-105">
+				<div className="flex transform flex-col justify-center gap-y-6 rounded-xl border-4 border-[#ea580c] bg-white p-8 transition-transform duration-300 md:hover:scale-105">
 					<h1 className="text-center font-oswald text-3xl font-bold italic text-[#ea580c] sm:text-4xl md:text-5xl lg:text-6xl xl:text-7xl">
 						Partners
 					</h1>

diff --git a/apps/web/src/components/shared/Navbar.tsx b/apps/web/src/components/shared/Navbar.tsx
@@ -5,11 +5,11 @@ import { Button } from "../shadcn/ui/button";
 import ProfileButton from "./ProfileButton";
 import { auth, currentUser } from "@clerk/nextjs";
 import NavBarLinksGrouper from "./NavBarLinksGrouper";
-import { Oswald } from "next/font/google";
+import { Open_Sans } from "next/font/google";
 import { cn } from "@/lib/utils/client/cn";
 
-const oswald = Oswald({
-	variable: "--font-oswald",
+const openSans = Open_Sans({
+	variable: "--font-open-sans",
 	subsets: ["latin"],
 });
 
@@ -20,10 +20,10 @@ interface NavbarProps {
 export default async function Navbar({ className }: NavbarProps) {
 	const user = await currentUser();
 	return (
-		<div className="z-50 w-screen bg-white dark:bg-black">
+		<div className="z-50 w-screen">
 			<div
 				className={cn(
-					`relative top-0 z-50 h-16 w-screen border-b border-b-border bg-nav ${oswald.variable}`,
+					`relative top-0 z-50 h-16 w-screen border-b border-b-border bg-nav bg-white dark:bg-black ${openSans.variable}`,
 					className,
 				)}
 			>
@@ -40,7 +40,9 @@ export default async function Navbar({ className }: NavbarProps) {
 								height={32}
 							/>
 							{/* <div className="bg-muted-foreground h-[45%] rotate-[25deg] w-[2px]" /> */}
-							<h2 className="font-oswald text-lg font-bold text-[#A7866A] dark:text-[#FEF2E6]">
+							<h2
+								className={`text-lg font-bold text-[#A7866A] dark:text-[#FEF2E6] ${openSans.variable}`}
+							>
 								{c.hackathonName}
 							</h2>
 						</Link>

diff --git a/apps/web/src/components/shared/ProfileButton.tsx b/apps/web/src/components/shared/ProfileButton.tsx
@@ -147,6 +147,11 @@ export default async function ProfileButton() {
 							Profile
 						</DropdownMenuItem>
 					</Link>
+					<Link href={`/dash`}>
+						<DropdownMenuItem className="cursor-pointer md:hidden">
+							Dashboard
+						</DropdownMenuItem>
+					</Link>
 					<Link href={`/dash/pass`}>
 						<DropdownMenuItem className="cursor-pointer">
 							Event Pass

diff --git a/packages/config/hackkit.config.ts b/packages/config/hackkit.config.ts
@@ -902,7 +902,7 @@ const c = {
 		"https://static.acmutsa.org/No%20Resume%20Provided.pdf",
 	// Come in and change this date to whenever the hackathon starts
 	startDate: new Date(new Date(2024, 9, 26).setHours(9)),
-	prettyLocation: "UTSA San Pedro I",
+	prettyLocation: "San Pedro I, UTSA",
 	roleBadges: {
 		hacker: {
 			title: "Hacker",