diff --git a/src/pages/Recruitment/Recruitment.tsx b/src/pages/Recruitment/Recruitment.tsx
index 4a92112bbb..139671fc61 100644
--- a/src/pages/Recruitment/Recruitment.tsx
+++ b/src/pages/Recruitment/Recruitment.tsx
@@ -8,7 +8,7 @@ import JoinUs from "../../static/img/team/joinus.png";
import "../../theme/styles.scss";
import JobPostings from "components/Postings/Postings";
-import { Button } from "components";
+//import { Button } from "components";
import usePostings from "hooks/postings";
const castData: MyProps[] = Text;
const imgData: string[] = [JoinUs];
@@ -25,9 +25,9 @@ const VideoContainer = styled.div`
padding-top: 56.25%; /* 16:9 Aspect Ratio (divide 9 by 16 = 0.5625) */
`;
-const SignUpButton = styled(Button)`
- width: 128px;
-`;
+//const SignUpButton = styled(Button)`
+ //width: 128px;
+//;
const Recruitment: React.FC = () =>{
@@ -84,9 +84,12 @@ const Recruitment: React.FC = () =>{
Missed recruitment but still want to join our team? Reach out to us at join@waterloop.ca!
*/}
- Want to learn about linear induction motors, high power PCBS, or other technical and business topics? Fill out out our Application Form here.
+ {//Want to learn about linear induction motors, high power PCBS, or other technical and business topics? Fill out out our Application Form here.
+ }
+ Have questions? Check our FAQ, or contact us.
+ );
+}
+
+export default App;
diff --git a/waterloop-website/src/App.test.js b/waterloop-website/src/App.test.js
new file mode 100644
index 0000000000..1f03afeece
--- /dev/null
+++ b/waterloop-website/src/App.test.js
@@ -0,0 +1,8 @@
+import { render, screen } from '@testing-library/react';
+import App from './App';
+
+test('renders learn react link', () => {
+ render();
+ const linkElement = screen.getByText(/learn react/i);
+ expect(linkElement).toBeInTheDocument();
+});
diff --git a/waterloop-website/src/index.css b/waterloop-website/src/index.css
new file mode 100644
index 0000000000..ec2585e8c0
--- /dev/null
+++ b/waterloop-website/src/index.css
@@ -0,0 +1,13 @@
+body {
+ margin: 0;
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+ 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+ sans-serif;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+code {
+ font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+ monospace;
+}
diff --git a/waterloop-website/src/index.js b/waterloop-website/src/index.js
new file mode 100644
index 0000000000..d563c0fb10
--- /dev/null
+++ b/waterloop-website/src/index.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import './index.css';
+import App from './App';
+import reportWebVitals from './reportWebVitals';
+
+const root = ReactDOM.createRoot(document.getElementById('root'));
+root.render(
+
+
+
+);
+
+// If you want to start measuring performance in your app, pass a function
+// to log results (for example: reportWebVitals(console.log))
+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+reportWebVitals();
diff --git a/waterloop-website/src/logo.svg b/waterloop-website/src/logo.svg
new file mode 100644
index 0000000000..9dfc1c058c
--- /dev/null
+++ b/waterloop-website/src/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/waterloop-website/src/reportWebVitals.js b/waterloop-website/src/reportWebVitals.js
new file mode 100644
index 0000000000..5253d3ad9e
--- /dev/null
+++ b/waterloop-website/src/reportWebVitals.js
@@ -0,0 +1,13 @@
+const reportWebVitals = onPerfEntry => {
+ if (onPerfEntry && onPerfEntry instanceof Function) {
+ import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+ getCLS(onPerfEntry);
+ getFID(onPerfEntry);
+ getFCP(onPerfEntry);
+ getLCP(onPerfEntry);
+ getTTFB(onPerfEntry);
+ });
+ }
+};
+
+export default reportWebVitals;
diff --git a/waterloop-website/src/setupTests.js b/waterloop-website/src/setupTests.js
new file mode 100644
index 0000000000..8f2609b7b3
--- /dev/null
+++ b/waterloop-website/src/setupTests.js
@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom';
From 2d8ceb5f4773af0ef1b5fce527555c9afa998d8f Mon Sep 17 00:00:00 2001
From: Jack Fogerty <156630534+jackfogerty@users.noreply.github.com>
Date: Thu, 13 Mar 2025 23:05:36 -0400
Subject: [PATCH 2/5] added goose 5 to past geese, replaced text to show that
goose 6 exists, need to update features and images, as well as getting goose
5 blurb
---
src/components/PastGeeseTimeline/hooks/geese-images.ts | 7 +++++++
src/pages/Contact.tsx | 5 +++--
src/pages/Flock.tsx | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/components/PastGeeseTimeline/hooks/geese-images.ts b/src/components/PastGeeseTimeline/hooks/geese-images.ts
index d7a127b7d2..ec0254eaaf 100644
--- a/src/components/PastGeeseTimeline/hooks/geese-images.ts
+++ b/src/components/PastGeeseTimeline/hooks/geese-images.ts
@@ -4,6 +4,7 @@ import goose1 from '../../../static/img/pgimgs/goose1.png';
import goose2 from '../../../static/img/pgimgs/goose2.png';
import goose3 from '../../../static/img/pgimgs/goose3.png';
import goose4 from '../../../static/img/pgimgs/goose4.png';
+import goose5 from '../../../static/img/pgimgs/goose5.png';
interface Image {
imgFile: string;
@@ -49,6 +50,12 @@ const imgs: Image[] = [
desc:
'By the fourth competition, we had realized that, despite wheeled propulsion posting record-breaking speeds in the SpaceX Hyperloop tube, there was no way of scaling those systems to transcontinental scale—wheels spinning at Mach 1 simply cannot last. We pivoted to designing a contactless linear induction motor from scratch, and simplified the rest of the pod to allow us to devote the majority of our time on the most difficult research.',
},
+ {
+ imgFile: goose5,
+ name: 'Goose V',
+ desc:
+ 'Placeholder text'
+ }
];
const useGeeseImages:
diff --git a/src/pages/Contact.tsx b/src/pages/Contact.tsx
index fb145c3bf7..5edd83dc79 100644
--- a/src/pages/Contact.tsx
+++ b/src/pages/Contact.tsx
@@ -4,7 +4,7 @@ import { ContactForm } from "components/ContactForm";
import Hero from "components/Hero/General";
// import { MAP } from "../config/map";
import "../theme/styles.scss";
-import NewsletterSignUpForm from "components/NewsletterSignUpForm";
+//import NewsletterSignUpForm from "components/NewsletterSignUpForm";
const Contact: React.FC = () => (
@@ -23,7 +23,8 @@ const Contact: React.FC = () => (
desc="Want to get in touch? Submit this form or drop us a message at contact@waterloop.ca"
>
-
+ {//
+ }
From a62d64899e709208c67d2190ed884387ed203a95 Mon Sep 17 00:00:00 2001
From: Jack Fogerty <156630534+jackfogerty@users.noreply.github.com>
Date: Tue, 18 Mar 2025 17:48:22 -0400
Subject: [PATCH 3/5] changed FAQ link to a button for consistency and removed
contact us hyperlink
---
src/pages/Recruitment/Recruitment.tsx | 14 +++++++-------
src/static/copy/Flock/exFeatsModel.json | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/pages/Recruitment/Recruitment.tsx b/src/pages/Recruitment/Recruitment.tsx
index 139671fc61..dace47554b 100644
--- a/src/pages/Recruitment/Recruitment.tsx
+++ b/src/pages/Recruitment/Recruitment.tsx
@@ -6,9 +6,9 @@ import { MyProps } from "components/TextWithImage";
import Text from "static/copy/Recruitment/Recruitment.json";
import JoinUs from "../../static/img/team/joinus.png";
import "../../theme/styles.scss";
-
import JobPostings from "components/Postings/Postings";
-//import { Button } from "components";
+
+import { Button } from "components";
import usePostings from "hooks/postings";
const castData: MyProps[] = Text;
const imgData: string[] = [JoinUs];
@@ -25,9 +25,9 @@ const VideoContainer = styled.div`
padding-top: 56.25%; /* 16:9 Aspect Ratio (divide 9 by 16 = 0.5625) */
`;
-//const SignUpButton = styled(Button)`
- //width: 128px;
-//;
+const FAQButton = styled(Button)`
+ width: 256px;
+`;
const Recruitment: React.FC = () =>{
@@ -86,9 +86,9 @@ const Recruitment: React.FC = () =>{
{//Want to learn about linear induction motors, high power PCBS, or other technical and business topics? Fill out out our Application Form here.
}
- Have questions? Check our FAQ, or contact us.
+ Have questions? Check our FAQ, or contact us.
- {// window.open('http://wloop.fly.dev/subscribe')} text="Sign up" backgroundColor="yellow" textColor="black" />
+ { window.open('recruitment/faq')} text="Frequently Asked Questions" backgroundColor="yellow" textColor="black" />
}
)}
diff --git a/src/static/copy/Flock/exFeatsModel.json b/src/static/copy/Flock/exFeatsModel.json
index b25ad8daed..05fe2a9979 100644
--- a/src/static/copy/Flock/exFeatsModel.json
+++ b/src/static/copy/Flock/exFeatsModel.json
@@ -2,27 +2,27 @@
"features": [
{
"imgAlt": "LIM.png",
- "header": "Linear Induction Motor",
+ "header": "GOOSE 6 PLACEHOLDER FEATURE",
"desc": "To scale to Hyperloop speeds, we need contactless propulsion. LIMs provide a way to levitate, stabilize, and propel, all in the same package, and they require a simple metal track with no magnets - perfect for minimizing infrastructure cost."
},
{
"imgAlt": "frame.png",
- "header": "Frame & Shell",
+ "header": "GOOSE 6 PLACEHOLDER FEATURE",
"desc": "The frame and shell provide structures to support the motor, battery, and everything else onboard the pod. It needs to withstand hundreds of pounds of force in any direction and yet be extremely lightweight, reliable, and expandable."
},
{
"imgAlt": "guidance.png",
- "header": "Guidance & Braking",
+ "header": "GOOSE 6 PLACEHOLDER FEATURE",
"desc": "Guidance and braking are failsafe mechanisms to control the pod's position and speed. Guidance wheels hold the LIM at a distance from the track measured in mere millimeters, and the mechanical brakes automatically actuate in the unlikely scenarios of loss of communications, electrical power, or pneumatic pressure."
},
{
"imgAlt": "battery.png",
- "header": "Motor Controller & Battery",
+ "header": "GOOSE 6 PLACEHOLDER FEATURE",
"desc": "Our high voltage power systems convert kilowatts of power from a carefully monitored lithium battery into three-phase power precisely modulated to maximize the linear induction motor's thrust."
},
{
"imgAlt": "embedded.png",
- "header": "Embedded Systems",
+ "header": "GOOSE 6 PLACEHOLDER FEATURE",
"desc": "The distributed flight computer aboard the pod implements realtime control algorithms for the power signals supplied to the LIM to allow efficient control at all speeds, and numerous sensors to analyze the performance and health of all subsystems. Our dashboard additionally gives us fine-grained, fail-safe control over everything the pod does during a test run."
}
]
From 00c94e19b2a374e3f755c24cea41b37dd0391b69 Mon Sep 17 00:00:00 2001
From: Jack Fogerty <156630534+jackfogerty@users.noreply.github.com>
Date: Wed, 2 Apr 2025 16:07:37 -0400
Subject: [PATCH 4/5] added team descriptions to website, adding circular
images right now for profile of team leads
---
src/components/OurTeam/OurTeam.tsx | 3 +
.../PastGeeseTimeline/hooks/geese-images.ts | 2 +-
src/components/Sponsor/SponsorPage.tsx | 2 +-
src/components/SponsorsLanding/index.ts | 2 +-
src/components/TextWithProfileImage/README.md | 33 +++++++
.../TextWithProfileImage.tsx | 83 ++++++++++++++++++
src/components/TextWithProfileImage/index.ts | 1 +
src/pages/Flock.tsx | 4 +-
src/pages/Home.tsx | 32 +++++--
src/pages/Sponsors.tsx | 45 +++++++++-
src/pages/Team.tsx | 66 +++++++++++++-
src/static/copy/Flock/exFeatsModel.json | 10 +--
src/static/copy/Recruitment/Recruitment.json | 2 +-
src/static/copy/Team/admin.json | 6 ++
src/static/copy/Team/descriptions.json | 1 +
src/static/copy/Team/electrical.json | 6 ++
src/static/copy/Team/exec.json | 6 ++
src/static/copy/Team/infrastructure.json | 6 ++
src/static/copy/Team/mech.json | 6 ++
src/static/copy/Team/software.json | 6 ++
src/static/copy/Team/teamleads.json | 6 ++
src/static/copy/Team/web.json | 6 ++
src/static/img/goose/goose6.png | Bin 0 -> 157611 bytes
src/static/img/goose/goose6_2.png | Bin 0 -> 100993 bytes
src/static/img/goose/goose6_better.png | Bin 0 -> 172975 bytes
src/static/img/goose/goose6_full.png | Bin 0 -> 199297 bytes
.../official-sponsors/Dassault-Systems.png | Bin 0 -> 23547 bytes
src/static/img/official-sponsors/SKF-Logo.png | Bin 0 -> 6618 bytes
src/static/img/official-sponsors/Stantec.png | Bin 0 -> 179942 bytes
src/static/img/official-sponsors/altium.jpg | Bin 0 -> 5466 bytes
src/static/img/official-sponsors/altium.png | Bin 0 -> 3489 bytes
src/static/img/official-sponsors/ansys.png | Bin 0 -> 33602 bytes
src/static/img/official-sponsors/bild.png | Bin 0 -> 32228 bytes
src/static/img/official-sponsors/hakko.png | Bin 0 -> 3335 bytes
src/static/img/official-sponsors/keysight.jpg | Bin 0 -> 4884 bytes
.../img/official-sponsors/mitutoyo_logo.png | Bin 0 -> 14734 bytes
src/static/img/team/propulsion_leads.png | Bin 0 -> 361868 bytes
src/theme/styles.scss | 13 +++
38 files changed, 324 insertions(+), 23 deletions(-)
create mode 100644 src/components/TextWithProfileImage/README.md
create mode 100644 src/components/TextWithProfileImage/TextWithProfileImage.tsx
create mode 100644 src/components/TextWithProfileImage/index.ts
create mode 100644 src/static/copy/Team/admin.json
create mode 100644 src/static/copy/Team/electrical.json
create mode 100644 src/static/copy/Team/exec.json
create mode 100644 src/static/copy/Team/infrastructure.json
create mode 100644 src/static/copy/Team/mech.json
create mode 100644 src/static/copy/Team/software.json
create mode 100644 src/static/copy/Team/teamleads.json
create mode 100644 src/static/copy/Team/web.json
create mode 100644 src/static/img/goose/goose6.png
create mode 100644 src/static/img/goose/goose6_2.png
create mode 100644 src/static/img/goose/goose6_better.png
create mode 100644 src/static/img/goose/goose6_full.png
create mode 100644 src/static/img/official-sponsors/Dassault-Systems.png
create mode 100644 src/static/img/official-sponsors/SKF-Logo.png
create mode 100644 src/static/img/official-sponsors/Stantec.png
create mode 100644 src/static/img/official-sponsors/altium.jpg
create mode 100644 src/static/img/official-sponsors/altium.png
create mode 100644 src/static/img/official-sponsors/ansys.png
create mode 100644 src/static/img/official-sponsors/bild.png
create mode 100644 src/static/img/official-sponsors/hakko.png
create mode 100644 src/static/img/official-sponsors/keysight.jpg
create mode 100644 src/static/img/official-sponsors/mitutoyo_logo.png
create mode 100644 src/static/img/team/propulsion_leads.png
diff --git a/src/components/OurTeam/OurTeam.tsx b/src/components/OurTeam/OurTeam.tsx
index 7353b43bad..44afa0750e 100644
--- a/src/components/OurTeam/OurTeam.tsx
+++ b/src/components/OurTeam/OurTeam.tsx
@@ -39,6 +39,9 @@ const OurTeam: React.FC = () => (
provide an effective mentorship experience for all new team members.
+
+ Curious how you can help? Here is a list of our teams, what they do, as well as the team leads.
+
);
diff --git a/src/pages/Sponsors.tsx b/src/pages/Sponsors.tsx
index 8050fd0e2b..cc43860748 100644
--- a/src/pages/Sponsors.tsx
+++ b/src/pages/Sponsors.tsx
@@ -1,14 +1,47 @@
import React from "react";
import Hero from "components/Hero/General";
-import SponsorList from "components/Sponsor/SponsorPage";
+//import SponsorList from "components/Sponsor/SponsorPage";
+import { SponsorsLanding } from 'components/SponsorsLanding';
import { TextWithImage } from "components/TextWithImage";
import { MyProps } from "components/TextWithImage";
import Text from "static/copy/Sponsors/Sponsors.json";
import SponsorsImg from "../static/img/team/sponsors.png";
import "../theme/styles.scss";
+import { ImgJSON } from 'components/SponsorsLanding';
+//import ColText from 'static/copy/Landing/ColumnBlock.json';
+
+// Images for sponsors:
+import Weef from '../static/img/official-sponsors/weef.jpg';
+import WaterlooEng from '../static/img/official-sponsors/wes.jpg';
+import UW from '../static/img/official-sponsors/foe.jpg';
+import Altium from '../static/img/official-sponsors/altium.png';
+import Ansys from '../static/img/official-sponsors/ansys.png';
+import BILD from '../static/img/official-sponsors/bild.png';
+import Dassault from '../static/img/official-sponsors/Dassault-Systems.png';
+import Hakko from '../static/img/official-sponsors/hakko.png';
+import Keysight from '../static/img/official-sponsors/keysight.jpg';
+import Mitutoyo from '../static/img/official-sponsors/mitutoyo_logo.png';
+import SKF from '../static/img/official-sponsors/SKF-Logo.png';
+import Stantec from '../static/img/official-sponsors/Stantec.png';
const castData: MyProps[] = Text;
const imgData: string[] = [SponsorsImg];
+//const ColData: Props[] = ColText;
+
+const imgJSON: ImgJSON[] = [
+ { imgSrc: Weef, imgAlt: 'Weef' },
+ { imgSrc: WaterlooEng, imgAlt: 'WaterlooEng' },
+ { imgSrc: UW, imgAlt: 'UW' },
+ { imgSrc: Ansys, imgAlt: 'Ansys' },
+ { imgSrc: BILD, imgAlt: 'BILD' },
+ { imgSrc: Dassault, imgAlt: 'Dassault' },
+ { imgSrc: Hakko, imgAlt: 'Hakko' },
+ { imgSrc: Keysight, imgAlt: 'Keysight' },
+ { imgSrc: Mitutoyo, imgAlt: 'Mitutoyo' },
+ { imgSrc: SKF, imgAlt: 'SKF' },
+ { imgSrc: Stantec, imgAlt: 'Stantec' },
+ { imgSrc: Altium, imgAlt: 'Altium' },
+];
const Sponsors: React.FC = () => (
);
diff --git a/src/pages/Team.tsx b/src/pages/Team.tsx
index 128d9e1694..84732127ab 100644
--- a/src/pages/Team.tsx
+++ b/src/pages/Team.tsx
@@ -2,7 +2,28 @@ import React from "react";
import Hero from "components/Hero/General";
import styled from "styled-components";
import OurTeam from "components/OurTeam";
-// import TeamsDisplayer from "components/TeamsDisplayer";
+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 ElecText from "static/copy/Team/electrical.json";
+import ExecText from "static/copy/Team/exec.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
+const elecText: MyProps [] = ElecText
+const execText: MyProps [] = ExecText
+const infraText: MyProps [] = InfraText
+const mechText: MyProps [] = MechText
+const softwareText: MyProps [] = SoftwareText
+const leadText: MyProps [] = LeadText
+const webImg : string[] = [propulsionLeads]
const ContentContainer = styled.div`
display: block;
@@ -21,8 +42,49 @@ const Teams: React.FC = () => (
- {/* // TODO: uncomment me when teamhub roster has been updated properly. */}
+ {// TODO: uncomment me when teamhub roster has been updated properly. */
+ }
+
+
+
+
+
+
+
+
);
diff --git a/src/static/copy/Flock/exFeatsModel.json b/src/static/copy/Flock/exFeatsModel.json
index 05fe2a9979..f92e8431ec 100644
--- a/src/static/copy/Flock/exFeatsModel.json
+++ b/src/static/copy/Flock/exFeatsModel.json
@@ -2,27 +2,27 @@
"features": [
{
"imgAlt": "LIM.png",
- "header": "GOOSE 6 PLACEHOLDER FEATURE",
+ "header": "Linear Induction Motor",
"desc": "To scale to Hyperloop speeds, we need contactless propulsion. LIMs provide a way to levitate, stabilize, and propel, all in the same package, and they require a simple metal track with no magnets - perfect for minimizing infrastructure cost."
},
{
"imgAlt": "frame.png",
- "header": "GOOSE 6 PLACEHOLDER FEATURE",
+ "header": "Frame and Shell",
"desc": "The frame and shell provide structures to support the motor, battery, and everything else onboard the pod. It needs to withstand hundreds of pounds of force in any direction and yet be extremely lightweight, reliable, and expandable."
},
{
"imgAlt": "guidance.png",
- "header": "GOOSE 6 PLACEHOLDER FEATURE",
+ "header": "Guiding and Braking",
"desc": "Guidance and braking are failsafe mechanisms to control the pod's position and speed. Guidance wheels hold the LIM at a distance from the track measured in mere millimeters, and the mechanical brakes automatically actuate in the unlikely scenarios of loss of communications, electrical power, or pneumatic pressure."
},
{
"imgAlt": "battery.png",
- "header": "GOOSE 6 PLACEHOLDER FEATURE",
+ "header": "Motor Controller and Battery",
"desc": "Our high voltage power systems convert kilowatts of power from a carefully monitored lithium battery into three-phase power precisely modulated to maximize the linear induction motor's thrust."
},
{
"imgAlt": "embedded.png",
- "header": "GOOSE 6 PLACEHOLDER FEATURE",
+ "header": "Embedded Systems",
"desc": "The distributed flight computer aboard the pod implements realtime control algorithms for the power signals supplied to the LIM to allow efficient control at all speeds, and numerous sensors to analyze the performance and health of all subsystems. Our dashboard additionally gives us fine-grained, fail-safe control over everything the pod does during a test run."
}
]
diff --git a/src/static/copy/Recruitment/Recruitment.json b/src/static/copy/Recruitment/Recruitment.json
index ad7b663bc3..ee942d60da 100644
--- a/src/static/copy/Recruitment/Recruitment.json
+++ b/src/static/copy/Recruitment/Recruitment.json
@@ -5,4 +5,4 @@
"link": "https://forms.gle/jfcf6xypJukN9xjf7",
"linkText": "Apply Now"
}
-]
+]
\ No newline at end of file
diff --git a/src/static/copy/Team/admin.json b/src/static/copy/Team/admin.json
new file mode 100644
index 0000000000..24f199e3f9
--- /dev/null
+++ b/src/static/copy/Team/admin.json
@@ -0,0 +1,6 @@
+[
+ {
+ "title": "Admin, Team Lead: x",
+ "text": "The business team is responsible for the marketing, sponsorship, and finance side of things at Waterloop. From posting social media campaigns to filling out funding applications and communicating with sponsors, the business team works hard to promote the Waterloop brand and support it financially. And don’t forget about everyone's favorite part, the business team also creates merch! "
+ }
+]
\ No newline at end of file
diff --git a/src/static/copy/Team/descriptions.json b/src/static/copy/Team/descriptions.json
index 593301d3c7..ad76019528 100644
--- a/src/static/copy/Team/descriptions.json
+++ b/src/static/copy/Team/descriptions.json
@@ -1,3 +1,4 @@
+
{
"Web": "The web team maintains and updates all web related projects on the team, including internal tools and marketing software. Tasks span across several different skills such as web development, design, project management, and quality assurance. Recent projects include development of the current marketing website and an internal team hub. ",
"Electrical": "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.",
diff --git a/src/static/copy/Team/electrical.json b/src/static/copy/Team/electrical.json
new file mode 100644
index 0000000000..ef60b15c91
--- /dev/null
+++ b/src/static/copy/Team/electrical.json
@@ -0,0 +1,6 @@
+[
+ {
+ "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."
+ }
+]
\ No newline at end of file
diff --git a/src/static/copy/Team/exec.json b/src/static/copy/Team/exec.json
new file mode 100644
index 0000000000..2e0b5485f3
--- /dev/null
+++ b/src/static/copy/Team/exec.json
@@ -0,0 +1,6 @@
+[
+ {
+ "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."
+ }
+]
\ No newline at end of file
diff --git a/src/static/copy/Team/infrastructure.json b/src/static/copy/Team/infrastructure.json
new file mode 100644
index 0000000000..c5e6c03d0d
--- /dev/null
+++ b/src/static/copy/Team/infrastructure.json
@@ -0,0 +1,6 @@
+[
+ {
+ "title": "Infrastructure, Team Lead:",
+ "text": "Infrastructure is responsible for exploring the broader feasibility of Hyperloop transportation. In particular, the team is working with UWaterloo administrators and industry connections to plan, design and construct a local test track facility. The test track would be used for testing, research, and hosting events for competition."
+ }
+]
\ No newline at end of file
diff --git a/src/static/copy/Team/mech.json b/src/static/copy/Team/mech.json
new file mode 100644
index 0000000000..ab64271c27
--- /dev/null
+++ b/src/static/copy/Team/mech.json
@@ -0,0 +1,6 @@
+[
+ {
+ "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."
+ }
+]
\ No newline at end of file
diff --git a/src/static/copy/Team/software.json b/src/static/copy/Team/software.json
new file mode 100644
index 0000000000..0eb4e2bbda
--- /dev/null
+++ b/src/static/copy/Team/software.json
@@ -0,0 +1,6 @@
+[
+ {
+ "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."
+ }
+]
\ No newline at end of file
diff --git a/src/static/copy/Team/teamleads.json b/src/static/copy/Team/teamleads.json
new file mode 100644
index 0000000000..5c025ab948
--- /dev/null
+++ b/src/static/copy/Team/teamleads.json
@@ -0,0 +1,6 @@
+[
+ {
+ "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."
+ }
+]
\ No newline at end of file
diff --git a/src/static/copy/Team/web.json b/src/static/copy/Team/web.json
new file mode 100644
index 0000000000..ea8ec92fe9
--- /dev/null
+++ b/src/static/copy/Team/web.json
@@ -0,0 +1,6 @@
+[
+ {
+ "title": "Web, Team Lead: x",
+ "text": "The web team maintains and updates all web related projects on the team, including internal tools and marketing software. Tasks span across several different skills such as web development, design, project management, and quality assurance. "
+ }
+]
\ No newline at end of file
diff --git a/src/static/img/goose/goose6.png b/src/static/img/goose/goose6.png
new file mode 100644
index 0000000000000000000000000000000000000000..75183c6afc5c9e6e248208fea2df75d819d62065
GIT binary patch
literal 157611
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