Leadership page visually finished, needs more pictures

osu-bsli · Sep 17, 2024 · a023957 · a023957
1 parent eb8cbc5
commit a023957
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 89 deletions.
diff --git a/src/assets/images/staff/Calvin Beall.webp b/src/assets/images/staff/Calvin Beall.webp
diff --git a/src/assets/images/staff/Zach Campbell.webp b/src/assets/images/staff/Zach Campbell.webp
diff --git a/src/components/widgets/Socials.astro b/src/components/widgets/Socials.astro
@@ -11,21 +11,23 @@ export interface Props {
   instagram?: string;
   classes?: string[] | string;
   useButtonStyle?: boolean;
+  vertical?: boolean;
 }
 
-const { linkedin, email, facebook, youtube, instagram, classes, useButtonStyle } = Astro.props;
+const { linkedin, email, facebook, youtube, instagram, classes, useButtonStyle, vertical } = Astro.props;
 ---
 
 <div
   class={twMerge(
     "font-normal flex flex-row flex-wrap gap-x-3 mt-2 text-muted",
-    useButtonStyle ? "gap-y-3" : "",
+    useButtonStyle && "gap-y-3",
     classes,
+    vertical && "flex-col"
   )}
 >
   {
-    instagram &&
-      <SocialLink icon="tabler:brand-instagram" href={instagram} label="Instagram" useButtonStyle={useButtonStyle} />
+    email &&
+      <SocialLink icon="tabler:mail" href={"mailto: " + email} label={email} useButtonStyle={useButtonStyle} />
   }
 
   {
@@ -34,8 +36,8 @@ const { linkedin, email, facebook, youtube, instagram, classes, useButtonStyle }
   }
 
   {
-    email &&
-      <SocialLink icon="tabler:mail" href={"mailto: " + email} label={email} useButtonStyle={useButtonStyle} />
+    instagram &&
+      <SocialLink icon="tabler:brand-instagram" href={instagram} label="Instagram" useButtonStyle={useButtonStyle} />
   }
 
   {

diff --git a/src/components/widgets/StaffCard.astro b/src/components/widgets/StaffCard.astro
@@ -31,32 +31,24 @@ function getImagePath(name) {
 let imagePath = getImagePath(name);
 if (getImagePath(name) == null) {
     imagePath = getImagePath("unknown");
-
-    //     throw new Error(
-    //         `Staff image not found for ${name} in ${basePath}
-
-    // Images considered:
-    // ${Object.keys(images).join("\n")}
-    //     `,
-    //     );
 }
 
 const image = images[imagePath]();
 ---
 
 <div
-    class="border border-[#ffffff29] bg-page rounded-md p-4 flex flex-col gap-4 shadow-lg"
+    class="border border-[#ffffff29] bg-page rounded-md p-4 flex flex-col gap-4 shadow-lg max-w-80"
 >
-    <Image class="rounded-sm" src={image} alt={name} width="400" />
+    <Image class="rounded-sm aspect-[3/2] object-cover" 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>
 
         <div class="py-4">
-            {leadershipData.year && <p>{leadershipData.year}</p>}
-            {leadershipData.major && <p>{leadershipData.major}</p>}
+            <p>{leadershipData.major || <span>&nbsp;</span>}</p>
+            <p>{leadershipData.year || <span>&nbsp;</span>}</p>
         </div>
 
-        {!noSocials && <Socials {...getStaffRecord(name)} />}
+        {!noSocials && <Socials vertical {...getStaffRecord(name)} />}
     </div>
 </div>
diff --git a/src/components/widgets/SubteamInfo.astro b/src/components/widgets/SubteamInfo.astro
@@ -1,14 +1,14 @@
 ---
 import Socials from "./Socials.astro";
-import Image from "../common/Image.astro";
+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<ImageProps>;
+  images: Array<{src: Promise<any>, alt: string}>;
 }
 
 const { title, leads = [], images = [] } = Astro.props;
@@ -42,7 +42,7 @@ const { title, leads = [], images = [] } = Astro.props;
   <div class="flex flex-col gap-4 md:w-1/2">
     {
       images.map((i) => (
-        <Image class="m-auto" widths={[400, 800]} layout="contained" {...i} />
+        <Image class="m-auto" widths={[400, 800]} {...i} />
       ))
     }
   </div>

diff --git a/src/components/widgets/TeamOverview.astro b/src/components/widgets/TeamOverview.astro
@@ -1,5 +1,5 @@
 ---
-import Image from "~/components/common/Image.astro";
+import { Image } from "astro:assets";
 import { type ImageProps } from "~/utils/images-optimization";
 
 interface Stat {
@@ -10,7 +10,7 @@ interface Stat {
 export interface Props {
   title: string;
   stats: Stat[];
-  image: ImageProps;
+  image: {src: Promise<any>, alt: string};
 }
 
 const { title, stats = [], image } = Astro.props;
@@ -44,5 +44,5 @@ const { title, stats = [], image } = Astro.props;
     </table>
   </div>
 
-  <Image {...image} class="m-auto object-contain w-1/2 max-h-screen" layout="custom"/>
+  <Image {...image} class="m-auto object-contain w-1/2 max-h-[800px]"/>
 </div>
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -71,7 +71,7 @@ const metadata = {
         description:
           "NASA SLI is a research-based, competitive, experiential exploration project striving to provide relevant research through payload components to support the development of NASA’s Space Launch System (SLS) program.",
         image: {
-          src: import("/src/assets/images/subteam-nasa.webp"),
+          src: import("~/assets/images/subteam-nasa.webp"),
           alt: "NASA Subteam",
         },
         href: getPermalink("/projects/nasa"),
@@ -91,7 +91,7 @@ const metadata = {
         description:
           "SAC competes at Spaceport America Cup, an international collegiate rocketry competition hosted in New Mexico every summer. BSLI competes in the 30k Student Research and Developed (SRAD) category.",
         image: {
-          src: import("/src/assets/images/subteam-sac.webp"),
+          src: import("~/assets/images/subteam-sac.webp"),
           alt: "Spaceport America Cup Team",
         },
         href: getPermalink("/projects/sac"),
@@ -111,7 +111,7 @@ const metadata = {
         description:
           "BSLI Liquids team focuses on liquid bipropellant rocket engine development. Current development includes working towards test firing an LR-101, and further refining our 1st custom engine.",
         image: {
-          src: import("/src/assets/images/subteam-liquids.webp"),
+          src: import("~/assets/images/subteam-liquids.webp"),
           alt: "Liquids Team",
         },
         href: getPermalink("/projects/liquids"),

diff --git a/src/pages/projects/liquids.astro b/src/pages/projects/liquids.astro
@@ -67,7 +67,7 @@ const metadata = {
       slot="Overview"
       title="LR-101"
       image={{
-        src: "~/assets/images/projects/liquids/overview.jpg",
+        src: import("~/assets/images/projects/liquids/overview.jpg"),
         alt: "LR-101 Engine",
       }}
       stats={[
@@ -91,7 +91,7 @@ const metadata = {
       title="Propulsion"
       images={[
         {
-          src: "~/assets/images/projects/liquids/propulsion.webp",
+          src: import("~/assets/images/projects/liquids/propulsion.webp"),
           alt: "Rocket Motor",
         },
       ]}
@@ -116,7 +116,7 @@ const metadata = {
       title="Fluids"
       images={[
         {
-          src: "~/assets/images/projects/liquids/fluids.webp",
+          src: import("~/assets/images/projects/liquids/fluids.webp"),
           alt: "Fluids Team",
         },
       ]}
@@ -141,7 +141,7 @@ const metadata = {
       title="Electronics"
       images={[
         {
-          src: "~/assets/images/projects/liquids/electronics.webp",
+          src: import("~/assets/images/projects/liquids/electronics.webp"),
           alt: "Electronics Team",
         },
       ]}

diff --git a/src/pages/projects/nasa.astro b/src/pages/projects/nasa.astro
@@ -93,7 +93,7 @@ const metadata = {
       slot="Overview"
       title="COSMOS"
       image={{
-        src: "~/assets/images/projects/nasa/overview.webp",
+        src: import("~/assets/images/projects/nasa/overview.webp"),
         alt: "NASA Davidson Center",
       }}
       stats={[
@@ -120,7 +120,7 @@ const metadata = {
       title="Structures"
       images={[
         {
-          src: "~/assets/images/projects/nasa/structures.webp",
+          src: import("~/assets/images/projects/nasa/structures.webp"),
           alt: "Rocket mounted on a launch stand",
         },
       ]}
@@ -139,7 +139,7 @@ const metadata = {
       title="Flight Systems"
       images={[
         {
-          src: "~/assets/images/projects/nasa/avionics.webp",
+          src: import("~/assets/images/projects/nasa/avionics.webp"),
           alt: "NASA SL avionics bay",
         },
       ]}
@@ -169,7 +169,7 @@ const metadata = {
       title="Payload"
       images={[
         {
-          src: "~/assets/images/projects/nasa/payload.webp",
+          src: import("~/assets/images/projects/nasa/payload.webp"),
           alt: "NASA SL payload",
         },
       ]}

diff --git a/src/pages/projects/sac.astro b/src/pages/projects/sac.astro
@@ -103,7 +103,7 @@ const metadata = {
       slot="Overview"
       title="ILIAD"
       image={{
-        src: "~/assets/images/projects/sac/overview.webp",
+        src: import("~/assets/images/projects/sac/overview.webp"),
         alt: "Iliad",
       }}
       stats={[
@@ -128,7 +128,7 @@ const metadata = {
       title="Structures"
       images={[
         {
-          src: "~/assets/images/projects/sac/structures.webp",
+          src: import("~/assets/images/projects/sac/structures.webp"),
           alt: "Structures Team",
         },
       ]}
@@ -146,7 +146,7 @@ const metadata = {
       title="Avionics"
       images={[
         {
-          src: "~/assets/images/projects/sac/avionics.webp",
+          src: import("~/assets/images/projects/sac/avionics.webp"),
           alt: "Avionics Bay",
         },
       ]}
@@ -165,7 +165,7 @@ const metadata = {
       title="Aerodynamics"
       images={[
         {
-          src: "~/assets/images/projects/sac/aerodynamics.webp",
+          src: import("~/assets/images/projects/sac/aerodynamics.webp"),
           alt: "CFD Simulation",
         },
       ]}
@@ -183,11 +183,11 @@ const metadata = {
       title="Recovery"
       images={[
         {
-          src: "~/assets/images/projects/sac/recovery1.webp",
+          src: import("~/assets/images/projects/sac/recovery1.webp"),
           alt: "Testing of parachute cord",
         },
         {
-          src: "~/assets/images/projects/sac/recovery2.webp",
+          src: import("~/assets/images/projects/sac/recovery2.webp"),
           alt: "Deployed parachute after landing",
         },
       ]}
@@ -206,7 +206,7 @@ const metadata = {
       title="Payload"
       images={[
         {
-          src: "~/assets/images/projects/sac/payload.webp",
+          src: import("~/assets/images/projects/sac/payload.webp"),
           alt: "Payload",
         },
       ]}
@@ -224,7 +224,7 @@ const metadata = {
       title="Propulsion"
       images={[
         {
-          src: "~/assets/images/projects/sac/propulsion.webp",
+          src: import("~/assets/images/projects/sac/propulsion.webp"),
           alt: "Static fire of student-developed rocket motor",
         },
       ]}

diff --git a/src/staffData.csv b/src/staffData.csv
@@ -1,35 +1,39 @@
-title,name,year,major,email,linkedin
-President,Lauren Clar,Senior,Computer Science and Engineering,,https://www.linkedin.com/in/lauren-clar-b4b357227
-Vice President,Elhan Majed,Sophomore,Mechanical Engineering ,,https://www.linkedin.com/in/elhan-majed-23a215283/
-Former Vice President,Alex Echanove,Graduate Student,Computer Science and Engineering,,https://www.linkedin.com/in/alejandro-echanove-8a456314a/
-Communications Director,Vacant Communications Director,,,,
-Finance Director,Youssef Erraki,,,,https://www.linkedin.com/in/youssef-erraki-50340a2a0/
-Business Ops Director,Marc Chow,,,[email protected],https://www.linkedin.com/in/marcchow2/
-Community Outreach Chair,Waleed Chaudhary,,,,
-Recruitment & Involvement Chair,Junchen Wu,Sophomore,,,https://www.linkedin.com/in/junchen-wu-35215924b/
-Alumni & Sponsorship Chair,Hana Winchester,Sophomore,Computer Science and Engineering,,https://www.linkedin.com/in/hana-winchester-988282258/
-Merchandise Chair,Grayson Ullman,,,,
-Social Media Chair,Anastasia Anikina,,,,https://www.linkedin.com/in/anistanika/
-Webmaster,Brian Jia,Sophomore,Electrical and 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 Deputy Project Manager,Abby Atchley,Senior,Computer Science and 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 ,,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,,,,https://www.linkedin.com/in/cameron-burford/
-Spaceport Deputy Project Manager,Rahul Srinivas,,,[email protected],https://www.linkedin.com/in/rahul-srinivas-501sw/
-Spaceport Structures Lead,Liam Juhas,,,[email protected],https://www.linkedin.com/in/liam-juhas-a14567267/
-Spaceport Avionics Lead,Toby Simpson,,,[email protected],
-Spaceport Aerodynamics Lead,Jackson Nicley,,,[email protected],https://www.linkedin.com/in/jackson-nicley/
-Spaceport Recovery Lead,Calvin Beall,,,[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,,,,https://www.linkedin.com/in/mdg25/
-Liquids Project Manager,Zach Campbell,,,,https://www.linkedin.com/in/zach-campbell-8bb08b244/
-Liquids Deputy Project Manager,Miguel Abando,,,,https://www.linkedin.com/in/miguel-antonio-abando-593533252/
-Liquids Propulsion Lead,Thomas Yu,,,,https://www.linkedin.com/in/thomas-yu-0b8b5a28a/
-Liquids Fluids Lead,Zafar Shaik,,,[email protected],https://www.linkedin.com/in/zafarshaik/
-Liquids DAQ/GSE Lead,Julian Hooks,,,[email protected],https://www.linkedin.com/in/julian-hooks-56912b291/
-Liquids Test Director,Ray Saracene,,,[email protected],
+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/,
+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/,
+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/,
+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 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/,
+,,,,,,
+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 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/,
+,,,,,,
+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 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],,
diff --git a/src/staffData.ts b/src/staffData.ts
@@ -1,6 +1,8 @@
 // @ts-ignore TSC doesn't know that we have a Vite plugin for csv
 import staffData from "./staffData.csv";
 
+
+
 export interface StaffData {
     [name: string]: StaffRecord;
 }
@@ -29,16 +31,6 @@ export default function getStaffRecord(name: string): StaffRecord {
 
     if (!record) throw new Error("No staff record found for " + name);
 
-    // Check if email contains last name
-    let lastName = name.split(' ').at(-1)?.toLowerCase();
-    if (lastName) {
-        if (record.email) {
-            if (!record.email.toLowerCase().includes(lastName)) {
-                throw new Error(name);
-            }
-        }
-    }
-
     return record;
 }