diff --git a/src/pages/AboutUs.tsx b/src/pages/AboutUs.tsx index 3298314..9a49bad 100644 --- a/src/pages/AboutUs.tsx +++ b/src/pages/AboutUs.tsx @@ -46,9 +46,6 @@ const AboutUs = () => { useEffect(() => { window.scrollTo(0, 0); - }, []); - - useEffect(() => { getAbout(setAbout); getVideos(setVideo, () => null); }, []); diff --git a/src/pages/Contact.tsx b/src/pages/Contact.tsx index ef8c26b..1bd1e74 100644 --- a/src/pages/Contact.tsx +++ b/src/pages/Contact.tsx @@ -12,6 +12,7 @@ const Contacts = () => { useEffect(() => { window.scrollTo(0, 0); }, []); + return (
diff --git a/src/pages/EventItem.tsx b/src/pages/EventItem.tsx index 347fbe4..0a68ce6 100644 --- a/src/pages/EventItem.tsx +++ b/src/pages/EventItem.tsx @@ -34,13 +34,11 @@ const EventItem = () => { ], content_html: "", }); + const { eventId } = useParams(); useEffect(() => { window.scrollTo(0, 0); - }, []); - - useEffect(() => { setLoader(true); getEvent(eventId, setEventData, setLoader); }, [eventId]); diff --git a/src/pages/Events.tsx b/src/pages/Events.tsx index 311bc98..6d87fb0 100644 --- a/src/pages/Events.tsx +++ b/src/pages/Events.tsx @@ -47,11 +47,9 @@ const Events = () => { loaded: false, }); - useEffect(() => { - getAllPosts(setEvents); - }, []); useEffect(() => { window.scrollTo(0, 0); + getAllPosts(setEvents); }, []); const breakpoints = useMediaQuery("(max-width: 550px"); diff --git a/src/pages/PlayerProfile.tsx b/src/pages/PlayerProfile.tsx index 4f5c47f..07d5e2a 100644 --- a/src/pages/PlayerProfile.tsx +++ b/src/pages/PlayerProfile.tsx @@ -29,6 +29,7 @@ const PlayerProfile = () => { const { playerId } = useParams(); useEffect(() => { + window.scrollTo(0, 0); getPlayerInfo(setPlayerInfo, `${players}/${playerId}`); }, [playerId]); diff --git a/src/pages/Rating.tsx b/src/pages/Rating.tsx index 18da44f..0eb1711 100644 --- a/src/pages/Rating.tsx +++ b/src/pages/Rating.tsx @@ -33,9 +33,6 @@ const Rating = () => { ]); useEffect(() => { window.scrollTo(0, 0); - }, []); - - useEffect(() => { getTeam(setPlayers); }, []); diff --git a/src/pages/Structure.tsx b/src/pages/Structure.tsx index 4b12748..e6f21da 100644 --- a/src/pages/Structure.tsx +++ b/src/pages/Structure.tsx @@ -42,9 +42,6 @@ const Structure = () => { useEffect(() => { window.scrollTo(0, 0); - }, []); - - useEffect(() => { getStructure(setStructureData); }, []); diff --git a/src/pages/Tournaments.tsx b/src/pages/Tournaments.tsx index acb09e5..2fdb4fe 100644 --- a/src/pages/Tournaments.tsx +++ b/src/pages/Tournaments.tsx @@ -48,11 +48,9 @@ const Tournaments = () => { useEffect(() => { window.scrollTo(0, 0); - }, []); - - useEffect(() => { getEvents(setTournaments); }, []); + return (