From dcaa3d8d14cc7ff560388d1322f0fcb2725aff74 Mon Sep 17 00:00:00 2001 From: VividTruthKeeper Date: Fri, 19 Aug 2022 22:55:34 +0500 Subject: [PATCH] files merged --- src/components/global/SearchTable.tsx | 2 +- src/components/global/VideoPlayer.tsx | 2 +- src/components/main/CalendarSection.tsx | 2 +- src/types/playerType.ts | 4 ---- src/types/players.ts | 18 ++++++++++++++++++ src/types/playersData.ts | 12 ------------ 6 files changed, 21 insertions(+), 19 deletions(-) delete mode 100644 src/types/playerType.ts delete mode 100644 src/types/playersData.ts diff --git a/src/components/global/SearchTable.tsx b/src/components/global/SearchTable.tsx index fafcc84..e578344 100644 --- a/src/components/global/SearchTable.tsx +++ b/src/components/global/SearchTable.tsx @@ -6,7 +6,7 @@ import { useMemo, useState, useRef, useEffect } from "react"; import search from "../../icons/search.svg"; // Types -import { PlayersData } from "../../types/playersData"; +import { PlayersData } from "../../types/players"; // Helpers import { searchFull, assembleData } from "../../helpers/searchTable"; diff --git a/src/components/global/VideoPlayer.tsx b/src/components/global/VideoPlayer.tsx index e20b7ef..2d834b8 100644 --- a/src/components/global/VideoPlayer.tsx +++ b/src/components/global/VideoPlayer.tsx @@ -6,7 +6,7 @@ import { hosting } from "../../links"; import PlayIcon from "./PlayIcon"; // Types -import { playerInterface } from "../../types/playerType"; +import { playerInterface } from "../../types/players"; const VideoPlayer = ({ videoUrl }: playerInterface) => { return ( diff --git a/src/components/main/CalendarSection.tsx b/src/components/main/CalendarSection.tsx index 2ddc9e4..c922a7a 100644 --- a/src/components/main/CalendarSection.tsx +++ b/src/components/main/CalendarSection.tsx @@ -10,7 +10,7 @@ import VideoPlayer from "../global/VideoPlayer"; import Calendar from "../global/Calendar"; // Types -import { playerType } from "../../types/playerType"; +import { playerType } from "../../types/players"; // Helpers import { getVideos } from "../../helpers/apiRequests"; diff --git a/src/types/playerType.ts b/src/types/playerType.ts deleted file mode 100644 index 01a30e5..0000000 --- a/src/types/playerType.ts +++ /dev/null @@ -1,4 +0,0 @@ -export type playerType = [string, React.Dispatch]; -export interface playerInterface { - videoUrl: string; -} diff --git a/src/types/players.ts b/src/types/players.ts index 8f345bc..9b9dbe3 100644 --- a/src/types/players.ts +++ b/src/types/players.ts @@ -5,3 +5,21 @@ export interface Player { img: string; average: number; } + +export interface PlayersData { + id: string; + title: string; + surname: string; + name: string; + birth: string; + classical: string; + rapid: string; + blitz: string; +} + +// Used in SearchTable.tsx + +export type playerType = [string, React.Dispatch]; +export interface playerInterface { + videoUrl: string; +} diff --git a/src/types/playersData.ts b/src/types/playersData.ts deleted file mode 100644 index 6f2e7c9..0000000 --- a/src/types/playersData.ts +++ /dev/null @@ -1,12 +0,0 @@ -export interface PlayersData { - id: string; - title: string; - surname: string; - name: string; - birth: string; - classical: string; - rapid: string; - blitz: string; -} - -// Used in SearchTable.tsx