From d0c48585bc05b212599785da40c38b613a8db9c4 Mon Sep 17 00:00:00 2001 From: nickofolas Date: Sun, 24 Apr 2022 18:51:30 -0500 Subject: [PATCH] Clean up code --- src/Infiltration/ui/BackwardGame.tsx | 17 ++++++++--------- src/Infiltration/ui/BlinkingCursor.tsx | 2 +- src/Infiltration/ui/BracketGame.tsx | 17 ++++++++--------- src/Infiltration/ui/BribeGame.tsx | 13 ++++++------- src/Infiltration/ui/CheatCodeGame.tsx | 17 ++++++++--------- src/Infiltration/ui/Countdown.tsx | 4 ++-- src/Infiltration/ui/Cyberpunk2077Game.tsx | 17 ++++++++--------- src/Infiltration/ui/Game.tsx | 1 - src/Infiltration/ui/GameTimer.tsx | 8 ++++---- src/Infiltration/ui/InfiltrationRoot.tsx | 4 ++-- src/Infiltration/ui/Intro.tsx | 7 +++---- src/Infiltration/ui/MinesweeperGame.tsx | 17 ++++++++--------- src/Infiltration/ui/SlashGame.tsx | 14 +++++++------- src/Infiltration/ui/Victory.tsx | 11 +++++------ src/Infiltration/ui/WireCuttingGame.tsx | 15 +++++++-------- 15 files changed, 77 insertions(+), 87 deletions(-) diff --git a/src/Infiltration/ui/BackwardGame.tsx b/src/Infiltration/ui/BackwardGame.tsx index dd2785ddd..f02e62abe 100644 --- a/src/Infiltration/ui/BackwardGame.tsx +++ b/src/Infiltration/ui/BackwardGame.tsx @@ -1,15 +1,14 @@ +import { Paper, Typography } from "@mui/material"; import React, { useState } from "react"; -import Grid from "@mui/material/Grid"; +import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; +import { Player } from "../../Player"; +import { KEY } from "../../utils/helpers/keyCodes"; +import { random } from "../utils"; +import { BlinkingCursor } from "./BlinkingCursor"; +import { interpolate } from "./Difficulty"; +import { GameTimer } from "./GameTimer"; import { IMinigameProps } from "./IMinigameProps"; import { KeyHandler } from "./KeyHandler"; -import { GameTimer } from "./GameTimer"; -import { random } from "../utils"; -import { interpolate } from "./Difficulty"; -import { BlinkingCursor } from "./BlinkingCursor"; -import { KEY } from "../../utils/helpers/keyCodes"; -import { Player } from "../../Player"; -import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; -import { Paper, Typography, Box } from "@mui/material"; interface Difficulty { [key: string]: number; diff --git a/src/Infiltration/ui/BlinkingCursor.tsx b/src/Infiltration/ui/BlinkingCursor.tsx index 0cace1fd1..c3152ab72 100644 --- a/src/Infiltration/ui/BlinkingCursor.tsx +++ b/src/Infiltration/ui/BlinkingCursor.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from "react"; +import React, { useEffect, useState } from "react"; export function BlinkingCursor(): React.ReactElement { const [on, setOn] = useState(true); diff --git a/src/Infiltration/ui/BracketGame.tsx b/src/Infiltration/ui/BracketGame.tsx index 9c620ce86..26f7e19fe 100644 --- a/src/Infiltration/ui/BracketGame.tsx +++ b/src/Infiltration/ui/BracketGame.tsx @@ -1,15 +1,14 @@ +import { Paper, Typography } from "@mui/material"; import React, { useState } from "react"; -import Grid from "@mui/material/Grid"; +import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; +import { Player } from "../../Player"; +import { KEY } from "../../utils/helpers/keyCodes"; +import { random } from "../utils"; +import { BlinkingCursor } from "./BlinkingCursor"; +import { interpolate } from "./Difficulty"; +import { GameTimer } from "./GameTimer"; import { IMinigameProps } from "./IMinigameProps"; import { KeyHandler } from "./KeyHandler"; -import { GameTimer } from "./GameTimer"; -import { random } from "../utils"; -import { interpolate } from "./Difficulty"; -import { BlinkingCursor } from "./BlinkingCursor"; -import { Player } from "../../Player"; -import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; -import { KEY } from "../../utils/helpers/keyCodes"; -import { Paper, Box, Typography } from "@mui/material"; interface Difficulty { [key: string]: number; diff --git a/src/Infiltration/ui/BribeGame.tsx b/src/Infiltration/ui/BribeGame.tsx index f8e02cfdd..6fdc85246 100644 --- a/src/Infiltration/ui/BribeGame.tsx +++ b/src/Infiltration/ui/BribeGame.tsx @@ -1,15 +1,14 @@ +import { Paper, Typography } from "@mui/material"; import React, { useEffect, useState } from "react"; -import Grid from "@mui/material/Grid"; -import { IMinigameProps } from "./IMinigameProps"; -import { KeyHandler } from "./KeyHandler"; -import { GameTimer } from "./GameTimer"; -import { interpolate } from "./Difficulty"; -import { KEY } from "../../utils/helpers/keyCodes"; import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; import { Player } from "../../Player"; import { Settings } from "../../Settings/Settings"; +import { KEY } from "../../utils/helpers/keyCodes"; import { downArrowSymbol, upArrowSymbol } from "../utils"; -import { Paper, Typography, Box } from "@mui/material"; +import { interpolate } from "./Difficulty"; +import { GameTimer } from "./GameTimer"; +import { IMinigameProps } from "./IMinigameProps"; +import { KeyHandler } from "./KeyHandler"; interface Difficulty { [key: string]: number; diff --git a/src/Infiltration/ui/CheatCodeGame.tsx b/src/Infiltration/ui/CheatCodeGame.tsx index e7b356369..471003b41 100644 --- a/src/Infiltration/ui/CheatCodeGame.tsx +++ b/src/Infiltration/ui/CheatCodeGame.tsx @@ -1,21 +1,20 @@ +import { Paper, Typography } from "@mui/material"; import React, { useState } from "react"; -import Grid from "@mui/material/Grid"; -import { IMinigameProps } from "./IMinigameProps"; -import { KeyHandler } from "./KeyHandler"; -import { GameTimer } from "./GameTimer"; +import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; +import { Player } from "../../Player"; import { - random, + downArrowSymbol, getArrow, getInverseArrow, leftArrowSymbol, + random, rightArrowSymbol, upArrowSymbol, - downArrowSymbol, } from "../utils"; import { interpolate } from "./Difficulty"; -import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; -import { Player } from "../../Player"; -import { Paper, Typography, Box } from "@mui/material"; +import { GameTimer } from "./GameTimer"; +import { IMinigameProps } from "./IMinigameProps"; +import { KeyHandler } from "./KeyHandler"; interface Difficulty { [key: string]: number; diff --git a/src/Infiltration/ui/Countdown.tsx b/src/Infiltration/ui/Countdown.tsx index 8b0659b86..00d068ba6 100644 --- a/src/Infiltration/ui/Countdown.tsx +++ b/src/Infiltration/ui/Countdown.tsx @@ -1,5 +1,5 @@ -import React, { useState, useEffect } from "react"; -import { Typography, Paper } from "@mui/material"; +import { Paper, Typography } from "@mui/material"; +import React, { useEffect, useState } from "react"; interface IProps { onFinish: () => void; diff --git a/src/Infiltration/ui/Cyberpunk2077Game.tsx b/src/Infiltration/ui/Cyberpunk2077Game.tsx index 534acfc49..3f88045f5 100644 --- a/src/Infiltration/ui/Cyberpunk2077Game.tsx +++ b/src/Infiltration/ui/Cyberpunk2077Game.tsx @@ -1,15 +1,14 @@ +import { Paper, Typography } from "@mui/material"; import React, { useState } from "react"; -import Grid from "@mui/material/Grid"; -import { IMinigameProps } from "./IMinigameProps"; -import { KeyHandler } from "./KeyHandler"; -import { GameTimer } from "./GameTimer"; -import { interpolate } from "./Difficulty"; -import { downArrowSymbol, getArrow, leftArrowSymbol, rightArrowSymbol, upArrowSymbol } from "../utils"; -import { KEY } from "../../utils/helpers/keyCodes"; -import { Settings } from "../../Settings/Settings"; import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; import { Player } from "../../Player"; -import { Paper, Typography, Box } from "@mui/material"; +import { Settings } from "../../Settings/Settings"; +import { KEY } from "../../utils/helpers/keyCodes"; +import { downArrowSymbol, getArrow, leftArrowSymbol, rightArrowSymbol, upArrowSymbol } from "../utils"; +import { interpolate } from "./Difficulty"; +import { GameTimer } from "./GameTimer"; +import { IMinigameProps } from "./IMinigameProps"; +import { KeyHandler } from "./KeyHandler"; interface Difficulty { [key: string]: number; diff --git a/src/Infiltration/ui/Game.tsx b/src/Infiltration/ui/Game.tsx index f11e2e632..2f58decda 100644 --- a/src/Infiltration/ui/Game.tsx +++ b/src/Infiltration/ui/Game.tsx @@ -1,6 +1,5 @@ import { Button, Container, Paper, Typography } from "@mui/material"; import React, { useState } from "react"; -import { Location } from "../../Locations/Location"; import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; import { use } from "../../ui/Context"; import { BackwardGame } from "./BackwardGame"; diff --git a/src/Infiltration/ui/GameTimer.tsx b/src/Infiltration/ui/GameTimer.tsx index 354973f77..77d6d28e9 100644 --- a/src/Infiltration/ui/GameTimer.tsx +++ b/src/Infiltration/ui/GameTimer.tsx @@ -1,9 +1,9 @@ -import React, { useState, useEffect } from "react"; -import withStyles from "@mui/styles/withStyles"; +import { LinearProgress, Paper } from "@mui/material"; import { Theme } from "@mui/material/styles"; -import { Paper, LinearProgress } from "@mui/material"; -import { use } from "../../ui/Context"; +import withStyles from "@mui/styles/withStyles"; +import React, { useEffect, useState } from "react"; import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; +import { use } from "../../ui/Context"; const TimerProgress = withStyles((theme: Theme) => ({ root: { diff --git a/src/Infiltration/ui/InfiltrationRoot.tsx b/src/Infiltration/ui/InfiltrationRoot.tsx index 53370ecbd..86e44a43d 100644 --- a/src/Infiltration/ui/InfiltrationRoot.tsx +++ b/src/Infiltration/ui/InfiltrationRoot.tsx @@ -1,9 +1,9 @@ import React, { useState } from "react"; -import { Intro } from "./Intro"; -import { Game } from "./Game"; import { Location } from "../../Locations/Location"; import { use } from "../../ui/Context"; import { calculateDifficulty, calculateReward } from "../formulas/game"; +import { Game } from "./Game"; +import { Intro } from "./Intro"; interface IProps { location: Location; } diff --git a/src/Infiltration/ui/Intro.tsx b/src/Infiltration/ui/Intro.tsx index 5c1711519..b87e3271c 100644 --- a/src/Infiltration/ui/Intro.tsx +++ b/src/Infiltration/ui/Intro.tsx @@ -1,10 +1,9 @@ +import { Report } from "@mui/icons-material"; +import { Box, Button, Container, Paper, Tooltip, Typography } from "@mui/material"; import React from "react"; import { Location } from "../../Locations/Location"; -import Grid from "@mui/material/Grid"; -import { numeralWrapper } from "../../ui/numeralFormat"; -import { Button, Paper, Typography, Container, Tooltip, Box } from "@mui/material"; -import { Report } from "@mui/icons-material"; import { Settings } from "../../Settings/Settings"; +import { numeralWrapper } from "../../ui/numeralFormat"; interface IProps { Location: Location; diff --git a/src/Infiltration/ui/MinesweeperGame.tsx b/src/Infiltration/ui/MinesweeperGame.tsx index 20a818e70..1ec2538b9 100644 --- a/src/Infiltration/ui/MinesweeperGame.tsx +++ b/src/Infiltration/ui/MinesweeperGame.tsx @@ -1,14 +1,13 @@ -import React, { useState, useEffect } from "react"; -import Grid from "@mui/material/Grid"; -import { IMinigameProps } from "./IMinigameProps"; -import { KeyHandler } from "./KeyHandler"; -import { GameTimer } from "./GameTimer"; -import { interpolate } from "./Difficulty"; -import { downArrowSymbol, getArrow, leftArrowSymbol, rightArrowSymbol, upArrowSymbol } from "../utils"; -import { KEY } from "../../utils/helpers/keyCodes"; +import { Paper, Typography } from "@mui/material"; +import React, { useEffect, useState } from "react"; import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; import { Player } from "../../Player"; -import { Paper, Typography, Box } from "@mui/material"; +import { KEY } from "../../utils/helpers/keyCodes"; +import { downArrowSymbol, getArrow, leftArrowSymbol, rightArrowSymbol, upArrowSymbol } from "../utils"; +import { interpolate } from "./Difficulty"; +import { GameTimer } from "./GameTimer"; +import { IMinigameProps } from "./IMinigameProps"; +import { KeyHandler } from "./KeyHandler"; interface Difficulty { [key: string]: number; diff --git a/src/Infiltration/ui/SlashGame.tsx b/src/Infiltration/ui/SlashGame.tsx index 9fa69ad04..f95ee7c37 100644 --- a/src/Infiltration/ui/SlashGame.tsx +++ b/src/Infiltration/ui/SlashGame.tsx @@ -1,12 +1,12 @@ -import React, { useState, useEffect } from "react"; +import { Box, Paper, Typography } from "@mui/material"; +import React, { useEffect, useState } from "react"; +import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; +import { Player } from "../../Player"; +import { KEY } from "../../utils/helpers/keyCodes"; +import { interpolate } from "./Difficulty"; +import { GameTimer } from "./GameTimer"; import { IMinigameProps } from "./IMinigameProps"; import { KeyHandler } from "./KeyHandler"; -import { GameTimer } from "./GameTimer"; -import { interpolate } from "./Difficulty"; -import { KEY } from "../../utils/helpers/keyCodes"; -import { Player } from "../../Player"; -import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; -import { Paper, Typography, Box } from "@mui/material"; interface Difficulty { [key: string]: number; diff --git a/src/Infiltration/ui/Victory.tsx b/src/Infiltration/ui/Victory.tsx index aec8b3bdb..c73993ae1 100644 --- a/src/Infiltration/ui/Victory.tsx +++ b/src/Infiltration/ui/Victory.tsx @@ -1,18 +1,17 @@ -import { Factions } from "../../Faction/Factions"; +import { Box, Button, MenuItem, Paper, Select, SelectChangeEvent, Typography } from "@mui/material"; import React, { useState } from "react"; +import { FactionNames } from "../../Faction/data/FactionNames"; +import { inviteToFaction } from "../../Faction/FactionHelpers"; +import { Factions } from "../../Faction/Factions"; +import { use } from "../../ui/Context"; import { Money } from "../../ui/React/Money"; import { Reputation } from "../../ui/React/Reputation"; -import { use } from "../../ui/Context"; -import { FactionNames } from "../../Faction/data/FactionNames"; import { formatNumber } from "../../utils/StringHelperFunctions"; import { calculateInfiltratorsRepReward, calculateSellInformationCashReward, calculateTradeInformationRepReward, } from "../formulas/victory"; -import { inviteToFaction } from "../../Faction/FactionHelpers"; -import { Button, MenuItem, Select, SelectChangeEvent, Paper, Typography, Box } from "@mui/material"; -import { Location } from "../../Locations/Location"; interface IProps { StartingDifficulty: number; diff --git a/src/Infiltration/ui/WireCuttingGame.tsx b/src/Infiltration/ui/WireCuttingGame.tsx index e8a08f453..ce994e1a4 100644 --- a/src/Infiltration/ui/WireCuttingGame.tsx +++ b/src/Infiltration/ui/WireCuttingGame.tsx @@ -1,15 +1,14 @@ +import { Box, Paper, Typography } from "@mui/material"; import React, { useEffect, useState } from "react"; -import Grid from "@mui/material/Grid"; -import { IMinigameProps } from "./IMinigameProps"; -import { KeyHandler } from "./KeyHandler"; -import { GameTimer } from "./GameTimer"; -import { random } from "../utils"; -import { interpolate } from "./Difficulty"; -import { KEY } from "../../utils/helpers/keyCodes"; import { AugmentationNames } from "../../Augmentation/data/AugmentationNames"; import { Player } from "../../Player"; import { Settings } from "../../Settings/Settings"; -import { Paper, Typography, Box } from "@mui/material"; +import { KEY } from "../../utils/helpers/keyCodes"; +import { random } from "../utils"; +import { interpolate } from "./Difficulty"; +import { GameTimer } from "./GameTimer"; +import { IMinigameProps } from "./IMinigameProps"; +import { KeyHandler } from "./KeyHandler"; interface Difficulty { [key: string]: number;