Skip to content

Commit

Permalink
Merge pull request #8 from csd-robocon-nitk/apoorva
Browse files Browse the repository at this point in the history
Modified team_data and updated home page to 2024 status
  • Loading branch information
imApoorva36 authored Jan 7, 2024
2 parents 368e14a + 6aeb56d commit cffd283
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 25 deletions.
Binary file modified public/images/team/Dev Goti.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/alumni_data.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default [
"photo": "KV Nayak.jpg",
},
{
"name": "Ajit Kadwadkar",
"name": "Late. Ajit Kadwadkar",
"batch": "1979",
"department": "Mechanical Engineering",
"photo": "Ajit Kadwadkar.jpg",
Expand Down
2 changes: 1 addition & 1 deletion src/components/HeroSection/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const HeroSection = () => {
}

if (progress == 100) {
setTimeout(() => setVisible(false), 1000)
setTimeout(() => setVisible(false), 200)
return
}

Expand Down
3 changes: 2 additions & 1 deletion src/components/index/about/about.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
}

#about #right {
max-width: 550px;
max-width: 620px;
padding-left: 50px;
}

#about img {
Expand Down
4 changes: 2 additions & 2 deletions src/components/index/about/about.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import "./about.css"
import image from "../../../images/abu.webp"
import image from "../../../images/LOGO_ROBOCON2024.png"

export default function AboutSection () {
return (
Expand All @@ -9,7 +9,7 @@ export default function AboutSection () {
<h1>ABU ROBOCON</h1>
<h2>An Ultimate Robotics Contest for Undergrads</h2>
<p>We build Robots that aim at incredible Precision, Reliability and Speed or in other words Industrial performance.</p>
<a className="button" href="https://aburobocon2024.vtv.gov.vn/">Learn More</a>
<a className="button" href="https://aburobocon2024.vtv.gov.vn/" target="_blank">Learn More</a>
</div>
<div id="right">
<img src={image} />
Expand Down
Binary file added src/images/LOGO_ROBOCON2024.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/abu.webp
Binary file not shown.
25 changes: 5 additions & 20 deletions src/team_data.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ export default {
"designation": "Team Member",
"photo": "Dev Goti.jpg"
},
{
"name": "Omkar Arvind Jungade",
"designation": "Team Member",
"photo": "Omkar.jpg"
},
{
"name": "N Nagabhushanam",
"designation": "Team Member",
Expand Down Expand Up @@ -117,20 +112,10 @@ export default {
"designation": "Team Member",
"photo": "Pooja.jpeg"
},
{
"name": "Tahsin Khan",
"designation": "Team Member",
"photo": "Tahsin.jpg"
},
{
"name": "Raghavendra Pandurang Jadhav",
"designation": "Team Member",
"photo": "Raghavendra.jpg"
},
{
"name": "Anushka Das",
"designation": "Team Member",
"photo": "Anushka.jpg"
},
{
"name": "Jash Lapsiwala",
Expand Down Expand Up @@ -158,11 +143,6 @@ export default {
"designation": "Team Member",
"photo": "Anant.jpg"
},
{
"name": "Akash Gowda H U",
"designation": "Team Member",
"photo": "Akash.jpg"
},
{
"name": "Srinidhi Srinivas",
"designation": "Team Member",
Expand Down Expand Up @@ -230,6 +210,11 @@ export default {
"name": "Ashna Sanjay Gaude",
"designation": "Team Member",
"photo": "Ashna.jpg"
},
{
"name": "Akash Gowda H U",
"designation": "Team Member",
"photo": "Akash.jpg"
}
],

Expand Down

0 comments on commit cffd283

Please sign in to comment.