Skip to content

Commit

Permalink
Sync Repos + Bug fixes (#29)
Browse files Browse the repository at this point in the history
* Sync Hackkit Repo with Rowdyhacks24 (#28)

* Port rh24-beta pt3

* Add: navbar styling

* Add: vercel analytics

* Fix Landing Logo

* Fix: Footer image

* Fix: broken lockfile

* Add: More RH Updates

* Add: Change hackathon-primary

* Update: README

* Fix: README

* New About and Components

* Add: more RH24 styling

* Quick update

* Update UI

* added carousel

* Added

* Added filler section

* Added team array

* Added basic card

* Partners section in progress

* Added Carousel assets

* small fix meet the team

* Meet The Team push

* Fixed meet team

* Sleep commit

* Fixed team images

* Merged in Josh-dev

* add contributions

* Finish work session

* Added sponsor images

* Updated contributions

* Chore: fix filler, temp hide partners

* Add: more contrasty about texts

* Center Team UI

* Temp: comment out team

* Fix: hackkit config

* Updated dinos

* Updated Marathon logo

* Added extra assets

* Update partner and Team

* Added date

* Updated partners

* Fix: package.json

* Remove: react-icons from rh fork

* Fixed logos

* Update about

* Update about and Filler

* Update Partners

* Updated Partners

* Add priority to fossil

* Update fossil

* Work?

* Update partners

* Update Team

* Updated Dell icon

* Update Dell Logo Name

* Feat: post message end point

* Fix: levelOfStudy Other Invalid

* Add: trinity university

* Chore: fix filler, temp hide partners

* Center Team UI

* Temp: comment out team

* Fix: hackkit config

* Remove: react-icons

* Remove: react-icons from rh fork

* Add: MLH Banner

* Auto stash before merge of "christian-dev" and "origin/josh-dev"

* FF branch to Josh-dev

* Add: MLH Banner

* Work pt 2 eletric boogaloo

* Footer closer match team color

* Mobile optimized Team

* Update Team

* Mobile fix Team

* remove team scrollbar

* Temp: remove volcano

* Removed unneeded assets

* Update Partner and Team bg

* Update Filler sections

* Refactor FillerPartnersTeam

* Update filler name

* Update Team photo sizes

* Remove fossils from filler

* Fix Dell Tech Logo

* Fix Natasha photo

* Fix partner image

* Fix partners (fr this time)

* optimize gradient below About

* add mobile navbar

* Added Christian Salinas

* Rename Natasha_Blussick.JPG to Natasha_Blussick.jpg

HOTFIX Natasha

* Fixed Partner BG

* Stash commits

* Fix: Partners section on mobile

just changed the z-index lol

* Fixed Partners mobile

* Fix: MLH Badge on other pages

Refactored MLH badge to only show on landing page

* Update partners

* Fix overflow on page

* Fixed Hero bg for scroll

* Add Embla Autoplay

* Add Embla-Carousel

* Add autoplay to Team

* Update UTSA DS logo

* Add sign

* Fix: make user table dynamic

* Temp: update middleware and remove signinmethod from admin user page

* Add arrow to mobile team

* Remove test.css

* Add: clouds

* Add: rock

* Fix: badge over acc drop down

* Add: badge theme flip flop

* Add: date tagline

* Add: compressed hero filler

* Temp: Add background to partners

* Temp fixes to partner imgs

* Remove shadow from team card

* Fixed scroll bug on hero

* Remove unused asset

* Add: mobile optimizations

* Add swivel to partner

* Update team

* Fix team centering

* Update date

* Update FillerHero

* Update partner imgs

* Partner fix 1.0

* Update Partner Cards

* Add Bunz

* Update partner colors

* Add: mentor/volunteer section

* Update: partner packet URL

* Fix page scroll

* Update Dell

* Sponsors v2

* Partners 2.1

* Add Bunz

* Mobile Optimize Workwithus

* Partners v3

* Update rowdy silver

* Update google svg

* Update partners

* Update swivel logo

* Minor tweaks team

* Fix workwithus

* Update Team (user feedback)

* Fix: config start date

* Fix lockfile

* Added dropdown

* Fix: hackkit.config.ts

* Fix: hackkit.config.ts

* Add better bot logging

* Dropdown v1.1.1

* Fix participant name

* Fix partner and Alessandro

* Set peoples username

* Temp patch nixpacks

* Repatch

* Repatch

* Repatch pt. 3

* Update Admin icons

* Add pagination shadcn

* Pagination v1.0

* fixed guide button on dash; added guide to config.links

* Modify users per page

* Pagination v2.0

* Remove FillerPartnersTeam

* Added _blank to extern links

* Update Icons

* Checkboxes now affect search

* Fix Searchbug

* Fix: Settings redirect bug

user now properly loaded from clerk avoiding redirect

* Added popup

* Added RSVp checkin

* Update RSVP

* Add Event Pass

* update checkin

* Fix: Update name setting

* Add guild to pass

* Patched scanner

* Fix Searchbar

* Update schedule to temp redirect to png

* Added info to scanner

* Added info to passscanner

* Small fixes

* Add: vscode to gitignore

* Chore: Remove most of Rowdyhacks Related Code

* Fix: Qr code pass

* Chore: Remove unneccsary assets and images

* Fix: UI bug with hackkit

* Remove: Old QR Drawer

* Add: Outlines on sections for Hackkit

* Fix: Schedule and event pass

* Add: admin console link to navbar

* Delete: Debug statements from admin

---------

Co-authored-by: Liam Murray <[email protected]>
Co-authored-by: joshuasilva414 <[email protected]>
Co-authored-by: Liam Murray <[email protected]>
Co-authored-by: Jacob Ellerbrock <[email protected]>
Co-authored-by: Jacob Ellerbrock <[email protected]>

* Delete: Old Rh logos

* Update: landing for mobile

* Update: Mobile Opt regist. closed

* Chore: Refactor admin components

* Chore: Refactor admin component folder

* Add: use debounce

* Fix: Search params URL bar

---------

Co-authored-by: Liam Murray <[email protected]>
Co-authored-by: joshuasilva414 <[email protected]>
Co-authored-by: Liam Murray <[email protected]>
Co-authored-by: Jacob Ellerbrock <[email protected]>
Co-authored-by: Jacob Ellerbrock <[email protected]>
  • Loading branch information
6 people authored Jun 9, 2024
1 parent 66305c9 commit 98a44fb
Show file tree
Hide file tree
Showing 110 changed files with 3,453 additions and 754 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,8 @@ yarn-error.log*
.turbo

# vercel
.vercel
.vercel
.env*.local

# vscode
.vscode
29 changes: 24 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
<p align="center" style="margin-bottom: 0px !important;">
<img width="200" src="https://github.com/acmutsa/HackKit/assets/38444224/07cf3752-36e5-4c72-b74b-cbb48da1cfd3" alt="Material Bread logo" align="center">
</p>
<h1 align="center" style="margin-top: 0px;">HackKit</h1>
<p align="center"><b>Feature-packed Hackathon Managment Software</b><br><br><br>More Here Soon...</p>
# 🦕 RowdyHacks IX: _A Land Before RowdyHacks_

**The offical website for RowdyHacks 2024!**

## Technologies Used

- TypeScript
- Next.js
- Drizzle ORM
- Tailwind CSS

[![Vercel](https://static.rowdyhacks.org/img/powered-by-vercel.svg)](https://vercel.com/?utm_source=ACM%20UTSA&utm_campaign=oss)

## Join The Team

Want to help make RowdyHacks the best Hackathon around? Please reach out to us at `[email protected]`!

## RH 2024 Website Contributors

<a href="https://github.com/acmutsa/RowdyHacks24/graphs/contributors">
<img src="https://contrib.rocks/image?repo=acmutsa/RowdyHacks24" />
</a>

[📣❤️ Other Contributions ❤️📣](https://github.com/UTSA-ACM/RowdyHacks24/blob/dev/contributions.md)
13 changes: 12 additions & 1 deletion apps/bot/bot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ for (const file of commandFiles) {
console.log(
`[WARNING] The command at ${filePath} is missing a required "data" or "execute" property.`
);
}
}
}
console.log(`Loaded ${client.commands.size} Commands`);

Expand Down Expand Up @@ -174,6 +174,7 @@ app.post("/api/checkDiscordVerification", async (h) => {
}

if (body.code === undefined || typeof body.code !== "string") {
console.log("failed cause of malformed body");
return h.json({ success: false });
}

Expand All @@ -184,6 +185,7 @@ app.post("/api/checkDiscordVerification", async (h) => {
console.log("got here 1 with verification ", verification);

if (!verification || !verification.clerkID) {
console.log("failed cause of no verification or missing clerkID");
return h.json({ success: false });
}
console.log("got here 2");
Expand All @@ -192,6 +194,7 @@ app.post("/api/checkDiscordVerification", async (h) => {
});
console.log("got here 2 with user", user);
if (!user) {
console.log("failed cause of no user in db");
return h.json({ success: false });
}

Expand All @@ -201,19 +204,27 @@ app.post("/api/checkDiscordVerification", async (h) => {

const guild = client.guilds.cache.get(verification.guild);
if (!guild) {
console.log("failed cause of no guild on intereaction");
return h.json({ success: false });
}

const role = guild.roles.cache.find((role) => role.name === c.botParticipantRole);
const userGroupRole = guild.roles.cache.find((role) => role.name === userGroupRoleName);

if (!role || !userGroupRole) {
console.log(
"failed cause could not find a role, was looking for group " +
user.group +
" called " +
userGroupRoleName
);
return h.json({ success: false });
}

const member = guild.members.cache.get(verification.discordUserID);

if (!member) {
console.log("failed cause could not find member");
return h.json({ success: false });
}

Expand Down
11 changes: 11 additions & 0 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
"dependencies": {
"@aws-sdk/client-ses": "^3.485.0",
"@clerk/nextjs": "^4.29.4",
"@gsap/react": "^2.0.2",
"@hookform/resolvers": "^3.1.1",
"@internationalized/date": "^3.3.0",
"@planetscale/database": "^1.8.0",
"@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-avatar": "^1.0.3",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.4",
Expand All @@ -30,6 +32,7 @@
"@types/node": "20.3.2",
"@types/react": "18.2.14",
"@types/react-dom": "18.2.6",
"@vercel/analytics": "^1.1.1",
"@vercel/blob": "^0.10.0",
"@vercel/kv": "^1.0.1",
"@vercel/postgres": "^0.4.0",
Expand All @@ -45,6 +48,11 @@
"db": "workspace:*",
"dotenv": "^16.3.1",
"drizzle-zod": "^0.5.1",
"embla-carousel": "8.0.0-rc22",
"embla-carousel-autoplay": "8.0.0-rc22",
"embla-carousel-react": "8.0.0-rc20",
"framer-motion": "^10.18.0",
"gsap": "^3.12.4",
"lucide-react": "^0.317.0",
"nanoid": "^4.0.2",
"next": "14.0.4",
Expand All @@ -54,10 +62,12 @@
"postgres": "^3.3.5",
"react": "18.2.0",
"react-aria": "^3.26.0",
"react-bootstrap": "^2.10.0",
"react-confetti": "^6.1.0",
"react-dom": "18.2.0",
"react-dropzone": "^14.2.3",
"react-email": "^1.10.0",
"react-fast-marquee": "^1.6.2",
"react-hook-form": "7.44.3",
"react-loader-spinner": "^6.1.6",
"react-parallax-tilt": "^1.7.154",
Expand All @@ -73,6 +83,7 @@
"tailwindcss-animate": "^1.0.6",
"title-case": "^3.0.3",
"typescript": "5.1.6",
"use-debounce": "^10.0.1",
"usehooks-ts": "^2.14.0",
"vaul": "^0.8.0",
"zod": "^3.21.4"
Expand Down
Binary file removed apps/web/public/img/dash/pass/bg.png
Binary file not shown.
Binary file removed apps/web/public/img/logo/hackkit.ico
Binary file not shown.
Binary file removed apps/web/public/img/logo/logo.png
Binary file not shown.
4 changes: 4 additions & 0 deletions apps/web/public/img/partner-logos/ACM_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions apps/web/public/img/partner-logos/AFCSLogo.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/partner-logos/Accenture-logo.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/partner-logos/Artea_logo.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/partner-logos/Bunz_logo.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/partner-logos/Codepath_logo.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/partner-logos/CyManII_Logo.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/partner-logos/Dell_Tech_Logo.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/partner-logos/FrostBank.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/partner-logos/Google_Icon.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/partner-logos/HEB.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/partner-logos/Marathon_Oil_Logo.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/partner-logos/PaycomLogo.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/partner-logos/Pho_logo.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/partner-logos/Six_Flags_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 98a44fb

Please sign in to comment.