Skip to content

Merge branch 'main' into dev #115

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

Closed
wants to merge 119 commits into from
Closed

Merge branch 'main' into dev #115

wants to merge 119 commits into from

Conversation

avsomers25
Copy link
Collaborator

No description provided.

kevinmonisit and others added 30 commits February 4, 2024 13:29
* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* About is added

* created cursor component with wand image (#30)

* "created cursor component with wang image
 with '#' will be ignored, and an empty message aborts the commit.

* Created Simple About Section (#31)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* Merge from Dev (#33)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* About is added

* fixed cursor selection bugs and added a trail

* Fixed missing component import for FAQ

* added comment in luge.js

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>

* Basic Sections (#32)

* completed basic generic sections

* Formatting with prettier

* added some colors and additional divider

* moved text divider half way up to previous section

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>

* Fire Animation (#45)

* Merging from Dev (#35)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* About is added

* created cursor component with wand image (#30)

* "created cursor component with wang image
 with '#' will be ignored, and an empty message aborts the commit.

* Created Simple About Section (#31)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* Merge from Dev (#33)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* About is added

* fixed cursor selection bugs and added a trail

* Fixed missing component import for FAQ

* added comment in luge.js

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>

* Basic Sections (#32)

* completed basic generic sections

* Formatting with prettier

* added some colors and additional divider

* moved text divider half way up to previous section

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>

---------

Co-authored-by: poojakedia <67982568+poojakedia@users.noreply.github.com>
Co-authored-by: Shivam Kajaria <57373405+bhivam@users.noreply.github.com>

* Fire Animation

* Fire Animation

* Animating fire-animation

* Animating fire-animation

* Fire-Animation

* Fire-Animation
Fire Animation.

* Fire Animation

* deleted webp in favor of png, fixed safari stuttering animation

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>
Co-authored-by: poojakedia <67982568+poojakedia@users.noreply.github.com>
Co-authored-by: Shivam Kajaria <57373405+bhivam@users.noreply.github.com>

* New FAQ (#47)

* Accordian Style FAQ Unstyled
Finished up accordian style FAQ without any styling applied
yet. Changed the FAQ constants to include the question as well
as answer.

* Styled FAQ and Made Responsive
Created responsive FAQ using breakpoints and styled accordian.

* Fixed Typo
Accordian -> Accordion

---------

Co-authored-by: poojakedia <67982568+poojakedia@users.noreply.github.com>
Co-authored-by: Shivam Kajaria <57373405+bhivam@users.noreply.github.com>
Co-authored-by: dchaudhari0811 <136735426+dchaudhari0811@users.noreply.github.com>
* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* About is added

* created cursor component with wand image (#30)

* "created cursor component with wang image
 with '#' will be ignored, and an empty message aborts the commit.

* Created Simple About Section (#31)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* Merge from Dev (#33)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* About is added

* fixed cursor selection bugs and added a trail

* Fixed missing component import for FAQ

* added comment in luge.js

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>

* Basic Sections (#32)

* completed basic generic sections

* Formatting with prettier

* added some colors and additional divider

* moved text divider half way up to previous section

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>

* Fire Animation (#45)

* Merging from Dev (#35)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* About is added

* created cursor component with wand image (#30)

* "created cursor component with wang image
 with '#' will be ignored, and an empty message aborts the commit.

* Created Simple About Section (#31)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* Merge from Dev (#33)

* Hero Section (#27)

* set up initial template

* added navbar to hero section

* responsive hero section

* Basic About is done

* About is added

* fixed cursor selection bugs and added a trail

* Fixed missing component import for FAQ

* added comment in luge.js

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>

* Basic Sections (#32)

* completed basic generic sections

* Formatting with prettier

* added some colors and additional divider

* moved text divider half way up to previous section

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>

---------

Co-authored-by: poojakedia <67982568+poojakedia@users.noreply.github.com>
Co-authored-by: Shivam Kajaria <57373405+bhivam@users.noreply.github.com>

* Fire Animation

* Fire Animation

* Animating fire-animation

* Animating fire-animation

* Fire-Animation

* Fire-Animation
Fire Animation.

* Fire Animation

* deleted webp in favor of png, fixed safari stuttering animation

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>
Co-authored-by: poojakedia <67982568+poojakedia@users.noreply.github.com>
Co-authored-by: Shivam Kajaria <57373405+bhivam@users.noreply.github.com>

* New FAQ (#47)

* Accordian Style FAQ Unstyled
Finished up accordian style FAQ without any styling applied
yet. Changed the FAQ constants to include the question as well
as answer.

* Styled FAQ and Made Responsive
Created responsive FAQ using breakpoints and styled accordian.

* Fixed Typo
Accordian -> Accordion

* added bottom image in new branch

* modified formatting

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>
Co-authored-by: Shivam Kajaria <57373405+bhivam@users.noreply.github.com>
Co-authored-by: dchaudhari0811 <136735426+dchaudhari0811@users.noreply.github.com>
* md, lg, xl working

* xs, sm completed

* styled button

* fixed button gradient direction
* added getSelf function to data.ts:

* removed current dashboard, to make way for our dashboard

* basic validation

* Displaying mock user data in frontend hacker dashboard

* New Landing Page Template (#8)

* new landing page template

* ci fixes

* more ci fixes

* landing page template added with new blank sections

* created ui for user data form

* Form validation

* Update package.json

* getUsers in data.ts mock

* zod validation and skeleton for database updating

* set up table ui

* Basic auth now works!

* SignUp page now exists and works, mostly

* registration widget

* Can now update self on hacker dashboard

* reset password

* submitting waiver

* added pagination and search functionality to admin and organizer dashboards. Email auth temporarily broken in order to allow access to mock director account

* Waiver Fixes

* Scroll to login + signup +  unnecessary console.logs removed

* waiver tested + ability to register

* Registration done

* New PNPM lock

* reformatted page directories to accomdoate layouts

* starry background z index fix

* Fixed register form y overflow

* dashboard to hero user flow

* trimmed frontend to fix typescript errors

---------

Co-authored-by: avsomers25 <avsomers25@gmail.com>
Co-authored-by: Ashrith <ashrithathmaram@gmail.com>
Co-authored-by: poojakedia <poojakedianov@gmail.com>
Co-authored-by: avsomers25 <67980093+avsomers25@users.noreply.github.com>
… to appear as well as fixed background from appearing in images (#70)

* fixed scroll bar appearing on full screen

* all scroll issues fixed

* removed background

* Work on 320 px min width

* 320px support for landing page

---------

Co-authored-by: Kevin Monisit <monisitkevin@gmail.com>
* mock sponspors section

* Sponsor URLS cached in data

* Sponsors return URLS

* deleted comment

---------

Co-authored-by: poojakedia <poojakedianov@gmail.com>
Copy link

vercel bot commented May 29, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
frontendv2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 29, 2024 2:43am

@avsomers25 avsomers25 closed this May 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants