#245: Started work on a new, simple tutorial system

2022-01-02 18:20:43 +01:00
parent 1b0d517fec
commit 5123f5ce36
13 changed files with 459 additions and 359 deletions
@@ -1,25 +1,30 @@
 import { useEffect } from "react";
-import { withRouter } from "react-router-dom";
+//import { withRouter } from "react-router-dom";
+import { useLocation } from "react-router-dom";

 function ScrollToTop({ getUserNotifications, setCurpath, history }) {
-  useEffect(() => {
-    const unlisten = history.listen(() => {
-      window.scroll({
-        top: 0,
-        left: 0,
-        behavior: "smooth",
-      });
+	let location = useLocation();

-      setCurpath(window.location.pathname);
-      getUserNotifications();
-    });
-    return () => {
-      unlisten();
-    };
-  }, []);
+  useEffect(() => {
+    //const unlisten = history.listen(() => {
+		window.scroll({
+			top: 0,
+			left: 0,
+			behavior: "smooth",
+		});
+
+		setCurpath(window.location.pathname);
+		getUserNotifications();
+    //});
+    //return () => {
+    //  unlisten();
+    //};
+  }, [location]);

  return null;
 }

 // https://stackoverflow.com/questions/36904185/react-router-scroll-to-top-on-every-transition
-export default withRouter(ScrollToTop);
+//export default withRouter(ScrollToTop);
+// https://v5.reactrouter.com/web/api/Hooks/uselocation
+export default ScrollToTop;