From ba4c2504798ac97e24ee90d435f41ed8a21b8b1f Mon Sep 17 00:00:00 2001 From: sarcoph <83266791+sarcoph@users.noreply.github.com> Date: Sun, 27 Feb 2022 11:58:18 -0900 Subject: [PATCH] moving unused tguis + minor refactors --- .../file_system/programs/configurator.dm | 2 +- .../file_system/programs/ntdownloader.dm | 2 +- .../file_system/programs/ntnrc_client.dm | 2 +- .../file_system/programs/powermonitor.dm | 2 +- .../file_system/programs/sm_monitor.dm | 2 +- .../code/modules/power/reactor/rbmk.dm | 2 +- .../{interfaces => components}/NtosWrapper.js | 2 +- .../interfaces/{ => @UNUSED}/Achievements.js | 4 +-- .../tgui/interfaces/{ => @UNUSED}/Bepis.js | 6 ++-- .../{ => @UNUSED}/ChemAcclimator.js | 7 ++-- .../{ => @UNUSED}/ChemDebugSynthesizer.js | 6 ++-- .../interfaces/{ => @UNUSED}/ChemFilter.js | 4 +-- .../interfaces/{ => @UNUSED}/ChemPress.js | 6 ++-- .../{ => @UNUSED}/ChemReactionChamber.js | 4 +-- .../interfaces/{ => @UNUSED}/ChemSplitter.js | 6 ++-- .../interfaces/{ => @UNUSED}/DecalPainter.js | 6 ++-- .../interfaces/{ => @UNUSED}/MedicalKiosk.js | 6 ++-- .../interfaces/{ => @UNUSED}/NtosArcade.js | 14 ++++---- .../interfaces/{ => @UNUSED}/ScannerGate.js | 6 ++-- .../{ => @UNUSED}/SyndContractor.js | 6 ++-- .../{ => @UNUSED}/VaultController.js | 6 ++-- .../tgui/interfaces/{ => @UNUSED}/Vending.js | 6 ++-- .../interfaces/{ => @UNUSED}/biogenerator.js | 8 ++--- tgui/packages/tgui/interfaces/Canvas.js | 34 ++++++++++--------- tgui/packages/tgui/interfaces/ImplantChair.js | 1 - tgui/packages/tgui/interfaces/NaniteRemote.js | 3 +- .../tgui/interfaces/NtosConfiguration.js | 10 +++--- tgui/packages/tgui/interfaces/NtosMain.js | 10 +++--- tgui/packages/tgui/interfaces/NtosNetChat.js | 10 +++--- .../tgui/interfaces/NtosNetDownloader.js | 10 +++--- .../packages/tgui/interfaces/NtosRbmkStats.js | 10 +++--- .../tgui/interfaces/NtosSupermatterMonitor.js | 10 +++--- tgui/packages/tgui/interfaces/PowerMonitor.js | 10 +++--- tgui/packages/tgui/interfaces/SmokeMachine.js | 3 +- .../tgui/interfaces/TelecommsInteraction.js | 2 +- .../tgui/interfaces/TelecommsLogBrowser.js | 2 +- .../tgui/interfaces/TelecommsMonitor.js | 2 +- .../tgui/interfaces/TelecommsPDALog.js | 2 +- 38 files changed, 116 insertions(+), 118 deletions(-) rename tgui/packages/tgui/{interfaces => components}/NtosWrapper.js (98%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/Achievements.js (97%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/Bepis.js (97%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/ChemAcclimator.js (92%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/ChemDebugSynthesizer.js (94%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/ChemFilter.js (95%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/ChemPress.js (93%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/ChemReactionChamber.js (97%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/ChemSplitter.js (90%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/DecalPainter.js (93%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/MedicalKiosk.js (98%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/NtosArcade.js (94%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/ScannerGate.js (98%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/SyndContractor.js (98%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/VaultController.js (86%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/Vending.js (96%) rename tgui/packages/tgui/interfaces/{ => @UNUSED}/biogenerator.js (96%) diff --git a/code/modules/modular_computers/file_system/programs/configurator.dm b/code/modules/modular_computers/file_system/programs/configurator.dm index 2d60323d1..76da58ea1 100644 --- a/code/modules/modular_computers/file_system/programs/configurator.dm +++ b/code/modules/modular_computers/file_system/programs/configurator.dm @@ -14,7 +14,7 @@ ui_y = 630 available_on_ntnet = 0 requires_ntnet = 0 - tgui_id = "ntos_configuration" + tgui_id = "NtosConfiguration" var/obj/item/modular_computer/movable = null diff --git a/code/modules/modular_computers/file_system/programs/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/ntdownloader.dm index 92e1453dc..993e9a01e 100644 --- a/code/modules/modular_computers/file_system/programs/ntdownloader.dm +++ b/code/modules/modular_computers/file_system/programs/ntdownloader.dm @@ -10,7 +10,7 @@ requires_ntnet_feature = NTNET_SOFTWAREDOWNLOAD available_on_ntnet = 0 ui_header = "downloader_finished.gif" - tgui_id = "ntos_net_downloader" + tgui_id = "NtosNetDownloader" var/datum/computer_file/program/downloaded_file = null var/hacked_download = 0 diff --git a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm index d8b3f96f4..4ae5bd326 100644 --- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm @@ -9,7 +9,7 @@ network_destination = "NTNRC server" ui_header = "ntnrc_idle.gif" available_on_ntnet = 1 - tgui_id = "ntos_net_chat" + tgui_id = "NtosNetChat" ui_x = 900 ui_y = 675 diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm index f7c734667..767047619 100644 --- a/code/modules/modular_computers/file_system/programs/powermonitor.dm +++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm @@ -11,7 +11,7 @@ requires_ntnet = 0 network_destination = "power monitoring system" size = 9 - tgui_id = "ntos_power_monitor" + tgui_id = "PowerMonitor" ui_style = "ntos" ui_x = 550 ui_y = 700 diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm index dbee59bb3..058b0b95b 100644 --- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm @@ -8,7 +8,7 @@ transfer_access = ACCESS_CONSTRUCTION network_destination = "supermatter monitoring system" size = 5 - tgui_id = "ntos_supermatter_monitor" + tgui_id = "NtosSupermatterMonitor" ui_style = "ntos" ui_x = 600 ui_y = 350 diff --git a/hyperstation/code/modules/power/reactor/rbmk.dm b/hyperstation/code/modules/power/reactor/rbmk.dm index 4a4e77d95..51f56b47a 100644 --- a/hyperstation/code/modules/power/reactor/rbmk.dm +++ b/hyperstation/code/modules/power/reactor/rbmk.dm @@ -803,7 +803,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful transfer_access = ACCESS_CONSTRUCTION network_destination = "rbmk monitoring system" size = 2 - tgui_id = "ntosrbmkstats" + tgui_id = "NtosRbmkStats" ui_x = 350 ui_y = 550 var/active = TRUE //Easy process throttle diff --git a/tgui/packages/tgui/interfaces/NtosWrapper.js b/tgui/packages/tgui/components/NtosWrapper.js similarity index 98% rename from tgui/packages/tgui/interfaces/NtosWrapper.js rename to tgui/packages/tgui/components/NtosWrapper.js index e1c32fca7..f467772f5 100644 --- a/tgui/packages/tgui/interfaces/NtosWrapper.js +++ b/tgui/packages/tgui/components/NtosWrapper.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Box, Button } from '../components'; +import { Box, Button } from '.'; import { refocusLayout } from '../refocus'; export const NtosWrapper = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/Achievements.js b/tgui/packages/tgui/interfaces/@UNUSED/Achievements.js similarity index 97% rename from tgui/packages/tgui/interfaces/Achievements.js rename to tgui/packages/tgui/interfaces/@UNUSED/Achievements.js index 64071bd41..71655cbbc 100644 --- a/tgui/packages/tgui/interfaces/Achievements.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/Achievements.js @@ -1,5 +1,5 @@ -import { useBackend } from '../backend'; -import { Box, Icon, Table, Tabs } from '../components'; +import { useBackend } from '../../backend'; +import { Box, Icon, Table, Tabs } from '../../components'; export const Achievements = (props, context) => { const { data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/Bepis.js b/tgui/packages/tgui/interfaces/@UNUSED/Bepis.js similarity index 97% rename from tgui/packages/tgui/interfaces/Bepis.js rename to tgui/packages/tgui/interfaces/@UNUSED/Bepis.js index 801d740c9..80e3124e7 100644 --- a/tgui/packages/tgui/interfaces/Bepis.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/Bepis.js @@ -1,6 +1,6 @@ -import { useBackend } from '../backend'; -import { Box, Button, Grid, LabeledList, NumberInput, Section } from '../components'; -import { Window } from '../layouts'; +import { useBackend } from '../../backend'; +import { Box, Button, Grid, LabeledList, NumberInput, Section } from '../../components'; +import { Window } from '../../layouts'; export const Bepis = (props, context) => { const { config, data, act } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/ChemAcclimator.js b/tgui/packages/tgui/interfaces/@UNUSED/ChemAcclimator.js similarity index 92% rename from tgui/packages/tgui/interfaces/ChemAcclimator.js rename to tgui/packages/tgui/interfaces/@UNUSED/ChemAcclimator.js index 51b58070b..ed7f862d9 100644 --- a/tgui/packages/tgui/interfaces/ChemAcclimator.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/ChemAcclimator.js @@ -1,7 +1,6 @@ -import { Fragment } from 'inferno'; -import { useBackend } from '../backend'; -import { Button, LabeledList, NumberInput, Section } from '../components'; -import { Window } from '../layouts'; +import { useBackend } from '../../backend'; +import { Button, LabeledList, NumberInput, Section } from '../../components'; +import { Window } from '../../layouts'; export const ChemAcclimator = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js b/tgui/packages/tgui/interfaces/@UNUSED/ChemDebugSynthesizer.js similarity index 94% rename from tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js rename to tgui/packages/tgui/interfaces/@UNUSED/ChemDebugSynthesizer.js index a7aeee660..6824075d7 100644 --- a/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/ChemDebugSynthesizer.js @@ -1,7 +1,7 @@ import { Fragment } from 'inferno'; -import { useBackend } from '../backend'; -import { AnimatedNumber, Box, Button, LabeledList, NumberInput, Section } from '../components'; -import { Window } from '../layouts'; +import { useBackend } from '../../backend'; +import { AnimatedNumber, Box, Button, LabeledList, NumberInput, Section } from '../../components'; +import { Window } from '../../layouts'; export const ChemDebugSynthesizer = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/ChemFilter.js b/tgui/packages/tgui/interfaces/@UNUSED/ChemFilter.js similarity index 95% rename from tgui/packages/tgui/interfaces/ChemFilter.js rename to tgui/packages/tgui/interfaces/@UNUSED/ChemFilter.js index dbac7a05d..9dbbfbc85 100644 --- a/tgui/packages/tgui/interfaces/ChemFilter.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/ChemFilter.js @@ -1,6 +1,6 @@ import { Component, Fragment } from 'inferno'; -import { useBackend } from '../backend'; -import { Button, Grid, Section, Input } from '../components'; +import { useBackend } from '../../backend'; +import { Button, Grid, Section, Input } from '../../components'; export class ChemFilter extends Component { constructor() { diff --git a/tgui/packages/tgui/interfaces/ChemPress.js b/tgui/packages/tgui/interfaces/@UNUSED/ChemPress.js similarity index 93% rename from tgui/packages/tgui/interfaces/ChemPress.js rename to tgui/packages/tgui/interfaces/@UNUSED/ChemPress.js index 07774b2ac..bfee7511d 100644 --- a/tgui/packages/tgui/interfaces/ChemPress.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/ChemPress.js @@ -1,6 +1,6 @@ -import { useBackend } from '../backend'; -import { Box, Button, Input, LabeledList, NumberInput, Section } from '../components'; -import { Window } from '../layouts'; +import { useBackend } from '../../backend'; +import { Box, Button, Input, LabeledList, NumberInput, Section } from '../../components'; +import { Window } from '../../layouts'; export const ChemPress = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/ChemReactionChamber.js b/tgui/packages/tgui/interfaces/@UNUSED/ChemReactionChamber.js similarity index 97% rename from tgui/packages/tgui/interfaces/ChemReactionChamber.js rename to tgui/packages/tgui/interfaces/@UNUSED/ChemReactionChamber.js index 3170de9d4..b38cffea6 100644 --- a/tgui/packages/tgui/interfaces/ChemReactionChamber.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/ChemReactionChamber.js @@ -1,8 +1,8 @@ import { Component } from 'inferno'; -import { Box, Button, LabeledList, NumberInput, Section, Input } from '../components'; +import { Box, Button, LabeledList, NumberInput, Section, Input } from '../../components'; import { map } from 'common/collections'; import { classes } from 'common/react'; -import { useBackend } from '../backend'; +import { useBackend } from '../../backend'; export class ChemReactionChamber extends Component { diff --git a/tgui/packages/tgui/interfaces/ChemSplitter.js b/tgui/packages/tgui/interfaces/@UNUSED/ChemSplitter.js similarity index 90% rename from tgui/packages/tgui/interfaces/ChemSplitter.js rename to tgui/packages/tgui/interfaces/@UNUSED/ChemSplitter.js index c11a374ac..2ce2da813 100644 --- a/tgui/packages/tgui/interfaces/ChemSplitter.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/ChemSplitter.js @@ -1,7 +1,7 @@ import { toFixed } from 'common/math'; -import { useBackend } from '../backend'; -import { LabeledList, NumberInput, Section } from '../components'; -import { Window } from '../layouts'; +import { useBackend } from '../../backend'; +import { LabeledList, NumberInput, Section } from '../../components'; +import { Window } from '../../layouts'; export const ChemSplitter = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/DecalPainter.js b/tgui/packages/tgui/interfaces/@UNUSED/DecalPainter.js similarity index 93% rename from tgui/packages/tgui/interfaces/DecalPainter.js rename to tgui/packages/tgui/interfaces/@UNUSED/DecalPainter.js index 575ed958c..f649091f9 100644 --- a/tgui/packages/tgui/interfaces/DecalPainter.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/DecalPainter.js @@ -1,6 +1,6 @@ -import { useBackend } from '../backend'; -import { Button, Section } from '../components'; -import { Window } from '../layouts'; +import { useBackend } from '../../backend'; +import { Button, Section } from '../../components'; +import { Window } from '../../layouts'; export const DecalPainter = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/MedicalKiosk.js b/tgui/packages/tgui/interfaces/@UNUSED/MedicalKiosk.js similarity index 98% rename from tgui/packages/tgui/interfaces/MedicalKiosk.js rename to tgui/packages/tgui/interfaces/@UNUSED/MedicalKiosk.js index 9dba6b56c..bd93f6b62 100644 --- a/tgui/packages/tgui/interfaces/MedicalKiosk.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/MedicalKiosk.js @@ -1,7 +1,7 @@ import { multiline } from 'common/string'; -import { useBackend } from '../backend'; -import { AnimatedNumber, Box, Button, LabeledList, ProgressBar, Section, Tabs } from '../components'; -import { Window } from '../layouts'; +import { useBackend } from '../../backend'; +import { AnimatedNumber, Box, Button, LabeledList, ProgressBar, Section, Tabs } from '../../components'; +import { Window } from '../../layouts'; export const MedicalKiosk = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/NtosArcade.js b/tgui/packages/tgui/interfaces/@UNUSED/NtosArcade.js similarity index 94% rename from tgui/packages/tgui/interfaces/NtosArcade.js rename to tgui/packages/tgui/interfaces/@UNUSED/NtosArcade.js index e020f85ed..5b1f5623c 100644 --- a/tgui/packages/tgui/interfaces/NtosArcade.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/NtosArcade.js @@ -1,12 +1,12 @@ -import { useBackend } from '../backend'; -import { AnimatedNumber, Box, Button, Grid, LabeledList, ProgressBar, Section } from '../components'; -import { Window } from '../layouts'; +import { useBackend } from '../../backend'; +import { AnimatedNumber, Box, Button, Grid, LabeledList, ProgressBar, Section } from '../../components'; +import { NtosWindow, Window } from '../../layouts'; export const NtosArcade = (props, context) => { const { act, data } = useBackend(context); return ( - - + +
@@ -55,8 +55,8 @@ export const NtosArcade = (props, context) => { Earned Tickets: {data.TicketCount}
- - + + ); }; diff --git a/tgui/packages/tgui/interfaces/ScannerGate.js b/tgui/packages/tgui/interfaces/@UNUSED/ScannerGate.js similarity index 98% rename from tgui/packages/tgui/interfaces/ScannerGate.js rename to tgui/packages/tgui/interfaces/@UNUSED/ScannerGate.js index f3bce2291..d844307ef 100644 --- a/tgui/packages/tgui/interfaces/ScannerGate.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/ScannerGate.js @@ -1,7 +1,7 @@ import { Fragment } from 'inferno'; -import { useBackend } from '../backend'; -import { Box, Button, LabeledList, NumberInput, Section } from '../components'; -import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox'; +import { useBackend } from '../../backend'; +import { Box, Button, LabeledList, NumberInput, Section } from '../../components'; +import { InterfaceLockNoticeBox } from '../common/InterfaceLockNoticeBox'; const DISEASE_THEASHOLD_LIST = [ 'Positive', diff --git a/tgui/packages/tgui/interfaces/SyndContractor.js b/tgui/packages/tgui/interfaces/@UNUSED/SyndContractor.js similarity index 98% rename from tgui/packages/tgui/interfaces/SyndContractor.js rename to tgui/packages/tgui/interfaces/@UNUSED/SyndContractor.js index 8eaea6a95..059435b1b 100644 --- a/tgui/packages/tgui/interfaces/SyndContractor.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/SyndContractor.js @@ -1,7 +1,7 @@ -import { Box, Button, Section, Dimmer, Table, Icon, NoticeBox, Tabs, Grid, LabeledList } from "../components"; -import { useBackend } from "../backend"; +import { Box, Button, Section, Dimmer, Table, Icon, NoticeBox, Tabs, Grid, LabeledList } from "../../components"; +import { useBackend } from "../../backend"; import { Fragment, Component } from "inferno"; -import { Window } from "../layouts"; +import { Window } from "../../layouts"; export const SyndContractor = (props, context) => { const { data, act } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/VaultController.js b/tgui/packages/tgui/interfaces/@UNUSED/VaultController.js similarity index 86% rename from tgui/packages/tgui/interfaces/VaultController.js rename to tgui/packages/tgui/interfaces/@UNUSED/VaultController.js index 0078e4770..9c8746ed2 100644 --- a/tgui/packages/tgui/interfaces/VaultController.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/VaultController.js @@ -1,7 +1,7 @@ import { toFixed } from 'common/math'; -import { useBackend } from '../backend'; -import { Button, LabeledList, ProgressBar, Section } from '../components'; -import { Window } from '../layouts'; +import { useBackend } from '../../backend'; +import { Button, LabeledList, ProgressBar, Section } from '../../components'; +import { Window } from '../../layouts'; export const VaultController = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/Vending.js b/tgui/packages/tgui/interfaces/@UNUSED/Vending.js similarity index 96% rename from tgui/packages/tgui/interfaces/Vending.js rename to tgui/packages/tgui/interfaces/@UNUSED/Vending.js index d3a8439de..500f2c287 100644 --- a/tgui/packages/tgui/interfaces/Vending.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/Vending.js @@ -1,7 +1,7 @@ -import { Section, Box, Button, Table } from '../components'; +import { Section, Box, Button, Table } from '../../components'; import { classes } from 'common/react'; -import { Window } from '../layouts'; -import { useBackend } from '../backend'; +import { Window } from '../../layouts'; +import { useBackend } from '../../backend'; export const Vending = (props, context) => { const { config, data, act } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/biogenerator.js b/tgui/packages/tgui/interfaces/@UNUSED/biogenerator.js similarity index 96% rename from tgui/packages/tgui/interfaces/biogenerator.js rename to tgui/packages/tgui/interfaces/@UNUSED/biogenerator.js index a69f1fcf2..812d34881 100644 --- a/tgui/packages/tgui/interfaces/biogenerator.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/biogenerator.js @@ -1,10 +1,10 @@ import { classes } from 'common/react'; import { createSearch } from 'common/string'; import { Fragment } from 'inferno'; -import { useBackend, useLocalState } from '../backend'; -import { Box, Button, Dimmer, Flex, Icon, Input, NoticeBox, NumberInput, Section, Table, Tabs } from '../components'; -import { formatMoney } from '../format'; -import { Window } from '../layouts'; +import { useBackend, useLocalState } from '../../backend'; +import { Box, Button, Dimmer, Flex, Icon, Input, NoticeBox, NumberInput, Section, Table, Tabs } from '../../components'; +import { formatMoney } from '../../format'; +import { Window } from '../../layouts'; const MAX_SEARCH_RESULTS = 25; diff --git a/tgui/packages/tgui/interfaces/Canvas.js b/tgui/packages/tgui/interfaces/Canvas.js index 8e08eb84b..ce522465f 100644 --- a/tgui/packages/tgui/interfaces/Canvas.js +++ b/tgui/packages/tgui/interfaces/Canvas.js @@ -4,6 +4,23 @@ import { Box } from '../components'; import { Window } from '../layouts'; +export const Canvas = (props, context) => { + const { act, data } = useBackend(context); + return ( + + + + act("paint", { x, y })} /> + {data.name} + + + + ); +}; + + class PaintCanvas extends Component { constructor(props) { super(props); @@ -76,19 +93,4 @@ class PaintCanvas extends Component { ); } -} -export const Canvas = (props, context) => { - const { act, data } = useBackend(context); - return ( - - - - act("paint", { x, y })} /> - {data.name} - - - - ); -}; +} \ No newline at end of file diff --git a/tgui/packages/tgui/interfaces/ImplantChair.js b/tgui/packages/tgui/interfaces/ImplantChair.js index f645196d6..a9d7b1161 100644 --- a/tgui/packages/tgui/interfaces/ImplantChair.js +++ b/tgui/packages/tgui/interfaces/ImplantChair.js @@ -1,4 +1,3 @@ -import { Fragment } from 'inferno'; import { useBackend } from '../backend'; import { Button, Icon, LabeledList, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/NaniteRemote.js b/tgui/packages/tgui/interfaces/NaniteRemote.js index d4f63130f..dde84a70d 100644 --- a/tgui/packages/tgui/interfaces/NaniteRemote.js +++ b/tgui/packages/tgui/interfaces/NaniteRemote.js @@ -1,6 +1,5 @@ -import { Fragment } from 'inferno'; import { useBackend } from '../backend'; -import { Button, LabeledList, NumberInput, Section, NoticeBox, Input, Table } from '../components'; +import { Button, Input, LabeledList, NoticeBox, NumberInput, Section, Table } from '../components'; import { Window } from '../layouts'; export const NaniteRemote = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/NtosConfiguration.js b/tgui/packages/tgui/interfaces/NtosConfiguration.js index 8d88bbdcf..22835b4e1 100644 --- a/tgui/packages/tgui/interfaces/NtosConfiguration.js +++ b/tgui/packages/tgui/interfaces/NtosConfiguration.js @@ -1,7 +1,7 @@ import { Fragment } from 'inferno'; import { useBackend } from '../backend'; import { Box, Button, LabeledList, ProgressBar, Section } from '../components'; -import { Window } from '../layouts'; +import { NtosWindow, Window } from '../layouts'; export const NtosConfiguration = (props, context) => { const { act, data } = useBackend(context); @@ -16,8 +16,8 @@ export const NtosConfiguration = (props, context) => { } = data; return ( - - + +
{
))} - - + + ); }; diff --git a/tgui/packages/tgui/interfaces/NtosMain.js b/tgui/packages/tgui/interfaces/NtosMain.js index 0b332e42d..2ccaa96e5 100644 --- a/tgui/packages/tgui/interfaces/NtosMain.js +++ b/tgui/packages/tgui/interfaces/NtosMain.js @@ -1,6 +1,6 @@ import { useBackend } from '../backend'; import { Button, ColorBox, Section, Table } from '../components'; -import { Window } from '../layouts'; +import { NtosWindow, Window } from '../layouts'; const PROGRAM_ICONS = { compconfig: 'cog', @@ -24,8 +24,8 @@ export const NtosMain = (props, context) => { comp_light_color, } = data; return ( - - + + {!!has_light && (
- - + + ); }; diff --git a/tgui/packages/tgui/interfaces/NtosNetChat.js b/tgui/packages/tgui/interfaces/NtosNetChat.js index 13e16014b..8a679c9de 100644 --- a/tgui/packages/tgui/interfaces/NtosNetChat.js +++ b/tgui/packages/tgui/interfaces/NtosNetChat.js @@ -1,7 +1,7 @@ import { Fragment } from 'inferno'; import { useBackend } from '../backend'; import { Box, Button, Icon, Input, Section, Table } from '../components'; -import { Window } from '../layouts'; +import { NtosWindow, Window } from '../layouts'; import { createLogger } from '../logging'; const logger = createLogger('ntos chat'); @@ -24,8 +24,8 @@ export const NtosNetChat = (props, context) => { const authorized = (authed || adminmode); return ( - - + +
{
- - + + ); }; diff --git a/tgui/packages/tgui/interfaces/NtosNetDownloader.js b/tgui/packages/tgui/interfaces/NtosNetDownloader.js index feeaaa29b..29776d715 100644 --- a/tgui/packages/tgui/interfaces/NtosNetDownloader.js +++ b/tgui/packages/tgui/interfaces/NtosNetDownloader.js @@ -1,6 +1,6 @@ import { useBackend } from '../backend'; import { Box, Button, Flex, Icon, LabeledList, NoticeBox, ProgressBar, Section } from '../components'; -import { Window } from '../layouts'; +import { NtosWindow, Window } from '../layouts'; export const NtosNetDownloader = (props, context) => { const { state } = props; @@ -14,8 +14,8 @@ export const NtosNetDownloader = (props, context) => { hackedavailable, } = data; return ( - - + + {!!error && ( @@ -60,8 +60,8 @@ export const NtosNetDownloader = (props, context) => { ))} )} - - + + ); }; diff --git a/tgui/packages/tgui/interfaces/NtosRbmkStats.js b/tgui/packages/tgui/interfaces/NtosRbmkStats.js index db924446a..a81432ce7 100644 --- a/tgui/packages/tgui/interfaces/NtosRbmkStats.js +++ b/tgui/packages/tgui/interfaces/NtosRbmkStats.js @@ -1,6 +1,6 @@ import { useBackend } from '../backend'; import { Button, Chart, ProgressBar, Section } from '../components'; -import { Window } from '../layouts'; +import { NtosWindow, Window } from '../layouts'; export const NtosRbmkStats = (props, context) => { @@ -11,8 +11,8 @@ export const NtosRbmkStats = (props, context) => { const tempInputData = data.tempInputData.map((value, i) => [i, value]); const tempOutputdata = data.tempOutputdata.map((value, i) => [i, value]); return ( - - + +
{ fillColor="rgba(255, 0, 0 , 0.1)" />
- - + + ); }; diff --git a/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.js b/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.js index 85ab15733..a0c5e88bb 100644 --- a/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.js +++ b/tgui/packages/tgui/interfaces/NtosSupermatterMonitor.js @@ -4,7 +4,7 @@ import { toFixed } from 'common/math'; import { useBackend } from '../backend'; import { Box, Button, Flex, LabeledList, ProgressBar, Section, Table } from '../components'; import { getGasColor, getGasLabel } from '../constants'; -import { Window } from '../layouts'; +import { NtosWindow, Window } from '../layouts'; const logScale = value => Math.log2(16 + Math.max(0, value)) - 4; @@ -25,8 +25,8 @@ export const NtosSupermatterMonitor = (props, context) => { ])(data.gases || []); const gasMaxAmount = Math.max(1, ...gases.map(gas => gas.amount)); return ( - - + +
@@ -62,8 +62,8 @@ export const NtosSupermatterMonitor = (props, context) => {
- - + + ); }; diff --git a/tgui/packages/tgui/interfaces/PowerMonitor.js b/tgui/packages/tgui/interfaces/PowerMonitor.js index f6a9ed07d..8702324c3 100644 --- a/tgui/packages/tgui/interfaces/PowerMonitor.js +++ b/tgui/packages/tgui/interfaces/PowerMonitor.js @@ -4,7 +4,7 @@ import { toFixed } from 'common/math'; import { pureComponentHooks } from 'common/react'; import { Component, Fragment } from 'inferno'; import { Box, Button, Chart, ColorBox, Flex, Icon, LabeledList, ProgressBar, Section, Table } from '../components'; -import { Window } from '../layouts'; +import { NtosWindow, Window } from '../layouts'; const PEAK_DRAW = 500000; @@ -46,8 +46,8 @@ export class PowerMonitor extends Component { area => -parseFloat(area.load)), ])(data.areas); return ( - - + +
@@ -146,8 +146,8 @@ export class PowerMonitor extends Component { ))}
- - + + ); } } diff --git a/tgui/packages/tgui/interfaces/SmokeMachine.js b/tgui/packages/tgui/interfaces/SmokeMachine.js index bda9a14d5..1ce72a17b 100644 --- a/tgui/packages/tgui/interfaces/SmokeMachine.js +++ b/tgui/packages/tgui/interfaces/SmokeMachine.js @@ -1,6 +1,5 @@ import { useBackend } from '../backend'; -import { Fragment } from 'inferno'; -import { AnimatedNumber, Box, Button, LabeledList, ProgressBar, NoticeBox, Section } from '../components'; +import { AnimatedNumber, Box, Button, LabeledList, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; export const SmokeMachine = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/TelecommsInteraction.js b/tgui/packages/tgui/interfaces/TelecommsInteraction.js index 44a990509..e626c46d0 100644 --- a/tgui/packages/tgui/interfaces/TelecommsInteraction.js +++ b/tgui/packages/tgui/interfaces/TelecommsInteraction.js @@ -5,7 +5,7 @@ import { RADIO_CHANNELS } from '../constants'; import { Button, LabeledList, NumberInput, NoticeBox, Section, Input } from '../components'; import { Window } from '../layouts'; -export const TeleInteract = (props, context) => { +export const TelecommsInteraction = (props, context) => { const { act, data } = useBackend(context); const { notice = "", diff --git a/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js b/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js index 71d4f675b..3cc231179 100644 --- a/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js +++ b/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js @@ -3,7 +3,7 @@ import { useBackend } from '../backend'; import { Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components'; import { Window } from '../layouts'; -export const TeleLogBrowser = (props, context) => { +export const TelecommsLogBrowser = (props, context) => { const { act, data } = useBackend(context); const { notice, diff --git a/tgui/packages/tgui/interfaces/TelecommsMonitor.js b/tgui/packages/tgui/interfaces/TelecommsMonitor.js index 274f10e52..282178fc0 100644 --- a/tgui/packages/tgui/interfaces/TelecommsMonitor.js +++ b/tgui/packages/tgui/interfaces/TelecommsMonitor.js @@ -5,7 +5,7 @@ import { Box, Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../co import { Window } from '../layouts'; -export const Telemonitor = (props, context) => { +export const TelecommsMonitor = (props, context) => { const { act, data } = useBackend(context); const { notice, diff --git a/tgui/packages/tgui/interfaces/TelecommsPDALog.js b/tgui/packages/tgui/interfaces/TelecommsPDALog.js index efdfbd95c..1c821b344 100644 --- a/tgui/packages/tgui/interfaces/TelecommsPDALog.js +++ b/tgui/packages/tgui/interfaces/TelecommsPDALog.js @@ -4,7 +4,7 @@ import { act as _act } from '../byond'; import { Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components'; import { Window } from '../layouts'; -export const TelePDALog = (props, context) => { +export const TelecommsPDALog = (props, context) => { const { act, data } = useBackend(context); const { network,