Some redesigning with Eddie

config.rb

@@ -1,6 +1,3 @@
-# bootstrap or bootstrap-red
-set :theme, 'bootstrap-red'
-
 # Assets
 set :css_dir, 'assets/stylesheets'
 set :js_dir, 'assets/javascripts'

data/sponsors.yml

@@ -1,6 +1,6 @@
 - name: 3M
   url: https://www.3m.com
-  image: assets/images/brands/3MLogo.png
+  image: assets/images/brands/3M.png
   about: >
     The 3M Company, is a United States multinational conglomerate corporation based in 
     Maplewood, Minnesota, United States. 3M has operations in more than 65 countries – 
@@ -34,7 +34,7 @@
 
 - name: Partnership Plan
   url: https://www.partnershipplan.org/
-  image: assets/images/brands/PartnershipPlanLogo.png
+  image: assets/images/brands/partnershipPlan.png
   about: >
     The Partnership Plan is a non-profit organization dedicated to enhancing learning opportunities through grants given to teachers and organizations.
 
@@ -64,7 +64,7 @@
 #
 # - name: Polaris
 #   url: https://www.polaris.com/en-us/home.aspx
-#   image: assets/images/brands/polaris_logo.jpg
+#   image: assets/images/brands/polaris.jpg
 #   about: >
 #     Polaris is an American manufacturer of snowmobiles, ATVs, and neighborhood electric vehicles,
 #     with a firm belief in the ethics and value of their employees. Polaris endeavors to manufacture
@@ -73,14 +73,14 @@
 
 # - name: United Hardware
 #   url: https://unitedhardware.com/Default.aspx
-#   image: assets/images/brands/hardware_logo.jpg
+#   image: assets/images/brands/hardwareHank.jpg
 #   about: >
 #     United Hardware is a distributing company located in Plymoth, MN. They supply hardware items to about
 #     610 businesses. Most of their supplies goes Hardware Hank stores, which is owned by United Hardware.
 
 # - name: Vistatek
 #   url: https://www.vistatek.com/
-#   image: assets/images/brands/VistaTek_logo.jpg
+#   image: assets/images/brands/vistaTek.jpg
 #   about: >
 #     VistaTek is a family-owned manufacturing company located in Stillwater, MN. The company’s state-of-the-art
 #     software and in-house technologies allow it to efficiently assist customers with small to large projects.

data/teams.yml

@@ -26,6 +26,9 @@
   image: assets/images/teams/2022.jpg
   leadership: >
     Captain - Addie Foote<br>
+    Machining Lead - Vincent Ramirez<br>
+    Programming Lead - Addie Foote<br>
+    Business Lead - Claire Abbott<br>
     Electronics Lead - Eddie Roots<br>
   challenge: Rapid React
   about:

source/404.html.erb

@@ -4,9 +4,7 @@
     <div class="col-lg-12">
       <div class="page-header">
         <div class="text-center">
-          <h2>
-            Page not found
-          </h2>
+          <h2>Page not found</h2>
         </div>
       </div>
     </div>
@@ -15,7 +13,8 @@
     <div class="col-lg-12">
       <div class="text-center">
         <p>
-          The page you have request cannot be found.  You can navigate to another page using the navigation bar above, or return to our <a href="./">homepage</a>.
+          The page you have request cannot be found.  
+          You can navigate to another page using the navigation bar above, or return to our <a href="./">homepage</a>.
         </p>
       </div>
     </div>

source/assets/javascripts/main.js

@@ -1,29 +1,17 @@
-$("body").scrollspy({
-  target: "#nav",
-  offset: 40,
-});
-
-$(".carousel").each(function () {
-  var speed = 5000;
-  if ($(this).data("rel-speed") != null) {
-    speed = $(this).data("rel-speed");
-  }
-  $(this).carousel({
-    interval: speed,
-  });
-});
-
-$("a").click(function () {
-  let href = $.attr(this, "href");
-  // Fix animation for anchors to IDs on the same page, need this because of base tag
-  if (href.includes("#")) {
-    href = href.substring(href.indexOf("#"));
-  }
-  $("html, body").animate(
-    {
-      scrollTop: $(href).offset().top,
-    },
-    500,
-  );
-  return false;
-});
+// Fix scrolling for anchors to IDs on the same page, need this because the base tag causes the page to be reloaded
+document.querySelectorAll("a").forEach((a) =>
+  a.addEventListener("click", function (e) {
+    let href = this.href;
+    let currentPath = document.location.href;
+    // Paths end with slashes in prod but not locally
+    if (currentPath.endsWith("/")) {
+      currentPath = currentPath.substring(0, currentPath.length - 1);
+    }
+    // Check if it points to the same page we're on
+    if (href.includes("#") && href.startsWith(currentPath)) {
+      href = href.substring(href.indexOf("#") + 1);
+      document.getElementById(href).scrollIntoView({ behavior: "smooth" });
+      e.preventDefault(); // Don't reload page
+    }
+  }),
+);