Skip to content

Commit

Permalink
Sync prod and main (#39)
Browse files Browse the repository at this point in the history
* migrate from clerk user metadata

* adds hackkit credits

* Added text saying only accepted files are PDF. Might want to make it dynamic later (acmutsa#121)

* Upgrade Next Safe Action (acmutsa#118)

* fix registration default

* Added "Presented by SWIVEL"

* Update README.md

* Fixed text overflow on user dashboard (#25)

* Fixed text sizing in user dashboard

* Formatted Project with Prettier

* Revert "Fixed text overflow on user dashboard (#25)" (#26)

This reverts commit ae09168.

* fixes overflow

* adds guilds

* fixes schedule default

* Add event location (acmutsa#124)

* add event location

* Prettier format

* fixed xs screen size overriding all other sizes (#28)

* updates bot name

* updates user profile

* updates media query size

* Adding Team Section (#29)

* meet the team page

* color change to show cards

* adjustments to card flip and mobile

* Testing on build if rotating cards is laggy

* Created team.json according to form/pictures as of 10/17

* Added all pictures

* RowdyHacks X Team Section added

* Prettier write

* Updated organizer list as of 10/21
Improved responsive design

* Added pictures for organizer list as of 10/21

* Prettier write

* Prettier write

* Updated pictures

* Prettier write

---------

Co-authored-by: Carter LaVigne <[email protected]>

* Merging in new schedule enhancements (acmutsa#128)

* schedule timeline initial styling

* Timeline days added

* add live pulsing effect

* add little line

* Bigger day headers

* run prettier

---------

Co-authored-by: joshuasilva414 <[email protected]>

* updates from prod

* Fix Hackathon Check-In Scanner (acmutsa#130)

* fix admin link check

* Satisfies User Settings w/ New Schema (acmutsa#112)

* test update image

* mobile optimize pass

* I made cool schedule (#33)

* Schedule timeline
* Mobile optimizations
* Prettier formatted

* fix current event logic

* fix current event display

* adds survival guide

* small event layout change

* updates theming

* updates settings

* updates build command

* Added sponsors section to the website (#37)

* Improved hacker dashboard color palette and fixed font issues (#38)

---------

Co-authored-by: joshuasilva414 <[email protected]>
Co-authored-by: Jacob Ellerbrock <[email protected]>
Co-authored-by: Joshua Silva <[email protected]>
Co-authored-by: Jacob <[email protected]>
Co-authored-by: Liam Murray <[email protected]>
Co-authored-by: Matthew Anderson <[email protected]>
Co-authored-by: Carter LaVigne <[email protected]>
  • Loading branch information
8 people authored Oct 26, 2024
1 parent bf53933 commit 32a0c1f
Show file tree
Hide file tree
Showing 18 changed files with 201 additions and 122 deletions.
4 changes: 4 additions & 0 deletions apps/web/public/img/sponsors/CYMANII.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/web/public/img/sponsors/DELL.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/web/public/img/sponsors/GROQ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions apps/web/public/img/sponsors/HEB.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/web/public/img/sponsors/KLESSE.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/web/public/img/sponsors/MATRIX.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/web/public/img/sponsors/SCHROEDER.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions apps/web/public/img/sponsors/SWIVEL Knockout-b.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions apps/web/public/img/sponsors/SWIVEL.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions apps/web/public/img/sponsors/UTSA_CS.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions apps/web/public/img/sponsors/UTSA_DATA_SCIENCE.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions apps/web/src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@

--radius: 0.5rem;

--gradient-color-1: #f7f5f5;
--gradient-color-2: #f7f5f5;
--gradient-color-3: #dcdcdc;
--gradient-color-4: #dcdcdc;
--gradient-color-1: #3f63c8;
--gradient-color-2: #1a46b3;
--gradient-color-3: #001773;
--gradient-color-4: #11377d;
}

.dark {
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import About from "@/components/landing/About";

import Partners from "@/components/landing/Partners";
import Footer from "@/components/landing/Footer";
import { Sponsors } from "@/components/landing/Sponsors";
import MLHBadge from "@/components/landing/MLHBadge";
import Team from "@/components/landing/Team";
import { Oswald } from "next/font/google";
Expand Down Expand Up @@ -52,6 +53,7 @@ export default function Home() {
</div>
<Hero />
<About />
<Sponsors />
{/* <Partners /> */}
<WorkWithUs />
<Team />
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/dash/overview/ServerBubbles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function TitleBubble() {
{c.hackathonName}
</h1> */}
<h1 className="bg-gradient-to-b from-orange-600 via-yellow-300 to-orange-600 bg-clip-text font-bttf text-4xl text-transparent sm:text-7xl lg:text-5xl xl:text-6xl">
{"RowdyHacks"}
{"rowdyhacks"}
</h1>
<h2 className="text-center font-mono text-xs text-orange-500 sm:text-base">
{`${format(c.startDate, "h:mma, MMM d, yyyy")}`} @{" "}
Expand Down
62 changes: 62 additions & 0 deletions apps/web/src/components/landing/SponsorItem.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import Image from "next/image";
import Link from "next/link";
import { Partner } from "@/lib/utils/shared/types";

const capitalize = (input: string) =>
input.charAt(0).toUpperCase() + input.slice(1);

const tierColorMap = {
title: "text-[#E817C6]",
gold: "text-yellow-600",
silver: "text-gray-400",
bronze: "text-[#a97142]",
partner: "text-[#17C6E8]",
} as const;

export function SponsorItem({ name, logo, tier, url }: Partner) {
const textColor = tierColorMap[tier];
const isTitle = tier === "title";

return (
<Link
href={url}
className={`group flex flex-col justify-center text-center ${
isTitle ? "w-full max-w-2xl" : "w-full"
}`}
>
<div>
<div className="relative z-50 rounded-xl border-2 border-[#ea580c] bg-white transition-transform lg:group-hover:-translate-y-6">
<div
className={`flex items-center justify-center p-4 ${
isTitle ? "h-96" : "h-60"
}`}
>
<Image
src={logo}
height={isTitle ? 300 : 200}
width={isTitle ? 300 : 200}
alt={`${name}'s Logo`}
className="object-contain"
/>
</div>
</div>
<div
className={`invisible ${textColor} relative ${
isTitle ? "bottom-32" : "bottom-20"
} z-10 transition-all duration-200 ease-linear lg:group-hover:visible lg:group-hover:bottom-0`}
>
<h1
className={`mb-2 font-semibold ${
isTitle ? "text-6xl" : "text-2xl"
}`}
>
{name}
</h1>
<h1 className={isTitle ? "text-4xl" : "text-xl"}>
{capitalize(tier)} Sponsor
</h1>
</div>
</div>
</Link>
);
}
48 changes: 48 additions & 0 deletions apps/web/src/components/landing/Sponsors.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { SponsorItem } from "./SponsorItem";
import { Partner } from "@/lib/utils/shared/types";
import partners from "./partners.json";

export async function Sponsors() {
const partnerList: Partner[] = partners.partners as Partner[];

const titleSponsors = partnerList.filter((p) => p.tier === "title");
const otherSponsors = partnerList.filter((p) => p.tier !== "title");

return (
<section className="mt-20 font-oswald">
<div className="rounded-xl px-8 py-10">
<div className="mb-28 py-10">
<h1 className="flex justify-center bg-gradient-to-b from-orange-600 via-yellow-300 to-orange-600 bg-clip-text text-center font-bttf text-4xl text-transparent sm:text-5xl md:text-6xl">
a huge thanks to our rowdyhacks partners
</h1>
</div>

{titleSponsors.length > 0 && (
<div className="mb-16 flex flex-wrap justify-center gap-8">
{titleSponsors.map(({ name, url, logo, tier }) => (
<SponsorItem
key={name}
name={name}
url={url}
logo={logo}
tier={tier}
/>
))}
</div>
)}

<div className="grid grid-cols-1 gap-8 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5">
{otherSponsors.map(({ name, url, logo, tier }) => (
<SponsorItem
key={name}
name={name}
url={url}
logo={logo}
tier={tier}
/>
))}
</div>
</div>
</section>
);
}
156 changes: 39 additions & 117 deletions apps/web/src/components/landing/partners.json
Original file line number Diff line number Diff line change
@@ -1,142 +1,64 @@
{
"partners": [
{
"name": "Cymanii",
"logo": "CyManII_Logo.svg",
"url": "https://cymanii.org/",
"tier": "Gold Sponsor"
},
{
"name": "UTSA DS Dept.",
"logo": "UTSADS.svg",
"url": "https://sds.utsa.edu/",
"tier": "Gold Sponsor"
},
{
"name": "Swivel",
"logo": "swivel_logo.svg",
"url": "https://www.getswivel.io/",
"tier": "Silver Sponsor"
},
{
"name": "UTSA CS Dept.",
"logo": "UTSA_CS.svg",
"url": "https://sciences.utsa.edu/computer-science/",
"tier": "Silver Sponsor"
},
{
"name": "Frost Bank",
"logo": "FrostBank.svg",
"url": "https://www.frostbank.com/",
"tier": "Silver Sponsor"
},
{
"name": "Valero",
"logo": "ValeroLogo.svg",
"url": "https://www.valero.com/",
"tier": "Silver Sponsor"
},
{
"name": "Google",
"logo": "Google_Icon.svg",
"url": "https://about.google/",
"tier": "Bronze Sponsor"
},
{
"name": "Paycom",
"logo": "PaycomLogo.svg",
"url": "https://www.paycom.com/",
"tier": "Bronze Sponsor"
"logo": "/img/sponsors/SWIVEL Knockout-b.svg",
"tier": "title",
"url": "https://www.getswivel.io/"
},
{
"name": "Dell",
"logo": "Dell_Tech_Logo.svg",
"url": "https://www.dell.com/",
"tier": "Bronze Sponsor"
},
{
"name": "S + S",
"logo": "Students_and_Startups.svg",
"url": "https://studentsstartups.com/",
"tier": "Bronze Sponsor"
},
{
"name": "AFCS",
"logo": "AFCSLogo.svg",
"url": "https://afciviliancareers.com/",
"tier": "Bronze Sponsor"
},
{
"name": "Accenture",
"logo": "Accenture-logo.svg",
"url": "https://www.accenture.com/",
"tier": "Rowdy Partner"
"name": "Schroeder",
"logo": "/img/sponsors/SCHROEDER.png",
"tier": "bronze",
"url": "/"
},
{
"name": "UTSA COE",
"logo": "UTSA_COE.svg",
"url": "https://klesse.utsa.edu/",
"tier": "Rowdy Partner"
"name": "Groq",
"logo": "/img/sponsors/GROQ.png",
"tier": "silver",
"url": "https://groq.com/"
},
{
"name": "UTSA Tech Store",
"logo": "rowdy_tech_logo.svg",
"url": "https://campustechnologystore.com/campustechnologystore/",
"tier": "Rowdy Partner"
"name": "Matrix AI",
"logo": "/img/sponsors/MATRIX.png",
"tier": "partner",
"url": "https://ai.utsa.edu/"
},
{
"name": "TD Synnex",
"logo": "TD_Synnex_logo.svg",
"url": "https://www.tdsynnex.com/",
"tier": "Rowdy Partner"
"name": "CyManii",
"logo": "/img/sponsors/CYMANII.svg",
"tier": "silver",
"url": "https://cymanii.org/"
},
{
"name": "Wolfram Alpha",
"logo": "wolfram_logo.svg",
"url": "https://www.wolframalpha.com/",
"tier": "Rowdy Partner"
"name": "Klesse Engineering",
"logo": "/img/sponsors/KLESSE.svg",
"tier": "partner",
"url": "https://klesse.utsa.edu/"
},
{
"name": "CodePath",
"logo": "Codepath_logo.svg",
"url": "https://www.codepath.org/",
"tier": "Rowdy Partner"
"name": "UTSA Data Science",
"logo": "/img/sponsors/UTSA_DATA_SCIENCE.svg",
"tier": "gold",
"url": "https://sds.utsa.edu/"
},
{
"name": "ACM",
"logo": "ACM_logo.svg",
"url": "https://www.acm.org/",
"tier": "Rowdy Partner"
"name": "UTSA Computer Science",
"logo": "/img/sponsors/UTSA_CS.svg",
"tier": "silver",
"url": "https://sciences.utsa.edu/computer-science/"
},
{
"name": "Artea",
"logo": "Artea_logo.svg",
"url": "https://www.drinkartea.com/",
"tier": "Rowdy In-Kind"
"name": "HEB",
"logo": "/img/sponsors/HEB.svg",
"tier": "silver",
"url": "https://www.heb.com/"
},
{
"name": "Pho Thien An",
"logo": "Pho_logo.svg",
"url": "https://www.phothienan.com/",
"tier": "Rowdy In-Kind"
},
{
"name": "Bunz Burgers",
"logo": "Bunz_logo.svg",
"url": "https://www.tastybunz.com/",
"tier": "Rowdy In-Kind"
},
{
"name": "H-E-B",
"logo": "HEB.svg",
"url": "https://www.heb.com/",
"tier": "Rowdy In-Kind"
},
{
"name": "Six Flags",
"logo": "Six_Flags_logo.svg",
"url": "https://www.sixflags.com/fiestatexas",
"tier": "Rowdy In-Kind"
"name": "Dell",
"logo": "/img/sponsors/DELL.svg",
"tier": "silver",
"url": "https://www.dell.com/en-us"
}
]
}
9 changes: 9 additions & 0 deletions apps/web/src/lib/utils/shared/types.ts
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
export type DeArray<T> = T extends (infer R)[] ? R : T;

type PartnerType = "gold" | "silver" | "bronze" | "title" | "partner";

export interface Partner {
name: string;
logo: string;
tier: PartnerType;
url: string;
}

0 comments on commit 32a0c1f

Please sign in to comment.