Skip to content

Fix/landing sam #125

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.

Sign up for GitHub

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

Merged
winzamark123 merged 3 commits into from
Dec 8, 2024
Merged

Fix/landing sam #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a05d067
Landing layout done
winzamark123 Dec 7, 2024
c58d3e3
added top right arrow to volunteer
winzamark123 Dec 8, 2024
72a8ea3
Merge branch 'main' into fix/LandingSam
winzamark123 Dec 8, 2024
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
6 changes: 3 additions & 3 deletions app/(pages)/(index-page)/_components/Landing/Landing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import Clouds from './_components/Clouds/Clouds';
import Form from './_components/Form/Form';
import Grass from './_components/Grass/Grass';
import styles from './Landing.module.scss';
import NewForm from './NewForm';

export default function Landing() {
return (
<main className="">
<div className={styles.landing_container}>
<div className={styles.form}>
<Form />
<div className="tw-absolute tw-left-1/2 tw-top-[20%] tw-z-[13] tw--translate-x-1/2 max-sm:tw-top-1/4 max-sm:tw-flex max-sm:tw--translate-y-1/2 max-sm:tw-items-center max-sm:tw-justify-center">
<NewForm />
</div>
<div className={styles.clouds}>
<Clouds />
Expand Down
113 changes: 113 additions & 0 deletions app/(pages)/(index-page)/_components/Landing/NewForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
import Link from 'next/link';
import { CiCalendar } from 'react-icons/ci';

type FormLink = {
title: string;
url: string;
};

const FormLinks: { [key: string]: FormLink } = {
Register: {
title: 'Register Now',
url: 'https://form.typeform.com/to/umWSVW9i',
},
Sponsor: {
title: 'Sponsor',
url: '#',
},
Volunteer: {
title: 'Volunteer',
url: 'https://form.typeform.com/to/MY8EI47D',
},
Mentor: { title: 'Mentor', url: 'https://form.typeform.com/to/cvy9LlyR' },
Teams: { title: 'Team Descriptions', url: 'https://hackdavis.io/#teams' },
Calendar: {
title: 'HackDavis 2024 Calendar',
url: 'https://drive.google.com/file/d/1AGBLnS55qNEuGNXh9VLSdx2PaHsGVgE7/view?usp=drive_link',
},
StarterPack: {
title: 'Starter Pack',
url: 'https://hackdavis.notion.site/HackDavis-2024-Starter-Pack-bea21741698046e99e46f13c9b311039?pvs=4',
},
Location: {
title: 'UCenter',
url: 'https://www.google.com/maps/place/University+Credit+Union+Center/@38.5418238,-121.7596385,17z/data=!3m1!4b1!4m6!3m5!1s0x808529d4ce160f1d:0x813925c4c65f6bb1!8m2!3d38.5418238!4d-121.7596385!16zL20vMDluZmh0?hl=en-US&entry=ttu',
},
};

export default function NewForm() {
return (
<main className="tw-font-metropolis tw-flex tw-flex-col tw-items-center tw-justify-center tw-gap-4 tw-text-dark-blue">
<div className="tw-w-fit">
<span className="tw-flex tw-items-baseline tw-whitespace-nowrap tw-text-left tw-text-[42px] tw-font-extrabold tw-leading-[103%] tw-tracking-[2px] tw-text-[#173A52] sm:tw-text-[32px] md:tw-text-center md:tw-text-[36px] md:tw-leading-[115%] lg:tw-text-[31.5px]">
<span className="tw-font-metropolis tw-text-5xl">
Ready to create for social good?
</span>
</span>
</div>
<div className="tw-flex tw-gap-4 tw-font-semibold tw-tracking-[1px]">
<p>Join us for HackDavis 2024</p>
<div className="tw-flex tw-items-center tw-gap-2">
<CiCalendar className="tw-text-2xl" />
<p>April 27 - 28, 2024 @ UCenter</p>
</div>
</div>
<div className="tw-mt-2 tw-flex tw-w-1/2 tw-cursor-pointer tw-items-center tw-justify-center tw-gap-4">
<Link
href={FormLinks.Register.url}
className="tw-flex tw-h-12 tw-items-center tw-justify-center tw-gap-2.5 tw-rounded-full tw-bg-[#173A52] tw-px-[1.3vw] tw-py-[0.75vw] tw-transition-colors tw-duration-200 hover:tw-bg-[#005271] md:tw-w-[85%]"
>
<p className="tw-font-metropolis tw-text-center tw-text-base tw-font-bold tw-capitalize tw-tracking-[0.48px] tw-text-white md:tw-text-lg">
{FormLinks.Register.title}
</p>
</Link>

<Link
href={FormLinks.Sponsor.url}
className="tw-flex tw-h-12 tw-items-center tw-justify-center tw-gap-2.5 tw-rounded-full tw-bg-white/75 tw-px-[1.3vw] tw-py-[0.75vw] tw-opacity-85 tw-backdrop-blur-[2px] tw-transition-opacity tw-duration-200 hover:tw-opacity-100 md:tw-w-[85%]"
>
<p className="tw-font-metropolis tw-text-center tw-text-base tw-font-bold tw-tracking-[0.48px] tw-text-[#173A52] md:tw-text-lg">
{FormLinks.Sponsor.title}
</p>
</Link>
</div>
<div className="tw-flex tw-w-1/2 tw-items-center tw-justify-center tw-gap-4 ">
<Link href={FormLinks.Volunteer.url}>
<div className="tw-flex tw-items-center tw-justify-center">
<p className="tw-font-bold">Volunteer</p>
<svg
className="tw-inline-block tw-h-4 tw-w-4 tw-translate-x-[2px] tw-translate-y-[-2px]"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
>
<path
fillRule="evenodd"
d="M5.22 14.78a.75.75 0 001.06 0l7.22-7.22v5.69a.75.75 0 001.5 0v-7.5a.75.75 0 00-.75-.75h-7.5a.75.75 0 000 1.5h5.69l-7.22 7.22a.75.75 0 000 1.06z"
clipRule="evenodd"
/>
</svg>
</div>
</Link>
<p>or</p>
<Link href={FormLinks.Mentor.url}>
<div className="tw-flex tw-items-center tw-justify-center">
<p className="tw-font-bold">Mentor</p>
<svg
className="tw-inline-block tw-h-4 tw-w-4 tw-translate-x-[2px] tw-translate-y-[-2px]"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
>
<path
fillRule="evenodd"
d="M5.22 14.78a.75.75 0 001.06 0l7.22-7.22v5.69a.75.75 0 001.5 0v-7.5a.75.75 0 00-.75-.75h-7.5a.75.75 0 000 1.5h5.69l-7.22 7.22a.75.75 0 000 1.06z"
clipRule="evenodd"
/>
</svg>
</div>
</Link>
</div>
</main>
);
}
87 changes: 30 additions & 57 deletions app/(pages)/(index-page)/_components/Landing/_components/Form/Form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import styles from './Form.module.scss';
// import { CiCalendar } from 'react-icons/ci';
import WordCycle from './_components/WordCycle';
import Link from 'next/link';
import { usePathname } from 'next/navigation'; // Import useRouter
// import Image from 'next/image';
// import intelLogoCoHost from 'public/index/Sponsors/intel.png';
import { usePathname } from 'next/navigation';

type FormLink = {
title: string;
Expand Down Expand Up @@ -32,87 +28,64 @@ const FormLinks: { [key: string]: FormLink } = {
},
Location: {
title: 'UCenter',
url: 'https://www.google.com/maps/place/University+Credit+Union+Center/@38.5418238,-121.7596385,17z/data=!3m1!4b1!4m6!3m5!1s0x808529d4ce160f1d:0x813925c4c65f6bb1!8m2!3d38.5418238!4d-121.7596385!16zL20vMDluZmh0?hl=en-US&entry=ttu',
url: 'https://www.google.com/maps/place/University+Credit+Union+Center/@38.5418238,-121.7596385,17z',
},
};

export default function Form() {
/*
* takes the current url and assigns it to the teams section of the page
* enables the "Team Descriptions" button to scroll to teams on click, similar to navbar
*/
const pathname = usePathname();
const teamsUrl =
pathname.substring(0, pathname.lastIndexOf('/') + 1) + '#teams';
FormLinks.Teams.url = teamsUrl;

return (
<div className={styles.background}>
<div className={styles.container}>
<div className={styles.title}>
<span className={styles.title_ready}>
<span style={{ opacity: 0.75, fontFamily: 'Metropolis' }}>
Ready to
</span>
<span className={styles.title_ready_wordCycle}>
<div className="tw-flex tw-bg-transparent">
<div className="tw-absolute tw-flex tw-w-[500px] tw-max-w-[500px] tw-flex-col tw-justify-center tw-gap-7 md:tw-relative md:tw-mt-[10%] md:tw-w-full md:tw-items-center md:tw-text-center lg:tw-w-[375px]">
<div className="tw-flex tw-flex-col">
<span className="tw-font-metropolis tw-flex tw-items-baseline tw-text-left tw-text-[42px] tw-font-extrabold tw-leading-[103%] tw-tracking-[0.96px] tw-text-[#173A52] sm:tw-text-[32px] md:tw-text-center md:tw-text-[36px] md:tw-leading-[115%] lg:tw-text-[31.5px]">
<span className="tw-font-metropolis tw-opacity-75">Ready to</span>
<span className="tw-flex tw-items-center tw-justify-center tw-pl-2.5">
<WordCycle />
</span>
</span>

<span className={styles.title_social}>social good?</span>
<span className="tw-font-metropolis tw-text-[64px] tw-font-extrabold tw-leading-[103%] tw-tracking-[1.4px] tw-text-[#173A52] sm:tw-text-[48px] md:tw-text-[56px] md:tw-leading-[115%] lg:tw-text-[48px]">
social good?
</span>
</div>
<div className={styles.calendar}>
<div className={styles.calendar_inner}>
<div className={styles.calendar_inner_intel}>
<span className={styles.calendar_inner_upper}>

<div className="tw-flex tw-flex-col">
<div className="tw-flex tw-flex-col">
<div className="tw-flex tw-w-max tw-items-center tw-gap-2.5 md:tw-w-[90vw] md:tw-flex-wrap md:tw-justify-center">
<span className="tw-font-metropolis tw-text-[24px] tw-font-semibold tw-leading-[150%] tw-tracking-[0.64px] tw-text-[#173A52]/70 md:tw-text-[24px] lg:tw-text-[18px]">
Apply to direct{' '}
<span className={styles.calendar_inner_upper_hackdavis}>
<span className="tw-font-metropolis tw-text-[24px] tw-font-semibold tw-leading-[150%] tw-tracking-[0.64px] tw-text-[#173A52] md:tw-text-[24px] lg:tw-text-[18px]">
HackDavis 2025
</span>
</span>
{/* <span className={styles.intelCoHostText}>co-hosted by </span>
<Image
src={intelLogoCoHost}
alt="Intel Logo"
className={styles.intelCoHostImage}
/> */}
</div>

{/* <div className={styles.calendar_inner_lower}>
<CiCalendar className={styles.calendar_inner_lower_icon} />
<span className={styles.calendar_inner_lower_text}>
April 27 - 28 @
<Link href={FormLinks.Location.url}>
<span>{FormLinks.Location.title}</span>
</Link>
</span>
</div> */}
</div>
</div>

<div className={styles.buttons}>
<div className="tw-flex tw-w-[60%] tw-cursor-pointer tw-flex-col tw-gap-4 md:tw-w-full md:tw-items-center md:tw-justify-center">
<Link
href={FormLinks.Register.url}
className={styles.buttons_register}
className="tw-mb-2.5 tw-flex tw-h-12 tw-items-center tw-justify-center tw-gap-2.5 tw-rounded-full tw-bg-[#173A52] tw-px-[1.3vw] tw-py-[0.75vw] tw-transition-colors tw-duration-200 hover:tw-bg-[#005271] md:tw-w-[85%]"
>
<p>{FormLinks.Register.title}</p>
<p className="tw-font-metropolis tw-text-center tw-text-base tw-font-bold tw-capitalize tw-tracking-[0.48px] tw-text-white md:tw-text-lg">
{FormLinks.Register.title}
</p>
</Link>
<a href={FormLinks.Teams.url} className={styles.buttons_sponsor}>
<p>{FormLinks.Teams.title}</p>

<a
href={FormLinks.Teams.url}
className="tw-flex tw-h-12 tw-items-center tw-justify-center tw-gap-2.5 tw-rounded-full tw-bg-white/75 tw-px-[1.3vw] tw-py-[0.75vw] tw-opacity-85 tw-backdrop-blur-[2px] tw-transition-opacity tw-duration-200 hover:tw-opacity-100 md:tw-w-[85%]"
>
<p className="tw-font-metropolis tw-text-center tw-text-base tw-font-bold tw-tracking-[0.48px] tw-text-[#173A52] md:tw-text-lg">
{FormLinks.Teams.title}
</p>
</a>
</div>
{/* <div className={styles.links}>
<div className={styles.links_calendar}>
Apply to be a
<Link href={FormLinks.Volunteer.url}>
<span className={styles.link}>{FormLinks.Volunteer.title}</span>
</Link>
or
<Link href={FormLinks.Mentor.url}>
<span>{FormLinks.Mentor.title}</span>
</Link>
</div>
</div> */}
</div>
</div>
);
Expand Down
Loading