From 7a6aaa07707fcf6b7918182ff9957e71aa32529d Mon Sep 17 00:00:00 2001
From: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com>
Date: Sat, 14 Oct 2023 08:25:39 +0000
Subject: [PATCH 1/4] fix: changes to website (#97)

* chore: payment changes

* fix: hero section

* feat: add priority
---
 config/content/payment.js                  |  1 +
 src/components/EventSection/index.jsx      |  2 +-
 src/components/Payment/PaymentCard.jsx     | 17 ++++++++++-
 src/components/Registration/index.jsx      |  1 +
 src/components/UserProfile/styles.js       |  1 +
 src/components/marginals/Navbar/styles.jsx |  2 +-
 src/pages/events.js                        |  2 +-
 src/pages/payment.js                       | 35 +++++++++++++++-------
 src/utils/useEvents.js                     | 12 ++++++--
 9 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/config/content/payment.js b/config/content/payment.js
index ef4b6c2..4639b3f 100644
--- a/config/content/payment.js
+++ b/config/content/payment.js
@@ -17,6 +17,7 @@ export const PaymentContent = {
   warning: 'Note: Registration fee is non-refundable.',
   info: 'Check your details before proceeding to payment.',
   endNote: 'For any queries, contact us at: +91 1234567890',
+  caption: 'Early Bird Registration Fee',
   proceed: 'Proceed to Payment',
   cancel: 'Cancel',
   termsLink: 'https://www.google.com/',
diff --git a/src/components/EventSection/index.jsx b/src/components/EventSection/index.jsx
index 1f35c5b..87cb696 100644
--- a/src/components/EventSection/index.jsx
+++ b/src/components/EventSection/index.jsx
@@ -6,7 +6,7 @@ import useEvents from '../../utils/useEvents';
 import { _event } from '../../../config/content';
 
 const EventSection = () => {
-  const { events } = useEvents('Technical');
+  const { events } = useEvents();
 
   return (
     <SectionLayout
diff --git a/src/components/Payment/PaymentCard.jsx b/src/components/Payment/PaymentCard.jsx
index 996e802..b3ec279 100644
--- a/src/components/Payment/PaymentCard.jsx
+++ b/src/components/Payment/PaymentCard.jsx
@@ -18,7 +18,8 @@ import Button from '../shared/Button';
 
 const PaymentCard = () => {
   const { userData, token } = useContext(AuthContext);
-  const { title, description, endNote, info, proceed, termsLink, warning } = PaymentContent;
+  const { title, description, endNote, info, proceed, termsLink, warning, caption } =
+    PaymentContent;
   const [agreed, setAgreed] = useState(false);
 
   const api = Api.getInstance();
@@ -67,6 +68,20 @@ const PaymentCard = () => {
       </Consent>
 
       <Warning>{warning}</Warning>
+      {/* TODO: Remove afterwards */}
+      <Body2 style={{ margin: '8px', display: 'flex', gap: '8px', justifyContent: 'center' }}>
+        {caption}:<b style={{ textDecoration: 'line-through' }}> ₹1000</b>
+        <b
+          style={{
+            background: 'var(--brand-gradient)',
+            backgroundClip: 'text',
+            WebkitBackgroundClip: 'text',
+            WebkitTextFillColor: 'transparent',
+          }}
+        >
+          ₹750
+        </b>
+      </Body2>
 
       <Button
         type='submit'
diff --git a/src/components/Registration/index.jsx b/src/components/Registration/index.jsx
index 333d966..b03452f 100644
--- a/src/components/Registration/index.jsx
+++ b/src/components/Registration/index.jsx
@@ -15,6 +15,7 @@ const RegistrationSection = () => {
         alignItems: 'center',
         justifyContent: 'center',
         width: '100%',
+        marginTop: '100px',
       }}
     >
       {stage === STAGES.TYPE_OF_USER && <ChoiceStage />}
diff --git a/src/components/UserProfile/styles.js b/src/components/UserProfile/styles.js
index d1fda56..b664b43 100644
--- a/src/components/UserProfile/styles.js
+++ b/src/components/UserProfile/styles.js
@@ -5,6 +5,7 @@ export const DetailWrapper = styled.div`
   ${tw`
     w-[90%]
     mx-[auto]
+    mt-28
   `}
 `;
 export const DetailContainer = styled.div`
diff --git a/src/components/marginals/Navbar/styles.jsx b/src/components/marginals/Navbar/styles.jsx
index d871410..acd0e12 100644
--- a/src/components/marginals/Navbar/styles.jsx
+++ b/src/components/marginals/Navbar/styles.jsx
@@ -13,7 +13,7 @@ const fadeDown = keyframes`
 `;
 
 export const NavSection = styled.header`
-  position: sticky;
+  position: fixed;
   top: 0;
   width: 100%;
   background-color: #2c2c2ccc;
diff --git a/src/pages/events.js b/src/pages/events.js
index 5c7bb48..02a61ba 100644
--- a/src/pages/events.js
+++ b/src/pages/events.js
@@ -74,7 +74,7 @@ const EventPage = () => {
   };
 
   return (
-    <div>
+    <div style={{ marginTop: '100px' }}>
       <TypeSelectWrapper>
         {_eventPage.map(({ type: _type, image, title }) => (
           <TypeSelector onClick={() => handleTypeChange(_type)} key={_type} active={_type === type}>
diff --git a/src/pages/payment.js b/src/pages/payment.js
index ed26a3b..976f3ea 100644
--- a/src/pages/payment.js
+++ b/src/pages/payment.js
@@ -1,9 +1,19 @@
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
+import { navigate } from 'gatsby';
 import { PaymentCard, PrivateRoute, SuccessCard } from '../components';
+import { AuthContext } from '../utils/Auth';
 
 const PaymentPage = () => {
   const [paymentStatus, setPaymentStatus] = useState(false);
+  const { userData } = useContext(AuthContext);
+
+  useEffect(() => {
+    if (!userData) {
+      toast.error('Please register first');
+      navigate('/register');
+    }
+  }, [userData]);
 
   useEffect(() => {
     const params = new URLSearchParams(window.location.search);
@@ -23,16 +33,19 @@ const PaymentPage = () => {
   return (
     <PrivateRoute>
       {/* Payment form here */}
-      <div
-        style={{
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          justifyContent: 'center',
-        }}
-      >
-        {paymentStatus ? <SuccessCard /> : <PaymentCard />}
-      </div>
+      {userData && (
+        <div
+          style={{
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+            justifyContent: 'center',
+            marginTop: '7rem',
+          }}
+        >
+          {paymentStatus ? <SuccessCard /> : <PaymentCard />}
+        </div>
+      )}
     </PrivateRoute>
   );
 };
diff --git a/src/utils/useEvents.js b/src/utils/useEvents.js
index b2a2f4a..4c6d230 100644
--- a/src/utils/useEvents.js
+++ b/src/utils/useEvents.js
@@ -12,7 +12,8 @@ const useEvents = (eventName) => {
 
   const events = useMemo(
     () =>
-      data?.data?.filter((event) => event?.status === 'ACTIVE')
+      data?.data
+        ?.filter((event) => event?.status === 'ACTIVE')
         ?.map((event) => {
           const description = JSON.parse(event.description);
           const date = new Date(event.startDate);
@@ -32,9 +33,16 @@ const useEvents = (eventName) => {
             venue: 'LA',
             prizes: event.prizeMoney,
             poster: event.poster ? event.poster : 'TODO://link',
+            priority: event.priority,
           };
         })
-        .sort((a, b) => +a.date - +b.date),
+        // sort by priority and then by date
+        ?.sort((a, b) => {
+          if (a.priority === b.priority) {
+            return a.date - b.date;
+          }
+          return b.priority - a.priority;
+        }),
     [data],
   );
 

From 740ad30f43ebc92bdf18db6945c05f0ee4fc507c Mon Sep 17 00:00:00 2001
From: anmol5936 <127973342+anmol5936@users.noreply.github.com>
Date: Sat, 14 Oct 2023 16:01:26 +0530
Subject: [PATCH 2/4] Content-Updates-1 (#93)

* Content-Updates-1

* Changes in FAQ

* About Us Changes

* accomodation changes

---------

Co-authored-by: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com>
---
 config/content/AboutUs.js            |  2 +-
 config/content/FAQ.js                | 48 ++++++++++++++++------------
 config/content/sponsors.js           |  8 +++--
 config/content/tempCodeRunnerFile.js |  7 ++++
 4 files changed, 40 insertions(+), 25 deletions(-)
 create mode 100644 config/content/tempCodeRunnerFile.js

diff --git a/config/content/AboutUs.js b/config/content/AboutUs.js
index 96e335b..bfca221 100644
--- a/config/content/AboutUs.js
+++ b/config/content/AboutUs.js
@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 export default {
   title: 'Innovision 2k23',
-  desc: `Innovision is one of the biggest technical fests in Eastern India. You can delve deeply into science and technology at this event. It is entirely run by the NIT Rourkela student body and provides a huge platform for many different activities, organized in the form of competitive events, guest lectures, technical workshops, and exhibitions. Technology enthusiasts can use it as a platform to show off their intelligence and ingenuity.
+  desc: `Innovision stands as one of Eastern India's most prominent technical festivals. It offers an immersive exploration of science and technology, embodying key themes in innovation and advancement. Innovision, entirely driven by the NIT Rourkela student body, provides an expansive platform encompassing competitive events, illuminating guest lectures, hands-on technical workshops, and captivating exhibitions. This dynamic fest beckons technology enthusiasts to display their intelligence and ingenuity. As a collective, these elements contribute to the cultivation of advanced technologies that continually evolve, learn, and interact with their surroundings in ever more sophisticated ways.
     `,
   link: 'https://www.youtube.com/embed/DrIwRpGM35I',
 };
diff --git a/config/content/FAQ.js b/config/content/FAQ.js
index d3b0ea9..bb6c192 100644
--- a/config/content/FAQ.js
+++ b/config/content/FAQ.js
@@ -1,46 +1,52 @@
 export const FAQS = [
   {
     id: 1,
-    question: 'When would Innovision happen?',
+    question: 'What is INNOVISION? ',
     answer:
-      'INNOVISION is the largest ' +
-      'techno-management fest of Eastern India lorem ipsum dolor ' +
-      'ipsum dolor somethin lorem ipsum dolor somethin lorem ipsum dolor somethin',
+      'Innovision is one of the biggest ' +
+      'techno management fest organised by students of NITR,' +
+      ' with participation from all over India ',
   },
   {
     id: 2,
-    question: 'What is INNOVISION?',
-    answer: 'INNOVISION is the largest techno-management fest of Eastern India',
+    question: 'Who are we?',
+    answer:
+      'Organised by students of NIT Rourkela, INNOVISION is the annual techno management.' +
+      'With our unrivalled ability to host such technical fests ' +
+      "we were recognised as  Odisha's top student chapter",
   },
   {
     id: 3,
-    question: 'What is INNOVISION?',
-    answer: 'INNOVISION is the largest techno-management fest of Eastern India',
+    question: 'Who can participate?',
+    answer:
+      'All science and technology enthusiasts currently ' +
+      'studying in college are invited to participate.',
   },
   {
     id: 4,
-    question: 'What is INNOVISION?',
-    answer: 'INNOVISION is the largest techno-management fest of Eastern India',
+    question: 'Will it be conducted online?',
+    answer: 'No the event will be conducted in offline mode.',
   },
   {
     id: 5,
-    question: 'What is INNOVISION?',
-    answer: 'INNOVISION is the largest techno-management fest of Eastern India',
+    question: 'What is the goal of the fest? ',
+    answer:
+      'The major purpose of the fest is to bring together people ' +
+      'who share a passion for technology in order ' +
+      'to showcase their skills and give attendees' +
+      ' a fantastic chance to broaden their technical understandings.',
   },
   {
     id: 6,
-    question: 'What is INNOVISION?',
-    answer: 'INNOVISION is the largest techno-management fest of Eastern India',
+    question: 'How could I know if I got selected for any event? ',
+    answer: "If you're chosen, we'll send you an email.",
   },
   {
     id: 7,
-    question: 'What is INNOVISION?',
-    answer: 'INNOVISION is the largest techno-management fest of Eastern India',
-  },
-  {
-    id: 8,
-    question: 'What is INNOVISION?',
-    answer: 'INNOVISION is the largest techno-management fest of Eastern India',
+    question: 'Cost of registration? ',
+    answer:
+      'The cost of registration, including accommodation is Rs. 950,' +
+      ' and without accommodation, it is Rs. 750.',
   },
 ];
 
diff --git a/config/content/sponsors.js b/config/content/sponsors.js
index d857e30..82e145c 100644
--- a/config/content/sponsors.js
+++ b/config/content/sponsors.js
@@ -1,7 +1,9 @@
 export default {
-  title: 'Sponsors',
-  footer: 'Want to sponsor us? Email us at dummy@gmail.com',
-  link: 'mailto:dummy@gmail.com',
+  title: 'Past Sponsors',
+  footer: 'Want to sponsor us? ',
+  link:
+    'https://docs.google.com/forms/d/e/1FAIpQLSfV6ZclXiO7K5vVWFjR6_' +
+    'ZtqjrQ1HpTQ4-Lk9WAu4VA9PuI_g/viewform?usp=sharing',
   id: 'sponsors',
 
   titleSponsor: [
diff --git a/config/content/tempCodeRunnerFile.js b/config/content/tempCodeRunnerFile.js
new file mode 100644
index 0000000..bfca221
--- /dev/null
+++ b/config/content/tempCodeRunnerFile.js
@@ -0,0 +1,7 @@
+/* eslint-disable max-len */
+export default {
+  title: 'Innovision 2k23',
+  desc: `Innovision stands as one of Eastern India's most prominent technical festivals. It offers an immersive exploration of science and technology, embodying key themes in innovation and advancement. Innovision, entirely driven by the NIT Rourkela student body, provides an expansive platform encompassing competitive events, illuminating guest lectures, hands-on technical workshops, and captivating exhibitions. This dynamic fest beckons technology enthusiasts to display their intelligence and ingenuity. As a collective, these elements contribute to the cultivation of advanced technologies that continually evolve, learn, and interact with their surroundings in ever more sophisticated ways.
+    `,
+  link: 'https://www.youtube.com/embed/DrIwRpGM35I',
+};

From f1bc8c91723b984f2aca1e4c0a2a28a780d9c69b Mon Sep 17 00:00:00 2001
From: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com>
Date: Sat, 14 Oct 2023 19:24:00 +0000
Subject: [PATCH 3/4] chore: remove offline plugin (#99)

---
 gatsby-config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gatsby-config.js b/gatsby-config.js
index bde32cb..de6686b 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -19,7 +19,7 @@ module.exports = {
         // Add any options here
       },
     },
-    `gatsby-plugin-offline`,
+    // `gatsby-plugin-offline`,
     {
       resolve: `gatsby-plugin-google-analytics`,
       options: {

From 4d03d071604c94d18e9fed210cbe9fcb2acda857 Mon Sep 17 00:00:00 2001
From: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com>
Date: Sun, 15 Oct 2023 07:55:40 +0000
Subject: [PATCH 4/4] feat: refactor navbar and payment (#101)

* feat: refactor navbar and payment

* fix: function parameters
---
 config/content/FAQ.js                         |  2 +-
 config/content/Navigation.js                  | 22 ++++-
 config/content/payment.js                     | 31 ++++++-
 src/components/EventCard/Card.jsx             |  3 +-
 src/components/HeroSection/HeroButton.jsx     | 33 +++++++-
 src/components/Payment/PaymentCard.jsx        | 54 ++++++++-----
 .../marginals/Navbar/DesktopNav.jsx           | 45 ++---------
 src/components/marginals/Navbar/MobileNav.jsx | 56 +------------
 src/components/marginals/Navbar/NavList.jsx   | 80 +++++++++++++++++++
 src/components/marginals/Navbar/styles.jsx    |  4 +-
 src/utils/Auth.jsx                            |  5 +-
 11 files changed, 209 insertions(+), 126 deletions(-)
 create mode 100644 src/components/marginals/Navbar/NavList.jsx

diff --git a/config/content/FAQ.js b/config/content/FAQ.js
index bb6c192..0d38beb 100644
--- a/config/content/FAQ.js
+++ b/config/content/FAQ.js
@@ -53,6 +53,6 @@ export const FAQS = [
 export const FAQContent = Object.freeze({
   title: 'Frequently Asked Questions',
   footer: 'Still have questions? Feel free to contact us',
-  footerLink: 'contact-us',
+  footerLink: 'mailto:reachus.inno@gmail.com',
   id: 'faq',
 });
diff --git a/config/content/Navigation.js b/config/content/Navigation.js
index 20f1a0c..4c19953 100644
--- a/config/content/Navigation.js
+++ b/config/content/Navigation.js
@@ -12,7 +12,7 @@ export default {
     },
     {
       name: 'Events',
-      id: 'events',
+      link: '/events',
     },
     {
       name: 'Sponsors',
@@ -23,4 +23,24 @@ export default {
       id: 'faq',
     },
   ],
+  otherPagesNavItems: [
+    {
+      name: 'Home',
+      link: '/',
+    },
+    {
+      name: 'Events',
+      link: '/events',
+    },
+    {
+      name: 'Register',
+      link: '/register',
+      authenticated: false,
+    },
+    {
+      name: 'Profile',
+      link: '/profile',
+      authenticated: true,
+    },
+  ],
 };
diff --git a/config/content/payment.js b/config/content/payment.js
index 4639b3f..c3a99ef 100644
--- a/config/content/payment.js
+++ b/config/content/payment.js
@@ -4,7 +4,7 @@ export const PaymentDetails = ({ email, name, mobile }) => {
   return {
     purpose: 'INNOVISION 2023 | Registration Fee',
     date: date.toDateString(),
-    amount: 750,
+    amount: 899,
     email,
     buyerName: name,
     phone: mobile,
@@ -16,9 +16,34 @@ export const PaymentContent = {
   description: 'Pay the registration fee to complete your registration.',
   warning: 'Note: Registration fee is non-refundable.',
   info: 'Check your details before proceeding to payment.',
-  endNote: 'For any queries, contact us at: +91 1234567890',
+  endNote: 'For any queries, contact us at: reachus.inno@gmail.com',
   caption: 'Early Bird Registration Fee',
   proceed: 'Proceed to Payment',
   cancel: 'Cancel',
-  termsLink: 'https://www.google.com/',
+  terms: [
+    {
+      id: 'privacy',
+      term: 'I have read and agree to the ',
+      linkText: 'Privacy Policy',
+      link: 'https://www.google.com',
+    },
+    {
+      id: 'code',
+      term: 'I have read and agree to the ',
+      linkText: 'Code of Conduct',
+      link: 'https://www.google.com',
+    },
+    {
+      id: 'refund',
+      term: 'I have read and agree to the ',
+      linkText: 'Refund Policy',
+      link: 'https://www.google.com',
+    },
+    {
+      id: 'terms',
+      term: 'I have read and agree to the ',
+      linkText: 'Terms and Conditions',
+      link: 'https://www.google.com',
+    },
+  ],
 };
diff --git a/src/components/EventCard/Card.jsx b/src/components/EventCard/Card.jsx
index a285783..7c74d27 100644
--- a/src/components/EventCard/Card.jsx
+++ b/src/components/EventCard/Card.jsx
@@ -81,7 +81,6 @@ const EventCard = ({ event, registered }) => {
               <Circle />
               {time}
               <Circle />
-              {venue}
             </EventTimeVenue>
           </CardTitleContainer>
           <CardTitleContainer>
@@ -118,7 +117,7 @@ const EventCard = ({ event, registered }) => {
             <BackDescription key={id}>{desc}</BackDescription>
           ))}
         </BackDescriptionContainer>
-        <Body2>Contact: {contact?.join(', ')}</Body2>
+        {contact ? <Body2>Contact: {contact?.join(', ')}</Body2> : null}
         <CardButtonContainer>
           <KnowButton text='Back' onClick={bringToFront} />
           <EventRegisterButton
diff --git a/src/components/HeroSection/HeroButton.jsx b/src/components/HeroSection/HeroButton.jsx
index a511d60..9539fbb 100644
--- a/src/components/HeroSection/HeroButton.jsx
+++ b/src/components/HeroSection/HeroButton.jsx
@@ -1,8 +1,10 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import styled from 'styled-components';
+import { navigate } from 'gatsby';
 import Arrow from '../../../images/Arrow.svg';
 import HeroBtnTop from '../../../images/HeroBtnTop.svg';
 import HeroBtnBelow from '../../../images/HeroBtnBelow.svg';
+import { AuthContext } from '../../utils/Auth';
 
 const ButtonTop = styled.div`
   display: flex;
@@ -52,12 +54,37 @@ const ButtonText = styled.div`
   }
 `;
 
+const enumButtonText = {
+  registered: 'Go to Profile',
+  paymentPending: 'Pay Now',
+  notRegistered: 'Register Now',
+};
+
 function HeroButton() {
+  const { userData } = useContext(AuthContext);
+
+  const isRegistered = userData?.rollNumber || userData?.festID?.includes('innovision-2023');
+  const isPaymentPending =
+    !userData?.rollNumber && !userData?.festID?.includes('innovision-2023') && userData?.id;
+
+  let buttonText = enumButtonText.notRegistered;
+  let buttonLink = '/register';
+
+  if (isRegistered) {
+    buttonText = enumButtonText.registered;
+    buttonLink = '/profile';
+  }
+
+  if (isPaymentPending) {
+    buttonText = enumButtonText.paymentPending;
+    buttonLink = '/payment';
+  }
+
   return (
-    <ButtonContainer type='submit'>
+    <ButtonContainer type='submit' onClick={() => navigate(buttonLink)}>
       <ButtonTop>
         <ButtonText>
-          REGISTER NOW
+          {buttonText}
           <img src={Arrow} alt='arrow' className='md:w-[16px]' />
         </ButtonText>
         <img src={HeroBtnTop} alt='Hero-Btn' />
diff --git a/src/components/Payment/PaymentCard.jsx b/src/components/Payment/PaymentCard.jsx
index b3ec279..414392c 100644
--- a/src/components/Payment/PaymentCard.jsx
+++ b/src/components/Payment/PaymentCard.jsx
@@ -18,13 +18,23 @@ import Button from '../shared/Button';
 
 const PaymentCard = () => {
   const { userData, token } = useContext(AuthContext);
-  const { title, description, endNote, info, proceed, termsLink, warning, caption } =
-    PaymentContent;
-  const [agreed, setAgreed] = useState(false);
+  const { title, description, endNote, info, proceed, terms, warning, caption } = PaymentContent;
+  const [checkboxValues, setCheckboxValues] = useState(
+    terms.reduce((acc, { id }) => ({ ...acc, [id]: false }), {}),
+  );
 
   const api = Api.getInstance();
   const details = useMemo(() => PaymentDetails(userData), [userData]);
 
+  const handleCheckboxChange = (event) => {
+    const { name, checked } = event.target;
+    setCheckboxValues((prev) => {
+      const newValues = { ...prev };
+      newValues[name] = checked;
+      return newValues;
+    });
+  };
+
   const handlePayment = () => {
     toast.promise(
       api.initiatePayment({
@@ -53,19 +63,23 @@ const PaymentCard = () => {
           </PaymentDetailsListItem>
         ))}
       </PaymentDetailsList>
-      <Consent>
-        <input
-          type='checkbox'
-          id='consent'
-          name='consent'
-          onClick={() => setAgreed((prev) => !prev)}
-          value={agreed}
-        />
-        {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
-        <label htmlFor='consent' aria-label='consent' aria-selected={agreed}>
-          I agree to the <Link to={termsLink}>terms and conditions</Link>
-        </label>
-      </Consent>
+
+      <ul style={{ listStyle: 'none', padding: '0', marginTop: '20px', marginBottom: '20px' }}>
+        {terms.map(({ id, term, linkText, link }) => (
+          <Consent key={id}>
+            <input
+              type='checkbox'
+              id={id}
+              name={id}
+              onClick={handleCheckboxChange}
+              value={checkboxValues[id]}
+            />
+            <label htmlFor={id} aria-label={id} aria-selected={checkboxValues[id]}>
+              {term} <Link to={link}>{linkText}</Link>
+            </label>
+          </Consent>
+        ))}
+      </ul>
 
       <Warning>{warning}</Warning>
       {/* TODO: Remove afterwards */}
@@ -88,9 +102,13 @@ const PaymentCard = () => {
         variant='filled'
         text={proceed}
         width='350px'
-        disabled={!agreed}
+        disabled={!Object.values(checkboxValues).every((value) => value)}
         onClick={handlePayment}
-        tooltip={!agreed ? 'Please agree to the terms and conditions' : ''}
+        tooltip={
+          !Object.values(checkboxValues).every((value) => value)
+            ? 'Please agree to the terms and conditions'
+            : ''
+        }
       />
 
       <CaptionText style={{ marginTop: '16px' }}>{endNote}</CaptionText>
diff --git a/src/components/marginals/Navbar/DesktopNav.jsx b/src/components/marginals/Navbar/DesktopNav.jsx
index fb0a832..4b3847d 100644
--- a/src/components/marginals/Navbar/DesktopNav.jsx
+++ b/src/components/marginals/Navbar/DesktopNav.jsx
@@ -3,35 +3,16 @@ import React, { useContext } from 'react';
 import { AuthContext } from '../../../utils/Auth';
 import { nav } from '../../../../config/content';
 import Heading4 from '../../shared/Typography/Heading4';
-import { Container, NavText } from '../../shared';
+import { Container } from '../../shared';
 import { NavCenter, NavRight, NavSection, NavWrapper, StyledHamburger } from './styles';
 import { MenuContext } from './MenuContext';
 import Button from '../../shared/Button';
-
-// Function Returning new scroll object
-const newScrollObject = () => {
-  // eslint-disable-next-line
-  const SmoothScroll = require('smooth-scroll');
-  return new SmoothScroll('', {
-    offset: () => 100,
-  });
-};
-
-const handleScroll = (id) => {
-  if (typeof window !== 'undefined' && id) {
-    const isHome = window.location.pathname === '/';
-    if (isHome) {
-      const scroll = newScrollObject();
-      const anchor = document.getElementById(id);
-      scroll.animateScroll(anchor);
-    }
-  }
-};
+import NavList from './NavList';
 
 function DesktopNav() {
   const menuContext = useContext(MenuContext);
-  const { toggleMenuOpen, menuopen } = menuContext;
   const authContext = useContext(AuthContext);
+  const { toggleMenuOpen, menuopen } = menuContext;
   const { authenticated, login, logout } = authContext;
 
   return (
@@ -45,28 +26,12 @@ function DesktopNav() {
           </div>
           <NavCenter>
             <StyledHamburger menuopen={menuopen} onClick={toggleMenuOpen} />
-            <ul className='navLinkList'>
-              {nav.navItems.map(({ id, name, link }) => (
-                <li
-                  key={id}
-                  onClick={() => !link && handleScroll(id)}
-                  onKeyPress={() => !link && handleScroll(id)}
-                  id={name}
-                  role='menuitem'
-                  tabIndex='0'
-                  className='navLinkItem'
-                >
-                  <Link style={{ textDecoration: 'none' }} to={link}>
-                    <NavText className='navLink'>{name}</NavText>
-                  </Link>
-                </li>
-              ))}
-            </ul>
+            <NavList />
           </NavCenter>
           <NavRight>
             <Button
               variant='outline'
-              text={authenticated ? 'logout' : 'Register'}
+              text={authenticated ? 'logout' : 'login'}
               onClick={authenticated ? logout : login}
             />
           </NavRight>
diff --git a/src/components/marginals/Navbar/MobileNav.jsx b/src/components/marginals/Navbar/MobileNav.jsx
index 784b2c5..f14164f 100644
--- a/src/components/marginals/Navbar/MobileNav.jsx
+++ b/src/components/marginals/Navbar/MobileNav.jsx
@@ -1,7 +1,6 @@
 import React, { useContext } from 'react';
 
 // Libraries
-import { Link, navigate } from 'gatsby';
 
 // Components
 import { MenuContext } from './MenuContext';
@@ -9,36 +8,8 @@ import { AuthContext } from '../../../utils/Auth';
 import { StyledMobileNav } from './styles';
 
 // Assets
-import { nav } from '../../../../config/content';
-import { NavText } from '../../shared';
 import Button from '../../shared/Button';
-
-// Function Returning new scroll object
-const newScrollObject = () => {
-  // eslint-disable-next-line
-  const SmoothScroll = require('smooth-scroll');
-  return new SmoothScroll('', {
-    offset: () => 100,
-  });
-};
-
-const handleScroll = (id) => {
-  if (typeof window !== 'undefined' && id) {
-    const isHome = window.location.pathname === '/';
-    if (isHome) {
-      const scroll = newScrollObject();
-      const anchor = document.getElementById(id);
-      scroll.animateScroll(anchor);
-    } else {
-      navigate('/');
-      setTimeout(() => {
-        const scroll = newScrollObject();
-        const anchor = document.getElementById(id);
-        scroll.animateScroll(anchor);
-      }, 1000);
-    }
-  }
-};
+import NavList from './NavList';
 
 function MobileNav() {
   const menuContext = useContext(MenuContext);
@@ -46,34 +17,13 @@ function MobileNav() {
   const authContext = useContext(AuthContext);
   const { authenticated, login, logout } = authContext;
 
-  const onMenuClick = (id) => {
-    handleScroll(id);
-    toggleMenuOpen();
-  };
-
   return (
     <StyledMobileNav>
       <div className='mobile-nav-container'>
-        <ul className='linkList'>
-          {nav.navItems.map(({ id, name, link }) => (
-            <li
-              key={id}
-              id={name}
-              className='listItem'
-              onClick={() => !link && onMenuClick(id)}
-              onKeyDown={() => !link && onMenuClick(id)}
-              role='menuitem'
-              tabIndex='0'
-            >
-              <Link to={link} style={{ textDecoration: 'none' }}>
-                <NavText className='link'>{name}</NavText>
-              </Link>
-            </li>
-          ))}
-        </ul>
+        <NavList toggleMenuOpen={toggleMenuOpen} />
         <Button
           variant='outline'
-          text={authenticated ? 'logout' : 'Register'}
+          text={authenticated ? 'logout' : 'login'}
           onClick={authenticated ? logout : login}
         />
       </div>
diff --git a/src/components/marginals/Navbar/NavList.jsx b/src/components/marginals/Navbar/NavList.jsx
new file mode 100644
index 0000000..0df784f
--- /dev/null
+++ b/src/components/marginals/Navbar/NavList.jsx
@@ -0,0 +1,80 @@
+import React, { useContext, useEffect, useState } from 'react';
+import { Link } from 'gatsby';
+import { AuthContext } from '../../../utils/Auth';
+import { nav } from '../../../../config/content';
+import { NavText } from '../../shared';
+
+// Function Returning new scroll object
+const newScrollObject = () => {
+  // eslint-disable-next-line
+  const SmoothScroll = require('smooth-scroll');
+  return new SmoothScroll('', {
+    offset: () => 100,
+  });
+};
+
+const handleScroll = (id) => {
+  if (typeof window !== 'undefined' && id) {
+    const isHome = window.location.pathname === '/';
+    if (isHome) {
+      const scroll = newScrollObject();
+      const anchor = document.getElementById(id);
+      scroll.animateScroll(anchor);
+    }
+  }
+};
+
+const onClick = (id, link, toggleMenuOpen) => {
+  if (!link) {
+    handleScroll(id);
+  }
+  if (toggleMenuOpen) toggleMenuOpen();
+};
+
+const NavList = ({ toggleMenuOpen }) => {
+  const authContext = useContext(AuthContext);
+  const { userData } = authContext;
+  const [isOtherPage, setIsOtherPage] = useState(false);
+
+  const isRegistered =
+    !!userData?.rollNumber || userData?.festID?.includes('innovision-2023') || false;
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  useEffect(() => {
+    if (typeof window !== 'undefined') {
+      setIsOtherPage(window.location.pathname !== '/');
+    }
+  });
+
+  return (
+    <ul className='navLinkList'>
+      {!isOtherPage
+        ? nav.navItems.map(({ id, name, link }) => (
+            <li
+              key={id}
+              onClick={() => onClick(id, link, toggleMenuOpen)}
+              onKeyPress={() => onClick(id, link, toggleMenuOpen)}
+              id={name}
+              role='menuitem'
+              tabIndex='0'
+              className='navLinkItem'
+            >
+              <Link style={{ textDecoration: 'none' }} to={link}>
+                <NavText className='navLink'>{name}</NavText>
+              </Link>
+            </li>
+          ))
+        : nav.otherPagesNavItems.map(({ id, name, link, authenticated: auth }) =>
+            isRegistered === auth || auth === undefined ? (
+              <li key={id} id={name} role='menuitem' tabIndex='0' className='navLinkItem'>
+                <Link style={{ textDecoration: 'none' }} to={link}>
+                  <NavText className='navLink'>{name}</NavText>
+                </Link>
+              </li>
+            ) : null,
+          )}
+    </ul>
+  );
+};
+
+export default NavList;
diff --git a/src/components/marginals/Navbar/styles.jsx b/src/components/marginals/Navbar/styles.jsx
index acd0e12..623b30a 100644
--- a/src/components/marginals/Navbar/styles.jsx
+++ b/src/components/marginals/Navbar/styles.jsx
@@ -118,13 +118,13 @@ export const StyledMobileNav = styled.section`
     min-height: 100%;
     gap: 10px;
   }
-  .linkList {
+  .navLinkList {
     display: flex;
     flex-direction: column;
     gap: 10px;
     list-style-type: none;
   }
-  .listItem {
+  .navLinkItem {
     text-align: center;
     margin-bottom: 1em;
     cursor: pointer;
diff --git a/src/utils/Auth.jsx b/src/utils/Auth.jsx
index 29c34f9..b80895a 100644
--- a/src/utils/Auth.jsx
+++ b/src/utils/Auth.jsx
@@ -72,9 +72,8 @@ const AuthContextProvider = ({ children }) => {
       signInWithPopup(auth, provider)
         .then((result) => {
           // This gives you a Google Access Token. You can use it to access the Google API.
-          const credential = GoogleAuthProvider.credentialFromResult(result);
-          const { accessToken } = credential;
-          console.log(accessToken);
+          // const credential = GoogleAuthProvider.credentialFromResult(result);
+          // const { accessToken } = credential;
           // The signed-in user info.
           const { user } = result;
           // ...