Add Responsible Engineers to Spaceport Avionics info

osu-bsli · Sep 19, 2024 · 413dd94 · 413dd94
1 parent 8aa03a4
commit 413dd94
Show file tree

Hide file tree

Showing 6 changed files with 111 additions and 65 deletions.
diff --git a/src/components/widgets/StaffCard.astro b/src/components/widgets/StaffCard.astro
@@ -8,10 +8,11 @@ import { twMerge } from "tailwind-merge";
 export interface Props {
     name: string;
     noSocials?: boolean;
-    forceAspectRatio?: boolean,
+    forceAspectRatio?: boolean;
+    title?: string;
 }
 
-const { name, noSocials, forceAspectRatio } = Astro.props;
+const { name, noSocials, forceAspectRatio, title } = Astro.props;
 
 const basePath = "/src/assets/images/staff/";
 let leadershipData = getStaffRecord(name);
@@ -48,7 +49,7 @@ const image = images[imagePath]();
     <Image class={twMerge("rounded-sm object-cover", forceAspectRatio && "aspect-[3/2]")} src={image} alt={name} width=400 widths={[400, 800]} />
     <div>
         <p class="text-primary font-bold text-xl">{name}</p>
-        <p class="font-bold">{leadershipData.title}</p>
+        <p class="font-bold">{title || leadershipData.title}</p>
 
         <div class="py-4">
             <p>{leadershipData.major || <span>&nbsp;</span>}</p>

diff --git a/src/components/widgets/SubteamInfo.astro b/src/components/widgets/SubteamInfo.astro
@@ -1,49 +1,55 @@
 ---
 import Socials from "./Socials.astro";
-import { Image} from "astro:assets";
+import { Image } from "astro:assets";
 import { type TeamMember } from "~/types";
 import { type ImageProps } from "~/utils/images-optimization";
 import getStaffRecord from "~/staffData";
 
 export interface Props {
   title: string;
   leads: string[];
-  images: Array<{src: Promise<any>, alt: string}>;
+  images: Array<{ src: Promise<any>; alt: string }>;
+  content?: string;
 }
 
-const { title, leads = [], images = [] } = Astro.props;
+const {
+  title,
+  leads = [],
+  images = [],
+  content = await Astro.slots.render("content"),
+} = Astro.props;
 ---
 
-<div class="flex flex-col md:flex-row justify-center gap-8">
-  <div class="md:w-1/2">
-    <h2 class="text-primary text-4xl font-bold font-heading py-4">{title}</h2>
+<div>
+  <div class="flex flex-col md:flex-row justify-center gap-8">
+    <div class="md:w-1/2">
+      <h2 class="text-primary text-4xl font-bold font-heading py-4">{title}</h2>
 
-    <div class="items-end my-4">
-      <h3 class="text-xl font-bold">
-        {leads.length > 1 ? "Team Leads: " : "Team Lead: "}
-        <span class="text-primary">
-          {
-            leads.map((name) => (
-              <div>
-                {name}
-                <Socials {...getStaffRecord(name)} />
-              </div>
-            ))
-          }
-        </span>
-      </h3>
+      <div class="items-end my-4">
+        <h3 class="text-xl font-bold">
+          {leads.length > 1 ? "Team Leads: " : "Team Lead: "}
+          <span class="text-primary">
+            {
+              leads.map((name) => (
+                <div>
+                  {name}
+                  <Socials {...getStaffRecord(name)} />
+                </div>
+              ))
+            }
+          </span>
+        </h3>
+      </div>
+
+      <div class="flex flex-col gap-4 text-lg">
+        <slot />
+      </div>
     </div>
 
-    <div class="flex flex-col gap-4 text-lg">
-      <slot />
+    <div class="flex flex-col gap-4 md:w-1/2">
+      {images.map((i) => <Image class="m-auto" widths={[400, 800]} {...i} />)}
     </div>
   </div>
 
-  <div class="flex flex-col gap-4 md:w-1/2">
-    {
-      images.map((i) => (
-        <Image class="m-auto" widths={[400, 800]} {...i} />
-      ))
-    }
-  </div>
+  <div set:html={content} />
 </div>
diff --git a/src/pages/leadership.astro b/src/pages/leadership.astro
@@ -25,23 +25,27 @@ for (let { sectionShort, sectionId } of leadershipPageLayout) {
     <Fragment slot="subtitle">&nbsp;</Fragment>
   </Hero>
 
-  {
-    leadershipPageLayout.map(({ section, sectionId, staff }) => (
-      <WidgetWrapper containerClass={`max-w-6xl`}`>
-        <div id={sectionId}>
-          <h2 class="text-primary text-3xl text-center font-bold mb-4">{section}</h2>
-
-          <div class="flex flex-wrap items-stretch justify-center gap-4">
-            {staff.map((name) => (
-              <StaffCard forceAspectRatio name={name} />
-            ))}
+  <WidgetWrapper containerClass={`max-w-6xl`} `>
+    {
+      leadershipPageLayout.map(({ section, sectionId, staff }) => (
+        <div class="max-w-6xl m-auto">
+          <div id={sectionId}>
+            <h2 class="text-primary text-3xl text-center font-bold py-8">
+              {section}
+            </h2>
+
+            <div class="flex flex-wrap items-stretch justify-center gap-4">
+              {staff.map((name) => (
+                <StaffCard forceAspectRatio name={name} />
+              ))}
+            </div>
           </div>
         </div>
+      ))
+    }
 
-        <Fragment slot="bg">
-          <div class="absolute inset-0 bg-gray-50 dark:bg-transparent" />
-        </Fragment>
-      </WidgetWrapper>
-    ))
-  }
+    <Fragment slot="bg">
+      <div class="absolute inset-0 bg-gray-50 dark:bg-transparent"></div>
+    </Fragment>
+  </WidgetWrapper>
 </Layout>
diff --git a/src/pages/projects/sac.astro b/src/pages/projects/sac.astro
@@ -8,6 +8,8 @@ import MeetTheTeams from "~/components/widgets/MeetTheTeams.astro";
 import TeamOverview from "~/components/widgets/TeamOverview.astro";
 import TeamOverviewLeader from "~/components/widgets/TeamOverviewLeader.astro";
 import SubteamInfo from "~/components/widgets/SubteamInfo.astro";
+import StaffCard from "~/components/widgets/StaffCard.astro";
+import { flightSoftwareResponsibleEngineers } from "~/staffData";
 
 const metadata = {
   title: "BSLI — The Ohio State University",
@@ -158,6 +160,22 @@ const metadata = {
       teams to collect proper data for a successful flight. Additionally, they
       work closely with Recovery and Payload to assist and ensure the proper
       systems and data collection systems work for their needs.
+
+      <Fragment slot="content">
+        <h2
+          class="text-primary text-3xl font-bold font-heading py-8 text-center"
+        >
+          Responsible Engineers
+        </h2>
+
+        <div class="flex flex-wrap items-stretch justify-center gap-4">
+          {
+            flightSoftwareResponsibleEngineers.map(({ name, title }) =>
+              <StaffCard forceAspectRatio name={name} title={title} />
+            )
+          }
+        </div>
+      </Fragment>
     </SubteamInfo>
 
     <SubteamInfo

diff --git a/src/staffData.csv b/src/staffData.csv
@@ -1,39 +1,45 @@
 title,name,year,major,email,linkedin,
 President,Lauren Clar,Senior,Computer Science & Engineering,[email protected],https://www.linkedin.com/in/lauren-clar-b4b357227,
-Vice President,Elhan Majed,Sophomore,Mechanical Engineering ,[email protected],https://www.linkedin.com/in/elhan-majed-23a215283/,
+Vice President,Elhan Majed,Sophomore,"Mechanical Engineering ",[email protected],https://www.linkedin.com/in/elhan-majed-23a215283/,
 Former Vice President,Alex Echanove,Graduate Student,Industrial & Systems Engineering,[email protected],https://www.linkedin.com/in/alejandro-echanove-8a456314a/,
 Communications Director,Vacant Communications Director,,,,,
 Finance Director,Youssef Erraki,,Aerospace Engineering,[email protected],https://www.linkedin.com/in/youssef-erraki-50340a2a0/,
 Business Ops Director,Marc Chow,,Aerospace Engineering,[email protected],https://www.linkedin.com/in/marcchow2/,
 ,,,,,,
-Community Outreach Chair,Waleed Chaudhary,Senior,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/waleed-j/,
+Community Outreach Chair,Waleed Chaudhary,Senior,"Aerospace Engineering ",[email protected],https://www.linkedin.com/in/waleed-j/,
 Recruitment & Involvement Chair,Junchen Wu,Sophomore,Computer Science & Engineering,[email protected],https://www.linkedin.com/in/junchen-wu-35215924b/,
 Alumni & Sponsorship Chair,Hana Winchester,Sophomore,Computer Science & Engineering,[email protected],https://www.linkedin.com/in/hana-winchester-988282258/,
 Merchandise Chair,Grayson Ullman,,Electrical & Computer Engineering,[email protected],,
-Social Media Chair,Anastasia Anikina,,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/anistanika/,
+Social Media Chair,Anastasia Anikina,,"Aerospace Engineering ",[email protected],https://www.linkedin.com/in/anistanika/,
 Webmaster,Brian Jia,Sophomore,Electrical & Computer Engineering,[email protected],https://www.linkedin.com/in/brian-jia-411629225/,
 ,,,,,,
-NASA Project Manager,Matthew Heinzman,Senior,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/heinzmanm/,
+NASA Project Manager,Matthew Heinzman,Senior,"Aerospace Engineering ",[email protected],https://www.linkedin.com/in/heinzmanm/,
 NASA Deputy Project Manager,Abby Atchley,Senior,Computer Science & Engineering,[email protected],https://www.linkedin.com/in/abby-atchley-990831252/,
-NASA Deputy Project Manager,Nisha Kumar,Senior,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/nisha-v-kumar/,
-NASA Structures Lead ,Kennedy Swyers,Sophomore ,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/kennedy-swyers-55459723a/,
-NASA Flight Systems Lead,Sahil Sura,Junior ,Mechanical Engineering ,[email protected],https://www.linkedin.com/in/sahil-sura/,
-NASA Aerodynamics Lead,Brady Wilson,Senior,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/brady-wilson-6ab002195/,
-NASA Payload Lead,Dominick Delpico,Senior,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/dominickdelpico/,
-NASA Co-Payload Lead,Sai Vidyud Senthil Nathan,Junior ,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/sai-vidyud-senthil-nathan-b9a46a214/,
+NASA Deputy Project Manager,Nisha Kumar,Senior,"Aerospace Engineering ",[email protected],https://www.linkedin.com/in/nisha-v-kumar/,
+"NASA Structures Lead ",Kennedy Swyers,"Sophomore ","Aerospace Engineering ",[email protected],https://www.linkedin.com/in/kennedy-swyers-55459723a/,
+NASA Flight Systems Lead,Sahil Sura,"Junior ","Mechanical Engineering ",[email protected],https://www.linkedin.com/in/sahil-sura/,
+NASA Aerodynamics Lead,Brady Wilson,Senior,"Aerospace Engineering ",[email protected],https://www.linkedin.com/in/brady-wilson-6ab002195/,
+NASA Payload Lead,Dominick Delpico,Senior,"Aerospace Engineering ",[email protected],https://www.linkedin.com/in/dominickdelpico/,
+NASA Co-Payload Lead,Sai Vidyud Senthil Nathan,"Junior ","Aerospace Engineering ",[email protected],https://www.linkedin.com/in/sai-vidyud-senthil-nathan-b9a46a214/,
 ,,,,,,
-Spaceport Project Manager,Cameron Burford,Junior ,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/cameron-burford/,
+Spaceport Project Manager,Cameron Burford,"Junior ","Aerospace Engineering ",[email protected],https://www.linkedin.com/in/cameron-burford/,
 Spaceport Deputy Project Manager,Rahul Srinivas,,Mechanical Engineering,[email protected],https://www.linkedin.com/in/rahul-srinivas-501sw/,
 Spaceport Structures Lead,Liam Juhas,,Mechanical Engineering,[email protected],https://www.linkedin.com/in/liam-juhas-a14567267/,
 Spaceport Avionics Lead,Toby Simpson,,Computer Science & Engineering,[email protected],,
-Spaceport Aerodynamics Lead,Jackson Nicley,,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/jackson-nicley/,
+Spaceport Aerodynamics Lead,Jackson Nicley,,"Aerospace Engineering ",[email protected],https://www.linkedin.com/in/jackson-nicley/,
 Spaceport Recovery Lead,Calvin Beall,,Engineering Physics,[email protected],https://www.linkedin.com/in/calvin-beall-a10128261/,
-Spaceport Payload Lead,Hanshu Kotta,Junior ,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/hanshu-kotta-73a979235/,
-Spaceport Propulsion Lead,Matthew Geiger,Senior,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/mdg25/,
+Spaceport Payload Lead,Hanshu Kotta,"Junior ","Aerospace Engineering ",[email protected],https://www.linkedin.com/in/hanshu-kotta-73a979235/,
+Spaceport Propulsion Lead,Matthew Geiger,Senior,"Aerospace Engineering ",[email protected],https://www.linkedin.com/in/mdg25/,
 ,,,,,,
-Liquids Project Manager,Zach Campbell,,Aerospace Engineering ,,https://www.linkedin.com/in/zach-campbell-8bb08b244/,
-Liquids Deputy Project Manager,Miguel Abando,,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/miguel-antonio-abando-593533252/,
+Liquids Project Manager,Zach Campbell,,"Aerospace Engineering ",,https://www.linkedin.com/in/zach-campbell-8bb08b244/,
+Liquids Deputy Project Manager,Miguel Abando,,"Aerospace Engineering ",[email protected],https://www.linkedin.com/in/miguel-antonio-abando-593533252/,
 Liquids Propulsion Lead,Thomas Yu,,Mechanical Engineering,[email protected],https://www.linkedin.com/in/thomas-yu-0b8b5a28a/,
-Liquids Fluids Lead,Zafar Shaik,Junior ,Aerospace Engineering ,[email protected],https://www.linkedin.com/in/zafarshaik/,
+Liquids Fluids Lead,Zafar Shaik,"Junior ","Aerospace Engineering ",[email protected],https://www.linkedin.com/in/zafarshaik/,
 Liquids DAQ/GSE Lead,Julian Hooks,,Engineering Physics,[email protected],https://www.linkedin.com/in/julian-hooks-56912b291/,
 Liquids Test Director,Ray Saracene,,Mechanical Engineering,[email protected],,
+,,,,,,
+,Pranav Moola,,Electrical & Computer Engineering,[email protected],,
+,Cyrus Kim,,Electrical & Computer Engineering,[email protected],,
+,Carter Davis,Sophomore,Aerospace Engineering,[email protected],,
+,Reilly Fastring,Sophomore,Aerospace Engineering,[email protected],,
+,,,,,,
diff --git a/src/staffData.ts b/src/staffData.ts
@@ -109,3 +109,14 @@ export const leadershipPageLayout: LeadershipPageLayout = [
         ]
     }
 ];
+
+export const flightSoftwareResponsibleEngineers = [
+    { name: "Pranav Moola", title: "Electronics" },
+    { name: "Cyrus Kim", title: "Electronics" },
+    { name: "Brian Jia", title: "Flight Software" },
+    { name: "Toby Simpson", title: "Guidance, Navigation, and Control (GNC) Software / Test Infrastructure" },
+    { name: "Elhan Majed", title: "Ground Control Software (Front End)" },
+    { name: "Lauren Clar", title: "Radio and Telemetry" },
+    { name: "Carter Davis", title: "Mechanical Structure" },
+    { name: "Reilly Fastring", title: "Air Brakes Mechatronics" },
+];