Merge branch 'rishavranjan943-main'

IIITKalyaniFOSC · Aug 17, 2024 · 08445a4 · 08445a4
2 parents 5347d33 + 81ccfb5
commit 08445a4
Show file tree

Hide file tree

Showing 11 changed files with 247 additions and 8 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -12,7 +12,7 @@ import Cp from './components/Cp/Cp'
 
 import LandingPage from './pages/LandingPage'
 import StatusCode0 from './components/StatusCode0/StatusCode0'
-
+import Prizes from './components/Prizes/Prizes'
 function App() {
 
   return (
@@ -21,6 +21,7 @@ function App() {
       <Navbar />
       <LandingPage/>
       <StatusCode0 />
+      <Prizes/>
       <Tracks />
       <Sponsors />
       <Cp/>

diff --git a/src/assets/images/prizes/prizesbg.png b/src/assets/images/prizes/prizesbg.png
diff --git a/src/assets/images/prizes/small_trpohy.png b/src/assets/images/prizes/small_trpohy.png
diff --git a/src/assets/images/prizes/win1.png b/src/assets/images/prizes/win1.png
diff --git a/src/assets/images/prizes/win2.png b/src/assets/images/prizes/win2.png
diff --git a/src/assets/images/prizes/win3.png b/src/assets/images/prizes/win3.png
diff --git a/src/components/HamburgerMenu.jsx b/src/components/HamburgerMenu.jsx
@@ -54,7 +54,7 @@ export default function SwipeableTemporaryDrawer() {
       onKeyDown={toggleDrawer(false)}
     >
       <List>
-        {['SCHEDULE', 'TRACKS', 'SPONSORS', 'FAQ', 'CONTACT US'].map((text, index) => (
+        {['SCHEDULE', 'PRIZES', 'TRACKS', 'SPONSORS', 'FAQ', 'CONTACT US'].map((text, index) => (
           <ListItem key={text} disablePadding>
             <ListItemButton onClick={() => {
                 const id = text === 'CONTACT US' ? 'footer' : text.toLowerCase();

diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
@@ -33,18 +33,25 @@ export default function Navbar(){
             footerSection.scrollIntoView({ behavior: 'smooth' });
         }
     };
+    const scrollToPrizes = () => {
+        const footerSection = document.getElementById('prizes');
+        if (footerSection) {
+            footerSection.scrollIntoView({ behavior: 'smooth' });
+        }
+    };
     return(
         <section className="w-full relative">
         <nav className="fixed  3xl:px-[250px] px-7 z-30 flex md:justify-between bg-gradient-to-b max-[768px]:space-x-5 from-[#040842] to-[#040842]  w-full h-[96px] 3xl:h-[250px] max-[540px]:h-[60px] mt-0 bg-blue-800 font-vt323 leading-[96px] ">
 
             <img className="justify-start 3xl:w-[300px] max-[450px]:w-[86px] max-[540px]:w-[90px] max-[640px]:w-[100px] sm:w-[107px] md:w-[88px] lg:w-[107px] xl:w-[120px] " src={sc1_logo}></img>
 
-            <ul className=" justify-center flex 3xl:text-6xl 3xl:space-x-[7rem]  xl:space-x-[4rem] lg:space-x-[3rem] sm:space-x-[1.6rem] sm:text-[22px] min-[540px]:space-x-[1.6rem] min-[540px]:text-[22px] md:text-[25px] md:space-x-5 lg:text-[1.8 rem] xl:text-[2.3rem] text-white items-center max-[768px]:hidden ">
-                <a onClick={scrollToSchedule} ><li className="hover:text-[#c3c3c3]">SCHEDULE</li></a>
-                <a onClick={scrollToTracks}><li className="hover:text-[#c3c3c3]">TRACKS</li></a>
-                <a onClick={scrollToSponsors}><li className="hover:text-[#c3c3c3]">SPONSORS</li></a>
-                <a onClick={scrollToFaq}><li className="hover:text-[#c3c3c3]">FAQ</li></a>
-                <a onClick={scrollToFooter}><li className="hover:text-[#c3c3c3]">CONTACT US</li></a>
+            <ul className=" justify-center flex 3xl:text-6xl 3xl:space-x-[7rem]  2xl:space-x-[4rem] lg:space-x-[2rem] sm:space-x-[1.2rem] sm:text-[22px] min-[540px]:space-x-[1.6rem] min-[540px]:text-[22px] md:text-[22px] md:space-x-5 lg:text-[1.6rem] xl:text-[2rem] text-white items-center max-[768px]:hidden ">
+                <a onClick={scrollToSchedule} ><li className="hover:text-[#c3c3c3] cursor-pointer">SCHEDULE</li></a>
+                <a onClick={scrollToPrizes} ><li className="hover:text-[#c3c3c3] cursor-pointer">PRIZES</li></a>
+                <a onClick={scrollToTracks}><li className="hover:text-[#c3c3c3] cursor-pointer">TRACKS</li></a>
+                <a onClick={scrollToSponsors}><li className="hover:text-[#c3c3c3] cursor-pointer">SPONSORS</li></a>
+                <a onClick={scrollToFaq}><li className="hover:text-[#c3c3c3] cursor-pointer">FAQ</li></a>
+                <a onClick={scrollToFooter}><li className="hover:text-[#c3c3c3] cursor-pointer">CONTACT US</li></a>
 
             </ul>
             <img className= "justify-end 3xl:w-[400px] md:w-[110px] lg:w-[154px] xl:w-[175px] max-[768px]:hidden" src={iiit_logo}></img>

diff --git a/src/components/Prizes/Prizes.jsx b/src/components/Prizes/Prizes.jsx
diff --git a/src/components/Tracks/Tracks.jsx b/src/components/Tracks/Tracks.jsx
@@ -110,6 +110,7 @@ const Tracks = () => {
                         <img src={right_key} alt="" className='opacity-50 hover:opacity-100' onClick={() => {moveRight(); handleCardClick((selectedTrack % 6) + 1)}}/>
                     </div>
                 </div>
+                <div className='px-12 text-white mt-8 text-xl md:text-xl lg:text-2xl xl:text-3xl 2xl:text-4xl'>P.S. You can win prizes worth <span className='text-[#E29B29]'>$</span>??? for the best hack in every track.</div>
             </div>
         </section>
     );

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -11,6 +11,7 @@ export default {
       },  
 
       screens: {
+        'xs':"600px",
         '3xl': "2560px",
       },
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,6 +110,7 @@ const Tracks = () => { @@
                             <img src={right_key} alt="" className='opacity-50 hover:opacity-100' onClick={() => {moveRight(); handleCardClick((selectedTrack % 6) + 1)}}/>
                         </div>
                     </div>
+                    <div className='px-12 text-white mt-8 text-xl md:text-xl lg:text-2xl xl:text-3xl 2xl:text-4xl'>P.S. You can win prizes worth <span className='text-[#E29B29]'>$</span>??? for the best hack in every track.</div>
                 </div>
             </section>
         );
@@ Expand Down @@