From 4cbb9985da1179639107d9d13fa3454bfbc5dd6e Mon Sep 17 00:00:00 2001
From: Justin Campbell <campb303@w2vm4.ecn.purdue.edu>
Date: Thu, 22 Oct 2020 19:29:31 -0400
Subject: [PATCH] Refacotring variable name/usage

---
 src/App.js | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/App.js b/src/App.js
index 64afb00..1f4eb7f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -13,11 +13,13 @@ function App() {
 	const [darkMode, setDarkMode] = useState(false);
 	const [activeItem, setActiveItem] = useState({});
 	const [sidebarOpen, setSidebarOpen] = useState(false);
-	const [itemQueue, setItemQueue] = useState([])
+	const [items, setItems] = useState([])
 
 	useEffect(() => {
-		fetch("/api/ce").then(res => res.json()).then(queue => {
-			setItemQueue(queue.items)
+		fetch("/api/ce")
+		.then(res => res.json())
+		.then(queue => {
+			setItems(queue.items)
 		})
 	}, [])
 
@@ -61,32 +63,22 @@ function App() {
 
 				<Box className={classes.leftCol}>
 					<ItemTableAppBar title="webqueue2" setDarkMode={setDarkMode} />
-					<ItemTable items={itemQueue} />
+					<ItemTable items={items} />
 				</Box>
 
 				<Box className={clsx(classes.rightCol, sidebarOpen && classes.rightColShift)}>
-					{itemQueue.length === 0 ? null :
+					{items.length === 0 ? null :
 						<Route
 							path="/:queue/:number"
 							render={({ match }) => {
-
-								/**
-								* Returns true if an item matches the URL parameters.
-								* @param item {Object} The item to compare.
-								* @param match {Object} The match parameters.
-								* @returns {boolean} 
-								*/
-								function itemMatchesURL(item, match) {
-									let queueMatches = item.queue === match.params.queue;
-									let numberMatches = item.number.toString() === match.params.number;
-									return queueMatches && numberMatches;
-								}
-
-								let item = itemQueue.find(item => itemMatchesURL(item, match));
+								const item = items.find((item) => {
+									return item.queue === match.params.queue && item.number === Number(match.params.number);
+								});
 
 								if (item === undefined) {
-									setSidebarOpen(true);
-									return "Item doesn't exist :(";
+									return (
+										<ItemViewAppBar title="Item Not Found" setSidebarOpen={setSidebarOpen} />
+									);
 								}
 
 								setActiveItem(item);
@@ -94,11 +86,13 @@ function App() {
 								return (
 									<>
 										<ItemViewAppBar title={activeItem["queue"] + " " + activeItem["number"]} setSidebarOpen={setSidebarOpen} />
-										<ItemView activeItem={activeItem} />
+										{/* <ItemView activeItem={activeItem} /> */}
 									</>
 								);
-							}}
-						/>}
+							}
+							}
+						/>
+					}
 				</Box>
 			</Box>
 		</ThemeProvider>