Skip to content

Commit

Permalink
Merge pull request #63 from waterloo-rocketry/update-member-list
Browse files Browse the repository at this point in the history
Update Member List
  • Loading branch information
Redstone-ray authored Feb 5, 2024
2 parents d03cd0f + 4550fe0 commit cd9bd42
Show file tree
Hide file tree
Showing 24 changed files with 34 additions and 27 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,5 @@ dist
.pnp.*

# Misc
.DS_Store
.DS_Store
.vscode/
11 changes: 0 additions & 11 deletions .vscode/settings.json

This file was deleted.

Binary file added src/img/teams/ManavT.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/img/teams/adamL.jpg
Binary file not shown.
Binary file added src/img/teams/alexA.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/img/teams/anthonyC.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/teams/ashL.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/img/teams/charlieB.jpg
Binary file not shown.
Binary file added src/img/teams/connorS.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/img/teams/evanC.jpg
Binary file not shown.
Binary file added src/img/teams/jenniferL.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/teams/jeremyS.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/img/teams/kimiL.jpg
Binary file not shown.
Binary file added src/img/teams/lucaS.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/teams/lucasS.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/teams/lydiaG.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/img/teams/makisL.jpg
Binary file not shown.
Binary file modified src/img/teams/michaelZ.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/teams/pranavM.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/teams/rheaS.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/img/teams/richardD.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/teams/seanG.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/teams/yuranW.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 32 additions & 15 deletions src/routes/Team.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,49 +11,57 @@ import teamCoverImage from '../img/teams/team-win-min.jpg';
// Members
import AaronL from '../img/teams/aaronL.jpg';
import ABMH from '../img/teams/abmH.jpg';
import AdamL from '../img/teams/adamL.jpg';
import AlexA from '../img/teams/alexA.jpg';
import AndreA from '../img/teams/andreA.jpg';
import AnthonyC from '../img/teams/anthonyC.jpg';
import ArtemS from '../img/teams/artemS.jpg';
import AshL from '../img/teams/ashL.jpg';
import CaseyT from '../img/teams/caseyT.jpg';
import ChamathW from '../img/teams/chamathW.jpg';
import CharlieB from '../img/teams/charlieB.jpg';
import ChrisS from '../img/teams/chrisS.jpg';
import ConnorS from '../img/teams/connorS.jpg';
import DavisL from '../img/teams/davisL.jpg';
import DomenicH from '../img/teams/domenicH.jpg';
import EvanC from '../img/teams/evanC.jpg';
import ElizabethX from '../img/teams/elizabethX.jpg';
import FrancisY from '../img/teams/francisY.jpg';
import JackC from '../img/teams/jackC.jpg';
import JasonX from '../img/teams/jasonX.jpg';
import JenniferL from '../img/teams/jenniferL.jpg';
import JeremyS from '../img/teams/jeremyS.jpg';
import JerryL from '../img/teams/jerryL.jpg';
import JiyaM from '../img/teams/jiyaM.jpg';
import JoeD from '../img/teams/joeD.jpg';
import JoelG from '../img/teams/joelG.jpg';
import KasiaA from '../img/teams/kasiaA.jpg';
import KavinS from '../img/teams/kavinS.jpg';
import KeeganT from '../img/teams/keeganT.jpg';
import KimiL from '../img/teams/kimiL.jpg';
import LanaT from '../img/teams/lanaT.jpg';
import LucaS from '../img/teams/lucaS.jpg';
import LucasS from '../img/teams/lucasS.jpg';
import LydiaG from '../img/teams/lydiaG.jpg';
import MabelA from '../img/teams/mabelA.jpg';
import MakisL from '../img/teams/makisL.jpg';
import ManavT from '../img/teams/ManavT.jpg';
import MatthewG from '../img/teams/matthewG.jpg';
import MichaelZ from '../img/teams/michaelZ.jpg';
import NahvidZ from '../img/teams/nahvidZ.jpg';
import OwenH from '../img/teams/owenH.jpg';
import OzayrR from '../img/teams/ozayrR.jpg';
import PatrickG from '../img/teams/patrickG.jpg';
import PranavM from '../img/teams/pranavM.jpg';
import RheaS from '../img/teams/rheaS.jpg';
import RichardD from '../img/teams/richardD.jpg';
import RidaS from '../img/teams/ridaS.jpg';
import RioL from '../img/teams/rioL.jpg';
import RobertC from '../img/teams/robertC.jpg';
import RomanK from '../img/teams/romanK.jpg';
import RyanL from '../img/teams/ryanL.jpg';
import SeanG from '../img/teams/seanG.jpg';
import StefanA from '../img/teams/stefanA.jpg';
import TessaP from '../img/teams/tessaP.jpg';
import ThomasF from '../img/teams/thomasf.jpg';
import ThomasM from '../img/teams/thomasm.jpg';
import XavierR from '../img/teams/xavierR.jpg';
import YuRanW from '../img/teams/yuranW.jpg';
import ZachariahM from '../img/teams/zachM.jpg';

// Alumni
Expand Down Expand Up @@ -113,16 +121,17 @@ const Team = () => {
</Row>

<Container className={styles.containerFluid} fluid>
<MemberImage image={RomanK} name="Roman Kobets" title="Team Co-Lead" />
<MemberImage image={JackC} name="Jack Christensen" title="Team Co-Lead" />
<MemberImage image={TessaP} name="Tessa Pugh" title="Team Co-Lead" />
<MemberImage image={MatthewG} name="Matthew Gordon" title="Safety Captain/Operations Lead" />
<MemberImage image={RidaS} name="Rida Sayed" title="Safety Captain" />
<MemberImage image={RheaS} name="Rhea Scollie" title="Safety Captain" />
<MemberImage image={AaronL} name="Aaron Leszkowiat" title="Senior Member" />
<MemberImage image={ZachariahM} name="Zachariah Mears" title="Senior Member" />
<MemberImage image={RomanK} name="Roman Kobets" title="Senior Member" />
<MemberImage image={ABMH} name="ABM Hussein" title="Senior Member" />
<MemberImage image={LanaT} name="Lana Tomlin" title="Payload/Electrical" />
<MemberImage image={FrancisY} name="Francis Yao" title="Airframe Lead/Launch Tower" />
<MemberImage image={FrancisY} name="Francis Yao" title="Senior Member" />
<MemberImage image={ChamathW} name="Chamath Wijesekera" title="Software/Electrical" />
<MemberImage image={ChrisS} name="Chris Sankey" title="Recovery" />
<MemberImage image={KavinS} name="Kavin Satheeskumar" title="Software/Electrical/Controls" />
Expand All @@ -132,33 +141,41 @@ const Team = () => {
<MemberImage image={JerryL} name="Jerry Lu" title="Propulsion" />
<MemberImage image={ArtemS} name="Artem Sotnikov" title="Recovery" />
<MemberImage image={JoelG} name="Joel Godard" title="Airframe" />
<MemberImage image={KimiL} name="Kimi Liang" title="Airframe" />
<MemberImage image={NahvidZ} name="Nahvid Zolfaghari" title="Infrastructure Lead/Airframe" />
<MemberImage image={JoeD} name="Joe Dolina" title="Controls Lead" />
<MemberImage image={XavierR} name="Xavier Rayes" title="Propulsion/Infrastructure" />
<MemberImage image={StefanA} name="Stefan Arroyo-Cottier" title="Recovery Lead" />
<MemberImage image={AndreA} name="Andre Arroyo-Cottier" title="Propulsion/Payload" />
<MemberImage image={AdamL} name="Adam Lastovka" title="Propulsion" />
<MemberImage image={CharlieB} name="Charlie Bell" title="Propulsion" />
<MemberImage image={DomenicH} name="Domenic Hampson" title="Electrical Co-Lead" />
<MemberImage image={OwenH} name="Owen Henry" title="Payload" />
<MemberImage image={ThomasF} name="Thomas Fairhead" title="Propulsion Lead" />
<MemberImage image={OzayrR} name="Ozayr Raazi" title="Software Lead" />
<MemberImage image={KeeganT} name="Keegan Tripp" title="Media Lead" />
<MemberImage image={EvanC} name="Evan Cheung" title="Software" />
<MemberImage image={LydiaG} name="Lydia Griffith" title="Payload Lead" />
<MemberImage image={CaseyT} name="Casey Tsujita" title="Finance Lead" />
<MemberImage image={ThomasM} name="Thomas Martinez" title="Infrastructure/Electrical" />
<MemberImage image={MabelA} name="Mabel Aung" title="Propulsion/Infrastructure" />
<MemberImage image={RyanL} name="Ryan Lau" title="Flight Dynamics" />
<MemberImage image={DavisL} name="Davis Liu" title="Electrical" />
<MemberImage image={JasonX} name="Jason Xu" title="Electrical Co-Lead" />
<MemberImage image={KasiaA} name="Kasia-Alexei Delpeche" title="Airframe" />
<MemberImage image={MakisL} name="Makis Lam" title="Airframe" />
<MemberImage image={KasiaA} name="Kasia-Alexei Delpeche" title="Airframe Co-Lead" />
<MemberImage image={JiyaM} name="Jiya Makwana" title="Propulsion" />
<MemberImage image={RichardD} name="Richard Ding" title="Controls" />
<MemberImage image={AnthonyC} name="Anthony Chen" title="Software" />
<MemberImage image={JenniferL} name="Jennifer Li" title="Airframe Co-Lead" />
<MemberImage image={RichardD} name="Richard Ding" title="Controls/Ansys CFD" />
<MemberImage image={LucaS} name="Luca Scavone" title="Airframe/Flight Dynamics" />
<MemberImage image={AnthonyC} name="Anthony Chen" title="Software/Infrastructure" />
<MemberImage image={ElizabethX} name="Xiaotong Elizabeth Xiong" title="Controls/Software" />
<MemberImage image={LucasS} name="Lucas Shumaker" title="Recovery" />
<MemberImage image={ConnorS} name="Connor Stubbs" title="Propulsion/Payload" />
<MemberImage image={SeanG} name="Sean Gauthier " title="Airframe" />
<MemberImage image={ManavT} name="Manav Toor" title="Co-op" />
<MemberImage image={YuRanW} name="Yu Ran Wang" title="Propulsion" />
<MemberImage image={PatrickG} name="Patrick Gu" title="Controls/Flight Dynamics" />
<MemberImage image={AlexA} name="Alex Aumais" title="Media/Software" />
<MemberImage image={JeremyS} name="Jeremy Schnellhardt" title="Co-op" />
<MemberImage image={PranavM} name="Pranav Mahabal" title="Electrical" />
<MemberImage image={AshL} name="Ash Lang" title="Electrical/Controls" />

</Container>

<Row className="my-4 mx-2 gx-4 justify-content-center">
Expand Down

0 comments on commit cd9bd42

Please sign in to comment.