Skip to content

Commit

Permalink
Changed type location
Browse files Browse the repository at this point in the history
  • Loading branch information
EwanLyon committed Feb 13, 2021
1 parent 72ced7d commit 468f5a9
Show file tree
Hide file tree
Showing 40 changed files with 68 additions and 68 deletions.
4 changes: 2 additions & 2 deletions src/dashboard/fixture/create-tournament.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/fixture/double-elimination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/fixture/edit-tournament.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/fixture/fixture-match.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/fixture/fixture.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Tournaments,
SingleElimination as ISingleElimination,
DoubleElimination as IDoubleElimination,
} from '../../types/tournament';
} from '../../../types/tournament';

import {
Button,
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/fixture/single-elimination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/game-settings/game-settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/production/currentmatch/currentmatch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/setup/maps/veto.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/setup/maps/vetosingle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/setup/schedule/schedule.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/setup/schedule/singlematch.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/setup/server/server.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`
& > * {
Expand Down
6 changes: 3 additions & 3 deletions src/dashboard/setup/teams/player-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
6 changes: 3 additions & 3 deletions src/dashboard/setup/teams/team.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/dashboard/setup/teams/teams.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard/setup/test/test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
10 changes: 5 additions & 5 deletions src/extension/example-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 4 additions & 4 deletions src/extension/extra-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions src/extension/hlae.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions src/extension/map-interp.ts
Original file line number Diff line number Diff line change
@@ -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<Record<string, MapPlayerData>>('interpMapPlayers');

Expand Down
8 changes: 4 additions & 4 deletions src/extension/matches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<Match | undefined>('currentMatch');
Expand Down
2 changes: 1 addition & 1 deletion src/extension/messages.ts
Original file line number Diff line number Diff line change
@@ -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<CSGO>('gameRep');
Expand Down
18 changes: 9 additions & 9 deletions src/extension/replicants.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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();

Expand Down
8 changes: 4 additions & 4 deletions src/extension/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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>('bundleStatus');
Expand Down
4 changes: 2 additions & 2 deletions src/extension/team-import-export.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/extension/testing.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/extension/tournament.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
SingleElimination,
DoubleElimination,
TournamentEdit,
} from '../types/tournament';
} from '../../types/tournament';

const nodecg = nodecgApiContext.get();

Expand Down
2 changes: 1 addition & 1 deletion src/extension/util/nodecg-api-context.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

import { NodeCG } from '../../types/nodecg';
import { NodeCG } from '../../../types/nodecg';

let context: NodeCG;

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 468f5a9

Please sign in to comment.