From fbdc1237196f64ddfb7da22fbc2f6b157418dccb Mon Sep 17 00:00:00 2001
From: Rachel Koh <rachelkohhuiqi@gmail.com>
Date: Sun, 26 Jan 2025 23:14:24 -0600
Subject: [PATCH 1/3] made sidebar + header bar sticky

---
 frontend/src/routes/appRoutes.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/routes/appRoutes.tsx b/frontend/src/routes/appRoutes.tsx
index edb08f8..98b97ee 100644
--- a/frontend/src/routes/appRoutes.tsx
+++ b/frontend/src/routes/appRoutes.tsx
@@ -23,13 +23,13 @@ function AppRoutes() {
 				<div style={{ width: "100%" }}>
 					<HeaderBar isOpen={isHeaderBarOpen} setIsOpen={setIsHeaderBarOpen} />
 				</div>
-				<div style={{ display: "flex", flex: 1 }}>
-					<div style={{ display: "flex", alignItems: "center" }}>
+					<div style={{ position: "absolute", display: "flex", alignItems: "center", top: "25%" }}>
 						<Sidebar
 							isCollapsed={isCollapsed}
 							setIsCollapsed={setIsCollapsed}
 						/>
 					</div>
+				<div style={{ display: "flex", flex: 1, overflow: "auto", paddingLeft: isCollapsed ? "6rem" : "17rem"}}>
 					<Routes>
 						<Route path="/" element={<Home />} />
 						<Route path="/catalog" element={<Catalog />} />

From 210ce99d49b0eb0ed676f01f42d8b06b2ac017b6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 05:37:39 +0000
Subject: [PATCH 2/3] Auto-format code with Prettier (Backend)

---
 backend/tests/video.test.ts  | 24 ++++++++++--------------
 backend/tests/video.tests.ts | 24 ++++++++++--------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/backend/tests/video.test.ts b/backend/tests/video.test.ts
index eb8ca7a..ba373d2 100644
--- a/backend/tests/video.test.ts
+++ b/backend/tests/video.test.ts
@@ -34,13 +34,11 @@ describe("Video Controller - Get Videos", () => {
 //tests create video
 describe("Video Controller - Create Video", () => {
 	it("should create a new video", async () => {
-		const res = await request(app)
-			.post("/api/videos")
-			.send({
-				title: "New Video",
-				description: "New Description",
-				published: true,
-			});
+		const res = await request(app).post("/api/videos").send({
+			title: "New Video",
+			description: "New Description",
+			published: true,
+		});
 
 		expect(res.status).toBe(201);
 		expect(res.body.success).toBe(true);
@@ -66,13 +64,11 @@ describe("Video Controller - Update Video", () => {
 			published: false,
 		});
 
-		const res = await request(app)
-			.put(`/api/videos/${video._id}`)
-			.send({
-				title: "Updated Title",
-				description: "Updated Desc",
-				published: true,
-			});
+		const res = await request(app).put(`/api/videos/${video._id}`).send({
+			title: "Updated Title",
+			description: "Updated Desc",
+			published: true,
+		});
 
 		expect(res.status).toBe(200);
 		expect(res.body.success).toBe(true);
diff --git a/backend/tests/video.tests.ts b/backend/tests/video.tests.ts
index 286ac5e..36972f8 100644
--- a/backend/tests/video.tests.ts
+++ b/backend/tests/video.tests.ts
@@ -33,13 +33,11 @@ describe("Video Controller - Get Videos", () => {
 //tests create video
 describe("Video Controller - Create Video", () => {
 	it("should create a new video", async () => {
-		const res = await request(app)
-			.post("/api/videos")
-			.send({
-				title: "New Video",
-				description: "New Description",
-				published: true,
-			});
+		const res = await request(app).post("/api/videos").send({
+			title: "New Video",
+			description: "New Description",
+			published: true,
+		});
 
 		expect(res.status).toBe(201);
 		expect(res.body.success).toBe(true);
@@ -65,13 +63,11 @@ describe("Video Controller - Update Video", () => {
 			published: false,
 		});
 
-		const res = await request(app)
-			.put(`/api/videos/${video._id}`)
-			.send({
-				title: "Updated Title",
-				description: "Updated Desc",
-				published: true,
-			});
+		const res = await request(app).put(`/api/videos/${video._id}`).send({
+			title: "Updated Title",
+			description: "Updated Desc",
+			published: true,
+		});
 
 		expect(res.status).toBe(200);
 		expect(res.body.success).toBe(true);

From e38d2d8467853d53fcfeb35b0a522a0f12181372 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 05:37:46 +0000
Subject: [PATCH 3/3] Auto-format code with Prettier (Frontend)

---
 frontend/src/routes/appRoutes.tsx | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/src/routes/appRoutes.tsx b/frontend/src/routes/appRoutes.tsx
index 98b97ee..9683ecc 100644
--- a/frontend/src/routes/appRoutes.tsx
+++ b/frontend/src/routes/appRoutes.tsx
@@ -23,13 +23,24 @@ function AppRoutes() {
 				<div style={{ width: "100%" }}>
 					<HeaderBar isOpen={isHeaderBarOpen} setIsOpen={setIsHeaderBarOpen} />
 				</div>
-					<div style={{ position: "absolute", display: "flex", alignItems: "center", top: "25%" }}>
-						<Sidebar
-							isCollapsed={isCollapsed}
-							setIsCollapsed={setIsCollapsed}
-						/>
-					</div>
-				<div style={{ display: "flex", flex: 1, overflow: "auto", paddingLeft: isCollapsed ? "6rem" : "17rem"}}>
+				<div
+					style={{
+						position: "absolute",
+						display: "flex",
+						alignItems: "center",
+						top: "25%",
+					}}
+				>
+					<Sidebar isCollapsed={isCollapsed} setIsCollapsed={setIsCollapsed} />
+				</div>
+				<div
+					style={{
+						display: "flex",
+						flex: 1,
+						overflow: "auto",
+						paddingLeft: isCollapsed ? "6rem" : "17rem",
+					}}
+				>
 					<Routes>
 						<Route path="/" element={<Home />} />
 						<Route path="/catalog" element={<Catalog />} />