Skip to content

Commit

Permalink
Merge pull request #181 from RoBorregos/Update/Members
Browse files Browse the repository at this point in the history
Update/members
  • Loading branch information
IvanRomero03 authored Oct 18, 2023
2 parents a4ad48a + 6b13f60 commit f4bda8c
Show file tree
Hide file tree
Showing 75 changed files with 2,709 additions and 4,491 deletions.
6,546 changes: 2,293 additions & 4,253 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/components/Home/HomeHeader/HomeHeader.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.home-header {
width: 100%;
height: 100%;
background: linear-gradient( 90deg, rgba(0, 0, 0, 0.5) 40%, rgba(0, 0, 0, 0.5) 100%), url(../../../images/home/team_2019.jpg);
background: linear-gradient( 90deg, rgba(0, 0, 0, 0.5) 40%, rgba(0, 0, 0, 0.5) 100%), url(../../../images/home/team.jpg);
background-size: cover;
background-position: top center;
background-repeat: no-repeat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const HomeMiniInformation = () => (
</div>
</div>
<h5 className="icon-legend">
46 members
52 members
</h5>
</Col>
<Col className="col-icon" xs={{ span: 3, offset: 1 }}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Home/HomeMisionVision/HomeMisionVision.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.home-vision{
right: 0;
top: 0;
background-image: url(../../../images/home/mision-vision/vision.jpg);
background-image: url(../../../images/home/mision-vision/vision.jpeg);
-webkit-clip-path: polygon(50% 0, 100% 0%, 100% 100%, 0% 100%);
clip-path: polygon(50% 0, 100% 0%, 100% 100%, 0% 100%);
}
Expand Down
18 changes: 9 additions & 9 deletions src/data/competitions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
"img": "projects/home.jpg",
"url": "https://athome.robocup.org/"
},
{
"name": "VSSS",
"img": "projects/vsss.jpg",
"url": "https://www.femexrobotica.org/tmr2020/en/larc-very-small-size-soccer/"
},
{
"name": "Smart Factory",
"img": "projects/cobot.jpg",
Expand All @@ -20,15 +15,20 @@
"img": "projects/contador_personas.jpg",
"url": "https://covid19.roborregos.com/"
},
{
"name": "LARC",
"img": "projects/larc_open.jpg",
"url": "https://femexrobotica.org/tmr2023/en/larc-open-challenge-2/"
},
{
"name": "Maze",
"img": "projects/maze.jpg",
"img": "projects/mazemod.jpg",
"url": "https://junior.robocup.org/rcj-rescue-maze/"
},
{
"name": "Soccer Open",
"img": "projects/soccer_open.jpg",
"url": "https://junior.robocup.org/rcj-soccer-open/"
"name": "Soccer Lightweight",
"img": "projects/soccer_light.jpg",
"url": "https://junior.robocup.org/rcj-soccer-lightweight/"
}
]
}
518 changes: 319 additions & 199 deletions src/data/members.json

Large diffs are not rendered by default.

17 changes: 4 additions & 13 deletions src/data/projects.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
},
{
"priority": "0",
"title": "LARC VSSS",
"description": "The LARC IEEE VSSS project consists of the development of a computer vision and communication system which controls a group of autonomous robots, coordinating their movements according to a collaborative soccer strategy.",
"wiki": "https://github.com/RoBorregos/VSSS_2019-Legacy/wiki",
"image": "vsss",
"title": "TAM",
"description": "Project in partnership with Mega Alimentos for the development of technological mechanisms to move products within the plant without the need for human assistance, making use of robotic models that condition the existing equipment (electric stacker) to move all types of products from one point to another within the plant.",
"wiki": "",
"image": "tam",
"background": "",
"color": ""
},
Expand Down Expand Up @@ -74,15 +74,6 @@
"image": "soccer_light",
"background": "",
"color": ""
},
{
"priority": "1",
"title": "Advanced Autonomous Drones",
"description": "This competition consists of several challenges where an autonomous drone has to use computer vision and control systems to take decisions of action.",
"wiki": "",
"image": "drones",
"background": "",
"color": ""
}
],
[
Expand Down
95 changes: 81 additions & 14 deletions src/data/timeline.json
Original file line number Diff line number Diff line change
Expand Up @@ -162,52 +162,52 @@
},
{
"date": "March 2019",
"month": "4",
"month": "3",
"year": "2019",
"img_path": "21",
"title": "TMR 2019",
"description": "Arath, Aldo, Jamir, and Juan Carlos won 1st place in Rescue Maze Category."
},
{
"date": "April 2019",
"month": "4",
"year": "2019",
"img_path": "22",
"title": "ICPC 2019",
"description": "Cisneros, Juárez and Mike participated in the regional tournament of the International Collegiate Programming Contest (ICPC)."
},
{
"date": "July 2019",
"month": "7",
"year": "2019",
"img_path": "22",
"img_path": "23",
"title": "Australia, Rescue Maze",
"description": "Arath, Aldo, Jamir and Mauricio obtained the \u201cBest Hardware Solution\u201d award on the RoboCup Jr. Rescue Maze in Sydney Australia."
},
{
"date": "August - November 2019",
"month": "8",
"year": "2019",
"img_path": "23",
"img_path": "24",
"title": "Candidates 2019",
"description": "The Candidates 2019 program was made, where 12 students joined the team."
},
{
"date": "October 2019",
"month": "10",
"year": "2019",
"img_path": "24",
"img_path": "25",
"title": "LARC OPEN 2019",
"description": "During the semester, a robot was developed for the LARC IEEE competition, Open category. The robot consisted of an autonomous car with a mechanism to grab metal blocks by means of electromagnets, along with a navigation and vision system to be able to leave the blocks in their corresponding places. In the end, we could not attend due to economic issues."
},
{
"date": "December 2019",
"month": "12",
"year": "2019",
"img_path": "25",
"img_path": "26",
"title": "1st Gen Grad",
"description": "Founders Diego, Emilio, Gerardo and Sebastian graduated."
},
{
"date": "December 2019",
"month": "12",
"year": "2019",
"img_path": "26",
"title": "First committee of Sponsorships and Networking",
"description": "A new position in the team opened for students to collaborate in the logistics of sponsorships and networking, as well as social media and image. The opportunity opened for any student of Tec de Monterrey, giving us better integration with other multidisciplinary areas of the team outside engineering."
},
{
"date": "February 2020",
"month": "2",
Expand Down Expand Up @@ -303,7 +303,72 @@
"img_path": "38",
"title": "Grads June 2021",
"description": "Aurora, Osvaldo, Alexis, Pacheco, Anita, Mariano and Paul graduated."
},
{
"date": "April 2022",
"month": "4",
"year": "2022",
"img_path": "39",
"title": "ICPC 2022",
"description": "Cisneros, Juárez and Mike's second participation in the regional tournament of the International Collegiate Programming Contest (ICPC)."
},
{
"date": "October 2022",
"month": "10",
"year": "2022",
"img_path": "40",
"title": "@HOME simulation - IROS Japan",
"description": "Aldo, Cisneros, Kevin, Bryan and Edison won 3rd place in Handyman challenge and 5th place overall."
},
{
"date": "November 2022",
"month": "11",
"year": "2022",
"img_path": "41",
"title": "Gala FETEC",
"description": "RoBorregos won the award for greatest student impact at the FETEC Gala, an award given to groups that stand out for having an integral performance, establishing a solid team with excellent execution of events."
},
{
"date": "November 2022",
"month": "11",
"year": "2022",
"img_path": "42",
"title": "Ana Avatar Xprize",
"description": "Kevin and Cisneros under the direction of Professor Muñoz participated in the Ana Avatar Xprize, which consists of creating a robotic avatar system that can transport human presence to a remote location in real time."
},
{
"date": "March 2023",
"month": "3",
"year": "2023",
"img_path": "43",
"title": "Tec Science Summit",
"description": "Iván and Cisneros participated in the Tec Science Summit 2023 presenting the @Home project."
},
{
"date": "March 2023",
"month": "3",
"year": "2023",
"img_path": "44",
"title": "Regional 2023",
"description": "Ale, Paco and Ángel won 2nd place in Soccer Lightweight. Yair, Jordan, Diego and Oscar won 3rd place in Rescue Maze."
},
{
"date": "April 2023",
"month": "4",
"year": "2023",
"img_path": "45",
"title": "TMR 2023",
"description": "1st place in LARC Open, 3rd place and winner of the technical challenge in Soccer Lightweight, best mechanics in Rescue Maze and first time participating in Home Major"
},
{
"date": "June 2023",
"month": "6",
"year": "2023",
"img_path": "46",
"title": "Grads June 2023",
"description": "Lore, Cisneros, Aldo, Mike, Jamir, Chapa, Emérico, Rosalba, Anel, Bryan, Kevin, Ruiz, Mau, Keven and Gaby graduated."
}

],
"years": [
"2015",
Expand All @@ -312,6 +377,8 @@
"2018",
"2019",
"2020",
"2021"
"2021",
"2022",
"2023"
]
}
Binary file modified src/images/about/carousel/Events.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/about/carousel/High-Performance.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/about/timeline/21.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/about/timeline/22.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/about/timeline/23.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/about/timeline/24.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/about/timeline/25.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/about/timeline/26.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/about/timeline/39.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/about/timeline/40.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/about/timeline/41.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/about/timeline/42.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/about/timeline/43.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/about/timeline/44.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/about/timeline/45.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/about/timeline/46.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/candidates/carousel_hack/hack2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/candidates/carousel_learn/learn3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/candidates/roles/mechanics.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/candidates/roles/networking.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/candidates/roles/programmer.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/header.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 modified src/images/home/carousel/1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/home/carousel/10.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/home/carousel/11.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/home/carousel/12.jpg
Binary file modified src/images/home/carousel/13.jpg
Binary file modified src/images/home/carousel/15.jpg
Binary file modified src/images/home/carousel/16.jpg
Binary file modified src/images/home/carousel/17.jpg
Binary file modified src/images/home/carousel/18.jpg
Binary file modified src/images/home/carousel/2.jpg
Binary file modified src/images/home/carousel/3.jpg
Binary file modified src/images/home/carousel/4.jpg
Binary file modified src/images/home/carousel/5.jpg
Binary file modified src/images/home/carousel/6.jpg
Binary file modified src/images/home/carousel/7.jpg
Binary file modified src/images/home/carousel/8.jpg
Binary file modified src/images/home/carousel/9.jpg
Binary file modified src/images/home/mision-vision/mision.jpg
Binary file added src/images/home/mision-vision/vision.jpeg
Binary file added src/images/home/team.jpg
Binary file added src/images/members/100.jpg
Binary file added src/images/members/101.jpg
Binary file added src/images/members/102.jpg
Binary file added src/images/members/103.jpg
Binary file added src/images/members/104.jpg
Binary file added src/images/members/105.jpg
Binary file added src/images/members/106.jpg
Binary file added src/images/members/107.jpg
Binary file added src/images/members/108.jpg
Binary file added src/images/members/110.jpg
Binary file added src/images/members/111.jpg
Binary file added src/images/members/112.jpg
Binary file added src/images/members/113.jpg
Binary file modified src/images/members/78.jpg
Binary file added src/images/members/95.jpg
Binary file added src/images/members/97.jpg
Binary file added src/images/members/98.jpg
Binary file added src/images/members/99.jpg
Binary file modified src/images/projects/home.jpg
Binary file modified src/images/projects/larc_open.jpg
Binary file modified src/images/projects/maze.jpg
Binary file added src/images/projects/mazemod.jpg
Binary file modified src/images/projects/soccer_light.jpg
Binary file added src/images/projects/tam.jpg
Binary file modified src/images/small_logo.png

1 comment on commit f4bda8c

@vercel
Copy link

@vercel vercel bot commented on f4bda8c Oct 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.