From 0ffd1b968ae325d6a7eb1ef4369c85dda7f5fd08 Mon Sep 17 00:00:00 2001
From: GhostOf0days <jaisal.patel45@gmail.com>
Date: Mon, 26 Feb 2024 18:14:28 -0500
Subject: [PATCH 1/2] added labrador

---
 public/labrador/labrador.md     |  1 +
 src/components/Navbar/index.tsx | 34 ++++++++++---
 src/pages/labrador.tsx          | 86 +++++++++++++++++++++++++++++++++
 src/styles/Labrador.module.scss | 61 +++++++++++++++++++++++
 4 files changed, 176 insertions(+), 6 deletions(-)
 create mode 100644 public/labrador/labrador.md
 create mode 100644 src/pages/labrador.tsx
 create mode 100644 src/styles/Labrador.module.scss

diff --git a/public/labrador/labrador.md b/public/labrador/labrador.md
new file mode 100644
index 0000000..1cca34d
--- /dev/null
+++ b/public/labrador/labrador.md
@@ -0,0 +1 @@
+# Labrador assets go in this folder
\ No newline at end of file
diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
index 2146d1a..15822cb 100644
--- a/src/components/Navbar/index.tsx
+++ b/src/components/Navbar/index.tsx
@@ -36,9 +36,13 @@ function Toolbar({ collapsed }: { collapsed: Boolean }) {
 						onClick={() => setMobileLinksVisible(false)}
 					>
 						<div className={styles.navLinkModal}>
-							{/* <Link href="/about" passHref>
-                <a className={`link ${styles.navLink}`}>/about</a>
-              </Link> */}
+							{/* <Link
+								href="/about"
+								passHref
+								className={`link ${styles.navLink}`}
+							>
+								/about
+							</Link> */}
 							<Link
 								href="/tech"
 								passHref
@@ -46,6 +50,13 @@ function Toolbar({ collapsed }: { collapsed: Boolean }) {
 							>
 								/tech
 							</Link>
+							<Link
+								href="/labrador"
+								passHref
+								className={`link ${styles.navLink}`}
+							>
+								/labrador
+							</Link>
 							<Link
 								href="/design"
 								passHref
@@ -65,9 +76,13 @@ function Toolbar({ collapsed }: { collapsed: Boolean }) {
 				) : null}
 			</div>
 			<div className={styles.navLinkContainer}>
-				{/* <Link href="/about" passHref>
-          <a className={`link ${styles.navLink}`}>/about</a>
-        </Link> */}
+				{/* <Link
+						href="/about"
+						passHref
+						className={`link ${styles.navLink}`}
+					>
+						/about
+					</Link> */}
 				<Link
 					href="/tech"
 					passHref
@@ -75,6 +90,13 @@ function Toolbar({ collapsed }: { collapsed: Boolean }) {
 				>
 					/tech
 				</Link>
+				<Link
+					href="/labrador"
+					passHref
+					className={`link ${styles.navLink}`}
+				>
+					/labrador
+				</Link>
 				<Link
 					href="/design"
 					passHref
diff --git a/src/pages/labrador.tsx b/src/pages/labrador.tsx
new file mode 100644
index 0000000..09ba87b
--- /dev/null
+++ b/src/pages/labrador.tsx
@@ -0,0 +1,86 @@
+// import Image from 'next/image';
+import Project from 'components/Project';
+import Timeline from 'components/Timeline';
+import Typography from 'components/Typography';
+import BaseLayout from 'layouts/BaseLayout';
+import styles from 'styles/Labrador.module.scss';
+
+export default function Labrador() {
+	return (
+		<BaseLayout collapsedNavBar>
+			<div className={styles.pageContent}>
+				<Typography variant="header">Labrador</Typography>
+				<div className={styles.aboutSection}>
+					<Typography variant="body">
+						The Labrador committee works on new projects from the
+						ground-up that tech may take on in the future. Think of
+						Labrador like ScottyLabs&apos; own internal
+						&quot;startup&quot; accelerator for tech projects.
+					</Typography>
+				</div>
+				<Timeline className={styles.projectTimeline}>
+					<Project
+						title="Veg"
+						softwareIcons={[
+							'javascript',
+							'typescript',
+							// 'react-native',
+							// 'firebase',
+						]}
+						description="Centralized grocery and expense management for housemates. Automated receipt splitting and shopping list tracking.."
+						// link="https://N/A.com/"
+						// image={
+						// 	<Image
+						// 		src="/labrador/N/A.png"
+						// 		width={1920}
+						// 		height={1080}
+						// 		alt="N/A"
+						// 	/>
+						// }
+					/>
+					<Project
+						title="CMUMaps"
+						softwareIcons={[
+							'typescript',
+							'nextjs',
+							'react',
+							'mongodb',
+							// 'applemapkit'
+						]}
+						description="Google Maps for CMU. Indoor room-level navigation, information, and availability for all buildings across the CMU campus."
+						// link="https://N/A.com/"
+						// image={
+						// 	<Image
+						// 		src="/labrador/N/A.png"
+						// 		width={1920}
+						// 		height={1080}
+						// 		alt="N/A"
+						// 	/>
+						// }
+					/>
+					<Project
+						title="CMUSeats"
+						softwareIcons={[
+							'javascript',
+							'typescript',
+							'mongodb',
+							// 'express',
+							'react',
+						]}
+						description="Crowdsourced study spot availability platform (starting with Gates)."
+						// link="https://N/A.com/"
+						// image={
+						// 	<Image
+						// 		src="/labrador/N/A.png"
+						// 		width={1920}
+						// 		height={1080}
+						// 		alt="N/A"
+						// 	/>
+						// }
+					/>
+					<Project title="Join the team!" />
+				</Timeline>
+			</div>
+		</BaseLayout>
+	);
+}
diff --git a/src/styles/Labrador.module.scss b/src/styles/Labrador.module.scss
new file mode 100644
index 0000000..5eb4702
--- /dev/null
+++ b/src/styles/Labrador.module.scss
@@ -0,0 +1,61 @@
+@import './variables.scss';
+@import './mixins.scss';
+
+.pageContainer {
+	display: flex;
+	flex-direction: column;
+	min-height: 100vh;
+	justify-content: space-between;
+}
+
+.pageContent {
+	width: 80%;
+	margin: 3em auto 0 auto;
+
+	@include down($breakpoint-lg) {
+		width: 90%;
+	}
+}
+
+.aboutSection {
+	display: grid;
+	grid-template-columns: 1fr;
+	gap: 2em;
+	margin-top: 1em;
+
+	@include down($breakpoint-sm) {
+		grid-template-columns: none;
+		grid-template-rows: 1fr;
+	}
+}
+
+.softwareIconContainer {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+	gap: 2em;
+
+	@include down($breakpoint-sm) {
+		gap: 1em;
+		justify-content: space-between;
+	}
+}
+
+.softwareIcon {
+	height: 64px;
+	width: 64px;
+
+	@include down($breakpoint-sm) {
+		height: 48px;
+		width: 48px;
+	}
+
+	@include down($breakpoint-xs) {
+		height: 36px;
+		width: 36px;
+	}
+}
+
+.projectTimeline {
+	margin-top: 5em;
+}

From 89ba4f5d922da28e1f4ba489c335e4e3d7f1eb98 Mon Sep 17 00:00:00 2001
From: GhostOf0days <jaisal.patel45@gmail.com>
Date: Mon, 26 Feb 2024 18:18:34 -0500
Subject: [PATCH 2/2] small grammar fix

---
 src/pages/labrador.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/labrador.tsx b/src/pages/labrador.tsx
index 09ba87b..753c511 100644
--- a/src/pages/labrador.tsx
+++ b/src/pages/labrador.tsx
@@ -27,7 +27,7 @@ export default function Labrador() {
 							// 'react-native',
 							// 'firebase',
 						]}
-						description="Centralized grocery and expense management for housemates. Automated receipt splitting and shopping list tracking.."
+						description="Centralized grocery and expense management for housemates. Automated receipt splitting and shopping list tracking."
 						// link="https://N/A.com/"
 						// image={
 						// 	<Image