solve conflicts

src/components/Global/Hero.jsx

@@ -28,90 +28,6 @@ const ParallaxSection = ({ children, yOffset = 0 }) => {
   const y = useTransform(scrollYProgress, [0, 1], [0, yOffset]);
 
   return (
-<<<<<<< HEAD
-      <div className="relative h-[600px] md:h-[500px] lg:h-[600px] bg-white overflow-hidden border border-gray-300">
-          <motion.div
-              className="absolute inset-0 grid grid-cols-12 gap-4 bg-[length:60px_60px]"
-              style={{
-                  backgroundImage: `
-        linear-gradient(270deg, hsla(0, 0%, 100%, 0) 25%, hsla(0, 0%, 100%, 0) 25.1%),
-        linear-gradient(to right, #e2e8f0 0.5px, transparent 3.1px),
-        linear-gradient(to bottom, #e2e8f0 1px, transparent 1px),
-        linear-gradient(to right, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0) 70%)`,
-              }}
-          >
-              {/* Floating Circles with subtle scaling and hovering animation */}
-              <motion.div
-                  className="absolute top-[-35px] left-[200px] md:left-[100px] lg:left-[300px] h-24 w-24 md:h-32 md:w-32 lg:h-36 lg:w-36 bg-yellow-500 rounded-full"
-                  animate={{ scale: [1, 1.1, 1] }}
-                  transition={{ duration: 2, repeat: Infinity }}
-              />
-              <motion.div
-                  className="absolute top-[50px] right-[20px] md:right-[50px] h-[250px] w-[250px] md:h-[300px] md:w-[300px] lg:h-[400px] lg:w-[400px] bg-blue-700 rounded-full"
-                  animate={{ scale: [1, 1.1, 1] }}
-                  transition={{ duration: 2, repeat: Infinity, delay: 0.3 }}
-              />
-              <motion.div
-                  className="absolute bottom-10 right-[150px] md:right-[300px] h-20 w-20 md:h-24 md:w-24 lg:h-28 lg:w-28 bg-red-500 rounded-full"
-                  animate={{ scale: [1, 1.1, 1] }}
-                  transition={{ duration: 2, repeat: Infinity, delay: 0.5 }}
-              />
-              <motion.div
-                  className="absolute bottom-[-40px] left-4 md:left-8 h-20 w-20 md:h-24 md:w-24 lg:h-[200px] lg:w-[200px] bg-green-500 rounded-full"
-                  animate={{ scale: [1, 1.1, 1] }}
-                  transition={{ duration: 2, repeat: Infinity, delay: 0.7 }}
-              />
-          </motion.div>
-
-          {/* Main Content */}
-          <div className="relative z-10 flex flex-col items-start justify-center h-full pl-6 md:pl-10 lg:pl-12 text-left">
-              <motion.h1
-                  className="text-3xl md:text-4xl lg:text-5xl font-bold text-black"
-                  initial={{ opacity: 0, y: 20 }}
-                  animate={{ opacity: 1, y: 0 }}
-                  transition={{ duration: 0.8 }}
-              >
-                  Bridging The Gap Between
-              </motion.h1>
-              <motion.h1
-                  className="text-3xl md:text-4xl lg:text-5xl font-bold text-black mt-2 md:mt-4"
-                  initial={{ opacity: 0, y: 20 }}
-                  animate={{ opacity: 1, y: 0 }}
-                  transition={{ duration: 0.8, delay: 0.3 }}
-              >
-                  Theory And Practice.
-              </motion.h1>
-              <motion.p
-                  className="mt-2 md:mt-4 max-w-md text-sm md:text-lg text-gray-600"
-                  initial={{ opacity: 0, y: 20 }}
-                  animate={{ opacity: 1, y: 0 }}
-                  transition={{ duration: 0.8, delay: 0.5 }}
-              >
-                  The Google Developer Student Club at RCCIIT is a
-                  university-based community group powered by Google Developers.
-              </motion.p>
-              <motion.div
-                  className="mt-4 md:mt-8 space-x-2 md:space-x-4"
-                  initial={{ opacity: 0, y: 20 }}
-                  animate={{ opacity: 1, y: 0 }}
-                  transition={{ duration: 0.8, delay: 0.7 }}
-              >
-                  <a
-                      href="#"
-                      className="inline-block px-4 py-2 md:px-6 md:py-3 text-white bg-blue-600 rounded-md hover:bg-blue-700"
-                  >
-                      Join Us
-                  </a>
-                  <a
-                      href="#"
-                      className="inline-block px-4 py-2 md:px-6 md:py-3 text-gray-800 border-2 border-gray-300 rounded-md hover:bg-gray-50 bg-white"
-                  >
-                      Contact Us
-                  </a>
-              </motion.div>
-          </div>
-      </div>
-=======
     <motion.div ref={ref} style={{ y }}>
       {children}
     </motion.div>
@@ -124,12 +40,6 @@ const GDSCLanding = () => {
 
   return (
     <div className="bg-gray-900 text-white overflow-hidden">
-      {/* Progress Bar */}
-      <motion.div
-        className="fixed top-0 left-0 right-0 h-1 bg-gradient-to-r from-blue-500 via-red-500 to-yellow-500 z-50"
-        style={{ scaleX, transformOrigin: "0%" }}
-      />
-
       {/* Hero Section */}
       <section className="min-h-screen relative overflow-hidden bg-gray-50">
         <div className="absolute inset-0">
@@ -279,7 +189,6 @@ const GDSCLanding = () => {
         </div>
       </section>
     </div>
->>>>>>> 356d5ea (add revamp landing page)
   );
 };