From e8b81f77a1b1ad9dd6d69e20bad9a2ba4ac5ceec Mon Sep 17 00:00:00 2001 From: Luke Berndt Date: Wed, 25 Jan 2023 22:14:35 -0500 Subject: [PATCH] better scrolling --- backend/controllers/events.js | 4 ++-- frontend/src/Call/Calls.js | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/backend/controllers/events.js b/backend/controllers/events.js index cc98de0..565cb6f 100644 --- a/backend/controllers/events.js +++ b/backend/controllers/events.js @@ -67,8 +67,8 @@ exports.addNewEvent = async function (req, res, next) { res.send("Not all of the Calls were found"); } calls = calls.sort(compareCalls); - event.startTime = new Date(calls[0].time); - event.endTime = new Date(calls[calls.length - 1].time); + event.endTime = new Date(calls[0].time); + event.startTime = new Date(calls[calls.length - 1].time); event.expireTime = new Date(); event.expireTime.setDate(event.startTime.getDate() + 29); calls.forEach((call) => { diff --git a/frontend/src/Call/Calls.js b/frontend/src/Call/Calls.js index 84b7870..30813f6 100644 --- a/frontend/src/Call/Calls.js +++ b/frontend/src/Call/Calls.js @@ -112,7 +112,7 @@ function Calls(props) { setSelectCallId(message._id); dispatch(addCall(message)); - console.log("Got: " + message._id); + console.log("Got Socket Message: " + message._id); break default: break @@ -121,7 +121,7 @@ function Calls(props) { const startSocket = () => { const filter = getFilterDescription(); - + console.log("Starting Socket"); socket.emit("start", { filterCode: filter.code, filterType: filter.type, @@ -131,6 +131,7 @@ function Calls(props) { }); } const stopSocket = () => { + console.log("Stopping Socket") socket.emit("stop"); } @@ -259,10 +260,12 @@ function Calls(props) { useEffect(() => { socket.on('connect', () => { + console.log("Socket Connect"); setIsConnected(true); }); socket.on('disconnect', () => { + console.log("Socket Disconnect"); setIsConnected(false); }); @@ -302,15 +305,13 @@ function Calls(props) { } }, [groupsData]) - useEffect(() => { - pageYOffset.current = positionRef.current.clientHeight; - }, [callsData]) + useLayoutEffect(() => { - const scrollAmount = parseInt(pageYOffset.current) - parseInt(positionRef.current.clientHeight); - if (scrollAmount > 0) { + const scrollAmount = parseInt(positionRef.current.clientHeight) - parseInt(pageYOffset.current); + window.scrollBy(0, scrollAmount); - } + }, [callsData])