Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/rhlogos #16

Merged
merged 21 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified apps/web/public/img/dash/pass/bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 17 additions & 21 deletions apps/web/src/app/dash/pass/page.tsx
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 w-full items-center justify-center h-[65%]">
<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
Binary file not shown.
58 changes: 30 additions & 28 deletions apps/web/src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,39 +21,41 @@ const oswald = Oswald({

export default function Home() {
return (
<div className={`${oswald.variable} w-full overflow-x-hidden`}>
<div
className={`${oswald.variable} 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 flex min-h-full flex-col overflow-x-hidden bg-[#1A3A9E]">
<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>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/dash/shared/TiltWrapper.tsx
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
7 changes: 1 addition & 6 deletions apps/web/src/components/landing/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,7 @@ 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
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
2 changes: 1 addition & 1 deletion apps/web/src/components/shared/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ interface NavbarProps {
export default async function Navbar({ className }: NavbarProps) {
const user = await currentUser();
return (
<div className="z-50 w-screen">
<div className="z-50 w-screen dark:bg-black bg-white">
<div
className={cn(
`relative top-0 z-50 h-16 w-screen border-b border-b-border bg-nav ${oswald.variable}`,
Expand Down
13 changes: 4 additions & 9 deletions packages/config/hackkit.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -861,10 +861,10 @@ const c = {
guide: "https://go.rowdyhacks.org/discord",
},
icon: {
sm: "/img/logo/hackkit.svg",
sm: "/img/logo/rhbttf.svg",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't seem like md: "/img/logo/rhbttf-md.png" and lg: "/img/logo/rhbttf-lg.png" exist in the repo. Am I missing something?

md: "/img/logo/hackkit-md.png",
lg: "/img/logo/hackkit-lg.png",
svg: "/img/logo/hackkit.svg",
svg: "/img/logo/rhbttf.svg",
},
dashPaths: {
dash: {
Expand Down Expand Up @@ -897,12 +897,12 @@ const c = {
maxResumeSizeInBytes: 4194304,
maxProfilePhotoSizeInBytes: 3145728,
maxFileSizeInBytes: 4194304,
eventPassBgImage: "/img/dash/pass/bg.png",
eventPassBgImage: "/img/logo/rhbttf.svg",
noResumeProvidedURL:
"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: "San Pedro I",
prettyLocation: "UTSA San Pedro I",
roleBadges: {
hacker: {
title: "Hacker",
Expand Down Expand Up @@ -975,11 +975,6 @@ const publicRoutes = [
"/faq"
];

// Generally it is reccomended to put your primary audience's university at the top of this list.




export default c;
export {
defaultTheme,
Expand Down
Loading