From a910921bdede56d87716ca1d57bfe12a72a3003a Mon Sep 17 00:00:00 2001 From: "andrey.dekterev" Date: Thu, 6 Apr 2023 13:59:16 +0000 Subject: [PATCH] revert 37950255197f4cf6858e970c5527edc4c7cd6b3f revert feat(in-454): default landing --- src/config/lexics/indexLexics.tsx | 2 - src/config/lexics/landingLexics.tsx | 9 -- src/features/App/AuthenticatedApp.tsx | 4 +- src/features/AuthStore/hooks/useAuth.tsx | 27 ++-- src/features/Landings/hooks.tsx | 141 ------------------ src/features/MatchPage/store/hooks/index.tsx | 18 +-- .../TeamLogoImg/index.tsx | 4 +- .../helpers.tsx | 0 src/features/TournamentLanding/hooks.tsx | 96 ++++++++++++ .../{Landings => TournamentLanding}/index.tsx | 55 ++----- .../styled.tsx | 46 +++--- src/features/TournamentPage/hooks.tsx | 38 +---- src/requests/getLandingStatus.tsx | 20 +-- ...etLanding.tsx => getTournamentLanding.tsx} | 24 +-- src/requests/index.tsx | 2 +- 15 files changed, 157 insertions(+), 329 deletions(-) delete mode 100644 src/config/lexics/landingLexics.tsx delete mode 100644 src/features/Landings/hooks.tsx rename src/features/{Landings => TournamentLanding}/TeamLogoImg/index.tsx (83%) rename src/features/{Landings => TournamentLanding}/helpers.tsx (100%) create mode 100644 src/features/TournamentLanding/hooks.tsx rename src/features/{Landings => TournamentLanding}/index.tsx (62%) rename src/features/{Landings => TournamentLanding}/styled.tsx (91%) rename src/requests/{getLanding.tsx => getTournamentLanding.tsx} (64%) diff --git a/src/config/lexics/indexLexics.tsx b/src/config/lexics/indexLexics.tsx index 7830ed5e..95118ce8 100644 --- a/src/config/lexics/indexLexics.tsx +++ b/src/config/lexics/indexLexics.tsx @@ -3,7 +3,6 @@ import { publicLexics } from './public' import { highlightsPageLexic } from './highlightsPageLexic' import { mailingsLexics } from './mailings' import { sportsLexic } from './sportsLexic' -import { landingLexics } from './landingLexics' const matchPopupLexics = { actions: 1020, @@ -220,5 +219,4 @@ export const indexLexics = { ...paymentLexics, ...sportsLexic, ...sportsPopup, - ...landingLexics, } diff --git a/src/config/lexics/landingLexics.tsx b/src/config/lexics/landingLexics.tsx deleted file mode 100644 index 178a8aab..00000000 --- a/src/config/lexics/landingLexics.tsx +++ /dev/null @@ -1,9 +0,0 @@ -export const landingLexics = { - inactive_button: 20083, - inactive_description_1: 20084, - inactive_description_2: 20086, - inactive_period: 801, - inactive_title_1: 20087, - inactive_title_2: 20088, - -} diff --git a/src/features/App/AuthenticatedApp.tsx b/src/features/App/AuthenticatedApp.tsx index cddfc571..9d010011 100644 --- a/src/features/App/AuthenticatedApp.tsx +++ b/src/features/App/AuthenticatedApp.tsx @@ -35,7 +35,7 @@ const MatchPage = lazy(() => import('features/MatchPage')) const PlayerPage = lazy(() => import('features/PlayerPage')) const TournamentPage = lazy(() => import('features/TournamentPage')) const SystemSettings = lazy(() => import('features/SystemSettings')) -const Landings = lazy(() => import('features/Landings')) +const TournamentLanding = lazy(() => import('features/TournamentLanding')) const HighlightsPage = lazy(() => import('pages/HighlightsPage')) const ThanksPage = lazy(() => import('pages/ThanksPage')) @@ -96,7 +96,7 @@ export const AuthenticatedApp = () => { - + diff --git a/src/features/AuthStore/hooks/useAuth.tsx b/src/features/AuthStore/hooks/useAuth.tsx index 2ea88c5c..54e701bf 100644 --- a/src/features/AuthStore/hooks/useAuth.tsx +++ b/src/features/AuthStore/hooks/useAuth.tsx @@ -10,7 +10,6 @@ import type { User } from 'oidc-client' import isString from 'lodash/isString' import isBoolean from 'lodash/isBoolean' -import includes from 'lodash/includes' import { PAGES } from 'config' @@ -21,6 +20,7 @@ import { readToken, setCookie, removeCookie, + isMatchPage, TOKEN_KEY, } from 'helpers' @@ -125,12 +125,15 @@ export const useAuth = () => { validator: isBoolean, }) - const [landingUrlFrom, setLandingUrlFrom] = useSessionStore({ - clearOnUnmount: true, - defaultValue: '', - key: 'landingUrlFrom', - validator: isString, - }) + useEffect(() => { + if (isMatchPage()) setPage(history.location.pathname) + if (history.location.pathname !== page) setIsFromLanding(false) + }, [ + history.location.pathname, + page, + setIsFromLanding, + setPage, + ]) const getTemporaryToken = async () => { try { @@ -278,11 +281,7 @@ export const useAuth = () => { setUserInfo(userInfoFetched) - if (includes(window.location.pathname, PAGES.landing)) { - changeLang(navigator.language.substring(0, 2)) - } else { - userInfoFetched.language.iso && changeLang(userInfoFetched.language.iso) - } + userInfoFetched.language.iso && changeLang(userInfoFetched.language.iso) // eslint-disable-next-line no-empty } catch (error) {} @@ -296,13 +295,11 @@ export const useAuth = () => { fetchUserInfo, isFromLanding, isNewDeviceLogin, - landingUrlFrom, loadingUser, login, logout, page, setIsFromLanding, - setLandingUrlFrom, setPage, setSearch, setUserInfo, @@ -311,7 +308,6 @@ export const useAuth = () => { }), [ fetchUserInfo, isNewDeviceLogin, - landingUrlFrom, logout, user, userInfo, @@ -323,7 +319,6 @@ export const useAuth = () => { page, setIsFromLanding, isFromLanding, - setLandingUrlFrom, ]) return auth diff --git a/src/features/Landings/hooks.tsx b/src/features/Landings/hooks.tsx deleted file mode 100644 index 84dd9108..00000000 --- a/src/features/Landings/hooks.tsx +++ /dev/null @@ -1,141 +0,0 @@ -import { - useEffect, - useState, -} from 'react' - -import size from 'lodash/size' -import includes from 'lodash/includes' - -import type { Landing } from 'requests/getLanding' -import { getLanding } from 'requests/getLanding' - -import { PAGES } from 'config/pages' - -import { redirectToUrl } from 'helpers/redirectToUrl' - -import { useLexicsStore } from 'features/LexicsStore' -import { useAuthStore } from 'features/AuthStore' - -import { getLandingName, isPastLandingDate } from './helpers' -import { getName } from '../Name' - -export const useLandings = () => { - const [tournamentInfo, setTournamentInfo] = useState(null) - const [isInactiveLanding, setIsInactiveLanding] = useState(false) - - const { addLexicsConfig, suffix } = useLexicsStore() - const { - landingUrlFrom, - setIsFromLanding, - user, - } = useAuthStore() - - const buttonLexic = tournamentInfo?.lexic_button || '' - const period = tournamentInfo?.lexic_period || '' - const title = tournamentInfo?.lexic_title || '' - const description = tournamentInfo?.lexic_description || '' - const gallery = tournamentInfo?.media.gallery - - useEffect(() => { - const lexics = [buttonLexic, period, title, description] - addLexicsConfig(lexics) - }, [ - addLexicsConfig, - buttonLexic, - description, - period, - title, - ]) - - const redirectToHomePage = () => redirectToUrl(PAGES.home) - const onButtonClick = () => { - if (includes(landingUrlFrom, PAGES.match) || includes(landingUrlFrom, PAGES.tournament)) { - setIsFromLanding(true) - redirectToUrl(landingUrlFrom) - sessionStorage.removeItem('landingUrlFrom') - } else { - redirectToUrl(tournamentInfo?.url_button || '') - } - } - - useEffect(() => { - (async () => { - const landingData = sessionStorage.getItem('landingData') - const parseLandingDate = landingData && JSON.parse(landingData) - - try { - const date = landingUrlFrom - ? await getLanding({ - landingName: parseLandingDate.landing_id || parseLandingDate.url_landing, - seasonId: parseLandingDate.season_id, - sportId: parseLandingDate.sport_id, - tournamentId: parseLandingDate.tournament_id, - }) - : await getLanding({ landingName: getLandingName() }) - if (user) return redirectToUrl(date.url_button || '') - if (isPastLandingDate(date.date_to)) setIsInactiveLanding(true) - setTournamentInfo(date) - return sessionStorage.removeItem('landingData') - } catch (err) { - return redirectToHomePage() - } - })() - }, [landingUrlFrom, user]) - - const [sliderItemId, setSliderItemId] = useState(0) - - const onSliderSwitchClick = (itemId: number) => setSliderItemId(itemId) - - const imgCounter = size(gallery) - - useEffect(() => { - if (sliderItemId === imgCounter) { - setSliderItemId(0) - } - const getSliderInterval = setInterval(() => { - setSliderItemId(sliderItemId + 1) - }, 5000) - return () => clearInterval(getSliderInterval) - }, [imgCounter, sliderItemId]) - - const isInactiveLandingData = () => { - if (!tournamentInfo?.tournaments || !isInactiveLanding) return null - - const { - season, - tournament_eng, - tournament_rus, - } = tournamentInfo.tournaments[0] - - const currentTournamentsTitle = { - name_eng: tournament_eng, - name_rus: tournament_rus, - } - - const tournamentsTitle = getName({ nameObj: currentTournamentsTitle, suffix }) - - return { - season, - tournamentsTitle, - } - } - - return { - buttonColor: tournamentInfo?.button_color, - buttonLexic, - description, - gallery, - isInactiveLanding, - isInactiveLandingData: isInactiveLandingData(), - logo: tournamentInfo?.media.logo, - logoInsports: tournamentInfo?.logo_insports, - onButtonClick, - onSliderSwitchClick, - period, - redirectToHomePage, - sliderItemId, - teams: tournamentInfo?.teams, - title, - tournamentInfo, - } -} diff --git a/src/features/MatchPage/store/hooks/index.tsx b/src/features/MatchPage/store/hooks/index.tsx index f6730768..0af8572f 100644 --- a/src/features/MatchPage/store/hooks/index.tsx +++ b/src/features/MatchPage/store/hooks/index.tsx @@ -3,7 +3,6 @@ import { useState, useMemo, } from 'react' -import { useHistory } from 'react-router' import includes from 'lodash/includes' import filter from 'lodash/filter' @@ -80,13 +79,10 @@ export const useMatchPage = () => { const { isFromLanding, - landingUrlFrom, setIsFromLanding, - setLandingUrlFrom, user, userInfo, } = useAuthStore() - const history = useHistory() const { close: hideProfileCard, @@ -142,22 +138,14 @@ export const useMatchPage = () => { })) useEffect(() => { - if (user || isFromLanding || history.length > 1) return + if (user || isFromLanding) return getLandingStatus({ matchId, sportType }) - .then((data) => { - setLandingUrlFrom(window.location.pathname) - sessionStorage.setItem( - 'landingData', - JSON.stringify(data), - ) + .then(({ landing_id }) => { setIsFromLanding(false) - if (data.landing_id) redirectToUrl(`${PAGES.landing}/${data.landing_id}`) + if (landing_id) redirectToUrl(`${PAGES.landing}/${landing_id}`) }) - // eslint-disable-next-line react-hooks/exhaustive-deps }, [ - setLandingUrlFrom, isFromLanding, - landingUrlFrom, matchId, setIsFromLanding, sportType, diff --git a/src/features/Landings/TeamLogoImg/index.tsx b/src/features/TournamentLanding/TeamLogoImg/index.tsx similarity index 83% rename from src/features/Landings/TeamLogoImg/index.tsx rename to src/features/TournamentLanding/TeamLogoImg/index.tsx index 27a2823d..59af1775 100644 --- a/src/features/Landings/TeamLogoImg/index.tsx +++ b/src/features/TournamentLanding/TeamLogoImg/index.tsx @@ -24,16 +24,14 @@ type Props = { export const TeamLogoImg = ({ src, }: Props) => { - const [isLogoError, setIsImgError] = useState(true) + const [isLogoError, setIsImgError] = useState(false) const onError = () => setIsImgError(true) - const onLoad = () => setIsImgError(false) return ( ) diff --git a/src/features/Landings/helpers.tsx b/src/features/TournamentLanding/helpers.tsx similarity index 100% rename from src/features/Landings/helpers.tsx rename to src/features/TournamentLanding/helpers.tsx diff --git a/src/features/TournamentLanding/hooks.tsx b/src/features/TournamentLanding/hooks.tsx new file mode 100644 index 00000000..52d3d493 --- /dev/null +++ b/src/features/TournamentLanding/hooks.tsx @@ -0,0 +1,96 @@ +import { + useEffect, + useState, +} from 'react' + +import size from 'lodash/size' +import includes from 'lodash/includes' + +import type { TournamentLanding } from 'requests/getTournamentLanding' +import { getTournamentLanding } from 'requests/getTournamentLanding' + +import { PAGES } from 'config/pages' + +import { redirectToUrl } from 'helpers/redirectToUrl' + +import { useLexicsStore } from 'features/LexicsStore' +import { useAuthStore } from 'features/AuthStore' + +import { getLandingName, isPastLandingDate } from './helpers' + +export const useTournamentLanding = () => { + const [tournamentInfo, setTournamentInfo] = useState(null) + + const { addLexicsConfig } = useLexicsStore() + const { page, setIsFromLanding } = useAuthStore() + + const buttonLexic = tournamentInfo?.lexic_button || '' + const period = tournamentInfo?.lexic_period || '' + const title = tournamentInfo?.lexic_title || '' + const description = tournamentInfo?.lexic_description || '' + const gallery = tournamentInfo?.media.gallery + + useEffect(() => { + const lexics = [buttonLexic, period, title, description] + addLexicsConfig(lexics) + }, [ + addLexicsConfig, + buttonLexic, + description, + period, + title, + ]) + + const redirectToHomePage = () => redirectToUrl(PAGES.home) + const onButtonClick = () => { + if (includes(page, 'matches')) { + setIsFromLanding(true) + redirectToUrl(page) + } else { + redirectToUrl(tournamentInfo?.url_button || '') + } + } + + useEffect(() => { + getTournamentLanding(getLandingName()) + .then((data) => ( + isPastLandingDate(data.date_to) + ? redirectToHomePage() + : setTournamentInfo(data) + )) + .catch(redirectToHomePage) + }, []) + + const [sliderItemId, setSliderItemId] = useState(0) + + const onSliderSwitchClick = (itemId: number) => setSliderItemId(itemId) + + const imgCounter = size(gallery) + + useEffect(() => { + if (sliderItemId === imgCounter) { + setSliderItemId(0) + } + const getSliderInterval = setInterval(() => { + setSliderItemId(sliderItemId + 1) + }, 5000) + return () => clearInterval(getSliderInterval) + }, [imgCounter, sliderItemId]) + + return { + buttonColor: tournamentInfo?.button_color, + buttonLexic, + description, + gallery, + logo: tournamentInfo?.media.logo, + logoInsports: tournamentInfo?.logo_insports, + onButtonClick, + onSliderSwitchClick, + period, + redirectToHomePage, + sliderItemId, + teams: tournamentInfo?.teams, + title, + tournamentInfo, + } +} diff --git a/src/features/Landings/index.tsx b/src/features/TournamentLanding/index.tsx similarity index 62% rename from src/features/Landings/index.tsx rename to src/features/TournamentLanding/index.tsx index b6c8ccca..16f57b5d 100644 --- a/src/features/Landings/index.tsx +++ b/src/features/TournamentLanding/index.tsx @@ -1,5 +1,3 @@ -import { Fragment } from 'react' - import format from 'date-fns/format' import map from 'lodash/map' @@ -8,7 +6,7 @@ import { isMobileDevice } from 'config/userAgent' import { T9n } from 'features/T9n' -import { useLandings } from './hooks' +import { useTournamentLanding } from './hooks' import { TeamLogoImg } from './TeamLogoImg' import { @@ -38,14 +36,12 @@ import { TournamentInfoContainer, } from './styled' -const Landings = () => { +const TournamentLanding = () => { const { buttonColor, buttonLexic, description, gallery, - isInactiveLanding, - isInactiveLandingData, logo, logoInsports, onButtonClick, @@ -56,7 +52,7 @@ const Landings = () => { teams, title, tournamentInfo, - } = useLandings() + } = useTournamentLanding() if (!tournamentInfo) return null @@ -71,7 +67,7 @@ const Landings = () => { { - gallery && !isInactiveLanding + gallery ? ( @@ -103,47 +99,18 @@ const Landings = () => { } - {isInactiveLanding - ? ( - - -   - {isInactiveLandingData?.season} - - -   - {isInactiveLandingData?.tournamentsTitle}  - - - -   - {isInactiveLandingData?.tournamentsTitle}  - - - - ) - : ( - - - - - - - - - - - - )} + + + - + - {(gallery && !isInactiveLanding) && } + {gallery && } {teams && ( {map(teams, (item) => ( @@ -154,7 +121,7 @@ const Landings = () => { ))} )} - {(logoInsports && !isInactiveLanding) && } + {logoInsports && } @@ -164,4 +131,4 @@ const Landings = () => { ) } -export default Landings +export default TournamentLanding diff --git a/src/features/Landings/styled.tsx b/src/features/TournamentLanding/styled.tsx similarity index 91% rename from src/features/Landings/styled.tsx rename to src/features/TournamentLanding/styled.tsx index ce9733f6..d67717db 100644 --- a/src/features/Landings/styled.tsx +++ b/src/features/TournamentLanding/styled.tsx @@ -4,6 +4,7 @@ import { isMobileDevice } from 'config/userAgent' import { ButtonSolid } from 'features/Common' import { Logo } from 'features/Logo' +import { T9n } from 'features/T9n' type ButtonProps = { buttonColor?: string, @@ -23,7 +24,6 @@ export const Wrapper = styled.div` color: white; display: flex; flex-direction: column; - justify-content: space-between; ` export const HeaderWrapper = styled.div` @@ -56,7 +56,7 @@ export const InsportsLogo = styled(Logo)` ` export const MainInfoContainer = styled.div` - height: 87%; + height: 100%; ${isMobileDevice ? css` @@ -101,7 +101,6 @@ export const MainLogoWrapper = styled.div` width: 50%; position: relative; align-items: center; - margin-right: 1%; ${isMobileDevice ? css` @@ -114,8 +113,8 @@ export const MainLogoWrapper = styled.div` ` export const MainLogoImg = styled.img` - width: 48%; - height: 48%; + width: 35%; + height: 35%; position: relative; ${isMobileDevice @@ -199,7 +198,7 @@ export const SliderSwitchItem = styled.div` height: 4px; border-radius: 2px; background-color: white; - opacity: ${({ slideOpacity }) => (slideOpacity ? '1' : '.3')}; + opacity: ${({ slideOpacity }) => (slideOpacity ? '1' : '.3')};; margin-right: 10px; cursor: pointer; transition: .7s; @@ -235,14 +234,14 @@ export const TournamentInfo = styled.div` margin-top: ${(isMobileDevice ? 'none' : '90px')}; ` -export const DateInfo = styled.div` +export const DateInfo = styled(T9n)` text-transform: uppercase; background-color: rgba(0, 0, 0, 0.4); padding: 8px 25px; color: #B9B9B9; width: fit-content; border-radius: 5px; - font-size: .62rem; + font-size: 13px; font-weight: 600; ${isMobileDevice @@ -250,14 +249,14 @@ export const DateInfo = styled.div` font-size: 10px; border-radius: 3px; background-color: rgba(0, 0, 0, 0.7); - padding: 3px 10px;` + padding: 5px 10px;` : ''}; ` -export const TournamentTitle = styled.div` +export const TournamentTitle = styled(T9n)` font-weight: 700; - font-size: 2.36rem; - margin-top: 2.4rem; + font-size: 50px; + margin-top: 50px; ${isMobileDevice ? css` @@ -272,13 +271,11 @@ export const TournamentTitle = styled.div` export const TournamentButton = styled(ButtonSolid)` width: 320px; height: fit-content; - font-size: 1.13rem; + font-size: 24px; font-weight: 600; border-radius: 5px; - margin-bottom: 4.25rem; - padding: 0.94rem 3rem; - display: flex; - justify-content: center; + margin-bottom: 90px; + padding: 20px 0; background-color: ${({ buttonColor }) => (buttonColor ? `${buttonColor}` : '#294FC3')}; ${isMobileDevice @@ -291,17 +288,16 @@ export const TournamentButton = styled(ButtonSolid)` : ''}; ` -export const TournamentDescription = styled.div` - max-width: 26.6rem; - margin: 2.4rem 0; - font-size: 0.8rem; - letter-spacing: 0.1px; - line-height: 150%; +export const TournamentDescription = styled(T9n)` + max-width: 400px; + margin: 50px 0; + font-size: 17px; ${isMobileDevice ? css` - max-width: 100%; font-size: 12px; + line-height: 150%; + letter-spacing: 0.1px; margin: 25px 0 30px; ` : ''}; @@ -311,7 +307,7 @@ export const TournamentMedia = styled.div` display: flex; align-items: center; height: 130px; - margin-bottom: 1.2rem; + margin-bottom: 25px; ${isMobileDevice ? css` diff --git a/src/features/TournamentPage/hooks.tsx b/src/features/TournamentPage/hooks.tsx index 5e78d5b6..13a7dcbd 100644 --- a/src/features/TournamentPage/hooks.tsx +++ b/src/features/TournamentPage/hooks.tsx @@ -11,18 +11,13 @@ import { getTournamentMatches, } from 'requests' -import { openSubscribePopup, redirectToUrl } from 'helpers' - -import { PAGES } from 'config/pages' - -import { useName } from 'features/Name' - import { checkUrlParams } from 'helpers/parseUrlParams/parseUrlParams' import { usePageParams } from 'hooks/usePageParams' +import { openSubscribePopup } from 'helpers' +import { useName } from 'features/Name' import { isPermittedTournament } from '../../helpers/isPermittedTournament' -import { getLandingStatus } from '../../requests/getLandingStatus' import { useProfileCard } from '../ProfileCard/hooks' import { useBuyMatchPopupStore } from '../BuyMatchPopup' import { MATCH_CONFIG } from '../BuyMatchPopup/store/hooks/useSubscriptions' @@ -35,12 +30,7 @@ export const useTournamentPage = () => { const country = useName(tournamentProfile?.country || {}) const history = useHistory() - const { - isFromLanding, - setIsFromLanding, - setLandingUrlFrom, - user, - } = useAuthStore() + const { user } = useAuthStore() const { isFavorite, toggleFavorites } = useProfileCard() @@ -57,28 +47,6 @@ export const useTournamentPage = () => { tournamentId, ]) - useEffect(() => { - if (user || isFromLanding || history.length > 1) return - getLandingStatus({ sportType, tournamentId }) - .then((data) => { - setLandingUrlFrom(window.location.pathname) - sessionStorage.setItem( - 'landingData', - JSON.stringify(data), - ) - setIsFromLanding(false) - if (data.landing_id) redirectToUrl(`${PAGES.landing}/${data.landing_id}`) - }) - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [ - setLandingUrlFrom, - isFromLanding, - tournamentId, - setIsFromLanding, - sportType, - user, - ]) - useEffect(() => { !isFavorite && checkUrlParams('from') === 'landing' diff --git a/src/requests/getLandingStatus.tsx b/src/requests/getLandingStatus.tsx index 80e6d564..d4ef5879 100644 --- a/src/requests/getLandingStatus.tsx +++ b/src/requests/getLandingStatus.tsx @@ -1,35 +1,21 @@ -import isUndefined from 'lodash/isUndefined' - import { API_ROOT } from 'config' import { callApi } from 'helpers' type Args = { - matchId?: number, + matchId: number, sportType: number, - tournamentId?: number, -} - -type LandingStatus = { - landing_id: number, - season_id: number, - sport_id: number, - tournament_id: number, - url_landing: string, } export const getLandingStatus = async ({ matchId, sportType, - tournamentId, -}: Args): Promise => { +}: Args): Promise<{landing_id: number | null}> => { const config = { method: 'GET', } return callApi({ config, - url: `${API_ROOT}/v1/landings/status/${sportType}?${ - isUndefined(matchId) ? '' : `match_id=${matchId}`}${ - isUndefined(tournamentId) ? '' : `tournament_id=${tournamentId}`}`, + url: `${API_ROOT}/v1/landings/${sportType}/${matchId}/status`, }) } diff --git a/src/requests/getLanding.tsx b/src/requests/getTournamentLanding.tsx similarity index 64% rename from src/requests/getLanding.tsx rename to src/requests/getTournamentLanding.tsx index 6947aa1d..905f0513 100644 --- a/src/requests/getLanding.tsx +++ b/src/requests/getTournamentLanding.tsx @@ -1,5 +1,3 @@ -import isUndefined from 'lodash/isUndefined' - import { API_ROOT } from 'config' import { callApi } from 'helpers' @@ -27,7 +25,7 @@ type Gallery = { url: string, } -export type Landing = { +export type TournamentLanding = { button_color?: string, date_from: string, date_to: string, @@ -44,31 +42,19 @@ export type Landing = { }, name: string, teams: Array, - tournaments: Array | null, + tournaments: Array, url_button?: string, } -type Args = { +export const getTournamentLanding = async ( landingName: number | string, - seasonId?: number, - sportId?: number, - tournamentId?: number, -} - -export const getLanding = async ({ - landingName, - seasonId, - sportId, - tournamentId, -}: Args): Promise => { +): Promise => { const config = { method: 'GET', } return callApi({ config, - url: `${API_ROOT}/v1/landings/${landingName}${isUndefined(seasonId) - ? '' - : `?season_id=${seasonId}&sport_id=${sportId}&tournament_id=${tournamentId}`}`, + url: `${API_ROOT}/v1/landings/${landingName}`, }) } diff --git a/src/requests/index.tsx b/src/requests/index.tsx index 0613c71a..a2cff564 100644 --- a/src/requests/index.tsx +++ b/src/requests/index.tsx @@ -8,7 +8,7 @@ export * from './getUserSportFavs' export * from './modifyUserSportFavs' export * from './getSportTournaments' export * from './getTournamentInfo' -export * from './getLanding' +export * from './getTournamentLanding' export * from './getTeamInfo' export * from './getUserInfo' export * from './getMatchInfo'