From f6c7ec6875fc37acb08dab51bafffcfb76946b14 Mon Sep 17 00:00:00 2001 From: Shivd131 Date: Sun, 27 Aug 2023 11:36:05 +0530 Subject: [PATCH 1/8] adjustments --- cookoff24-landing/src/components/About.js | 1 + cookoff24-landing/src/components/AboutMask.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cookoff24-landing/src/components/About.js b/cookoff24-landing/src/components/About.js index 18f9fdd..8a3fe56 100644 --- a/cookoff24-landing/src/components/About.js +++ b/cookoff24-landing/src/components/About.js @@ -45,6 +45,7 @@ const About = () => { return (
+

ABOUT EVENT

{ const { setIsHovered, setIsHoveredOnSmall } = useAppContext(); return ( -

+

{ setIsHoveredOnSmall(true); @@ -26,7 +26,7 @@ const AboutMask = () => { setIsHovered(false); }} id="proxima" - className="text-justify text-4xl tracking-wide font-bold leading-relaxed mx-[13%] md:mx-[10%]" + className="text-justify text-4xl tracking-wide font-bold leading-relaxed sm:tracking-wide sm:font-semibold" > Cook off is CodeChef VIT's flagship competitive coding event that tests the coding skills of tech From c063d32c1f7cb65cb05b6fc71894a9d09e5e77a1 Mon Sep 17 00:00:00 2001 From: Shivd131 Date: Sun, 27 Aug 2023 11:40:38 +0530 Subject: [PATCH 2/8] fix: margin to padding --- cookoff24-landing/src/components/About.js | 2 +- cookoff24-landing/src/components/AboutMask.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookoff24-landing/src/components/About.js b/cookoff24-landing/src/components/About.js index a69ede9..91c1c3e 100644 --- a/cookoff24-landing/src/components/About.js +++ b/cookoff24-landing/src/components/About.js @@ -44,7 +44,7 @@ const About = () => { //basically for cursor we need to keep track of it's size, it's mouse position and the scroll position return (

-
+

ABOUT EVENT

{ const { setIsHovered, setIsHoveredOnSmall } = useAppContext(); return ( -

+

{ setIsHoveredOnSmall(true); From 7eea2157467e11ebe8babefc0a03b26394afe840 Mon Sep 17 00:00:00 2001 From: Shivd131 Date: Sun, 27 Aug 2023 12:45:40 +0530 Subject: [PATCH 3/8] fix: Prizes section margin --- cookoff24-landing/src/components/About.js | 3 +-- cookoff24-landing/src/components/AboutMask.js | 2 +- cookoff24-landing/src/components/Prizes.js | 25 +++++++++++++++---- .../src/components/PrizesComps/Awards.js | 6 ++--- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/cookoff24-landing/src/components/About.js b/cookoff24-landing/src/components/About.js index 91c1c3e..42a8e91 100644 --- a/cookoff24-landing/src/components/About.js +++ b/cookoff24-landing/src/components/About.js @@ -48,11 +48,10 @@ const About = () => {

ABOUT EVENT

Cook off is CodeChef VIT's flagship competitive coding event that tests the coding skills of tech - enthusiasts across the country. The event provides a platform for participants to develop their competitive coding skills and test their abilities. Cook Off 7.0 will be the seventh edition through which we hope to broaden the horizons of the participants. diff --git a/cookoff24-landing/src/components/AboutMask.js b/cookoff24-landing/src/components/AboutMask.js index 52fff69..4f84c7e 100644 --- a/cookoff24-landing/src/components/AboutMask.js +++ b/cookoff24-landing/src/components/AboutMask.js @@ -26,7 +26,7 @@ const AboutMask = () => { setIsHovered(false); }} id="proxima" - className="text-justify text-4xl tracking-wide font-bold leading-relaxed sm:tracking-wide sm:font-semibold" + className="text-justify text-4xl tracking-wide font-bold leading-relaxed lg:text-2xl lg:tracking-wide lg:font-semibold sm:text-2xl sm:tracking-wide sm:font-semibold" > Cook off is CodeChef VIT's flagship competitive coding event that tests the coding skills of tech diff --git a/cookoff24-landing/src/components/Prizes.js b/cookoff24-landing/src/components/Prizes.js index e796f4f..2692190 100644 --- a/cookoff24-landing/src/components/Prizes.js +++ b/cookoff24-landing/src/components/Prizes.js @@ -35,11 +35,26 @@ const Prizes = () => { content="You’ll get like 1.5 Lakhs in cash, damm that’s a lot of money. What are you going to do with all? I’m gonna buy myself some doge." /> - +

+
+

+ WOMEN +

+

+ You’ll get like 1.5 Lakhs in cash, damm that’s a lot of money. What + are you going to do with all? I’m gonna buy myself some doge. +

+
+
+

+ WOMEN +

+

+ You’ll get like 1.5 Lakhs in cash, damm that’s a lot of money. What + are you going to do with all? I’m gonna buy myself some doge. +

+
+
); diff --git a/cookoff24-landing/src/components/PrizesComps/Awards.js b/cookoff24-landing/src/components/PrizesComps/Awards.js index a6de038..03a12cf 100644 --- a/cookoff24-landing/src/components/PrizesComps/Awards.js +++ b/cookoff24-landing/src/components/PrizesComps/Awards.js @@ -4,15 +4,15 @@ const Awards = (props) => { return (
-
-

+

+

{props.title}

{props.content}

-
+

{props.title}

From d72ff3af0886b715bb5bfe67e80e18c6fefa5e47 Mon Sep 17 00:00:00 2001 From: Shivd131 Date: Sun, 27 Aug 2023 15:27:23 +0530 Subject: [PATCH 4/8] fix: responsiveness --- cookoff24-landing/src/components/About.js | 2 +- cookoff24-landing/src/components/Faqs.js | 2 +- cookoff24-landing/src/components/Prizes.js | 6 +++--- cookoff24-landing/src/components/PrizesComps/Awards.js | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cookoff24-landing/src/components/About.js b/cookoff24-landing/src/components/About.js index 42a8e91..86f3b57 100644 --- a/cookoff24-landing/src/components/About.js +++ b/cookoff24-landing/src/components/About.js @@ -45,7 +45,7 @@ const About = () => { return (
-

ABOUT EVENT

+

ABOUT EVENT

{ return (

- faqs + FAQs
{ id="proxima" className="h-[100vh] w-[100vw] text-grey flex flex-col items-start justify-between gap-[3.1rem] py-16" > -

PRIZES

+

PRIZES

{ />
-

+

WOMEN

@@ -46,7 +46,7 @@ const Prizes = () => {

-

+

WOMEN

diff --git a/cookoff24-landing/src/components/PrizesComps/Awards.js b/cookoff24-landing/src/components/PrizesComps/Awards.js index 03a12cf..ce1dada 100644 --- a/cookoff24-landing/src/components/PrizesComps/Awards.js +++ b/cookoff24-landing/src/components/PrizesComps/Awards.js @@ -4,19 +4,19 @@ const Awards = (props) => { return (

-
-

+

+

{props.title}

-

+

{props.content}

-

+

{props.title}

-

+

{props.content}

From 1a3ac100d67e9feb461aa8fcaca5909763720e7d Mon Sep 17 00:00:00 2001 From: Shivd131 Date: Sun, 27 Aug 2023 15:37:08 +0530 Subject: [PATCH 5/8] feat: navbar responsive --- cookoff24-landing/src/components/FixedNav.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cookoff24-landing/src/components/FixedNav.js b/cookoff24-landing/src/components/FixedNav.js index 9dab8c9..0d98a95 100644 --- a/cookoff24-landing/src/components/FixedNav.js +++ b/cookoff24-landing/src/components/FixedNav.js @@ -9,14 +9,14 @@ const FixedNav = () => { return (
-
-
+
+
- CC Logo + CC Logo
-
+
From 3775cc35db8f5af8adc54030eddd158029a80f0c Mon Sep 17 00:00:00 2001 From: Shivd131 Date: Sun, 27 Aug 2023 15:40:41 +0530 Subject: [PATCH 6/8] feat:Remove mask from mobile display --- cookoff24-landing/src/pages/landing.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/cookoff24-landing/src/pages/landing.js b/cookoff24-landing/src/pages/landing.js index 23fc9c1..00aa243 100644 --- a/cookoff24-landing/src/pages/landing.js +++ b/cookoff24-landing/src/pages/landing.js @@ -23,13 +23,9 @@ import TimelineMask from "@/components/TimelineMask"; const inter = Inter({ subsets: ["latin"] }); export default function Home() { - const { - setInnerHeight, - scrollPosition, - setScrollPosition, - size - } = useAppContext(); - console.log(size) + const { setInnerHeight, scrollPosition, setScrollPosition, size } = + useAppContext(); + console.log(size); useEffect(() => { const handleScroll = () => { @@ -68,11 +64,11 @@ export default function Home() { WebkitMaskSize: `${size}px`, }} transition={{ type: "tween", ease: "easeOut", duration: 0.2 }} - className="one mask-content -z-30" + className="one mask-content -z-30 sm:hidden" > - + ); From 93503c5e199413d79ed90f6f0ab1eaed3d386159 Mon Sep 17 00:00:00 2001 From: Shivd131 Date: Sun, 27 Aug 2023 15:46:39 +0530 Subject: [PATCH 7/8] feat:more responsive prizes page --- cookoff24-landing/src/components/Prizes.js | 8 ++++---- cookoff24-landing/src/components/PrizesComps/Awards.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cookoff24-landing/src/components/Prizes.js b/cookoff24-landing/src/components/Prizes.js index 7c9303f..03ee4e5 100644 --- a/cookoff24-landing/src/components/Prizes.js +++ b/cookoff24-landing/src/components/Prizes.js @@ -37,19 +37,19 @@ const Prizes = () => { />
-

+

WOMEN

-

+

You’ll get like 1.5 Lakhs in cash, damm that’s a lot of money. What are you going to do with all? I’m gonna buy myself some doge.

-

+

WOMEN

-

+

You’ll get like 1.5 Lakhs in cash, damm that’s a lot of money. What are you going to do with all? I’m gonna buy myself some doge.

diff --git a/cookoff24-landing/src/components/PrizesComps/Awards.js b/cookoff24-landing/src/components/PrizesComps/Awards.js index ce1dada..a6565e2 100644 --- a/cookoff24-landing/src/components/PrizesComps/Awards.js +++ b/cookoff24-landing/src/components/PrizesComps/Awards.js @@ -5,18 +5,18 @@ const Awards = (props) => {
-

+

{props.title}

-

+

{props.content}

-

+

{props.title}

-

+

{props.content}

From 1ab54891da525556ce954f76c81f96b1f8a6206d Mon Sep 17 00:00:00 2001 From: Shivd131 Date: Sun, 27 Aug 2023 16:17:26 +0530 Subject: [PATCH 8/8] changes --- .../src/components/FixedNavMask.js | 45 +++++++++++++++++++ cookoff24-landing/src/pages/landing.js | 2 + 2 files changed, 47 insertions(+) create mode 100644 cookoff24-landing/src/components/FixedNavMask.js diff --git a/cookoff24-landing/src/components/FixedNavMask.js b/cookoff24-landing/src/components/FixedNavMask.js new file mode 100644 index 0000000..2a33dfc --- /dev/null +++ b/cookoff24-landing/src/components/FixedNavMask.js @@ -0,0 +1,45 @@ +import React from "react"; +import cclogo from "../assets/cclogo.svg"; +import Options from "./NavbarComps/Options"; +import SocialHandles from "./NavbarComps/SocialHandles"; +import Image from "next/image"; +import { useAppContext } from "@/context/appContext"; +import { motion } from "framer-motion"; +import useMousePosition from "@/utils/useMousePosition"; + +const FixedNavMask = () => { + const { setIsHovered, setIsHoveredOnSmall } = useAppContext(); + return ( +
+
+
+ { + setIsHovered(true); + }} + onMouseLeave={() => { + setIsHovered(false); + }} + className="h-16 w-auto sm:h-12" + src={cclogo} + alt="CC Logo" + /> +
+ +
+
{ + setIsHoveredOnSmall(true); + }} + onMouseLeave={() => { + setIsHoveredOnSmall(false); + }} + className="absolute left-[3.7rem] bottom-40 sm:hidden" + > + +
+
+ ); +}; + +export default FixedNavMask; diff --git a/cookoff24-landing/src/pages/landing.js b/cookoff24-landing/src/pages/landing.js index 00aa243..b418a75 100644 --- a/cookoff24-landing/src/pages/landing.js +++ b/cookoff24-landing/src/pages/landing.js @@ -19,6 +19,7 @@ import { useState, useEffect } from "react"; import AboutMask from "@/components/AboutMask"; import WelcomeMask from "@/components/WelcomeMask"; import TimelineMask from "@/components/TimelineMask"; +import FixedNavMask from "@/components/FixedNavMask"; const inter = Inter({ subsets: ["latin"] }); @@ -66,6 +67,7 @@ export default function Home() { transition={{ type: "tween", ease: "easeOut", duration: 0.2 }} className="one mask-content -z-30 sm:hidden" > +