diff --git a/client/src/actions/cities.ts b/client/src/actions/cities.ts index a54475c7cbd69b06db3476cd7d6c08ebd7739070..9226aee57b2f477d85d9d5fa781174d097773afc 100644 --- a/client/src/actions/cities.ts +++ b/client/src/actions/cities.ts @@ -11,11 +11,11 @@ export const getCities = () => async (dispatch: AppDispatch) => { payload: res.data.items, }) dispatch({ - type: Types.SET_COMPETITIONS_TOTAL, + type: Types.SET_CITIES_COUNT, payload: res.data.total_count, }) dispatch({ - type: Types.SET_COMPETITIONS_COUNT, + type: Types.SET_CITIES_TOTAL, payload: res.data.count, }) }) diff --git a/client/src/pages/admin/dashboard/components/NumberOfCompetitions.tsx b/client/src/pages/admin/dashboard/components/NumberOfCompetitions.tsx index da5d015fd52d77de7e599e4f1bc2a62cee805483..87d8272ae035ce56d509dd99380bdb1ed17426a6 100644 --- a/client/src/pages/admin/dashboard/components/NumberOfCompetitions.tsx +++ b/client/src/pages/admin/dashboard/components/NumberOfCompetitions.tsx @@ -1,23 +1,23 @@ import { Box, Typography } from '@material-ui/core' import React, { useEffect } from 'react' -import { getSearchUsers } from '../../../../actions/searchUser' +import { getCompetitions } from '../../../../actions/competitions' import { useAppDispatch, useAppSelector } from '../../../../hooks' const NumberOfCompetitions: React.FC = () => { - const cities = useAppSelector((state) => state.cities.cities) + const competitions = useAppSelector((state) => state.competitions.competitions) const dispatch = useAppDispatch() const handleCount = () => { - if (cities.length >= 1000000) { - ;<div>{cities.length / 1000000 + 'M'}</div> - } else if (cities.length >= 1000) { - ;<div>{cities.length / 1000 + 'K'}</div> + if (competitions.length >= 1000000) { + ;<div>{competitions.length / 1000000 + 'M'}</div> + } else if (competitions.length >= 1000) { + ;<div>{competitions.length / 1000 + 'K'}</div> } - return <div>{cities.length}</div> + return <div>{competitions.length}</div> } useEffect(() => { - dispatch(getSearchUsers()) + dispatch(getCompetitions()) }, []) return ( <div> diff --git a/client/src/pages/admin/dashboard/components/NumberOfRegions.tsx b/client/src/pages/admin/dashboard/components/NumberOfRegions.tsx index a48b41a61f7a46089cedcd9e6a981b9ca625ec56..360b3663b0e45e9a24018f855ede3023c95bf39a 100644 --- a/client/src/pages/admin/dashboard/components/NumberOfRegions.tsx +++ b/client/src/pages/admin/dashboard/components/NumberOfRegions.tsx @@ -1,23 +1,23 @@ import { Box, Typography } from '@material-ui/core' import React, { useEffect } from 'react' -import { getSearchUsers } from '../../../../actions/searchUser' +import { getCities } from '../../../../actions/cities' import { useAppDispatch, useAppSelector } from '../../../../hooks' const NumberOfRegions: React.FC = () => { - const competitionTotal = useAppSelector((state) => state.competitions.total) + const regions = useAppSelector((state) => state.cities.total) const dispatch = useAppDispatch() const handleCount = () => { - if (competitionTotal >= 1000000) { - ;<div>{competitionTotal / 1000000 + 'M'}</div> - } else if (competitionTotal >= 1000) { - ;<div>{competitionTotal / 1000 + 'K'}</div> + if (regions >= 1000000) { + ;<div>{regions / 1000000 + 'M'}</div> + } else if (regions >= 1000) { + ;<div>{regions / 1000 + 'K'}</div> } - return <div>{competitionTotal}</div> + return <div>{regions}</div> } useEffect(() => { - dispatch(getSearchUsers()) + dispatch(getCities()) }, []) return ( <div>