From 72e912b02fb94594d7582ecadad974c58021f1c1 Mon Sep 17 00:00:00 2001
From: ashutosh-rath02 <ashutosh123rath@gmail.com>
Date: Sun, 17 Mar 2024 21:39:48 +0530
Subject: [PATCH 1/5] chore: add components to homepage

---
 src/components/Hero.jsx          |  2 +-
 src/components/shared/NavBar.jsx |  2 +-
 src/pages/home.jsx               | 39 +++++++++-----------------------
 3 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/components/Hero.jsx b/src/components/Hero.jsx
index 527e432..6ef29d1 100644
--- a/src/components/Hero.jsx
+++ b/src/components/Hero.jsx
@@ -29,7 +29,7 @@ const Hero = () => {
 					</button>
 				</div>
 				<div
-					className='w-[100%] md:w-1/2  flex items-center justify-center relative '
+					className='w-[100%] md:w-1/2  flex items-center justify-center relative -z-10'
 					style={{ height: '600px', marginLeft: '29px' }}>
 					<div
 						className='absolute w-[189px] h-[270px] md:w-[303.075px] md:h-[404.558px] '
diff --git a/src/components/shared/NavBar.jsx b/src/components/shared/NavBar.jsx
index 5d578d9..a69addd 100644
--- a/src/components/shared/NavBar.jsx
+++ b/src/components/shared/NavBar.jsx
@@ -18,7 +18,7 @@ function NavBar() {
 	return (
 		<nav style={{ position: 'sticky', top: '0' }}>
 			<div
-				className='navbar flex justify-between items-center opacity-53 bg-hard-light bg-center bg-cover bg-[#F9F5F2] h-[73.8px] overflow-hidden pl-10 '
+				className='navbar flex justify-between items-center opacity-53 bg-hard-light bg-center bg-cover bg-[#F9F5F2] h-[73.8px] overflow-hidden pl-10 z-1'
 				style={{ backgroundImage: `url(${image})` }}>
 				<Logo src={logo.src} alt={logo.alt} />
 				<div className={`navitem md:flex ${isNavOpen ? 'hidden' : 'flex'} hidden`}>
diff --git a/src/pages/home.jsx b/src/pages/home.jsx
index 437c9fd..d22453d 100644
--- a/src/pages/home.jsx
+++ b/src/pages/home.jsx
@@ -1,34 +1,17 @@
-import { Link } from 'react-router-dom';
-import { Button } from '../components/ui/button';
+import AboutUs from '../components/AboutUs';
+import FAQ from '../components/FaqSection/faq';
+import Hero from '../components/Hero';
+import Navbar from '../components/shared/NavBar';
+import Footer from '../components/shared/marginals/footer';
 
 export default function Home() {
 	return (
-		<div className='container py-6'>
-			<h1 className='text-3xl font-bold'>1999 Reunion Tour</h1>
-			<div className='mt-4'>
-				<h2 className='text-xl font-bold'>How to contribute</h2>
-				<p>
-					1. Store content and other data in <code className='bg-gray-200 p-1 rounded-sm'>data</code> folder.
-				</p>
-				<p>
-					2. Store reusable components in <code className='bg-gray-200 p-1'>components</code> folder.
-				</p>
-				<p>
-					3. Store pages in <code className='bg-gray-200 p-1'>pages</code> folder.
-				</p>
-				<p>
-					4. Add custom styles in <code className='bg-gray-200 p-1'>tailwind.config.css</code> file.
-				</p>
-				<p>
-					5. Add shared ui in <code className='bg-gray-200 p-1'>ui</code> folder.
-				</p>
-				<p>
-					6. Add images and other assets in <code className='bg-gray-200 p-1'>assets</code> folder.
-				</p>
-			</div>
-			<Link to='/play'>
-				<Button>Go to playground</Button>
-			</Link>
+		<div className=''>
+			<Navbar />
+			<Hero />
+			<AboutUs />
+			<FAQ />
+			<Footer />
 		</div>
 	);
 }

From 3c2aa2b526cf7522c355e5887886e0ecd5aa304b Mon Sep 17 00:00:00 2001
From: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:41:12 +0530
Subject: [PATCH 2/5] chore: float the navbar

---
 src/components/shared/NavBar.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/shared/NavBar.jsx b/src/components/shared/NavBar.jsx
index a69addd..71f346c 100644
--- a/src/components/shared/NavBar.jsx
+++ b/src/components/shared/NavBar.jsx
@@ -18,7 +18,7 @@ function NavBar() {
 	return (
 		<nav style={{ position: 'sticky', top: '0' }}>
 			<div
-				className='navbar flex justify-between items-center opacity-53 bg-hard-light bg-center bg-cover bg-[#F9F5F2] h-[73.8px] overflow-hidden pl-10 z-1'
+				className='navbar flex justify-between items-center opacity-53 bg-hard-light bg-center bg-cover bg-[#F9F5F2] h-[73.8px] overflow-hidden pl-10 z-20'
 				style={{ backgroundImage: `url(${image})` }}>
 				<Logo src={logo.src} alt={logo.alt} />
 				<div className={`navitem md:flex ${isNavOpen ? 'hidden' : 'flex'} hidden`}>

From cfd077171a283659f549d481bcebfdb30bda2959 Mon Sep 17 00:00:00 2001
From: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:45:42 +0530
Subject: [PATCH 3/5] chore: set hero z-index to -ve index

---
 src/components/Hero.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Hero.jsx b/src/components/Hero.jsx
index 3592acc..1189155 100644
--- a/src/components/Hero.jsx
+++ b/src/components/Hero.jsx
@@ -5,7 +5,7 @@ import { imgURLs } from '../data/eventsData';
 
 const Hero = () => {
 	return (
-		<div className='mx-5 lg:mx-14 xl:max-w-[1483px]'>
+		<div className='mx-5 lg:mx-14 xl:max-w-[1483px] -z-1'>
 			<div className='flex flex-col md:flex-row justify-center items-center min-h-screen gap-20 lg:gap-10'>
 				<div className='w-[100%] md:w-1/2 h-fit'>
 					<div className='flex flex-col justify-end ml-2' style={{ color: '#FF4409' }}>

From 222effede010574c7358fad17e72e14f70187248 Mon Sep 17 00:00:00 2001
From: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:47:30 +0530
Subject: [PATCH 4/5] chore: set position to relative

---
 src/components/Hero.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Hero.jsx b/src/components/Hero.jsx
index 1189155..986c9fe 100644
--- a/src/components/Hero.jsx
+++ b/src/components/Hero.jsx
@@ -5,7 +5,7 @@ import { imgURLs } from '../data/eventsData';
 
 const Hero = () => {
 	return (
-		<div className='mx-5 lg:mx-14 xl:max-w-[1483px] -z-1'>
+		<div className='mx-5 lg:mx-14 xl:max-w-[1483px] -z-1 relative'>
 			<div className='flex flex-col md:flex-row justify-center items-center min-h-screen gap-20 lg:gap-10'>
 				<div className='w-[100%] md:w-1/2 h-fit'>
 					<div className='flex flex-col justify-end ml-2' style={{ color: '#FF4409' }}>

From f994622b8ac3ff0e1c57cb3ce6b716117fb7beaf Mon Sep 17 00:00:00 2001
From: Ashish Padhy <100484401+Shurtu-gal@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:53:23 +0530
Subject: [PATCH 5/5] chore: use tailwind

---
 src/components/shared/NavBar.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/shared/NavBar.jsx b/src/components/shared/NavBar.jsx
index 71f346c..9688e34 100644
--- a/src/components/shared/NavBar.jsx
+++ b/src/components/shared/NavBar.jsx
@@ -16,9 +16,9 @@ function NavBar() {
 	};
 
 	return (
-		<nav style={{ position: 'sticky', top: '0' }}>
+		<nav className='sticky top-0 z-20'>
 			<div
-				className='navbar flex justify-between items-center opacity-53 bg-hard-light bg-center bg-cover bg-[#F9F5F2] h-[73.8px] overflow-hidden pl-10 z-20'
+				className='navbar flex justify-between items-center opacity-53 bg-hard-light bg-center bg-cover bg-[#F9F5F2] h-[73.8px] overflow-hidden pl-10'
 				style={{ backgroundImage: `url(${image})` }}>
 				<Logo src={logo.src} alt={logo.alt} />
 				<div className={`navitem md:flex ${isNavOpen ? 'hidden' : 'flex'} hidden`}>