Skip to content

Commit

Permalink
Refacotring variable name/usage
Browse files Browse the repository at this point in the history
  • Loading branch information
Justin Campbell committed Oct 22, 2020
1 parent f56ac52 commit 4cbb998
Showing 1 changed file with 18 additions and 24 deletions.
42 changes: 18 additions & 24 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
}, [])

Expand Down Expand Up @@ -61,44 +63,36 @@ 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);

return (
<>
<ItemViewAppBar title={activeItem["queue"] + " " + activeItem["number"]} setSidebarOpen={setSidebarOpen} />
<ItemView activeItem={activeItem} />
{/* <ItemView activeItem={activeItem} /> */}
</>
);
}}
/>}
}
}
/>
}
</Box>
</Box>
</ThemeProvider>
Expand Down

0 comments on commit 4cbb998

Please sign in to comment.