Merge pull request #21 from ShubhiGulati/main

upgrade
GDSC-NITJ · Jan 18, 2024 · 3cc5b0f · 3cc5b0f
2 parents 4e995b7 + dfd00b6
commit 3cc5b0f
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 41 deletions.
diff --git a/src/components/Hero/bulb.tsx b/src/components/Hero/bulb.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import Image from 'next/image';
+export default function Bulb()
+{
+    return(
+        <>
+     <Image src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHTSURBVHgB7ZbPSwJBFMe/9rsgkA0hCgpiuxdRHrpFh04G2aWOdgiPBdWlQ/0/denUv6CBadbJRdQsBFMXjUyhtn2TRWHqm8FO+oFlmR/vve97M7szQJdOxwE1rHb564Ec1sa23wqEY8gVK78e6qOxJuL+REaxCKzPTDWdZMRTcM/Nsn1zBbCCq4hgLYFd2obBtdGBuj6aSzYcOBVomj0JyJeqdf3cKrAEPGZLGBwcgAyVShUTrtGWMVhL8FJ+hSxcG5aAXN5EwSyCC80lGw59nEnjLg2ZbF44HdOcGBkeqlsSKjll/RWYbNolwLF3cGwdHe6LBgXIMYxsG2Hb0jl4WMmHnKgCB8p+enKsrQLYImSCEzJngaNW1qZwS68iALFQRmzCRtAYzflX6MQzUln6O4rHPgnFm/pqp6EUrM/wJ5RhOHD73b6PpT/fSCtlr3IhoWzrfjRUfn3KJe1TugKEz7OGZe8OdF0XbcMwsLW+AhVkb0SCrGniORFCf9VE8upSBL+LhKGCkgCX097t8QSCgSCC1zci+KbXAxWUloAqsLowj0X3ErShdxH87PwCKvRCntMns3CiOTWUK2+IRiO2oDJ2/T4ak97Uqtdywmqjry4dzAeSYtoa5M/boQAAAABJRU5ErkJggg==" alt="" 
+     width={ 32}
+     height= {32}
+     flex-shrink= {0}
+     />
+
+        </>
+    )
+}
diff --git a/src/components/Hero/marquee.tsx b/src/components/Hero/marquee.tsx
@@ -0,0 +1,35 @@
+// Marquee.js
+
+import React from 'react';
+import Image from 'next/image';
+
+export default function  Marquee  ({ text }) {
+  return (
+    <div className="marquee">
+
+      <p className="bulb">Let’s Hack it! <Image className="bo" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHTSURBVHgB7ZbPSwJBFMe/9rsgkA0hCgpiuxdRHrpFh04G2aWOdgiPBdWlQ/0/denUv6CBadbJRdQsBFMXjUyhtn2TRWHqm8FO+oFlmR/vve97M7szQJdOxwE1rHb564Ec1sa23wqEY8gVK78e6qOxJuL+REaxCKzPTDWdZMRTcM/Nsn1zBbCCq4hgLYFd2obBtdGBuj6aSzYcOBVomj0JyJeqdf3cKrAEPGZLGBwcgAyVShUTrtGWMVhL8FJ+hSxcG5aAXN5EwSyCC80lGw59nEnjLg2ZbF44HdOcGBkeqlsSKjll/RWYbNolwLF3cGwdHe6LBgXIMYxsG2Hb0jl4WMmHnKgCB8p+enKsrQLYImSCEzJngaNW1qZwS68iALFQRmzCRtAYzflX6MQzUln6O4rHPgnFm/pqp6EUrM/wJ5RhOHD73b6PpT/fSCtlr3IhoWzrfjRUfn3KJe1TugKEz7OGZe8OdF0XbcMwsLW+AhVkb0SCrGniORFCf9VE8upSBL+LhKGCkgCX097t8QSCgSCC1zci+KbXAxWUloAqsLowj0X3ErShdxH87PwCKvRCntMns3CiOTWUK2+IRiO2oDJ2/T4ak97Uqtdywmqjry4dzAeSYtoa5M/boQAAAABJRU5ErkJggg==" alt="" 
+     width={ 32}
+     height= {32}
+     flex-shrink= {0}
+     /> </p>
+      <p className="bulb">Let’s Hack it! <Image className=" bo"src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHTSURBVHgB7ZbPSwJBFMe/9rsgkA0hCgpiuxdRHrpFh04G2aWOdgiPBdWlQ/0/denUv6CBadbJRdQsBFMXjUyhtn2TRWHqm8FO+oFlmR/vve97M7szQJdOxwE1rHb564Ec1sa23wqEY8gVK78e6qOxJuL+REaxCKzPTDWdZMRTcM/Nsn1zBbCCq4hgLYFd2obBtdGBuj6aSzYcOBVomj0JyJeqdf3cKrAEPGZLGBwcgAyVShUTrtGWMVhL8FJ+hSxcG5aAXN5EwSyCC80lGw59nEnjLg2ZbF44HdOcGBkeqlsSKjll/RWYbNolwLF3cGwdHe6LBgXIMYxsG2Hb0jl4WMmHnKgCB8p+enKsrQLYImSCEzJngaNW1qZwS68iALFQRmzCRtAYzflX6MQzUln6O4rHPgnFm/pqp6EUrM/wJ5RhOHD73b6PpT/fSCtlr3IhoWzrfjRUfn3KJe1TugKEz7OGZe8OdF0XbcMwsLW+AhVkb0SCrGniORFCf9VE8upSBL+LhKGCkgCX097t8QSCgSCC1zci+KbXAxWUloAqsLowj0X3ErShdxH87PwCKvRCntMns3CiOTWUK2+IRiO2oDJ2/T4ak97Uqtdywmqjry4dzAeSYtoa5M/boQAAAABJRU5ErkJggg==" alt="" 
+     width={ 32}
+     height= {32}
+     flex-shrink= {0}
+     /></p>
+      <p className="bulb">Let’s Hack it! <Image className="bo" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHTSURBVHgB7ZbPSwJBFMe/9rsgkA0hCgpiuxdRHrpFh04G2aWOdgiPBdWlQ/0/denUv6CBadbJRdQsBFMXjUyhtn2TRWHqm8FO+oFlmR/vve97M7szQJdOxwE1rHb564Ec1sa23wqEY8gVK78e6qOxJuL+REaxCKzPTDWdZMRTcM/Nsn1zBbCCq4hgLYFd2obBtdGBuj6aSzYcOBVomj0JyJeqdf3cKrAEPGZLGBwcgAyVShUTrtGWMVhL8FJ+hSxcG5aAXN5EwSyCC80lGw59nEnjLg2ZbF44HdOcGBkeqlsSKjll/RWYbNolwLF3cGwdHe6LBgXIMYxsG2Hb0jl4WMmHnKgCB8p+enKsrQLYImSCEzJngaNW1qZwS68iALFQRmzCRtAYzflX6MQzUln6O4rHPgnFm/pqp6EUrM/wJ5RhOHD73b6PpT/fSCtlr3IhoWzrfjRUfn3KJe1TugKEz7OGZe8OdF0XbcMwsLW+AhVkb0SCrGniORFCf9VE8upSBL+LhKGCkgCX097t8QSCgSCC1zci+KbXAxWUloAqsLowj0X3ErShdxH87PwCKvRCntMns3CiOTWUK2+IRiO2oDJ2/T4ak97Uqtdywmqjry4dzAeSYtoa5M/boQAAAABJRU5ErkJggg==" alt="" 
+     width={ 32}
+     height= {32}
+     flex-shrink= {0}
+     /></p>
+
+      <p className="bulb">Let’s Hack it! <Image className="bo" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHTSURBVHgB7ZbPSwJBFMe/9rsgkA0hCgpiuxdRHrpFh04G2aWOdgiPBdWlQ/0/denUv6CBadbJRdQsBFMXjUyhtn2TRWHqm8FO+oFlmR/vve97M7szQJdOxwE1rHb564Ec1sa23wqEY8gVK78e6qOxJuL+REaxCKzPTDWdZMRTcM/Nsn1zBbCCq4hgLYFd2obBtdGBuj6aSzYcOBVomj0JyJeqdf3cKrAEPGZLGBwcgAyVShUTrtGWMVhL8FJ+hSxcG5aAXN5EwSyCC80lGw59nEnjLg2ZbF44HdOcGBkeqlsSKjll/RWYbNolwLF3cGwdHe6LBgXIMYxsG2Hb0jl4WMmHnKgCB8p+enKsrQLYImSCEzJngaNW1qZwS68iALFQRmzCRtAYzflX6MQzUln6O4rHPgnFm/pqp6EUrM/wJ5RhOHD73b6PpT/fSCtlr3IhoWzrfjRUfn3KJe1TugKEz7OGZe8OdF0XbcMwsLW+AhVkb0SCrGniORFCf9VE8upSBL+LhKGCkgCX097t8QSCgSCC1zci+KbXAxWUloAqsLowj0X3ErShdxH87PwCKvRCntMns3CiOTWUK2+IRiO2oDJ2/T4ak97Uqtdywmqjry4dzAeSYtoa5M/boQAAAABJRU5ErkJggg==" alt="" 
+     width={ 32}
+     height= {32}
+     flex-shrink= {0}
+     /></p>
+    </div>
+  );
+};
+
+
diff --git a/src/components/hero/banner.tsx b/src/components/hero/banner.tsx
@@ -7,7 +7,7 @@ import Link from 'next/link';
     return (
         <>
             <Script src="https://apply.devfolio.co/v2/sdk.js" defer async></Script>
-            <div className=" woow w-full bg-black shadow border-2 border-black sticky top-0 margin- 10px
+            <div className=" woow w-full bg-black shadow border-2 border-black  top-0 margin- 10px
       padding- 40px h-full
 
  ">

diff --git a/src/components/hero/nav.tsx b/src/components/hero/nav.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import Link from "next/link";
 import React from 'react';
-// import '../styles/Navbar.css';
+import {useRouter} from "next/router"
 
 export default function NavBar  ()  {
 
@@ -68,9 +68,9 @@ export default function NavBar  ()  {
                 <ul className="
     
 ">
-                <li className=" texx  justify-content  gap-4px">
+                <li className=" texx text-black hover:bg-white hover:text-black rounded-lg p-2t justify-content  gap-4px">
                    <Link
-                      href="https://www.nitj.ac.in/events_registration/hackmol/login"
+                      href={'#schedule'}
 
                     > <button onClick={() => console.log('connect')}>
                       SCHEDULE
@@ -79,42 +79,42 @@ export default function NavBar  ()  {
 
 
                 </li>
-                  <li className="texx2">
+                  <li className="texx2 text-black hover:bg-white hover:text-black rounded-lg p-2t ">
                     <Link
-                      href='#rules'
+                      href={'#prizes'}
                       scroll={false}
                     >
                      PRIZES
                     </Link>
                   </li>
-                   <li className="texx3">
+                   <li className="texx3 text-black hover:bg-white hover:text-black rounded-lg p-2t">
                     <Link
-                      href={'#schedule'}
+                      href={'#rules'}
                       scroll={false}
                     >
                      RULES
                     </Link>
                   </li>  
-                   <li className="texx4">
+                   <li className="texx4 text-black hover:bg-white hover:text-black rounded-lg p-2t">
                     <Link
-                      href={'#prizes'}
+                      href={'#hackthon tracks'}
                       scroll={false}
                     >
                      TRACKS
                     </Link>
                   </li> 
 
-                  <li className="texx5">
+                  <li className="texx5 text-black hover:bg-white hover:text-black rounded-lg p-2t">
                     <Link
-                      href={'#contact'}
+                      href={'#judges'}
                       scroll={false}
                     >
                       JUDGES
                     </Link>
                   </li>
-                  <li className="texx6">
+                  <li className="texx6 text-black hover:bg-white hover:text-black rounded-lg p-2t">
                     <Link
-                      href={'#contact'}
+                      href={'#faq'}
                       scroll={false}
                     >
                       FAQS
@@ -129,9 +129,9 @@ export default function NavBar  ()  {
             <div className="md:hidden ">
                  <div className=" wish px-2 pt-2 pb-3 space-y-1 sm:px">
                     <div className=" heaven display-flex width- 1160px padding- 40px 60px flex-direction: column justify-content: center align-items: center gap-4px">
-                 <div className="hell">
+                 <div className="hell text-black hover:bg-white hover:text-black rounded-lg p-2t">
                     <Link
-                      href="https://www.nitj.ac.in/events_registration/hackmol/login"
+                      href="#about"
 
                     > <button onClick={() => console.log('connect')}>
                       About
@@ -140,7 +140,7 @@ export default function NavBar  ()  {
                     </div>
                 <div className=" hell text-black hover:bg-white hover:text-black rounded-lg p-2t ">
                  <Link
-                      href="https://www.nitj.ac.in/events_registration/hackmol/login"
+                      href='#schedule'
 
                     > <button onClick={() => console.log('connect')}>
                       Schedule
@@ -149,45 +149,45 @@ export default function NavBar  ()  {
 
                  </div>
 
-                  <div className="hell">
+                  <div className="hell text-black hover:bg-white hover:text-black rounded-lg p-2t">
                     <Link
-                      href='#rules'
-                      scroll={false}
-                    >
-                     Prizes
+                      href='#prizes'>
+                      <button onClick={() => console.log('connect')}>
+                      Prizes
+                      </button>
                     </Link>
                   </div>
-                   <div className="hell">
+                   <div className="hell text-black hover:bg-white hover:text-black rounded-lg p-2t ">
                     <Link
-                      href={'#schedule'}
+                      href={'#rules'}
                       scroll={false}
                     >
                      Rules
                     </Link>
                   </div>  
-                   <div className="hell">
+                   <div className="hell text-black hover:bg-white hover:text-black rounded-lg p-2t">
                     <Link
-                      href={'#prizes'}
+                      href={'#tracks'}
                       scroll={false}
                     >
                      Tracks
                     </Link>
                   </div> 
 
-                  <div className="hell">
+                  <div className="hell text-black hover:bg-white hover:text-black rounded-lg p-2t">
                     <Link
-                      href={'#contact'}
+                      href={'#judges'}
                       scroll={false}
                     >
                       Judges
                     </Link>
                   </div>
-                  <div className="hell">
+                  <div className="hell text-black hover:bg-white hover:text-black rounded-lg p-2t">
                     <Link
-                      href={'#contact'}
+                      href={'#FAQ'}
                       scroll={false}
                     >
-                      FAQS
+                      FAQ
                     </Link>
                   </div>
                   </div>

diff --git a/src/pages/index.js b/src/pages/index.js
@@ -1,9 +1,10 @@
-import Banner2 from "../components/hero/banner";
-import Hackmol from   "../components/hero/img";
-import Register from  "../components/hero/reg";
-import Log from "../components/hero/logo";
-import NavBar from "../components/hero/nav";
+import Banner2 from "../components/Hero/banner";
+import Hackmol from   "../components/Hero/img";
+import Register from  "../components/Hero/reg";
+import Log from "../components/Hero/logo";
+import NavBar from "../components/Hero/nav";
 import Link from 'next/link'
+import Marquee from "../components/Hero/marquee";
 import Testimonies from "../components/Testimonies";
 import  About from "../components/About";
 import Rules from "../components/Rules/Rules";
@@ -46,6 +47,7 @@ export default function Home() {
 
 <NavBar/>
 <HeroSection />
+<Marquee/>
 <PrizeSection />
       <Testimonies />
       <About/>

diff --git a/src/styles/hero.css b/src/styles/hero.css
@@ -379,7 +379,7 @@ nav.navbar {
   @media (min-width: 700px) {
     .woow{
       display: flex;
-  width:1520px;
+  width:1560px;
   padding:38px 4px;
   justify-content: center;
   align-items: center;
@@ -428,12 +428,13 @@ nav.navbar {
     color: var(--white, #FFF);
 
     font-family: Space Grotesk;
-    font-size: 15px;
+    font-size: 14px;
     font-style: normal;
     font-weight: 700;
     line-height: 125%;
-    letter-spacing: 0.2px;
+  word-spacing: 12px;
     justify-content: space-between;
+
   }
   .heaven
   {
@@ -692,5 +693,56 @@ right:500%;
       bottom:14.4rem;
       left:370%;
     }
-
-
+ .bulb{
+  color: #000;
+text-align: center;
+font-family: Minecrafter;
+font-size: 23px;
+font-style: normal;
+font-weight: 900;
+line-height: 100%; /* 23px */
+padding: 110px;
+margin-top: 2%;
+
+  overflow: hidden;
+  animation: marquee-animation 2s linear infinite;
+  animation-iteration-count:marquee-animation infinite;
+  justify-content: flex-start;
+ }
+ @media (max-width: 900px) {
+ .marquee{
+  display: flex;
+  background: #79FF4A;
+width: 100%;
+height: 65px;
+padding: 7px 10px;
+justify-content: flex-start;
+align-items: center;
+
+ }
+}
+@media (min-width: 900px) {
+  .marquee{
+   display: flex;
+   background: #79FF4A;
+ width:1570px;
+ height: 65px;
+ padding: 7px 10px;
+ justify-content: flex-start;
+ align-items: center;
+
+  }
+ }
+ @keyframes marquee-animation {
+  0% {
+    transform: translateX(100%);
+  }
+  100% {
+    transform: translateX(-100%);
+  }
+}
+  .bo{
+    position: relative;
+    bottom: 1.8rem;
+    left:99%;
+  }