Merge pull request #53 from CWRUbotix/update-2024

Update Summer 2024
CWRUbotix · Sep 7, 2024 · 9a6ec82 · 9a6ec82
2 parents 777ea77 + dd2e5f4
commit 9a6ec82
Show file tree

Hide file tree

Showing 29 changed files with 130 additions and 66 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,15 +6,16 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.11.1)
+    coffee-script-source (1.12.2)
     colorator (1.1.0)
     commonmarker (0.23.9)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
+    csv (3.3.0)
     dnsruby (1.61.9)
       simpleidn (~> 0.1)
     em-websocket (0.5.3)
@@ -30,21 +31,19 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    ffi (1.15.5)
-    ffi (1.15.5-x64-mingw32)
-    ffi (1.15.5-x86-mingw32)
+    ffi (1.17.0)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (228)
-      github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.3)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.4.0)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
+    github-pages (232)
+      github-pages-health-check (= 1.18.2)
+      jekyll (= 3.10.0)
+      jekyll-avatar (= 0.8.0)
+      jekyll-coffeescript (= 1.2.2)
+      jekyll-commonmark-ghpages (= 0.5.1)
+      jekyll-default-layout (= 0.1.5)
+      jekyll-feed (= 0.17.0)
       jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
+      jekyll-github-metadata (= 2.16.1)
       jekyll-include-cache (= 0.2.1)
       jekyll-mentions (= 1.6.0)
       jekyll-optional-front-matter (= 0.3.2)
@@ -71,30 +70,32 @@ GEM
       jekyll-theme-tactile (= 0.2.0)
       jekyll-theme-time-machine (= 0.2.0)
       jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.2)
+      jemoji (= 0.13.0)
+      kramdown (= 2.4.0)
       kramdown-parser-gfm (= 1.1.0)
       liquid (= 4.0.4)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
-      rouge (= 3.26.0)
+      nokogiri (>= 1.16.2, < 2.0)
+      rouge (= 3.30.0)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.17.9)
+      webrick (~> 1.8)
+    github-pages-health-check (1.18.2)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (>= 3.0, < 5.0)
+      octokit (>= 4, < 8)
+      public_suffix (>= 3.0, < 6.0)
       typhoeus (~> 1.3)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.3)
+    jekyll (3.10.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
@@ -105,27 +106,28 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
+      webrick (>= 1.0)
+    jekyll-avatar (0.8.0)
       jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
+    jekyll-coffeescript (1.2.2)
       coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
+      coffee-script-source (~> 1.12)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.4.0)
-      commonmarker (~> 0.23.7)
-      jekyll (~> 3.9.0)
+    jekyll-commonmark-ghpages (0.5.1)
+      commonmarker (>= 0.23.7, < 1.1.0)
+      jekyll (>= 3.9, < 4.0)
       jekyll-commonmark (~> 1.4.0)
       rouge (>= 2.0, < 5.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
+    jekyll-default-layout (0.1.5)
+      jekyll (>= 3.0, < 5.0)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
+    jekyll-github-metadata (2.16.1)
       jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
+      octokit (>= 4, < 7, != 4.4.0)
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-mentions (1.6.0)
@@ -196,40 +198,41 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
+    jemoji (0.13.0)
+      gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.7)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.18.0)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.16.7)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
+    public_suffix (5.1.1)
     racc (1.6.2)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.26.0)
+    rexml (3.3.6)
+      strscan
+    rouge (3.30.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
@@ -243,6 +246,7 @@ GEM
       faraday (>= 0.17.3, < 3)
     simpleidn (0.2.1)
       unf (~> 0.1.4)
+    strscan (3.1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.0)
@@ -259,6 +263,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw-ucrt
   x64-mingw32
   x86-mingw32
 
@@ -267,4 +272,4 @@ DEPENDENCIES
   webrick (~> 1.8)
 
 BUNDLED WITH
-   2.2.22
+   2.5.18
diff --git a/_data/members.yml b/_data/members.yml
@@ -34,12 +34,12 @@
   imgurl: res/members/MaxRollis_LabAndSafety.jpg
   bio: I'm a senior studying mechanical engineering. When I'm not building robots, I enjoy playing chess and rock climbing.
 
-# - name: Liv Gatchall
+# - name: Ben Kwiatkowski
 #   exec: true
-#   position: PR and Outreach Manager
-#   email: org6@case.edu
-#   imgurl: res/members/liv_PR.jpg
-#   bio: Hello! :) I'm a fourth-year BS/MS Mechanical Engineering student specializing in robotics and manufacturing. This year will be my third year on the MATE ROV mechanical team and second as PR & Outreach Manager. Outside of robotics, I play guitar, Wizard101, and pet a lot of dogs.
+#   position: Super secret PR and Outreach Manager
+#   email: btk35@case.edu
+#   imgurl: 
+#   bio: I'm a fourth year studying electrical engineering and biomedical engineering and I help design electronics on the MATE ROV team. I like playing video games, especially Bloodborne.
 
 - name: Dr. Richard Bachmann
   exec: false

diff --git a/_data/sponsors.yml b/_data/sponsors.yml
@@ -1,8 +1,10 @@
+# Good as of 2024
 - name: Case Alumni Association
   link: https://www.casealum.org/
   image: res/sponsors/caa.svg
   alt: Case Alumni Association crest
 
+# Good as of 2024
 - name: Teledyne FLIR
   link: https://www.teledyne.com/
   image: res/sponsors/teledyne-logo.png
@@ -13,31 +15,37 @@
 #  image: res/sponsors/kyocera_sgs.png
 #  alt: Kyocera and SGS logos
 
+# Remove
 - name: Gene Haas Grant
   link: https://ghaasfoundation.org
   image: https://ghaasfoundation.org/content/dam/haascnc/gene-haas-foundation/2021-logo-ghf/GHF_WebsiteHeaderLogo.svg
   alt: Gene Haas Foundation logo
 
+# Good as of 2024
 - name: think[box]
   link: https://thinkbox.case.edu
   image: res/sponsors/thinkbox.svg
   alt: think[box] logo
 
+# Good as of 2024
 - name: Undergraduate Student Government
   link: https://usg.case.edu
   image: res/sponsors/usg.png
   alt: Undergraduate Student Government logo
 
+# Good as of 2024
 - name: Solidworks
   link: https://www.solidworks.com/
   image: res/sponsors/solidworks.svg
   alt: Solidworks logo
 
+# Good as of 2024
 - name: Altium
   link: https://altium.com
   image: res/sponsors/altium.png
   alt: Altium logo
 
+
 - name: MakerGear
   link: https://www.makergear.com/
   image: res/sponsors/makergear-logo.png

diff --git a/_includes/blog-tiles.html b/_includes/blog-tiles.html
@@ -4,9 +4,10 @@
             <p class="rec_blog_title" style="font-size: 24px">
                 {{post.title}}
             </p>
-            <p class="rec_blog_date">
+            <!-- Fix this if you want dates in blog post thumbnails. Probably not necessary. -->
+            <!-- <p class="rec_blog_date">
                 {{post.date.long_month}} {{post.date.i_day}}, {{post.date.year}}
-            </p>
+            </p> -->
             <img src="{{post.imgurl}}">
             <p class="rec_blog_text">
                 {{post.summary}}

diff --git a/_posts/2022-7-5-bootcamp_marshmallow_launcher.html b/_posts/2022-7-5-bootcamp_marshmallow_launcher.html
@@ -3,7 +3,7 @@
 layout      : default
 stylesheets : [projects]
 categories  : [bootcamp]
-imgurl      : res/bootcamp_2019.jpg
+imgurl      : res/bootcamp/bootcamp_2019.jpg
 ---
 
 <div class="topspace"></div>

diff --git a/_posts/2022-7-5-bootcamp_whegs.html b/_posts/2022-7-5-bootcamp_whegs.html
@@ -3,7 +3,7 @@
 layout      : default
 stylesheets : [projects]
 categories  : [bootcamp]
-imgurl      : res/bootcamp_2021.JPG
+imgurl      : res/bootcamp/bootcamp_2021.JPG
 ---
 
 <div class="topspace"></div>

diff --git a/_posts/2024-8-24-Recap23-24.html b/_posts/2024-8-24-Recap23-24.html
@@ -0,0 +1,50 @@
+---
+layout      : post
+title       : "2023-2024 Year Recap"
+categories  : [blog]
+stylesheets : [blog]
+subhead     : 2023-2024 Season Recap
+summary     : We had a lot of wins this year, and we're excited for next year!
+imgurl      : res/mate_rov/rovTeam24.jpg
+author      : Noah Mollerstuen
+author-role : Club President
+---
+<p class="blog_text">
+    This year was a massive success for CWRUbotix! We competed in NRC’s Micromouse competition as well as MATE II’s World Championship. Below are updates from each of our competition teams.
+</p>
+
+<p class="blog_section">
+NRC Micromouse
+</p>
+<img style="max-width: 50%;" src="/res/micromouse/uMouseBot24.jpg"/>
+<p class="blog_text">
+    Our Micromouse team won the Gold Award at NRC’s Micromouse competition! Their design was so impressive that they were awarded the Honda Innovation award as well. This year they plan to make the robot even smaller and optimize its movement.
+</p>
+
+<p class="blog_section">
+    MATE ROV
+</p>
+<img style="max-width: 100%;" src="/res/mate_rov/ROV_24.jpg"/>
+<p class="blog_text">
+    Our MATE ROV team placed in 5th at MATE II’s ROV World Championship, this year in Kingsport, Tennessee. They were less than 10 points away from the top 3, out of 750 points total. This year, the team has several ideas for improving the robot and scoring more points, with the goal to place in the top 3 next competition.
+</p>
+
+<p class="blog_section">
+    Combat
+</p>
+
+<div>
+    <img style="display: inline; max-width: 50%;" src="/res/combat/combat.jpg"/><!--
+    --><img style="display: inline; max-width: 50%;" src="/res/combat/combatCAD.png"/>
+</div>
+
+<p class="blog_text">
+    Our NRC Combat team has been hard at work manufacturing their 12 lb. robot, Rogue Wave, with plans to compete in this new weight class next year.
+</p>
+
+<p class="blog_section">
+    Thank you!
+</p>
+<p class="blog_text">
+    We would like to thank our sponsors for their generous support, which helps make building these robots possible. We look forward to innovating on our robots in the coming months and preparing for competition season.
+</p>
diff --git a/bootcamp.html b/bootcamp.html
@@ -6,7 +6,7 @@
 ---
 <div class="topspace"></div>
 <div id="project">
-    <img class="logo" src="res/bootcamp_full.png"/>
+    <img class="logo" src="res/bootcamp/bootcamp_full.png"/>
     <p class="hd">Bootcamp</p>
     <div class="division"></div>
     <p class="info">

diff --git a/index.html b/index.html
@@ -46,25 +46,25 @@
    <!--
       <div class="project">
       <a href="nasa_rmc.html">
-        <img src="res/nasarmc.png"/>
+        <img src="res/nasa_rmc/nasarmc.png"/>
         <div class="project_txt"><b>NASA Robotic Mining Competition</b></div>
       </a>
     </div> -->
     <div class="project">
       <a href="mate_rov.html">
-        <img src="res/ROV_24.jpg"/>
+        <img src="res/mate_rov/ROV_24.jpg"/>
         <div class="project_txt"><b>MATE ROV Competition</b></div>
       </a>
     </div>
     <div class="project">
       <a href="nrc.html">
-        <img src="res/nrc.png"/>
+        <img src="res/nrc/nrc.png"/>
         <div class="project_txt"><b>National Robotics Challenge</b></div>
       </a>
     </div>
     <div class="project">
       <a href="bootcamp.html">
-        <img src="res/bootcamp.jpg"/>
+        <img src="res/bootcamp/bootcamp.jpg"/>
         <div class="project_txt"><b>Member Education Bootcamp</b></div>
       </a>
     </div>