diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index 99901e3a0..beab8c683 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -14,7 +14,7 @@ import { alertContext } from "./contexts/alertContext"; import { AuthContext } from "./contexts/authContext"; import { locationContext } from "./contexts/locationContext"; import { TabsContext } from "./contexts/tabsContext"; -import { autoLogin, getLoggedUser, onLogin } from "./controllers/API"; +import { autoLogin, getLoggedUser } from "./controllers/API"; import Router from "./routes"; export default function App() { @@ -37,7 +37,7 @@ export default function App() { successData, successOpen, setSuccessOpen, - setErrorData + setErrorData, } = useContext(alertContext); const navigate = useNavigate(); @@ -131,33 +131,34 @@ export default function App() { }; //this function is to get the user logged in when the page is refreshed - const { setUserData, getAuthentication, login, setAutoLogin } = useContext(AuthContext); + const { setUserData, getAuthentication, login, setAutoLogin } = + useContext(AuthContext); useEffect(() => { setTimeout(() => { - autoLogin().then((user) => { - if(user && user['access_token']){ - user['refresh_token'] = "auto"; - login(user['access_token'], user['refresh_token']); - setAutoLogin(true); - } - }).catch((error) => { - setAutoLogin(false); - if (getAuthentication && !isLoginPage) { - getLoggedUser() - .then((user) => { - setUserData(user); - }) - .catch((error) => {}); - } - else{ - navigate("/login"); - } - }); + autoLogin() + .then((user) => { + if (user && user["access_token"]) { + user["refresh_token"] = "auto"; + login(user["access_token"], user["refresh_token"]); + setAutoLogin(true); + } + }) + .catch((error) => { + setAutoLogin(false); + if (getAuthentication && !isLoginPage) { + getLoggedUser() + .then((user) => { + setUserData(user); + }) + .catch((error) => {}); + } else { + navigate("/login"); + } + }); }, 500); }, []); - return ( //need parent component with width and height
diff --git a/src/frontend/src/components/PaginatorComponent/index.tsx b/src/frontend/src/components/PaginatorComponent/index.tsx index 0bb40fa60..0e9242f15 100644 --- a/src/frontend/src/components/PaginatorComponent/index.tsx +++ b/src/frontend/src/components/PaginatorComponent/index.tsx @@ -19,7 +19,9 @@ export default function PaginatorComponent({ }: PaginatorComponentType) { const [size, setPageSize] = useState(pageSize); const [index, setPageIndex] = useState(pageIndex); - const [maxIndex, setMaxPageIndex] = useState(Math.ceil(totalRowsCount/pageSize)); + const [maxIndex, setMaxPageIndex] = useState( + Math.ceil(totalRowsCount / pageSize) + ); const [currentPage, setCurrentPage] = useState(1); return ( @@ -32,7 +34,7 @@ export default function PaginatorComponent({