Skip to content

Commit

Permalink
Sync dev and production (#22)
Browse files Browse the repository at this point in the history
  • Loading branch information
@christianhelp
christianhelp authored Sep 18, 2024
1 parent 8f189f7 commit f880196
Show file tree
Hide file tree
Showing 18 changed files with 132 additions and 139 deletions.
Binary file modified apps/web/public/img/dash/pass/bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions apps/web/src/app/api/registration/create/route.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ export async function POST(req: Request) {
skills: body.skills.map((v) => v.text.toLowerCase()),
profilePhoto: user.imageUrl,
isFullyRegistered: true,
phoneNumber:body.phoneNumber,
phoneNumber: body.phoneNumber,
isSearchable: body.profileIsSearchable,
countryOfResidence:body.countryOfResidence,
countryOfResidence: body.countryOfResidence,
});

await tx.insert(userHackerData).values({
Expand Down
38 changes: 17 additions & 21 deletions apps/web/src/app/dash/pass/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ function EventPass({ qrPayload, user, clerk, guild }: EventPassProps) {
return (
<div className="relative my-20 h-max">
<div className="absolute left-1/2 top-0 z-10 h-[75px] w-[75px] -translate-x-1/2 -translate-y-[50%] rotate-45 rounded-full border-2 border-background border-b-muted border-r-muted bg-background dark:border" />
<div className="flex aspect-[9/17] !max-h-[calc(100vh-7rem)] w-full max-w-[400px] flex-col overflow-hidden rounded-3xl border-2 border-muted bg-background py-[37.5px] dark:border">
<div className="relative flex h-[30%] w-full flex-col items-center pt-2">
<div className="flex aspect-[9/17] !max-h-[calc(100vh-7rem)] w-full min-w-[min(100vw-5rem,350px)] max-w-[500px] flex-col overflow-hidden rounded-3xl border-2 border-muted bg-background py-[37.5px] dark:border">
<div className="relative flex min-h-fit w-full flex-col items-center pt-2">
<Image
src={clerk.imageUrl}
alt={`${user.firstName}'s Profile Picture`}
Expand All @@ -72,25 +72,21 @@ function EventPass({ qrPayload, user, clerk, guild }: EventPassProps) {
</h3>
</div>
</div>
<div className="event-pass-img relative flex h-[45%] w-full items-end">
<div className="absolute left-1/2 top-1/2 aspect-square w-[200px] -translate-x-1/2 -translate-y-[65%] bg-hackathon opacity-60 blur-[50px] will-change-transform"></div>
<Image
src={c.eventPassBgImage}
alt={""}
fill
className="no-select -translate-y-[15%] scale-[0.8] object-contain"
/>
<div className="grid h-20 w-full grid-cols-2">
<div className="flex h-full w-full items-center justify-start pl-2">
{/* <Image
src={c.icon.svg}
height={60}
width={60}
alt={``}
/> */}
<div className="event-pass-img relative flex h-full w-full flex-col items-center justify-evenly">
<div className="absolute left-1/2 top-1/2 aspect-square w-[200px] -translate-x-1/2 -translate-y-[65%] bg-slate-400 opacity-60 blur-[50px] will-change-transform"></div>
<div className="relative flex h-[65%] w-full items-center justify-center">
<Image
src={c.eventPassBgImage}
alt={""}
fill
className="no-select z-50 scale-[0.8] object-contain"
/>
</div>
<div className="mx-6 grid min-h-fit w-full grid-cols-2 gap-2">
<div className="flex h-full w-full items-start justify-center">
<h1 className="text-md ml-1 font-bold leading-tight">
{c.hackathonName}{" "}
<span className="text-hackathon">
<span className="text-orange-400">
{c.itteration}
</span>
</h1>
Expand All @@ -106,10 +102,10 @@ function EventPass({ qrPayload, user, clerk, guild }: EventPassProps) {
</div>
</div>
</div>
<div className="flex h-[25%] w-full items-center justify-center border-dashed border-muted">
<div className="flex h-36 w-full items-center justify-center border-dashed border-muted">
<Drawer>
<DrawerTrigger asChild>
<div className="flex aspect-square h-[90%] items-center justify-center overflow-x-hidden rounded-xl border-2 border-dashed border-muted p-2">
<div className="flex aspect-square h-[90%] items-center justify-center overflow-x-hidden rounded-xl border-2 border-muted p-2">
<QRCode
className="h-full"
bgColor="hsl(var(--background))"
Expand Down
Binary file modified apps/web/src/app/favicon.ico
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion apps/web/src/app/globals.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,4 @@

.register-clip {
clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
}
}
62 changes: 32 additions & 30 deletions apps/web/src/app/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import WorkWithUs from "@/components/landing/WorkWithUs";
import TrailerSection from "@/components/landing/TrailerSection";
import { Suspense } from "react";
import { Skeleton } from "@/components/shadcn/ui/skeleton";
import {WavyBackground} from "@/components/landing/WavyBackground";
import { WavyBackground } from "@/components/landing/WavyBackground";

const oswald = Oswald({
variable: "--font-oswald",
Expand All @@ -21,43 +21,45 @@ const oswald = Oswald({

export default function Home() {
return (
<div className={`${oswald.variable} w-full overflow-x-hidden`}>
<div
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="overflow-x-hidden relative flex flex-col min-h-full">
<div className="fixed inset-0 w-screen h-screen -z-10 overflow-hidden">
<WavyBackground
backgroundFill="#1A3A9E"
colors={[
"#1D41AE",
"#1A3A9E",
"#17338E",
"#1D41AE",
"#1A3A9E",
"#1D41AE",
"#1A3A9E",
"#17338E",
"#1D41AE",
"#1A3A9E",
]}
speed="fast"
waveOpacity={1}
waveWidth={300}
containerClassName="scale-x-125 scale-y-[2] h-full"
/>
</div>
<Hero/>
<About/>
<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"
colors={[
"#1D41AE",
"#1A3A9E",
"#17338E",
"#1D41AE",
"#1A3A9E",
"#1D41AE",
"#1A3A9E",
"#17338E",
"#1D41AE",
"#1A3A9E",
]}
speed="fast"
waveOpacity={1}
waveWidth={300}
containerClassName="scale-x-125 scale-y-[2] h-full"
/>
</div>
<Hero />
<About />
{/* <Partners /> */}
<WorkWithUs/>
<TrailerSection/>
<Footer/>
<WorkWithUs />
<TrailerSection />
<Footer />
</main>
</div>
);
}

export const runtime = "edge";
export const revalidate = 30;
export const revalidate = 30;
2 changes: 1 addition & 1 deletion apps/web/src/components/dash/shared/TiltWrapper.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function TiltWrapper({ children }: { children: ReactNode }) {
tiltReverse={true}
glareEnable={doTilt}
glareMaxOpacity={0.2}
glareColor="hsl(var(--hackathon-primary))"
glareColor="#94a3b8"
glarePosition="all"
glareBorderRadius="1.5rem"
tiltEnable={doTilt}
Expand Down
14 changes: 6 additions & 8 deletions apps/web/src/components/landing/About.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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 />
Expand All @@ -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!"
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/landing/Footer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default function Footer() {
<p className="col-span-2 self-center justify-self-center text-center font-mono text-xs text-orange-500 sm:col-start-2 md:py-0 lg:col-span-3 lg:col-start-2 lg:row-start-2 lg:w-11/12">
Made with &lt;/&gt; &amp; ♥ @ RowdyHacks
<br />© RowdyHacks &amp; Association of Computing Machinery
at UTSA2024. All Rights Reserved.
at UTSA 2024. All Rights Reserved.
</p>
</div>
</section>
Expand Down
31 changes: 13 additions & 18 deletions apps/web/src/components/landing/Hero.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,34 @@ export default function Home() {
<div
className={`z-20 mx-4 flex flex-col items-center space-y-3 md:flex-row md:space-y-0`}
>
<ShinyLogo/>
<ShinyLogo />
<h1 className="bg-gradient-to-b from-orange-600 via-yellow-300 to-orange-600 bg-clip-text p-5 pl-2 font-bttf text-5xl text-transparent sm:text-7xl lg:text-8xl">
<span className="text-7xl sm:text-8xl md:text-[length:inherit]">
{"HACK<"}
</span>
<br/>
<br />
{"&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>
<div className="w-full relative hover:scale-125 ease-in-out duration-150">
<Link href={'/register'}>
<div className="relative max-w-[250px] lg:max-w-[475px] mx-auto my-10">
<div
className="absolute z-[5] h-[64px] w-full max-w-[500px] hover:cursor-pointer bg-white mx-auto flex items-center justify-center register-clip">
<h2 className="bg-gradient-to-b from-orange-600 via-yellow-300 to-orange-600 bg-clip-text px-2 font-bttf text-2xl lg:text-5xl text-transparent lg:mt-3">
<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]">
<div className="register-clip absolute z-[5] mx-auto flex h-[64px] w-full max-w-[500px] items-center justify-center bg-white hover:cursor-pointer">
<h2 className="bg-gradient-to-b from-orange-600 via-yellow-300 to-orange-600 bg-clip-text px-2 font-bttf text-2xl text-transparent lg:mt-3 lg:text-5xl">
register
</h2>
</div>
<div
className="translate-y-2 absolute h-[64px] w-full max-w-[500px] hover:cursor-pointer bg-orange-400 mx-auto flex items-center justify-center register-clip"></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>
);
}
Expand All @@ -42,12 +43,6 @@ function Overlay() {
return (
<div className="pointer-events-none fixed left-0 top-0 z-50 h-full w-screen select-none p-5 pt-16">
<div className="relative h-full w-full">
{/* Start Corners */}
{/* <div className="absolute left-0 top-0 h-[15px] w-[15px] border-l-2 border-t-2 border-orange-400"/>
<div className="absolute right-0 top-0 h-[15px] w-[15px] border-r-2 border-t-2 border-orange-400"/>
<div className="absolute bottom-0 left-0 h-[15px] w-[15px] border-b-2 border-l-2 border-orange-400"/>
<div className="absolute bottom-0 right-0 h-[15px] w-[15px] border-b-2 border-r-2 border-orange-400"/> */}
{/* End Corners */}
<p className="absolute bottom-0 left-0 w-full text-center font-mono text-orange-400">
ROWDYHACKS X · SAN PEDRO I, UTSA
</p>
Expand Down
3 changes: 2 additions & 1 deletion apps/web/src/components/landing/TeamMember.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
import { Oswald } from "next/font/google";
import Image from "next/image";
import { useState } from "react";
import c from "config";
const oswald = Oswald({
variable: "--font-oswald",
subsets: ["latin"],
Expand Down Expand Up @@ -99,7 +100,7 @@ export default function TeamMember({ person }: { person: Person }) {
priority={true}
alt="Person Placeholder"
onError={(e) => {
setSrc("/img/logo/hackkit.svg");
setSrc(`${c.icon.svg}`);
setStyling(FallBackStyling);
}}
/>
Expand Down
8 changes: 4 additions & 4 deletions apps/web/src/components/landing/WorkWithUs.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 6 additions & 7 deletions apps/web/src/components/registration/RegisterForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ export default function RegisterForm({ defaultEmail }: RegisterFormProps) {
shirtSize: "" as any,
schoolID: "",
university: "",
phoneNumber:"",
countryOfResidence:"",
phoneNumber: "",
countryOfResidence: "",
},
});

Expand All @@ -116,10 +116,9 @@ export default function RegisterForm({ defaultEmail }: RegisterFormProps) {
}
}, [universityValue]);


useEffect(()=>{
console.log(countryValue)
},[countryValue])
useEffect(() => {
console.log(countryValue);
}, [countryValue]);

async function onSubmit(data: z.infer<typeof RegisterFormValidator>) {
console.log(data);
Expand Down Expand Up @@ -180,7 +179,7 @@ export default function RegisterForm({ defaultEmail }: RegisterFormProps) {
setIsLoading(false);
alert(
`Something went wrong while attempting to register. Please try again. If this is a continuing issue, please reach out to us at ${c.issueEmail}.`,
)
);
return console.log(
`Recieved a unexpected response from the server. Please try again. If this is a continuing issue, please reach out to us at ${c.issueEmail}.`,
);
Expand Down
12 changes: 7 additions & 5 deletions apps/web/src/components/shared/Navbar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
});

Expand All @@ -23,7 +23,7 @@ export default async function Navbar({ className }: NavbarProps) {
<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,
)}
>
Expand All @@ -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>
Expand Down
Loading

0 comments on commit f880196

Please sign in to comment.