Merge pull request #3075 from ApamNapat/simplified_imports

Simplified some relative imports

src/ui/ActiveScripts/RecentScriptAccordion.tsx

@@ -26,7 +26,7 @@ import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFuncti
 import { arrayToString } from "../../utils/helpers/arrayToString";
 import { Money } from "../React/Money";
 import { MoneyRate } from "../React/MoneyRate";
-import { RecentScript } from "../..//Netscript/RecentScripts";
+import { RecentScript } from "../../Netscript/RecentScripts";
 import { LogBoxEvents } from "../React/LogBoxManager";
 
 const useStyles = makeStyles({

src/ui/CharacterStats.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 
-import { numeralWrapper } from "../ui/numeralFormat";
+import { numeralWrapper } from "./numeralFormat";
 import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions";
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
 import { SourceFileFlags } from "../SourceFile/SourceFileFlags";

src/ui/GameRoot.tsx

@@ -44,7 +44,7 @@ import { CorporationRoot } from "../Corporation/ui/CorporationRoot";
 import { InfiltrationRoot } from "../Infiltration/ui/InfiltrationRoot";
 import { ResleeveRoot } from "../PersonObjects/Resleeving/ui/ResleeveRoot";
 import { WorkInProgressRoot } from "./WorkInProgressRoot";
-import { GameOptionsRoot } from "../ui/React/GameOptionsRoot";
+import { GameOptionsRoot } from "./React/GameOptionsRoot";
 import { SleeveRoot } from "../PersonObjects/Sleeve/ui/SleeveRoot";
 import { HacknetRoot } from "../Hacknet/ui/HacknetRoot";
 import { GenericLocation } from "../Locations/ui/GenericLocation";
@@ -54,7 +54,7 @@ import { Root as ScriptEditorRoot } from "../ScriptEditor/ui/ScriptEditorRoot";
 import { MilestonesRoot } from "../Milestones/ui/MilestonesRoot";
 import { TerminalRoot } from "../Terminal/ui/TerminalRoot";
 import { TutorialRoot } from "../Tutorial/ui/TutorialRoot";
-import { ActiveScriptsRoot } from "../ui/ActiveScripts/ActiveScriptsRoot";
+import { ActiveScriptsRoot } from "./ActiveScripts/ActiveScriptsRoot";
 import { FactionsRoot } from "../Faction/ui/FactionsRoot";
 import { FactionRoot } from "../Faction/ui/FactionRoot";
 import { CharacterStats } from "./CharacterStats";

src/ui/React/AlertManager.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { EventEmitter } from "../../utils/EventEmitter";
-import { Modal } from "../../ui/React/Modal";
+import { Modal } from "./Modal";
 import Typography from "@mui/material/Typography";
 import Box from "@mui/material/Box";
 import {sha256} from "js-sha256";

src/ui/React/CharacterOverview.tsx

@@ -4,7 +4,7 @@ import React, { useState, useEffect } from "react";
 import { Theme, useTheme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { Reputation } from "./Reputation";
 import { KillScriptsModal } from "./KillScriptsModal";
 import { convertTimeMsToTimeElapsedString } from "../../utils/StringHelperFunctions";

src/ui/React/Favor.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";

src/ui/React/HashRate.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { Hashes } from "../../ui/React/Hashes";
+import { numeralWrapper } from "../numeralFormat";
+import { Hashes } from "./Hashes";
 
 export function HashRate({ hashes }: { hashes: number }): React.ReactElement {
   return <Hashes hashes={`${numeralWrapper.formatHashes(hashes)} h / s`} />;

src/ui/React/Hashes.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";

src/ui/React/Money.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";

src/ui/React/MoneyRate.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { Money } from "../../ui/React/Money";
+import { numeralWrapper } from "../numeralFormat";
+import { Money } from "./Money";
 
 export function MoneyRate({ money }: { money: number }): JSX.Element {
   return <Money money={`${numeralWrapper.formatMoney(money)} / sec`} />;

src/ui/React/PromptManager.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { EventEmitter } from "../../utils/EventEmitter";
-import { Modal } from "../../ui/React/Modal";
+import { Modal } from "./Modal";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 

src/ui/React/Reputation.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
+import { numeralWrapper } from "../numeralFormat";
 import { Theme } from "@mui/material/styles";
 import makeStyles from "@mui/styles/makeStyles";
 import createStyles from "@mui/styles/createStyles";

src/ui/React/ReputationRate.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { Reputation } from "../../ui/React/Reputation";
+import { numeralWrapper } from "../numeralFormat";
+import { Reputation } from "./Reputation";
 
 export function ReputationRate({ reputation }: { reputation: number }): React.ReactElement {
   return <Reputation reputation={`${numeralWrapper.formatReputation(reputation)} / sec`} />;