Skip to content

Commit

Permalink
Revert "Change map background and robot image"
Browse files Browse the repository at this point in the history
This reverts commit 6fd49ab.
  • Loading branch information
LegendaryGene committed Mar 1, 2024
1 parent 6fd49ab commit 74919ff
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 15 deletions.
Binary file removed src/assets/backgrounds/robobg.jpg
Binary file not shown.
2 changes: 0 additions & 2 deletions src/assets/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import logo from './logo/logo.gif';
import logotext from './logo/logo-text-black.png';

import shaq from './personal/shaq.png';
import robobg from './backgrounds/robobg.jpg'

import backend from './icons/backend.png';
import ux from './icons/ux.png';
Expand Down Expand Up @@ -68,7 +67,6 @@ export {
logo,
logotext,
shaq,
robobg,
backend,
ux,
frontend,
Expand Down
Binary file added src/assets/projects/210524_Kislay_Lab4.pdf
Binary file not shown.
Binary file removed src/assets/projects/Dribble.png
Binary file not shown.
Binary file removed src/assets/projects/Dribblerem.png
Binary file not shown.
Binary file added src/assets/projects/richDad.pdf
Binary file not shown.
9 changes: 5 additions & 4 deletions src/components/About.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ const About = () => {
3. <b>Empowering Future Leaders</b>: Empower gifted students through invaluable guidance and mentorship, all while increasing your company's visibility among budding professionals.<br/>
4. <b>Digital Dominance</b>: Amplify your online presence across our website and social media channels, magnifying your outreach and forging connections with a broader audience, all through the influential network of Team ERA.
</motion.p> */}

<br/>
<br/>
<br/>
<div className="-mt-[-2rem]">
<motion.div variants={textVariant()}>
Expand All @@ -90,7 +91,7 @@ const About = () => {
<motion.p
variants={fadeIn('', '', 0.2, 1)}
className="mt-4 text-taupe text-[1.250rem] max-w-3xl leading-[1.875rem]">
RoboCup Middle Size League (MSL) is an international competition where teams of 5 fully autonomous robots play soccer with a regular-size FIFA soccer ball. The vision of the competition is to reach a level in autonomous robots where a team of fully autonomous robots can win against the most recent FIFA World Cup winner by the year 2050. We aim to be among the first entrants from India and not only compete but win!
RoboCup Middle Size League (MSL) is an international competition where teams of 5 fully autonomous robots play soccer with a regular-size FIFA soccer ball. The vision of the competition is to reach a level in autonomous robots where a team of fully autonomous robots can win against the most recent FIFA World Cup winner by the year 2050. We aim to be among the first entrants from India and not only compete but win as undergraduates against teams that comprise a significant number of PG members. This makes our campaign ever more challenging and drives us to work harder than ever.
{/* <a
href="https://www.dropbox.com/scl/fi/165w2ovsfg4wlif3zone6/Brochure.pdf?rlkey=wjhej532ayequjvny56ggnpjt&dl=0"
style={{
Expand Down Expand Up @@ -136,9 +137,9 @@ const About = () => {
</div>
<div className="flex flex-col items-end">
<motion.img
src='/src/assets/projects/Dribblerem.png'
src='/src/assets/projects/Robo2.png'
alt="Robo2"
style={{ width: '40.83vw', height: 'auto', marginTop: '18.29vh', marginLeft: '-10vw' }} // Adjust the size as needed
style={{ width: '20.83vw', height: 'auto', marginTop: '18.29vh', marginLeft: '5vw' }} // Adjust the size as needed
variants={fadeIn('right', 'spring', 0.5, 0.75)}
/>
</div>
Expand Down
47 changes: 40 additions & 7 deletions src/components/Hero.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { motion } from 'framer-motion';
import { Link } from 'react-router-dom';
import { styles } from '../styles';
import { navLinks } from '../constants';
import { shaq, bwmap, worldmap, robobg } from '../assets';
import { shaq, bwmap, worldmap } from '../assets';
import SocialMenu from './socialMenu';
import Typewriter from './Typewriter';
// import { useEffect, useState } from 'react';
Expand All @@ -12,11 +12,18 @@ const Hero = () => {
<section id="hero" className="relative flex sm:flex-row flex-col w-full h-screen mx-auto sm:bg-hero bg-hero-mobile overflow-hidden">
<div className="absolute top-0 left-0 z-0 h-[100vh] w-screen">
<img
src={robobg}
src={bwmap}
alt="world map"
className="w-full h-full sm:block hidden object-cover"
/>
</div>
<div className="absolute top-0 left-0 z-0 h-[100vh] w-screen">
<img
src={worldmap}
alt="world map"
className="w-full h-full sm:hidden block object-cover"
/>
</div>
<section
className="relative flex sm:flex-row flex-col w-full h-screen mx-auto
sm:bg-hero bg-hero-mobile overflow-hidden">
Expand All @@ -30,15 +37,41 @@ const Hero = () => {
<div className="w-1 sm:h-80 h-40 bw-gradient sm:hidden" />
</div>
<div>

{/* <h1
className={`${styles.heroHeadText} text-eerieBlack font-poppins uppercase pr-4 sm:pr-6`} style={{ marginLeft: '-60px' }}>
Hi, Welcome to {' '}
<span
className="sm:text-battleGray sm:text-[7vw]
text-eerieBlack text-[7vw] font-mova
font-extrabold uppercase"
style={{ color: '#6194fb' }}>
ERA
</span>
</h1> */}
<Typewriter styles={styles} />
<section className="footer-follow" style={{ fontSize: 48, display: 'flex', gap: '20px', marginLeft:'25px' }}>
<SocialMenu />
</section>
</div>
<SocialMenu />
</section>
{/* <p className={`${styles.heroSubText} mt-2 text-eerieBlack text-centre`}>
The Rising Of A New ERA <br className="sm:block hidden" />
<br className="sm:block hidden" />
<br className="sm:block hidden" />
<br className="sm:block hidden" />
<p className={`mt-2 text eerieBlack text-[1.4vw] items-centre text-centre pl-6`}>
Team for Autonomous Robotics
</p>
</p> */}

</div>
<div
className="w-screen flex flex-col items-start
justify-center sm:-ml-[3rem] xxs:mt-4">
</div>
justify-center sm:-ml-[3rem] xxs:mt-4"></div>

<div></div>
</div>

<div
Expand Down
4 changes: 2 additions & 2 deletions src/components/Particles.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const Particles = () => {
default: "bounce",
},
random: false,
speed: 2.25,
speed: 3,
straight: false,
},
number: {
Expand Down Expand Up @@ -110,4 +110,4 @@ export const Particles = () => {
}

return <></>;
};
};

0 comments on commit 74919ff

Please sign in to comment.