Robot page

src/components/AboutSubteams.vue

@@ -146,32 +146,32 @@ $grid-rows: 3;
 }
 
 .programming {
-    background-image: url("images/Subteams_images_Temp/ProgTeam_Picture.jpg");
+    background-image: url("images/Subteams_images/Subteams_images_Temp//ProgTeam_Picture.jpg");
     grid-area: programming;
 }
 
 .SND {
-    background-image: url("images/Subteams_images_Temp/SnDTeam_Picture.jpg");
+    background-image: url("images/Subteams_images/Subteams_images_Temp//SnDTeam_Picture.jpg");
     grid-area: SND;
 }
 
 .construction {
-    background-image: url("images/Subteams_images_Temp/ConstructionTeam_Picture.jpg");
+    background-image: url("images/Subteams_images/Subteams_images_Temp//ConstructionTeam_Picture.jpg");
     grid-area: construction;
 }
 
 .marketing {
-    background-image: url("images/Subteams_images_Temp/MarketingTeam_Picture.jpg");
+    background-image: url("images/Subteams_images/Subteams_images_Temp//MarketingTeam_Picture.jpg");
     grid-area: marketing;
 }
 
 .medias {
-    background-image: url("images/Subteams_images_Temp/MediasTeam_Picture.jpg");
+    background-image: url("images/Subteams_images/Subteams_images_Temp//MediasTeam_Picture.jpg");
     grid-area: medias;
 }
 
 .design {
-    background-image: url("images/Subteams_images_Temp/DesignTeam_Picture.jpg");
+    background-image: url("images/Subteams_images/Subteams_images_Temp//DesignTeam_Picture.jpg");
     grid-area: design;
 }
 

src/components/BaseNav.vue

@@ -50,7 +50,7 @@ export default {
           </a>
         </ul>
       </li>
-      <li><a :class="{ active: isActive('/robots/') }" href="/wip/">Robots</a></li>
+      <li><a :class="{ active: isActive('/robots/') }" href="/robots/">Robots</a></li>
       <li><a :class="{ active: isActive('/outreach/') }" href="/outreach/">Outreach</a></li>
       <li><a :class="{ active: isActive('/sponsors/') }" href="/sponsors/">Sponsors</a></li>
     </ul>

src/components/HomeRecently.vue

@@ -11,7 +11,7 @@ import NewsCardUnclick from "./NewsCardUnclick.vue";
       <!-- TODO-Content: Complete with events and possibly links to learn more if needed ; if not, use NewsCardUnclick -->
       <NewsCardClickable link="/wip/">
         <template v-slot:img>
-          <img src="../components/images/robot-2025.jpg"/>
+          <img src="../components/images/Robot_images/2025_robot.jpg"/>
         </template>
         <template v-slot:tag>Event</template>
         <template v-slot:date>March 6, 2025</template>
@@ -22,7 +22,7 @@ import NewsCardUnclick from "./NewsCardUnclick.vue";
 
       <NewsCardUnclick>
         <template v-slot:img>
-          <img class="img" src="../components/images/Outreach_images/GalaRobot-2025.jpg"/>
+          <img class="img" src="../components/images/Robot_images/2025_GalaRobot.jpg"/>
         </template>
         <template v-slot:tag>Event</template>
         <template v-slot:date>June 18, 2025</template>

src/components/RobotCardComponent.vue

@@ -248,11 +248,11 @@ $circle-radius : 15px;
   @include content($primary);
 }
 
-#reefscape {
+#reefscape_2025 {
   @include content(#b2e6f4);
 }
 
-#crescendo {
+#crescendo_2024 {
   @include content(#aedaca);
 }
 

src/robots/Robots-page.vue

@@ -5,107 +5,105 @@ import RobotCardComponent from '../../src/components/RobotCardComponent.vue';
 </script>
 <template>
 
-  <BaseHeader/>
+  <BaseHeader />
 
   <main>
     <h1>Robots</h1>
 
     <nav>
-      <a href="#crescendo">
+      <a href="#reefscape_2025">
+        <h2>2025</h2>
+        <img src="../components/images/Competition_logos/2025_REEFSCAPE/2025_logo_text.png" class="logo"
+          min-width="336px">
+      </a>
+      <a href="#crescendo_2024">
         <h2>2024</h2>
         <img
-          src="https://www.chiefdelphi.com/uploads/default/original/3X/e/3/e368a7acb70c869b89fee0382bfe312c595bb781.svg"
-          class="logo">
+          src="../components/images/Competition_logos/2024_CRESCENDO/Horizontal/Full Color/FIS_CRESCENDO_Logo_Horizontal_RGB.png"
+          class="logo" min-width="336px">
       </a>
-      <a href="#chargedup">
+      <a href="#charged_up_2023">
         <h2>2023</h2>
         <img
-          src="https://upload.wikimedia.org/wikipedia/en/thumb/b/b7/Charged_Up_Logo.svg/1920px-Charged_Up_Logo.svg.png"
-          class="logo">
+          src="../components/images/Competition_logos/2023_CHARGED UP/Horizontal/Full Color/CHARGED_UP_Logo_Horiz_RGB_FullColor.png"
+          class="logo" min-width="336px">
       </a>
-      <a href="#rapidreact">
+      <a href="#rapid_react_2022">
         <h2>2022</h2>
         <img
-          src="https://upload.wikimedia.org/wikipedia/en/thumb/0/08/Rapid_React_Logo.svg/1024px-Rapid_React_Logo.svg.png"
-          class="logo">
+          src="../components/images/Competition_logos/2022_RAPID REACT/Horizontal/Full Color/RAPID_REACT_Logo_Horizontal_RGB_FullColor-01.png"
+          class="logo" min-width="378px">
       </a>
     </nav>
 
 
 
     <div class="timeline">
       <i class="fa-solid fa-chevron-up arrow"></i>
-      <RobotCardComponent side="left" year="reefscape">
+      <RobotCardComponent side="left" year="reefscape_2025">
         <template v-slot:logo>
-          <img src="./../components/images/fd_frc_reefscape_logo_patch_full color_rgb.png" width="100%">
+          <img src="../components/images/Competition_logos/2025_REEFSCAPE/2025_logo_patch.png" min-width="116px"
+            width="100%">
         </template>
         <template v-slot:img>
-          <img src="../components/images/robot.jpg" width="100%">
+          <img src="../components/images/Robot_images/2025_robot.jpg" width="100%">
         </template>
         <template v-slot:desc>
-          Lorem ipsum odor amet, consectetuer adipiscing elit. Sed leo nascetur integer facilisis accumsan aliquet
-          elementum phasellus vitae. Tempus dis mauris integer nostra hac. Metus porta lacus ultricies fermentum
-          mollis
-          curabitur pharetra risus. Nam nullam class imperdiet iaculis felis taciti fringilla porta. Congue taciti leo
-          bibendum feugiat tristique. Nam dictumst id ligula at scelerisque ex euismod. Imperdiet nisl natoque varius
-          mauris quisque. Consequat lacinia nascetur tellus dignissim nibh, dolor neque eleifend.
-          <br>
-          Et dis nostra maximus suscipit cursus viverra quisque. Cursus malesuada elementum euismod consequat
-          condimentum pellentesque vulputate. Curabitur leo praesent amet maecenas, rhoncus facilisi adipiscing. Magna
-          magnis donec egestas dui erat vitae fames dui. Faucibus integer enim faucibus; sem et nisl! Augue felis
-          nostra
-          inceptos; curae ultrices accumsan. Sed finibus faucibus vitae vulputate accumsan ad. Blandit neque ipsum
-          dictumst sociosqu pretium non.
+          Our robot for Reefscape had three mecanisms: the first one was able to pickup coral on the ground and on for
+          the feeding station, the second one was able to grab algea from the ground and put it into the processor, the
+          third one was able to reach up and remove the algea from the reef and drop it on the ground to be later picked
+          up.
         </template>
-        <template v-slot:date>Reefscape - 2025</template>
+        <template v-slot:date>Reefscape<sup>SM</sup> - 2025</template>
       </RobotCardComponent>
-      <RobotCardComponent year="crescendo">
+      <RobotCardComponent side="right" year="crescendo_2024">
         <template v-slot:logo>
-          <img src="https://www.chiefdelphi.com/uploads/default/original/3X/e/3/e368a7acb70c869b89fee0382bfe312c595bb781.svg" width="100%">
+          <img
+            src="../components/images/Competition_logos/2024_CRESCENDO/Horizontal/Full Color/FIS_CRESCENDO_Logo_Horizontal_RGB.png"
+            min-width="116px" width="100%">
         </template>
         <template v-slot:img>
-          <img src="../components/images/robot.jpg" width="100%">
+          <img src="../components/images/Robot_images/2024_robot.jpg" width="100%">
         </template>
         <template v-slot:desc>
-          Lorem ipsum odor amet, consectetuer adipiscing elit. Sed leo nascetur integer facilisis accumsan aliquet
-          elementum phasellus vitae. Tempus dis mauris integer nostra hac. Metus porta lacus ultricies fermentum
-          mollis
-          curabitur pharetra risus. Nam nullam class imperdiet iaculis felis taciti fringilla porta. Congue taciti leo
-          bibendum feugiat tristique. Nam dictumst id ligula at scelerisque ex euismod. Imperdiet nisl natoque varius
-          mauris quisque. Consequat lacinia nascetur tellus dignissim nibh, dolor neque eleifend.
-          <br>
-          Et dis nostra maximus suscipit cursus viverra quisque. Cursus malesuada elementum euismod consequat
-          condimentum pellentesque vulputate. Curabitur leo praesent amet maecenas, rhoncus facilisi adipiscing. Magna
-          magnis donec egestas dui erat vitae fames dui. Faucibus integer enim faucibus; sem et nisl! Augue felis
-          nostra
-          inceptos; curae ultrices accumsan. Sed finibus faucibus vitae vulputate accumsan ad. Blandit neque ipsum
-          dictumst sociosqu pretium non.
+          Our robot for Crescendo had an arm with an intake able to pickup from the ground and output into the Amp. This
+          arm was installed on an elevator which was also used as our climbing mechanism with the help of hooks mounted
+          on the elevator. We were able to score in the trap during endgame but multiple problems led to this never
+          happening during a match.
         </template>
-        <template v-slot:date>Crescendo - 2024</template>
+        <template v-slot:date>Crescendo<sup>SM</sup> - 2024</template>
       </RobotCardComponent>
-      <RobotCardComponent side="left" year="chargedup">
+      <RobotCardComponent side="left" year="charged_up_2023">
         <template v-slot:logo>
-          <img src="https://www.chiefdelphi.com/uploads/default/original/3X/e/3/e368a7acb70c869b89fee0382bfe312c595bb781.svg" width="100%">
+          <img
+            src="../components/images/Competition_logos/2023_CHARGED UP/Vertical/Full Color/CHARGED_UP_Logo_Vert_RGB_FullColor.png"
+            min-width="116px" width="100%">
         </template>
         <template v-slot:img>
-          <img src="../components/images/robot.jpg" width="100%">
+          <img src="../components/images/Robot_images/2023_robot.jpg" width="100%">
         </template>
         <template v-slot:desc>
-          Lorem ipsum odor amet, consectetuer adipiscing elit. Sed leo nascetur integer facilisis accumsan aliquet
-          elementum phasellus vitae. Tempus dis mauris integer nostra hac. Metus porta lacus ultricies fermentum
-          mollis
-          curabitur pharetra risus. Nam nullam class imperdiet iaculis felis taciti fringilla porta. Congue taciti leo
-          bibendum feugiat tristique. Nam dictumst id ligula at scelerisque ex euismod. Imperdiet nisl natoque varius
-          mauris quisque. Consequat lacinia nascetur tellus dignissim nibh, dolor neque eleifend.
-          <br>
-          Et dis nostra maximus suscipit cursus viverra quisque. Cursus malesuada elementum euismod consequat
-          condimentum pellentesque vulputate. Curabitur leo praesent amet maecenas, rhoncus facilisi adipiscing. Magna
-          magnis donec egestas dui erat vitae fames dui. Faucibus integer enim faucibus; sem et nisl! Augue felis
-          nostra
-          inceptos; curae ultrices accumsan. Sed finibus faucibus vitae vulputate accumsan ad. Blandit neque ipsum
-          dictumst sociosqu pretium non.
+          Our robot for Charged Up was driven with a mecanum drive and a U shapped frame. In order to pickup the game
+          pieces, we had a suction cup which was mounted on a custom angled elevator. To correctly position the cones
+          and cubes in the robot, we had two wheels on either sides of the U.
         </template>
-        <template v-slot:date>Charged Up - 2023</template>
+        <template v-slot:date>Charged Up<sup>SM</sup> - 2023</template>
+      </RobotCardComponent>
+      <RobotCardComponent side="right" year="rapid_react_2022">
+        <template v-slot:logo>
+          <img
+            src="../components/images/Competition_logos/2022_RAPID REACT/Vertical/Full Color/RAPID_REACT_Logo_Vertical_RGB_FullColor.png"
+            min-width="224px" width="100%">
+        </template>
+        <template v-slot:img>
+          <img src="../components/images/Robot_images/2022_robot_practice.png" width="100%">
+        </template>
+        <template v-slot:desc>
+          Our robot for Rapid React was driven with a tank drive and a U shapped frame. Our intake lead the balls into
+          the shooter which had a fixed shooting angle designed to fall directly into the basket. During the endgame,
+          our climber was able to pull itself from the second level bar.
+        </template>
+        <template v-slot:date>RAPID REACT<sup>SM</sup> - 2022</template>
       </RobotCardComponent>
     </div>
   </main>
@@ -115,19 +113,6 @@ import RobotCardComponent from '../../src/components/RobotCardComponent.vue';
 <style scoped lang="scss">
 @import "../assets/base.scss";
 
-$line-distance : 50px;
-$circle-radius : 15px;
-
-@mixin content($card-background) {
-  background: $card-background;
-
-  .dots {
-    background-color: $card-background;
-    box-shadow: 0px 10px 5px 5px $card-background;
-  }
-}
-
-
 nav {
   display: flex;
   justify-content: space-around;
@@ -152,18 +137,4 @@ nav {
     transform: translateX(-50%) translateY(-10px);
   }
 }
-
-// Styles specific to year
-
-.card { // DEFAULT
-  @include content($primary);
-}
-
-#reefscape {
-  @include content(#b2e6f4);
-}
-
-#crescendo {
-  @include content(#aedaca);
-}
-</style>
+</style>