Update Players and Rankings

ClaudioMartinH · Sep 23, 2024 · 8a84b06 · 8a84b06
1 parent 1f621bb
commit 8a84b06
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/client/src/components/Players.tsx b/client/src/components/Players.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import { useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
@@ -19,17 +20,19 @@ const Players = () => {
   };
 
   useEffect(() => {
-    setToken(sessionStorage.getItem("token"));
+    const storedToken = sessionStorage.getItem('token');
 
-   if (document.readyState === "complete") {
-      onWindowLoad();
+    if (storedToken) {
+      setToken(storedToken);
     } else {
-      window.addEventListener("load", onWindowLoad);
+      navigate('/');
     }
+  }, []);
 
-    return () => {
-      window.removeEventListener("load", onWindowLoad);
-    };
+  useEffect(() => {
+    if (token !== null) {
+      onWindowLoad();
+    }
   }, [token]);
 
   function getPlayers() {

diff --git a/client/src/components/Rankings.tsx b/client/src/components/Rankings.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { Player } from "./Players";
@@ -143,8 +144,19 @@ const Rankings = () => {
     }
 
     useEffect(() => {
-      setToken(sessionStorage.getItem("token"));
-      loadPage();
+      const storedToken = sessionStorage.getItem('token');
+
+      if (storedToken) {
+        setToken(storedToken);
+      } else {
+        navigate('/');
+      }
+    }, []);
+
+    useEffect(() => {
+      if (token !== null) {
+        loadPage();
+      }
     }, [token]);