Skip to content

Commit

Permalink
Revert "Merge pull request #33 from quhacks/development"
Browse files Browse the repository at this point in the history
This reverts commit 5a36516, reversing
changes made to d32f114.
  • Loading branch information
devsai9 committed Jul 23, 2024
1 parent 5a36516 commit 73e81f1
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/app/components/faq/faq.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function Faq() {
/>
<FaqQuestion
question={"Who can attend?"}
answer={`You are eligible to participate in QuHacks 2025 if you currently attend middle or high school. If you have already graduated but would still like to attend the event, please consider volunteering or mentoring for the event! Send us an email at [email protected] for more information on contributing to QuHacks, or if you have any questions about our eligibility`}
answer={`You are eligible to participate in QuHacks 2024 if you currently attend middle or high school. If you have already graduated but would still like to attend the event, please consider volunteering or mentoring for the event! Send us an email at [email protected] for more information on contributing to QuHacks, or if you have any questions about our eligibility`}
/>
<FaqQuestion
question={"How much does QuHacks cost?"}
Expand All @@ -36,7 +36,7 @@ export default function Faq() {
/>
<FaqQuestion
question={"Where is QuHacks?"}
answer={`QuHacks 2025's location is coming soon...`}
answer={`QuHacks will be held in building 201 at the Johns Hopkins Applied Physics Laboratory. The address is 11091 Johns Hopkins Rd, Fulton, MD 20759.`}
/>
<FaqQuestion
question={"Can I use past projects?"}
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/footer/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ export default function Footer() {
return (
<main className={styles.container}>
<div className={styles.col}>
<Link href="/" className={styles.sectionheader}>QuHacks 2025</Link>
<Link href="/" className={styles.sectionheader}>QuHacks 2024</Link>
<a className={styles.navlink} href="mailto:[email protected]">Email</a>
<a className={styles.navlink} rel="noreferrer noopener" target='_blank' href="https://discord.gg/H2EteNDhEP">Join our Discord!</a>
<a className={styles.navlink} rel="noreferrer noopener" target='_blank' href="https://www.instagram.com/quhacks/">Instagram</a>
</div>
<div className={styles.col}>
<h3 className={styles.sectionheader}>Site Links</h3>
<Link className={styles.navlink} href='/#about'>About</Link>
{/* <Link className={styles.navlink} href='/#schedule'>Schedule</Link> */}
<Link className={styles.navlink} href='/#schedule'>Schedule</Link>
<Link className={styles.navlink} href="/#faq">FAQ</Link>
</div>
<div className={styles.lastcol}>
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/navbar/navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ export default function NavBar() {
return (
<main>
<nav className={styles.navbar}>
<Link href='/' className={styles.name}><span>$</span>QuHacks 2025<span className={styles.cursor}></span></Link>
<Link href='/' className={styles.name}><span>$</span>QuHacks 2024<span className={styles.cursor}></span></Link>

<button className={styles.moreBtn} onClick={toggleLinks}>[menu]</button>
<span className={`link ${styles.navlink}`} onClick={() => scrollIntoViewWithOffset("#about",100)}>About</span>
{/* <span className={`link ${styles.navlink}`} onClick={() => scrollIntoViewWithOffset("#schedule",100)}>Schedule</span> */}
<span className={`link ${styles.navlink}`} onClick={() => scrollIntoViewWithOffset("#schedule",100)}>Schedule</span>
<span className={`link ${styles.navlink}`} onClick={() => scrollIntoViewWithOffset("#faq",100)}>FAQ</span>
<span className={`link ${styles.navlink}`} onClick={() => scrollIntoViewWithOffset("#team",100)}>Team</span>
<Link className={`link ${styles.navlink}`} rel="noreferrer noopener" target='_blank' href="https://discord.gg/H2EteNDhEP">Discord</Link>
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/sponsors/sponsors.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import styles from "./component.module.css"
export default function Sponsors() {
return (
<div className={styles.sectionContainer}>
<h1 className={styles.title}>2024 Sponsors</h1>
<h1 className={styles.title}>Sponsors</h1>
<div className={styles.sponsorCall}>
<p>Interested in sponsoring QuHacks this year? <a href="mailto:[email protected]">Contact us!</a></p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Footer from './components/footer/footer'
const inter = Inter({ subsets: ['latin'] })

export const metadata = {
title: 'QuHacks 2025',
title: 'QuHacks 2024',
description: "MD's largest annual student run hackathon!",
metadataBase: new URL('https://quhacks.tech'),
}
Expand Down
13 changes: 6 additions & 7 deletions src/app/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,11 @@ export default function Home() {
<div className={styles.homecontainer}>
<Image alt='QuHacks Logo' src="/logo.png" width={100} height={100} sizes='(max-width: 750px) 15rem, 20rem' className={styles.logo} />
<div>
<span className={styles.title}>QuHacks 2025</span>
<p>Coming Soon</p>
{/* <p>9 AM - 6 PM</p> */}
<span className={styles.title}>QuHacks 2024</span>
<p>December 16th @ Johns Hopkins APL (Building 201)</p>
<p>9 AM - 6 PM</p>
<div className={styles.btngroup}>
{/* Logic for register: onClick={() => setShowRegisterModal(true)} */}
<button className='btn-primary' disabled={true}>Register!</button>
<button className='btn-primary' disabled={false} onClick={() => setShowRegisterModal(true)}>Register!</button>
<div className={styles.secondaryBtns}>
<button className={`btn-secondary ${styles.submitBtn}`} onClick={() => router.push("/submit")} disabled={!submbissionsOpen}>Submit Your Project!</button>
<button className={`btn-secondary ${styles.galleryBtn}`} onClick={() => router.push("/gallery")} disabled={!galleryOpen}>View Gallery &gt;</button>
Expand All @@ -73,9 +72,9 @@ export default function Home() {
<div className={styles.content} id="about">
<AboutSection></AboutSection>
</div>
{/* <div className={styles.content} id="schedule">
<div className={styles.content} id="schedule">
<ScheduleSection></ScheduleSection>
</div> */}
</div>
<div className={styles.content} id="faq">
<Faq></Faq>
</div>
Expand Down

0 comments on commit 73e81f1

Please sign in to comment.