polished for merge to main

Author: jackfogerty

src/components/TextWithImage/TextWithImage.tsx

@@ -7,6 +7,8 @@ export type MyProps = {
   text: string;
   link?: string;
   linkText?: string;
+  wideImage?: boolean;
+  largeImage?: boolean;
 };
 
 interface Props {
@@ -48,7 +50,7 @@ export class TextWithImage extends React.Component<Props> {
             </div>
           </div>
           <img
-            className="Img-TextWithImage"
+            className={`Img-TextWithImage ${entry.largeImage ? 'Img-TextWithImage--large' : ''} ${entry.wideImage ? 'Img-TextWithImage--wide' : ''}`}
             src={this.props.imgData[key]}
             alt="waterloop"
           ></img>

src/components/TextWithProfileImage/TextWithProfileImage.tsx

@@ -39,20 +39,20 @@ export class TextWithProfileImage extends React.Component<Props> {
       }
 
       return (
-        <div key={key} className={`Block-TextWithImage ${posClass}`}>
-          <div className="TextBlock-TextWithImage">
+        <div key={key} className={`Block-TextWithProfileImage ${posClass}`}>
+          <div className="TextBlock-TextWithProfileImage">
             {entry.title !== undefined ? <h3>{entry.title}</h3> : <b></b>}
             <p>{entry.text}</p>
-            <div className="ButtonBlock-TextWithImage">
+            <div className="ButtonBlock-TextWithProfileImage">
               {this.renderButton(entry.link, entry.linkText)}
             </div>
           </div>
           <img
-            className="Img-TextWithImage"
+            className="Img-TextWithProfileImage"
             src={this.props.imgData[key]}
             alt="waterloop"
           ></img>
-          <div className="text-w-image-btn-mobile">
+          <div className="text-w-profile-image-btn-mobile">
             {this.renderButton(entry.link, entry.linkText)}
           </div>
         </div>

src/components/TextWithProfileImage/index.ts

@@ -1 +1 @@
-export { TextWithProfileImage} from './TextWithProfileImage'; // This will take all the named exports
+export * from './TextWithProfileImage'; // This will take all the named exports

src/components/index.ts

@@ -13,6 +13,8 @@ export * from './SimpleFeatures';
 export * from './Hero';
 export * from './TeamsDisplayer';
 export * from './TextWithImage';
+export * from './TextWithProfileImage';
+export * from './TextWithProfileImage';
 export * from './ColumnBlock';
 export * from './Postings';
 export * from './NewsletterSignUpForm';

src/pages/Team.tsx

@@ -4,26 +4,34 @@ import styled from "styled-components";
 import OurTeam from "components/OurTeam";
 import { TextWithImage } from "components";
 import { MyProps } from "components/TextWithImage";
-import { TextWithProfileImage } from "components";
 //import TeamsDisplayer from "components/TeamsDisplayer";
-import WebText from "static/copy/Team/web.json";
-import AdminText from "static/copy/Team/admin.json";
+//import WebText from "static/copy/Team/web.json";
+//import AdminText from "static/copy/Team/admin.json";
 import ElecText from "static/copy/Team/electrical.json";
 import ExecText from "static/copy/Team/exec.json";
-import InfraText from "static/copy/Team/infrastructure.json";
+//import InfraText from "static/copy/Team/infrastructure.json";
 import MechText from "static/copy/Team/mech.json";
 import SoftwareText from "static/copy/Team/software.json";
 import LeadText from "static/copy/Team/teamleads.json";
-import propulsionLeads from "static/img/team/propulsion_leads.png";
-const webText: MyProps [] = WebText
-const adminText: MyProps [] = AdminText
+//import propulsionLeads from "static/img/team/propulsion_leads.png";
+import mechLeads from "static/img/team/mech_leads.png";
+import firmwareLeads from "static/img/team/firmware_leads.png";
+import elecLeads from "static/img/team/elec_leads.png";
+import PMS from "static/img/team/PMS.png";
+
+//const webText: MyProps [] = WebText
+//const adminText: MyProps [] = AdminText
 const elecText: MyProps [] = ElecText
 const execText: MyProps [] = ExecText
-const infraText: MyProps [] = InfraText
+//const infraText: MyProps [] = InfraText
 const mechText: MyProps [] = MechText
 const softwareText: MyProps [] = SoftwareText
 const leadText: MyProps [] = LeadText
-const webImg : string[] = [propulsionLeads]
+//const propulsionImg : string[] = [propulsionLeads]
+const mechImg : string[] = [mechLeads]
+const firmwareImg : string[] = [firmwareLeads]
+const elecImg : string[] = [elecLeads]
+const PmsImg : string[] = [PMS]
 
 const ContentContainer = styled.div`
   display: block;
@@ -45,45 +53,52 @@ const Teams: React.FC = () => (
         {//<TeamsDisplayer initFilterSetting={0} /> TODO: uncomment me when teamhub roster has been updated properly. */
         }
       </ContentContainer>
-      <TextWithProfileImage
+      {
+        /*
+      <TextWithImage
           data={webText}
           textPos={"left"}
-          imgData={webImg}
-      ></TextWithProfileImage>
+          imgData={propulsionImg}
+      ></TextWithImage>
       <TextWithImage
           data={adminText}
           textPos={"right"}
-          imgData={webImg}
+          imgData={propulsionImg}
       ></TextWithImage>
+      */
+      }
       <TextWithImage
           data={elecText}
           textPos={"left"}
-          imgData={webImg}
+          imgData={elecImg}
       ></TextWithImage>
       <TextWithImage
           data={execText}
           textPos={"right"}
-          imgData={webImg}
+          imgData={PmsImg}
       ></TextWithImage>
+      {/*
       <TextWithImage
           data={infraText}
           textPos={"left"}
-          imgData={webImg}
+          imgData={propulsionImg}
       ></TextWithImage>
+      */
+      }
       <TextWithImage
           data={mechText}
-          textPos={"right"}
-          imgData={webImg}
+          textPos={"left"}
+          imgData={mechImg}
       ></TextWithImage>
       <TextWithImage
           data={softwareText}
-          textPos={"left"}
-          imgData={webImg}
+          textPos={"right"}
+          imgData={firmwareImg}
       ></TextWithImage>
       <TextWithImage
           data={leadText}
-          textPos={"right"}
-          imgData={webImg}
+          textPos={"left"}
+          imgData={PmsImg}
       ></TextWithImage>
     </div>
   </div>

src/static/copy/Team/electrical.json

@@ -1,6 +1,7 @@
 [
     {
         "title": "Electrical; Team Leads, Mathew and Christina",
-        "text": "The electrical team works on powering and controlling the Hyperloop pod while providing sensor feedback. The team has a strong focus on both HV and LV development in battery management, motor control and embedded sensing."
+        "text": "The electrical team works on powering and controlling the Hyperloop pod while providing sensor feedback. The team has a strong focus on both HV and LV development in battery management, motor control and embedded sensing.",
+        "wideImage": true
     }
 ]

src/static/copy/Team/exec.json

@@ -1,6 +1,7 @@
 [
     {
-        "title": "Executive, Team Lead: x",
-        "text": "Execs are responsible for high-level planning for the team as a whole, ensuring work is completed in time to meet short- and long-term schedule milestones, and providing technical and leadership mentorship for subteam leads."
+        "title": "Executives: Mathew, Yifei, Mark, and Surya",
+        "text": "Execs are responsible for high-level planning for the team as a whole, ensuring work is completed in time to meet short- and long-term schedule milestones, and providing technical and leadership mentorship for subteam leads.",
+        "largeImage": true
     }
 ]

src/static/copy/Team/mech.json

@@ -1,6 +1,7 @@
 [
     {
-        "title": "Mechanical, Team Lead:",
-        "text": "The mechanical team is in charge of the design, fabrication, and testing of all physical mechanisms for structures, guidance, and propulsion subsystems on the Hyperloop pod. The team uses skills in CAD, drafting, as well as analysis through simulations. Through manufacturing the pod components, machine shop skills like milling, turning and use of power-tools are learned. Recent projects include frame analysis, motor design, and mathematical modelling of pod motion."
+        "title": "Mechanical, Team Leads: Mark and Surya",
+        "text": "The mechanical team is in charge of the design, fabrication, and testing of all physical mechanisms for structures, guidance, and propulsion subsystems on the Hyperloop pod. The team uses skills in CAD, drafting, as well as analysis through simulations. Through manufacturing the pod components, machine shop skills like milling, turning and use of power-tools are learned. Recent projects include frame analysis, motor design, and mathematical modelling of pod motion.",
+        "wideImage": true
     }
 ]

src/static/copy/Team/software.json

@@ -1,6 +1,7 @@
 [
     {
-        "title": "Software, Team Lead:",
-        "text": "The software team is responsible for controlling all the embedded components related to the Hyperloop pod. Our work consists of projects on the desktop application to coding the motor controller for our Linear Induction Motor."
+        "title": "Software, Team Leads: Jessica, Tharun, and Sardor",
+        "text": "The software team is responsible for controlling all the embedded components related to the Hyperloop pod. Our work consists of projects on the desktop application to coding the motor controller for our Linear Induction Motor.",
+        "largeImage": true
     }
 ]

src/static/copy/Team/teamleads.json

@@ -1,6 +1,7 @@
 [
     {
-        "title": "Leads, Team Lead: x",
-        "text": "Leads are experienced members of the team responsible for mentoring younger members, reviewing designs, doing high-level planning and scoping tasks for each term, and ensuring work is completed in time to meet schedule milestones. This group consists of all the subteam leads as well as a few executive members who manage the overall team."
+        "title": "Leads, Team Lead: Mathew, Yifei, Mark, and Surya",
+        "text": "Leads are experienced members of the team responsible for mentoring younger members, reviewing designs, doing high-level planning and scoping tasks for each term, and ensuring work is completed in time to meet schedule milestones. This group consists of all the subteam leads as well as a few executive members who manage the overall team.",
+        "largeImage": true
     }
 ]