From 31457e18dbb15caed7f9879dd2b945f61229bfdb Mon Sep 17 00:00:00 2001 From: tattle <66640614+dragomagol@users.noreply.github.com> Date: Tue, 24 Oct 2023 16:37:15 -0700 Subject: [PATCH] Converts some js to tsx (#78946) --- .../chemistry/machinery/smoke_machine.dm | 20 +++---- ...kMarketUplink.js => BlackMarketUplink.tsx} | 35 +++++++++++- .../{BountyBoard.js => BountyBoard.tsx} | 29 +++++++++- .../{BrigTimer.js => BrigTimer.tsx} | 24 +++++--- .../{Clipboard.js => Clipboard.tsx} | 12 +++- .../{EightBallVote.js => EightBallVote.tsx} | 17 +++++- .../interfaces/{Signaler.js => Signaler.tsx} | 55 +++++++++++-------- .../{SmokeMachine.js => SmokeMachine.tsx} | 33 +++++++---- 8 files changed, 164 insertions(+), 61 deletions(-) rename tgui/packages/tgui/interfaces/{BlackMarketUplink.js => BlackMarketUplink.tsx} (86%) rename tgui/packages/tgui/interfaces/{BountyBoard.js => BountyBoard.tsx} (92%) rename tgui/packages/tgui/interfaces/{BrigTimer.js => BrigTimer.tsx} (71%) rename tgui/packages/tgui/interfaces/{Clipboard.js => Clipboard.tsx} (93%) rename tgui/packages/tgui/interfaces/{EightBallVote.js => EightBallVote.tsx} (82%) rename tgui/packages/tgui/interfaces/{Signaler.js => Signaler.tsx} (73%) rename tgui/packages/tgui/interfaces/{SmokeMachine.js => SmokeMachine.tsx} (75%) diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm index 3a8754bfe4f..88072874e0f 100644 --- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm +++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm @@ -13,7 +13,6 @@ var/efficiency = 20 var/on = FALSE var/cooldown = 0 - var/screen = "home" var/useramount = 30 // Last used amount var/setting = 1 // displayed range is 3 * setting var/max_range = 3 // displayed max range is 3 * max range @@ -126,18 +125,16 @@ /obj/machinery/smoke_machine/ui_data(mob/user) var/data = list() - var/TankContents[0] - var/TankCurrentVolume = 0 + var/tank_contents = list() + var/tank_current_volume = 0 for(var/datum/reagent/R in reagents.reagent_list) - TankContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list... - TankCurrentVolume += R.volume - data["TankContents"] = TankContents - data["isTankLoaded"] = reagents.total_volume ? TRUE : FALSE - data["TankCurrentVolume"] = reagents.total_volume ? reagents.total_volume : null - data["TankMaxVolume"] = reagents.maximum_volume + tank_contents += list(list("name" = R.name, "volume" = R.volume)) // list in a list because Byond merges the first list... + tank_current_volume += R.volume + data["tankContents"] = tank_contents + data["tankCurrentVolume"] = reagents.total_volume ? reagents.total_volume : null + data["tankMaxVolume"] = reagents.maximum_volume data["active"] = on data["setting"] = setting - data["screen"] = screen data["maxSetting"] = max_range return data @@ -163,8 +160,5 @@ message_admins("[ADMIN_LOOKUPFLW(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [ADMIN_VERBOSEJMP(src)].") usr.log_message("activated a smoke machine that contains [english_list(reagents.reagent_list)]", LOG_GAME) log_combat(usr, src, "has activated [src] which contains [english_list(reagents.reagent_list)] at [AREACOORD(src)].") - if("goScreen") - screen = params["screen"] - . = TRUE #undef REAGENTS_BASE_VOLUME diff --git a/tgui/packages/tgui/interfaces/BlackMarketUplink.js b/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx similarity index 86% rename from tgui/packages/tgui/interfaces/BlackMarketUplink.js rename to tgui/packages/tgui/interfaces/BlackMarketUplink.tsx index 627386997e9..c7c9e22805b 100644 --- a/tgui/packages/tgui/interfaces/BlackMarketUplink.js +++ b/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx @@ -3,8 +3,39 @@ import { AnimatedNumber, Box, Button, Modal, Section, Stack, Tabs } from '../com import { formatMoney } from '../format'; import { Window } from '../layouts'; +type Data = { + categories: string[]; + markets: Market[]; + items: Item[]; + money: number; + viewing_market: string; + viewing_category: string; + buying: boolean; + ltsrbt_built: boolean; + delivery_methods: DeliveryMethod[]; + delivery_method_description: Record; +}; + +type Market = { + id: string; + name: string; +}; + +type Item = { + id: string; + name: string; + desc: string; + amount: number; + cost: number; +}; + +type DeliveryMethod = { + name: string; + price: number; +}; + export const BlackMarketUplink = (props, context) => { - const { act, data } = useBackend(context); + const { act, data } = useBackend(context); const { categories = [], markets = [], @@ -94,7 +125,7 @@ export const BlackMarketUplink = (props, context) => { }; const ShipmentSelector = (props, context) => { - const { act, data } = useBackend(context); + const { act, data } = useBackend(context); const { buying, ltsrbt_built, money } = data; if (!buying) { return null; diff --git a/tgui/packages/tgui/interfaces/BountyBoard.js b/tgui/packages/tgui/interfaces/BountyBoard.tsx similarity index 92% rename from tgui/packages/tgui/interfaces/BountyBoard.js rename to tgui/packages/tgui/interfaces/BountyBoard.tsx index 002cf8db047..c1d0ba181e9 100644 --- a/tgui/packages/tgui/interfaces/BountyBoard.js +++ b/tgui/packages/tgui/interfaces/BountyBoard.tsx @@ -4,6 +4,33 @@ import { BlockQuote, Box, Button, Collapsible, Flex, NumberInput, Section, Stack import { formatMoney } from '../format'; import { Window } from '../layouts'; +type Data = { + accountName: string; + requests: Request[]; + applicants: Applicant[]; + bountyValue: number; + bountyText: string; + user: User; +}; + +type Request = { + name: string; + owner: string; + description: string; + value: number; + acc_number: number; +}; + +type Applicant = { + name: string; + request_id: number; + requestee_id: number; +}; + +type User = { + name: string; +}; + export const BountyBoard = (props, context) => { return ( @@ -15,7 +42,7 @@ export const BountyBoard = (props, context) => { }; export const BountyBoardContent = (props, context) => { - const { act, data } = useBackend(context); + const { act, data } = useBackend(context); const { accountName, requests = [], diff --git a/tgui/packages/tgui/interfaces/BrigTimer.js b/tgui/packages/tgui/interfaces/BrigTimer.tsx similarity index 71% rename from tgui/packages/tgui/interfaces/BrigTimer.js rename to tgui/packages/tgui/interfaces/BrigTimer.tsx index 5b1065a2043..1e5b253828d 100644 --- a/tgui/packages/tgui/interfaces/BrigTimer.js +++ b/tgui/packages/tgui/interfaces/BrigTimer.tsx @@ -1,9 +1,18 @@ +import { BooleanLike } from 'common/react'; import { useBackend } from '../backend'; import { Button, Section } from '../components'; import { Window } from '../layouts'; +type Data = { + timing: BooleanLike; + minutes: number; + seconds: number; + flash_charging: BooleanLike; +}; + export const BrigTimer = (props, context) => { - const { act, data } = useBackend(context); + const { act, data } = useBackend(context); + const { timing, minutes, seconds, flash_charging } = data; return ( @@ -13,14 +22,14 @@ export const BrigTimer = (props, context) => { <>