From 2edcc9d6d63d7fd46f98c6d1f0effd188c372ff5 Mon Sep 17 00:00:00 2001
From: darkicewolf50 <brock.tomlinson@ucalgary.ca>
Date: Sat, 23 Mar 2024 12:02:06 -0600
Subject: [PATCH] added teams: page content is ready for changes in
 Subteams.yml

---
 src/MockDB/Leadership.yml | 28 ------------------
 src/MockDB/SubTeams.yml   | 35 ++++++++++++++++++++++
 src/Teams/SubTeams.js     | 62 ++++++++++++++++++++++++++++++++-------
 3 files changed, 86 insertions(+), 39 deletions(-)
 delete mode 100644 src/MockDB/Leadership.yml
 create mode 100644 src/MockDB/SubTeams.yml

diff --git a/src/MockDB/Leadership.yml b/src/MockDB/Leadership.yml
deleted file mode 100644
index a73bc1e..0000000
--- a/src/MockDB/Leadership.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-Chassis:
-  url: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
-  shortDescription: Chassis Description (1 line)
-  longDescription: Chassis Description
-Drivetrain:
-  url: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
-  shortDescription: Drivetrain Description (1 line)
-  longDescription: Drivetrain Description
-Steering:
-  url: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
-  shortDescription: Steering Description (1 line)
-  longDescription: Steering Description
-Suspension:
-  url: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
-  shortDescription: Suspension Description (1 line)
-  longDescription: Suspension Description
-Electrical:
-  url: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
-  shortDescription: Electrical Description (1 line)
-  longDescription: Electrical Description
-Logistics:
-  url: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
-  shortDescription: Logistics Description (1 line)
-  longDescription: Logistics Description
-Software:
-  url: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
-  shortDescription: Software Description (1 line)
-  longDescription: Software Description
diff --git a/src/MockDB/SubTeams.yml b/src/MockDB/SubTeams.yml
new file mode 100644
index 0000000..34b9fc7
--- /dev/null
+++ b/src/MockDB/SubTeams.yml
@@ -0,0 +1,35 @@
+Chassis:
+  iconUrl: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+  shortDescription: Chassis Description (1 line)
+  longDescription: Chassis Description
+  subteamAtWork: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+Drivetrain:
+  iconUrl: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+  shortDescription: Drivetrain Description (1 line)
+  longDescription: Drivetrain Description
+  subteamAtWork: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+Steering:
+  iconUrl: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+  shortDescription: Steering Description (1 line)
+  longDescription: Steering Description
+  subteamAtWork: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+Suspension:
+  iconUrl: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+  shortDescription: Suspension Description (1 line)
+  longDescription: Suspension Description
+  subteamAtWork: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+Electrical:
+  iconUrl: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+  shortDescription: Electrical Description (1 line)
+  longDescription: Electrical Description
+  subteamAtWork: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+Logistics:
+  iconUrl: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+  shortDescription: Logistics Description (1 line)
+  longDescription: Logistics Description
+  subteamAtWork: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+Software:
+  iconUrl: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
+  shortDescription: Software Description (1 line)
+  longDescription: Software Description
+  subteamAtWork: https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg
diff --git a/src/Teams/SubTeams.js b/src/Teams/SubTeams.js
index 26413f7..df308e7 100644
--- a/src/Teams/SubTeams.js
+++ b/src/Teams/SubTeams.js
@@ -1,7 +1,7 @@
 import "./SubTeams.css";
 import { useState, useEffect } from "react";
 import yaml from "js-yaml";
-import leadershipData from "../MockDB/Leadership.yml";
+import leadershipData from "../MockDB/SubTeams.yml";
 
 const SubTeams = () => {
 	const [subteamsDict, setSubteamsDict] = useState();
@@ -29,7 +29,6 @@ const SubTeams = () => {
 			console.error("Error recieving data from server:");
 		}
 	};
-	console.log(subteamsDict);
 
 	return (
 		<div id="Subteams">
@@ -45,49 +44,49 @@ const SubTeams = () => {
 								{/* row 1 */}
 								<td>
 									<img
-										src={subteamsArray[0].url}
+										src={subteamsArray[0].iconUrl}
 										alt={subteamsArray[0] + "'s Icon"}
 									/>
 								</td>
 								{/* row 2 */}
 								<td>
 									<img
-										src={subteamsArray[1].url}
+										src={subteamsArray[1].iconUrl}
 										alt={subteamsArray[1] + "'s Icon"}
 									/>
 								</td>
 								{/* row 3 */}
 								<td>
 									<img
-										src={subteamsArray[2].url}
+										src={subteamsArray[2].iconUrl}
 										alt={subteamsArray[2] + "'s Icon"}
 									/>
 								</td>
 								{/* row 4 */}
 								<td>
 									<img
-										src={subteamsArray[3].url}
+										src={subteamsArray[3].iconUrl}
 										alt={subteamsArray[3] + "'s Icon"}
 									/>
 								</td>
 								{/* row 5 */}
 								<td>
 									<img
-										src={subteamsArray[4].url}
+										src={subteamsArray[4].iconUrl}
 										alt={subteamsArray[4] + "'s Icon"}
 									/>
 								</td>
 								{/* row 6 */}
 								<td>
 									<img
-										src={subteamsArray[5].url}
+										src={subteamsArray[5].iconUrl}
 										alt={subteamsArray[5] + "'s Icon"}
 									/>
 								</td>
 								{/* row 7 */}
 								<td>
 									<img
-										src={subteamsArray[6].url}
+										src={subteamsArray[6].iconUrl}
 										alt={subteamsArray[6] + "'s Icon"}
 									/>
 								</td>
@@ -130,8 +129,49 @@ const SubTeams = () => {
 							const className = index % 2 === 0 ? "SubteamsEnd" : "";
 							return (
 								<div>
-									<h2 className={className}>{subteamName}</h2>
-									<p>{subteam.longDescription}</p>
+									{index % 2 === 0 ? (
+										<>
+											<div>
+												<img
+													src={subteam.iconUrl}
+													alt={subteamName + "'s Icon"}
+													className={className}
+												/>
+												<h2 className={className}>{subteamName}</h2>
+											</div>
+											<div>
+												<img
+													src={subteam.subteamAtWork}
+													alt={
+														subteamName +
+														"'s members work or working on a project"
+													}
+												/>
+												<p>{subteam.longDescription}</p>
+											</div>
+										</>
+									) : (
+										<>
+											<div>
+												<h2 className={className}>{subteamName}</h2>
+												<img
+													src={subteam.iconUrl}
+													alt={subteamName + "'s Icon"}
+													className={className}
+												/>
+											</div>
+											<div>
+												<p>{subteam.longDescription}</p>
+												<img
+													src={subteam.subteamAtWork}
+													alt={
+														subteamName +
+														"'s members work or working on a project"
+													}
+												/>
+											</div>
+										</>
+									)}
 								</div>
 							);
 						})}