Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Pitt-RAS/PittRAS
Browse files Browse the repository at this point in the history
  • Loading branch information
@DigitalYD
DigitalYD committed Jan 20, 2025
2 parents 0c48da0 + 44d2835 commit 4b5f5f5
Show file tree
Hide file tree
Showing 25 changed files with 280 additions and 162 deletions.
15 changes: 10 additions & 5 deletions assets/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,7 @@ input, select, textarea {
opacity: 1.0;
}

/* Box */
/* Box - */

.box {
border-radius: 3px;
Expand Down Expand Up @@ -2167,6 +2167,7 @@ video {
@media screen and (max-width: 750px) {
video { display: none; }
body {
background: url("../../images/ras-logos/ras-black.png") no-repeat;
background: url("../../images/ras-logos/ras-black.png") no-repeat;
background-size: cover;
}
Expand Down Expand Up @@ -3918,10 +3919,10 @@ video {
/* Main */
#main > header {
padding: 12em 0 10em 0 ;
background-image: -moz-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: -webkit-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: -ms-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: -moz-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/banner.jpg");
background-image: -webkit-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/banner.jpg");
background-image: -ms-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/banner.jpg");
background-image: linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/banner.jpg");
background-attachment: fixed;
background-position: center center;
background-repeat: no-repeat;
Expand Down Expand Up @@ -4072,6 +4073,10 @@ video {
/* Landing */

body.landing #page-wrapper {
background-image: -moz-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: -webkit-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: -ms-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: -moz-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: -webkit-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
background-image: -ms-linear-gradient(top, rgba(0,0,0,0.5), rgba(0,0,0,0.5)), url("../../images/ras-logos/ras-black.png");
Expand Down
19 changes: 10 additions & 9 deletions contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h1><a href="/">Home</a></h1>
<li><a href="/">Home</a></li>
<li><a href="aboutus">About Us</a></li>
<li><a href="projects">Projects</a></li>
<li><a href="mprw">MIT-PITT-RW</a></li>
<!-- <li><a href="mprw">MIT-PITT-RW</a></li> -->
<li><a href="workshops">Workshops</a></li>
<li><a href="sponsors">Sponsors</a></li>
<li><a href="contact">Contact</a></li>
Expand All @@ -70,24 +70,24 @@ <h2>Contact</h2>
<div class="inner">

<h3>How to Join</h3>
<h5>Getting Involved In the Club</h5>
<!-- <h5>Getting Involved In the Club</h5> -->
<!-- put id slightly above intentionnal because the link does not account for the space that banner takes up -->
<p id="join-mit-pitt-rw">Whether you are just starting out or you have years of experience, you can find a place to contribute at RAS.
<!-- <p id="join-mit-pitt-rw">Whether you are just starting out or you have years of experience, you can find a place to contribute at RAS.
The best way to get involved is to join a project team. You are free to join a project at any point and to move
between teams should you find one that suits you more. You can find out more information about current
and past projects on the Projects Page. We love meeting new people, so get
in touch by joining our mailing list and Discord below!</p>
in touch by joining our mailing list and Discord below!</p> -->

<h5>Joining MIT-PITT-RW</h5>
<!-- <h5>Joining MIT-PITT-RW</h5>
<p>For this project, we are seeking people with some previous experience in programming and robotics, although as of now, it doesn't have to be extensive experience and
the team is ready and willing to train new members and get them up to speed.
If you're interested, please do the following:
<br>1) Complete the Google Form that can be found <a href="https://forms.gle/thq54Tc1kpA1Uuux5">here</a>.
<br>2) Please send an email to the team's co-captains, Rotimi Adetunji ([email protected]) and Cindy Heredia ([email protected]), to let us know that you have completed the Google form.
<br>3) Someone from our team will get back to you shortly. If you haven't heard from us in a week, please don't hesitate to follow up!
</p>
</p> -->

<h5>Joining Any Other Project</h5>
<!-- <h5>Joining Any Other Project</h5> -->
<P>No experience necessary to join! There is no formal process to join a project, however, to get started building and programming
robots, please join our Discord and introduce yourself in the dedicated project channel that you're interested in. Someone will respond
and help you get started!
Expand All @@ -112,15 +112,16 @@ <h3>Contact Info</h3>
<li><a href="https://discord.gg/NzDuVSQ2Eh" class="icon brands fa-discord">&nbsp&nbspDiscord<span class="label">Discord</span></a></li>
<li><a href="https://github.com/Pitt-RAS" class="icon brands fa-github">&nbsp&nbspGithub<span class="label">Github</span></a></li>
<li><a href="https://www.youtube.com/channel/UCDuQc80b6SRBf-Yg8Vi14Rw" class="icon brands fa-youtube">&nbsp&nbspYoutube<span class="label">Youtube</span></a></li>
<li><a href="https://twitter.com/RobotsNAutomate" class="icon brands fa-twitter">&nbsp&nbspTwitter<span class="label">Twitter</span></a></li>
<!-- <li><a href="https://twitter.com/RobotsNAutomate" class="icon brands fa-twitter">&nbsp&nbspTwitter<span class="label">Twitter</span></a></li> -->
<li style="padding-bottom: 0.75em;"><a href="https://www.flickr.com/photos/141111993@N08/" class="icon brands fa-flickr">&nbsp&nbspFlickr<span class="label">Flickr</span></a></li>
<br>
<li><a href="https://www.linkedin.com/company/pitt-robotics-and-automation-society" class="icon brands fa-linkedin">&nbsp&nbspPittRAS LinkedIn<span class="label">PittRAS LinkedIn</span></a></li>
<li><a href="https://www.linkedin.com/company/mit-pitt-rw/" class="icon brands fa-linkedin">&nbsp&nbspMIT-PITT-RW LinkedIn<span class="label">MIT-PITT-RW LinkedIn</span></a></li>
<!-- <li><a href="https://www.linkedin.com/company/mit-pitt-rw/" class="icon brands fa-linkedin">&nbsp&nbspMIT-PITT-RW LinkedIn<span class="label">MIT-PITT-RW LinkedIn</span></a></li> -->
</ul>
<hr />
<!-- Begin Mailchimp Signup Form -->
<div id="mc_embed_signup">

<form action="https://pittras.us4.list-manage.com/subscribe/post?u=365cfc6d7fe992549eeab16d4&amp;id=933611a80d&amp;f_id=002070e9f0" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
<div id="mc_embed_signup_scroll">
<h3>Mailing List</h3>
Expand Down
Binary file added images/projects/rover/Arm Base Gearbox Solidworks Model.png
View file
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 images/projects/rover/Current Hand Solidworks Model.png
View file
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 images/projects/rover/Full Rover in Benedum Lobby-rescaled.jpg
View file
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 images/projects/rover/Full Rover in Benedum Lobby.jpg
View file
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 images/projects/rover/Previous Arm Segments.JPG
View file
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 images/projects/rover/Previous Hand Prototype.JPG
View file
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 images/projects/rover/real-img-chassis.jpg
View file
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 images/projects/rover/real-img-sim.jpg
View file
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 images/projects/rover/rover-scaled-down.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
90 changes: 39 additions & 51 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@ <h2>Welcome to RAS Pitt</h2>

<div class="inner">
<!-- <header class="major"> -->
<h2>Who are we?</h2>
<!-- <p>The Pitt Robotics and Automation Society is a student-run organization where we aim to inspire careers in robotics by delivering an unparalleled robotics experience
through projects, competitions, workshops, and more.
</p> -->
<h2>Who are we?</h2>
<!-- <p>The Pitt Robotics and Automation Society is a student-run organization where we aim to inspire careers in robotics by delivering an unparalleled robotics experience
through projects, competitions, workshops, and more.
</p> -->

<p>We are the Pitt Robotics and Automation Society (RAS), a student-run club that aims to provide its members with hands-on experience in robotics.
Through our club, motivated individuals are given the tools and resources to develop cutting-edge autonomous robots. </p>

<p>We are the Pitt Robotics and Automation Society (RAS), a student-run club that aims to provide its members with hands-on experience in robotics.
Through our club, motivated individuals are given the tools and resources to develop cutting-edge autonomous robots. </p>

<p>Our club was founded in 2013 and since then we've been able to work on many robots from maze navigating robots to autonomous drones,
and now autonomous racecars! We are currently working on a 1:10th scale RC car for F1Tenth, full-sized racecars for the
Indy Autonomous Challenge, and more. Our club is always looking for new members and would love to have you join us in developing cutting-edge
<p>Our club was founded in 2013 and since then we've been able to work on many robots from maze navigating robots to autonomous drones and racecars,
and now autonomous Mar rover! We are currently working on a combative robot, 6 axis robotic, and more. Our club is always looking for new members
and would love to have you join us in developing cutting-edge
technology for the future of robotics.</p>


Expand All @@ -95,50 +95,11 @@ <h2 style="text-align:center">Full Scale Autonomous Racing.</h2>
</header>

<!-- <div class="row" style="display:flex; flex-direction:row;"> -->
<div class="col-6 col-12-medium" style="display:flex; flex-direction:column; vertical-align: top; align-content: center; justify-content: center; align-items: top;">
<!-- <div> -->
<!-- <header> -->
<!-- <h4 style="text-align:center">Indy Autonomous Challenge</h4> -->
<!-- <p style="font-size: medium;">Our car unwrapped at the Indianapolis Motor Speedway</p> -->
<!-- </header> -->
<div>
<img class="" style="width: 57%" src="images/mprw/indy_cars.jpg">
</div>
<p></p>
<h4>Always iterating.</h4>
<p style="margin:auto; text-align: center; width: 75%; margin-bottom: 20pt; ">
Our team has now competed at two massive races as part of the <a href="https://www.indyautonomouschallenge.com/">Indy Autonomous Challenge</a> and
we're not stopping there. The MIT-PITT-RW team continues to refine and improve our software stack to get ready for the world's first, truly multi-agent autonomous
race.
</p>
<!-- <p>In an exciting sequel to the <a href="https://www.indyautonomouschallenge.com/">Indy Autonomous Challenge</a>, the MIT-PITT-RW team will be participating
in the world's first multi-agent, fully autonomous race at the Las Vegas Motor Speedway in January 2022. Buckle up, it's going to be a big one.</p> -->

<div class="col-6 col-12-medium" style="display:flex; flex-direction:column; vertical-align: top; align-content: center;
justify-content: center; align-items: top;">
</div>
<!-- DO NOT DELETE THE FOLLOWING COMMENTED OUT LINE -->
<!-- <div class="col-6 col-12-medium" style="display:flex; flex-direction:column;vertical-align: middle; align-content: center; justify-content: center;"> -->
<!-- <div class="col-6 col-12-medium" style="display:flex; flex-direction:column; vertical-align: top; justify-content: top; align-items: top;" >
<h4 style="text-align:center">Roborace</h4>
<div style="vertical-align: middle; align-content: center; justify-content: center;">
<img class="" style="width:90%" src="images/roborace.jpg">
</div>
<p></p>
<h4>You can count on us being there.</h4>
<p>RoboRace is an exciting multi-agent autonomous race featuring a new vehicle (DevBot 2.0) and perhaps the biggest twist in racing yet - integration with the metaverse. Be sure to
watch our team help create and compete in Motorsports 2.0.
</p>
</div> -->
<!-- </div> -->

<ul style="text-align:center" class="actions stacked ">
<li><a href="https://www.mitpittrw.com/" class="button primary">Learn more</a></li>
<!-- <li><a href="#" class="button primary ">Join Us</a></li> -->
<!-- <li><a href="#" class="button ">Sponsors</a></li> -->
</ul>

<hr>

<div class="inner">
<header>
<h2 style="text-align:center; margin-bottom: 0.2em">Battle Bots</h2>
Expand Down Expand Up @@ -200,6 +161,33 @@ <h4>Open to expansion!</h4>

</div>

<hr>
<div class="inner" >
<header>
<h2 style="text-align:center; margin-bottom: 0.2em">Rover</h2>
<p>The Sky is the Limit</p>
</header>

<h4>Project Details</h4>
<p style="margin:auto; text-align: center; width: 80%; margin-bottom: 20pt; ">
Our team designs and assembles a rover from raw material, manufactured components (gears, bearings, etc.), and
pre-built electronics (motors, arduinos, etc.). There are several systems that are being worked on for the rover.
Main systems include the chassis, the arm, the science module, and autonomous control.
</p>



<p>If interested, please contact us!</p>
<div style="text-align: center;"><a href="projects/rover.html" class="button ">Learn More</a></div>

</div>
<!-- <div class="col-6 col-12-medium" style="display:flex; flex-direction:column; justify-content: center;margin-top: 0%;" >
<div style="vertical-align: middle; align-content: center; justify-content: center;">
<img style="width: 70%; height:auto;" src="images/projects/battle-bots/2024_spring/teamleads.jpg">
</div>
</div> -->
</div>

<hr>

<div class="inner">
Expand Down
Loading

0 comments on commit 4b5f5f5

Please sign in to comment.