Skip to content

Commit

Permalink
Merge pull request #118 from HackDavis/feat/removeDOEStuff
Browse files Browse the repository at this point in the history
feat: removed resources and prizes
  • Loading branch information
Sauvikesh authored May 6, 2024
2 parents 9087577 + a674560 commit 1deff6f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ export default function BottomSection() {
return (
<div className={style.container}>
<DirectorFAQ />

<FAQ />
<div className={style.polaroids}>
<BottomPolaroids />
</div>
<FAQ />
</div>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ const DirectorFAQ = () => {
};

return (
<div id="directors" className={styles.container}>
<div id="teams" className={styles.container}>
<div>
<h1 className={styles.FAQText}>Teams</h1>
</div>
Expand Down
14 changes: 7 additions & 7 deletions app/(pages)/(index-page)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import Sponsors from './_components/Sponsors/Sponsors';
import { LoadingProvider } from '@contexts/LoadingContext';
import Loader from '@components/Loader/Loader';
import RiverCow from './_components/RiverCow/RiverCow';
import PrizeList from '../(event-page)/event/_components/Prizes/PrizeList';
import Resources from './_components/Resources/Resources';
import { resourcePackDOE } from '../_data/resourceData';
// import PrizeList from '../(event-page)/event/_components/Prizes/PrizeList';
// import Resources from './_components/Resources/Resources';
// import { resourcePackDOE } from '../_data/resourceData';

export default function Home() {
return (
Expand All @@ -20,18 +20,18 @@ export default function Home() {
<div id="landing">
<Landing />
</div>
<div id="resources">
{/* <div id="resources">
<Resources resourcePack={resourcePackDOE} />
</div>
</div> */}
<div id="whatishackdavis">
<WhatIsHackdavis />
</div>
<div id="stats">
<Stats />
</div>
<div id="prizes">
{/* <div id="prizes">
<PrizeList />
</div>
</div> */}
<div id="everyone">
<RiverCow />
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/(pages)/_data/navLinks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ interface NavLink {
}
const navLinks: NavLink[] = [
{ name: 'Impact', slug: '/#whatishackdavis' },
{ name: 'Prizes', slug: '/#prizes' },
// { name: 'Prizes', slug: '/#prizes' },
{ name: 'Inclusion', slug: '/#everyone' },
{ name: 'Teams', slug: '/#directors' },
{ name: 'Teams', slug: '/#teams' },
{ name: 'FAQ', slug: '/#faq' },
{ name: 'Sponsors', slug: '/#sponsors' },
{ name: 'About', slug: '/about-us' },
Expand Down

0 comments on commit 1deff6f

Please sign in to comment.