diff --git a/src/dashboard/fixture/create-tournament.tsx b/src/dashboard/fixture/create-tournament.tsx index 6da5269..15cd9c6 100644 --- a/src/dashboard/fixture/create-tournament.tsx +++ b/src/dashboard/fixture/create-tournament.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import styled from 'styled-components'; import { useReplicant } from 'use-nodecg'; -import { Asset } from '../../types/nodecg'; +import { Asset } from '../../../types/nodecg'; import { Button, @@ -16,7 +16,7 @@ import { Select, TextField, } from '@material-ui/core'; -import { TournamentSetup } from '../../types/tournament'; +import { TournamentSetup } from '../../../types/tournament'; interface Props { open: boolean; diff --git a/src/dashboard/fixture/double-elimination.tsx b/src/dashboard/fixture/double-elimination.tsx index 7b22c10..2297d7a 100644 --- a/src/dashboard/fixture/double-elimination.tsx +++ b/src/dashboard/fixture/double-elimination.tsx @@ -4,8 +4,8 @@ import styled from 'styled-components'; import { useReplicant } from 'use-nodecg'; import _ from 'lodash'; -import { Matches } from '../../types/matches'; -import { DoubleElimination as IDoubleElimination } from '../../types/tournament'; +import { Matches } from '../../../types/matches'; +import { DoubleElimination as IDoubleElimination } from '../../../types/tournament'; import { FixtureMatch } from './fixture-match'; diff --git a/src/dashboard/fixture/edit-tournament.tsx b/src/dashboard/fixture/edit-tournament.tsx index 54e6232..ab9f8d2 100644 --- a/src/dashboard/fixture/edit-tournament.tsx +++ b/src/dashboard/fixture/edit-tournament.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { useReplicant } from 'use-nodecg'; -import { Asset } from '../../types/nodecg'; +import { Asset } from '../../../types/nodecg'; import { Button, @@ -16,7 +16,7 @@ import { Select, TextField, } from '@material-ui/core'; -import { Tournament, TournamentEdit } from '../../types/tournament'; +import { Tournament, TournamentEdit } from '../../../types/tournament'; interface Props { tournament: Tournament | undefined; diff --git a/src/dashboard/fixture/fixture-match.tsx b/src/dashboard/fixture/fixture-match.tsx index 68e30df..05ccbc6 100644 --- a/src/dashboard/fixture/fixture-match.tsx +++ b/src/dashboard/fixture/fixture-match.tsx @@ -1,7 +1,7 @@ import React, { ChangeEvent } from 'react'; import styled from 'styled-components'; -import { Match } from '../../types/matches'; +import { Match } from '../../../types/matches'; import { Select, MenuItem } from '@material-ui/core'; diff --git a/src/dashboard/fixture/fixture.tsx b/src/dashboard/fixture/fixture.tsx index b476898..ce2fb12 100644 --- a/src/dashboard/fixture/fixture.tsx +++ b/src/dashboard/fixture/fixture.tsx @@ -8,7 +8,7 @@ import { Tournaments, SingleElimination as ISingleElimination, DoubleElimination as IDoubleElimination, -} from '../../types/tournament'; +} from '../../../types/tournament'; import { Button, diff --git a/src/dashboard/fixture/single-elimination.tsx b/src/dashboard/fixture/single-elimination.tsx index 3156f5d..07dcd12 100644 --- a/src/dashboard/fixture/single-elimination.tsx +++ b/src/dashboard/fixture/single-elimination.tsx @@ -4,8 +4,8 @@ import styled from 'styled-components'; import { useReplicant } from 'use-nodecg'; import _ from 'lodash'; -import { Matches } from '../../types/matches'; -import { SingleElimination as ISingleElimination } from '../../types/tournament'; +import { Matches } from '../../../types/matches'; +import { SingleElimination as ISingleElimination } from '../../../types/tournament'; import { FixtureMatch } from './fixture-match'; diff --git a/src/dashboard/game-settings/game-settings.tsx b/src/dashboard/game-settings/game-settings.tsx index 8f52505..5ae4011 100644 --- a/src/dashboard/game-settings/game-settings.tsx +++ b/src/dashboard/game-settings/game-settings.tsx @@ -13,7 +13,7 @@ import { TextField } from '@material-ui/core'; import { StyledToggleButton } from '../atoms/toggle-button'; // Interfaces -import { GameSettings as IGameSettings } from '../../types/game-settings'; +import { GameSettings as IGameSettings } from '../../../types/game-settings'; const useStyles = makeStyles(() => createStyles({ diff --git a/src/dashboard/production/currentmatch/currentmatch.tsx b/src/dashboard/production/currentmatch/currentmatch.tsx index 05be7d2..a947381 100644 --- a/src/dashboard/production/currentmatch/currentmatch.tsx +++ b/src/dashboard/production/currentmatch/currentmatch.tsx @@ -4,7 +4,7 @@ import { useReplicant } from 'use-nodecg'; import styled from 'styled-components'; import { theme } from '../../theme'; -import { MapInfo, Matches, Match, Score } from '../../../types/matches'; +import { MapInfo, Matches, Match, Score } from '../../../../types/matches'; import { ThemeProvider } from '@material-ui/styles'; import { Grid, Button, Chip } from '@material-ui/core'; diff --git a/src/dashboard/setup/maps/veto.tsx b/src/dashboard/setup/maps/veto.tsx index 1cb28f9..ffbe760 100644 --- a/src/dashboard/setup/maps/veto.tsx +++ b/src/dashboard/setup/maps/veto.tsx @@ -14,7 +14,7 @@ import { NotDraggingStyle, DropResult, } from 'react-beautiful-dnd'; -import { MapInfo, Match } from '../../../types/matches'; +import { MapInfo, Match } from '../../../../types/matches'; import { DashVETOSingle } from './vetosingle'; import { GreenButton } from '../../atoms/styled-ui'; diff --git a/src/dashboard/setup/maps/vetosingle.tsx b/src/dashboard/setup/maps/vetosingle.tsx index b877697..2b1aa75 100644 --- a/src/dashboard/setup/maps/vetosingle.tsx +++ b/src/dashboard/setup/maps/vetosingle.tsx @@ -2,7 +2,7 @@ import React from 'react'; import styled from 'styled-components'; import { theme } from '../../theme'; -import { MapInfo } from '../../../types/matches'; +import { MapInfo } from '../../../../types/matches'; import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd'; import { Chip, Grid } from '@material-ui/core'; diff --git a/src/dashboard/setup/schedule/schedule.tsx b/src/dashboard/setup/schedule/schedule.tsx index 10941a4..9e4021a 100644 --- a/src/dashboard/setup/schedule/schedule.tsx +++ b/src/dashboard/setup/schedule/schedule.tsx @@ -4,9 +4,9 @@ import styled from 'styled-components'; import { theme } from '../../theme'; import { useReplicant } from 'use-nodecg'; -import { TeamsPreset } from '../../../types/team-preset'; +import { TeamsPreset } from '../../../../types/team-preset'; import { teamPlayerPreset } from '../../../extension/example-data'; -import { Match, Matches, NewMatch } from '../../../types/matches'; +import { Match, Matches, NewMatch } from '../../../../types/matches'; import { Grid, diff --git a/src/dashboard/setup/schedule/singlematch.tsx b/src/dashboard/setup/schedule/singlematch.tsx index 99096b0..d9721e2 100644 --- a/src/dashboard/setup/schedule/singlematch.tsx +++ b/src/dashboard/setup/schedule/singlematch.tsx @@ -1,8 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { Match } from '../../../types/matches'; -import { Team } from '../../../types/team-preset'; +import { Match } from '../../../../types/matches'; +import { Team } from '../../../../types/team-preset'; import { GrabHandles } from '../../atoms/grabhandle'; import { RedButton } from '../../atoms/styled-ui'; diff --git a/src/dashboard/setup/server/server.tsx b/src/dashboard/setup/server/server.tsx index bb947aa..a4800d4 100644 --- a/src/dashboard/setup/server/server.tsx +++ b/src/dashboard/setup/server/server.tsx @@ -12,7 +12,7 @@ import { ThemeProvider } from '@material-ui/styles'; // Interfaces import { bundleStatus as ExampleBundle } from '../../../extension/example-data'; -import { BundleStatus } from '../../../types/bundle-status'; +import { BundleStatus } from '../../../../types/bundle-status'; const HlaeActive = styled.div` width: 100%; diff --git a/src/dashboard/setup/team-preset-creator/team-preset-creator.tsx b/src/dashboard/setup/team-preset-creator/team-preset-creator.tsx index cfc1106..29267d1 100644 --- a/src/dashboard/setup/team-preset-creator/team-preset-creator.tsx +++ b/src/dashboard/setup/team-preset-creator/team-preset-creator.tsx @@ -21,10 +21,10 @@ import { ThemeProvider } from '@material-ui/styles'; import { flagList } from '../../atoms/flag-list'; import { theme } from '../../theme'; -import { TeamsPreset } from '../../../types/team-preset'; +import { TeamsPreset } from '../../../../types/team-preset'; import { teamPlayerPreset } from '../../../extension/example-data'; import { FullTeam } from 'hltv/lib/models/FullTeam'; -import { Asset } from '../../../types/nodecg'; +import { Asset } from '../../../../types/nodecg'; const ControlsContainer = styled.div` & > * { diff --git a/src/dashboard/setup/teams/player-box.tsx b/src/dashboard/setup/teams/player-box.tsx index c46c1d7..407d41f 100644 --- a/src/dashboard/setup/teams/player-box.tsx +++ b/src/dashboard/setup/teams/player-box.tsx @@ -21,9 +21,9 @@ import DialogActions from '@material-ui/core/DialogActions'; import DialogContent from '@material-ui/core/DialogContent'; import DialogTitle from '@material-ui/core/DialogTitle'; -import { CSGOAllplayer } from '../../../types/csgo-gsi'; -import { PlayerData } from '../../../types/extra-data'; -import { Asset } from '../../../types/nodecg'; +import { CSGOAllplayer } from '../../../../types/csgo-gsi'; +import { PlayerData } from '../../../../types/extra-data'; +import { Asset } from '../../../../types/nodecg'; import { useReplicant } from 'use-nodecg'; import { flagList } from '../../atoms/flag-list'; diff --git a/src/dashboard/setup/teams/team.tsx b/src/dashboard/setup/teams/team.tsx index 7dbf5d5..7ac5162 100644 --- a/src/dashboard/setup/teams/team.tsx +++ b/src/dashboard/setup/teams/team.tsx @@ -2,12 +2,12 @@ import React from 'react'; import styled from 'styled-components'; import { useReplicant } from 'use-nodecg'; -import { CSGOAllplayer } from '../../../types/csgo-gsi'; -import { Team as ITeam } from '../../../types/team-preset'; +import { CSGOAllplayer } from '../../../../types/csgo-gsi'; +import { Team as ITeam } from '../../../../types/team-preset'; import { Grid } from '@material-ui/core'; import { PlayerBox } from './player-box'; -import { PlayerDataAll } from '../../../types/extra-data'; +import { PlayerDataAll } from '../../../../types/extra-data'; const TeamContainer = styled.div` width: 324px; diff --git a/src/dashboard/setup/teams/teams.tsx b/src/dashboard/setup/teams/teams.tsx index bb419d7..2b798eb 100644 --- a/src/dashboard/setup/teams/teams.tsx +++ b/src/dashboard/setup/teams/teams.tsx @@ -10,11 +10,11 @@ import { ThemeProvider } from '@material-ui/styles'; import { Team } from './team'; // Interfaces -import { Map, CSGOAllplayer } from '../../../types/csgo-gsi'; -import { TeamData, PlayerDataAll } from '../../../types/extra-data'; -import { TeamsPreset } from '../../../types/team-preset'; +import { Map, CSGOAllplayer } from '../../../../types/csgo-gsi'; +import { TeamData, PlayerDataAll } from '../../../../types/extra-data'; +import { TeamsPreset } from '../../../../types/team-preset'; import ExampleData from '../../../extension/example-data'; -import { Match } from '../../../types/matches'; +import { Match } from '../../../../types/matches'; const Divider = styled.div` width: 3px; diff --git a/src/dashboard/setup/test/test.tsx b/src/dashboard/setup/test/test.tsx index 9e2f69b..3816086 100644 --- a/src/dashboard/setup/test/test.tsx +++ b/src/dashboard/setup/test/test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { render } from 'react-dom'; import styled from 'styled-components'; -import { PlayerDeath } from '../../../types/hlae'; +import { PlayerDeath } from '../../../../types/hlae'; import { theme } from '../../theme'; import { Button } from '@material-ui/core'; diff --git a/src/extension/example-data.ts b/src/extension/example-data.ts index 16394cc..7f0c0a0 100644 --- a/src/extension/example-data.ts +++ b/src/extension/example-data.ts @@ -8,11 +8,11 @@ import { CSGOOutputGrenade, CSGOGrenadesAll, CSGO, -} from '../types/csgo-gsi'; -import { GameSettings } from '../types/game-settings'; -import { BundleStatus } from '../types/bundle-status'; -import { PlayerDataAll, TeamData as ITeamData } from '../types/extra-data'; -import { TeamsPreset } from '../types/team-preset'; +} from '../../types/csgo-gsi'; +import { GameSettings } from '../../types/game-settings'; +import { BundleStatus } from '../../types/bundle-status'; +import { PlayerDataAll, TeamData as ITeamData } from '../../types/extra-data'; +import { TeamsPreset } from '../../types/team-preset'; export const match: Map = { mode: 'competitive', diff --git a/src/extension/extra-data.ts b/src/extension/extra-data.ts index fc2fb4c..0c36c72 100644 --- a/src/extension/extra-data.ts +++ b/src/extension/extra-data.ts @@ -2,11 +2,11 @@ import * as nodecgApiContext from './util/nodecg-api-context'; import * as SteamAPI from './util/steam-api'; import _ from 'lodash'; -import { CSGOAllplayer, CSGOPhaseCountdowns, Map } from '../types/csgo-gsi'; -import { PlayerDataAll, TeamData } from '../types/extra-data'; -import { MapInfo, Matches } from '../types/matches'; +import { CSGOAllplayer, CSGOPhaseCountdowns, Map } from '../../types/csgo-gsi'; +import { PlayerDataAll, TeamData } from '../../types/extra-data'; +import { MapInfo, Matches } from '../../types/matches'; import { extraData as exampleExtraData } from './example-data'; -import { TeamsPreset } from '../types/team-preset'; +import { TeamsPreset } from '../../types/team-preset'; const nodecg = nodecgApiContext.get(); diff --git a/src/extension/hlae.ts b/src/extension/hlae.ts index b6d426a..162f40e 100644 --- a/src/extension/hlae.ts +++ b/src/extension/hlae.ts @@ -2,8 +2,8 @@ import * as nodecgApiContext from './util/nodecg-api-context'; const nodecg = nodecgApiContext.get(); import Websocket from 'ws'; -import { PlayerDeath } from '../types/hlae'; -import { Map } from '../types/csgo-gsi'; +import { PlayerDeath } from '../../types/hlae'; +import { Map } from '../../types/csgo-gsi'; import { BufferReader, GameEventUnserializer, basicEnrichments } from './util/hlae-serialization'; diff --git a/src/extension/map-interp.ts b/src/extension/map-interp.ts index 8af3b05..2a400a0 100644 --- a/src/extension/map-interp.ts +++ b/src/extension/map-interp.ts @@ -1,8 +1,8 @@ import * as nodecgApiContext from './util/nodecg-api-context'; const nodecg = nodecgApiContext.get(); -import { MapPlayerData } from '../types/map-player'; -import { CSGOPhaseCountdowns } from '../types/csgo-gsi'; +import { MapPlayerData } from '../../types/map-player'; +import { CSGOPhaseCountdowns } from '../../types/csgo-gsi'; const interpMapPlayersRep = nodecg.Replicant>('interpMapPlayers'); diff --git a/src/extension/matches.ts b/src/extension/matches.ts index 7e9f7c8..b5b63ed 100644 --- a/src/extension/matches.ts +++ b/src/extension/matches.ts @@ -2,10 +2,10 @@ import * as nodecgApiContext from './util/nodecg-api-context'; import { v4 as uuid } from 'uuid'; import _ from 'lodash'; -import { MapInfo, Match, Matches, NewMatch } from '../types/matches'; -import { TeamsPreset } from '../types/team-preset'; -import { CSGO } from '../types/csgo-gsi'; -import { PlayerDeath } from '../types/hlae'; +import { MapInfo, Match, Matches, NewMatch } from '../../types/matches'; +import { TeamsPreset } from '../../types/team-preset'; +import { CSGO } from '../../types/csgo-gsi'; +import { PlayerDeath } from '../../types/hlae'; const nodecg = nodecgApiContext.get(); const currentMatchRep = nodecg.Replicant('currentMatch'); diff --git a/src/extension/messages.ts b/src/extension/messages.ts index fd778dc..9a1ef08 100644 --- a/src/extension/messages.ts +++ b/src/extension/messages.ts @@ -1,7 +1,7 @@ import * as nodecgApiContext from './util/nodecg-api-context'; const nodecg = nodecgApiContext.get(); -import { CSGO } from '../types/csgo-gsi'; +import { CSGO } from '../../types/csgo-gsi'; // Sends messages based on game information const gameRep = nodecg.Replicant('gameRep'); diff --git a/src/extension/replicants.ts b/src/extension/replicants.ts index e55398d..3f8bd3d 100644 --- a/src/extension/replicants.ts +++ b/src/extension/replicants.ts @@ -1,10 +1,10 @@ import * as nodecgApiContext from './util/nodecg-api-context'; -import { PlayerDataAll, TeamData } from '../types/extra-data'; -import { PlayerDeath } from '../types/hlae'; -import { MapPlayerData } from '../types/map-player'; -import { Match, Matches } from '../types/matches'; -import { BundleStatus } from '../types/bundle-status'; +import { PlayerDataAll, TeamData } from '../../types/extra-data'; +import { PlayerDeath } from '../../types/hlae'; +import { MapPlayerData } from '../../types/map-player'; +import { Match, Matches } from '../../types/matches'; +import { BundleStatus } from '../../types/bundle-status'; import { CSGO, CSGOAllplayer, @@ -13,11 +13,11 @@ import { CSGOBomb, CSGOPhaseCountdowns, CSGOGrenadesAll, -} from '../types/csgo-gsi'; +} from '../../types/csgo-gsi'; import ExampleData from './example-data'; -import { TeamsPreset } from '../types/team-preset'; -import { Tournaments } from '../types/tournament'; -import { GameSettings } from '../types/game-settings'; +import { TeamsPreset } from '../../types/team-preset'; +import { Tournaments } from '../../types/tournament'; +import { GameSettings } from '../../types/game-settings'; const nodecg = nodecgApiContext.get(); diff --git a/src/extension/server.ts b/src/extension/server.ts index 82c9e43..43ba82d 100644 --- a/src/extension/server.ts +++ b/src/extension/server.ts @@ -3,7 +3,7 @@ import * as nodecgApiContext from './util/nodecg-api-context'; import http from 'http'; import _ from 'lodash'; -import { BundleStatus } from '../types/bundle-status'; +import { BundleStatus } from '../../types/bundle-status'; import { Map, CSGOAllplayer, @@ -12,9 +12,9 @@ import { CSGOPhaseCountdowns, CSGOGrenadesAll, CSGO, -} from '../types/csgo-gsi'; -import { TeamData } from '../types/extra-data'; -import { MapPlayerData } from '../types/map-player'; +} from '../../types/csgo-gsi'; +import { TeamData } from '../../types/extra-data'; +import { MapPlayerData } from '../../types/map-player'; const nodecg = nodecgApiContext.get(); const bundleStatus = nodecg.Replicant('bundleStatus'); diff --git a/src/extension/team-import-export.ts b/src/extension/team-import-export.ts index 1d8a4b0..2660fbc 100644 --- a/src/extension/team-import-export.ts +++ b/src/extension/team-import-export.ts @@ -4,8 +4,8 @@ import _ from 'lodash'; import { HLTV } from 'hltv'; const nodecg = nodecgApiContext.get(); -import { TeamsPreset, Team, Player } from '../types/team-preset'; -import { PlayerDataAll } from '../types/extra-data'; +import { TeamsPreset, Team, Player } from '../../types/team-preset'; +import { PlayerDataAll } from '../../types/extra-data'; interface Asset { base: string; diff --git a/src/extension/testing.ts b/src/extension/testing.ts index 7e73a29..bd592d6 100644 --- a/src/extension/testing.ts +++ b/src/extension/testing.ts @@ -1,7 +1,7 @@ import * as nodecgApiContext from './util/nodecg-api-context'; // Import { testData } from './testing-data/testing'; -import { CSGO } from '../types/csgo-gsi'; +import { CSGO } from '../../types/csgo-gsi'; // Testing data import TestStandard from './testing-data/standard.json'; diff --git a/src/extension/tournament.ts b/src/extension/tournament.ts index b428f10..a0463f0 100644 --- a/src/extension/tournament.ts +++ b/src/extension/tournament.ts @@ -10,7 +10,7 @@ import { SingleElimination, DoubleElimination, TournamentEdit, -} from '../types/tournament'; +} from '../../types/tournament'; const nodecg = nodecgApiContext.get(); diff --git a/src/extension/util/nodecg-api-context.ts b/src/extension/util/nodecg-api-context.ts index 2bf9820..692e04c 100644 --- a/src/extension/util/nodecg-api-context.ts +++ b/src/extension/util/nodecg-api-context.ts @@ -1,6 +1,6 @@ 'use strict'; -import { NodeCG } from '../../types/nodecg'; +import { NodeCG } from '../../../types/nodecg'; let context: NodeCG; diff --git a/src/types/bundle-status.d.ts b/types/bundle-status.d.ts similarity index 100% rename from src/types/bundle-status.d.ts rename to types/bundle-status.d.ts diff --git a/src/types/csgo-gsi.d.ts b/types/csgo-gsi.d.ts similarity index 100% rename from src/types/csgo-gsi.d.ts rename to types/csgo-gsi.d.ts diff --git a/src/types/extra-data.d.ts b/types/extra-data.d.ts similarity index 100% rename from src/types/extra-data.d.ts rename to types/extra-data.d.ts diff --git a/src/types/game-settings.d.ts b/types/game-settings.d.ts similarity index 100% rename from src/types/game-settings.d.ts rename to types/game-settings.d.ts diff --git a/src/types/hlae.d.ts b/types/hlae.d.ts similarity index 100% rename from src/types/hlae.d.ts rename to types/hlae.d.ts diff --git a/src/types/map-player.d.ts b/types/map-player.d.ts similarity index 100% rename from src/types/map-player.d.ts rename to types/map-player.d.ts diff --git a/src/types/matches.d.ts b/types/matches.d.ts similarity index 100% rename from src/types/matches.d.ts rename to types/matches.d.ts diff --git a/src/types/nodecg.d.ts b/types/nodecg.d.ts similarity index 100% rename from src/types/nodecg.d.ts rename to types/nodecg.d.ts diff --git a/src/types/team-preset.d.ts b/types/team-preset.d.ts similarity index 100% rename from src/types/team-preset.d.ts rename to types/team-preset.d.ts diff --git a/src/types/tournament.d.ts b/types/tournament.d.ts similarity index 100% rename from src/types/tournament.d.ts rename to types/tournament.d.ts