Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 15 additions & 53 deletions app/(pages)/(index-page)/_components/hero/heroInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';
import Image from 'next/image';
import Link from 'next/link';
import HeartButton from '../HeartButton/heartButton';
import WordCycle from './wordCycle';

/*import Image from 'next/image';
import Link from 'next/link';
import HeartButton from '../HeartButton/heartButton';*/

export default function HeroInfo() {
return (
<div className="flex flex-col items-start gap-[22px] break-625:items-end break-625:gap-[31px]">
Expand All @@ -18,65 +19,26 @@ export default function HeroInfo() {
social good
</h1>
<p className="mt-[31px] font-metropolis text-[16px] font-normal tracking-[0.48px] text-white break-625:text-[20px]">
Apply to direct <strong>HackDavis 2026</strong>
Stay tuned for <strong>HackDavis 2026</strong>
</p>
</div>

<div className="flex flex-row items-start gap-[12px] break-625:flex-col break-625:items-end break-625:gap-[28px] sm:flex-row sm:items-center">
<Link
href="https://hackdavis.typeform.com/to/N6DEZIVH"
<div className="flex flex-col items-start gap-[12px] break-625:flex-col break-625:items-end break-625:gap-[28px] sm:flex-col sm:items-center">
<a
href="https://forms.gle/QgmucXL1RN97pNFh9"
target="_blank"
className="inline-flex h-[40px] items-center justify-center gap-[10px] whitespace-nowrap rounded-[100px] bg-highlight-yellow px-[10px] py-[11px] text-center font-metropolis text-[18px] font-bold tracking-[0.4px] text-text-dark shadow-[0px_5px_75px_0px_rgba(0,0,0,0.25)] break-625:h-[50px] break-625:px-[40px] break-625:py-0 break-625:text-[20px]"
rel="noopener noreferrer"
>
Director Application
</Link>
<div className="flex h-[40px] w-[138px] flex-shrink-0 items-center rounded-[100px] bg-white/15 text-center font-metropolis text-[18px] font-bold tracking-[0.4px] text-white break-625:h-[50px] break-625:w-[170px] break-625:py-0 break-625:text-[20px]">
{/* <div className="flex h-[40px] w-[40px] flex-shrink-0 items-center justify-center rounded-[50px] bg-highlight-yellow shadow-[0px_5px_75px_0px_rgba(0,0,0,0.25)] break-625:h-[50px] break-625:w-[50px]">
<Image
src="/Hero/heart.svg"
alt="Heart icon"
width={24}
height={24}
className="h-[15px] w-[17px] object-contain break-625:h-[24px] break-625:w-[24px]"
/>
</div>
<span className="flex-1 pl-[9px] pr-[15px] text-center">Sponsor</span> */}
<HeartButton text="Sponsor" href="mailto:[email protected]" />
</div>
</div>

<div className="flex flex-col items-start gap-2 text-left break-625:flex-row break-625:items-end break-625:text-right">
<span className="hidden font-metropolis text-[18px] font-normal tracking-[0.48px] text-white break-625:inline md:text-[20px]">
Check out the{' '}
</span>
<div className="flex items-center gap-2 text-white">
<FormLink
text="roles and teams"
href="/?section=teams"
// includeComma={true}
includeComma={false}
/>
{/* <FormLink
text="Mentor"
href="https://form.typeform.com/to/uNuWRicb"
// includeComma={true}
includeComma={false}
/> */}
<span className="font-metropolis text-[18px] font-normal tracking-[0.48px] md:text-[20px]">
we have!
</span>
{/* <FormLink
text="Volunteer"
href="https://form.typeform.com/to/sTYMFPMW"
includeComma={false}
/> */}
</div>
<button className="grid w-fit place-items-center justify-center rounded-full border-none bg-[--highlight-yellow] pb-[8px] pl-[24px] pr-[24px] pt-[8px] text-[16px] font-bold text-[--text-dark] break-625:pb-[10px] break-625:pl-[30px] break-625:pr-[30px] break-625:pt-[10px] break-625:text-[20px]">
2026 Judge Interest Form
</button>
</a>
</div>
</div>
);
}

interface FormLinkProps {
/*interface FormLinkProps {
text: string;
href: string;
includeComma: boolean;
Expand All @@ -100,4 +62,4 @@ function FormLink({ text, href, includeComma }: FormLinkProps) {
{includeComma && <p>,</p>}
</Link>
);
}
}*/
14 changes: 7 additions & 7 deletions app/(pages)/(index-page)/page.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
// import Directors from './(about-us)/_components/Directors/Directors';
// 'use client';

import BigVinyl from './_components/BigVinyl/BigVinyl';
import HeroSection from './_components/hero/heroMainSection';
/*import BigVinyl from './_components/BigVinyl/BigVinyl';
import SandCastle from './_components/SandCastle';
import Sponsors from './_components/Sponsors/Sponsors';
import styles from './page.module.scss';
import FAQ from './_components/FAQ/FAQ';
import Underwater from '../_components/Underwater/Underwater';
import BigWave from './_components/BigWave/BigWave';
import Crowdfund from './_components/Crowdfund/Crowdfund';
import Crowdfund from './_components/Crowdfund/Crowdfund';*/
import HeroSection from './_components/hero/heroMainSection';
import styles from './page.module.scss';

export default function Home() {
return (
<div className={styles.container}>
<div id="home">
<HeroSection />
<SandCastle />
{/*<SandCastle />*/}
</div>

{/*
<div id="underwater">
<BigWave />
<Underwater />
Expand All @@ -32,7 +32,7 @@ export default function Home() {
<Sponsors />
<Crowdfund />
<BigVinyl />
</div>
</div>*/}
</div>
);
}
4 changes: 2 additions & 2 deletions app/(pages)/_components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const links = [
page: '/',
path: '/?section=home', // remove section if scroll issue fixed
},
{
/*{
ids: ['donate'],
body: 'DONATE',
page: '/',
Expand All @@ -56,7 +56,7 @@ const links = [
body: 'SPONSORS',
page: '/',
path: '/?section=sponsors',
},
},*/
{
ids: ['about'],
body: 'ABOUT',
Expand Down
2 changes: 0 additions & 2 deletions app/(pages)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import '@globals/styles/globals.scss';
import metadataJSON from '@app/(pages)/_globals/metadata.json';
import fonts from './_globals/fonts';
import Navbar from '@app/(pages)/_components/Navbar/Navbar';
import Footer from '@app/(pages)/_components/Footer/Footer';
import { Suspense } from 'react';
import { Analytics } from '@vercel/analytics/next';

Expand All @@ -22,7 +21,6 @@ export default function RootLayout({
<Navbar />
</Suspense>
{children}
<Footer />
</body>
</html>
);
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"react-icons": "^5.3.0",
"react-scroll-parallax": "^3.4.5",
"react-transition-group": "^4.4.5",
"sass": "^1.81.0",
"sass": "^1.89.2",
"sharp": "^0.33.5",
"styled-components": "^6.1.15"
},
Expand Down