diff --git a/tgui/packages/tgui/interfaces/SkillPanel.js b/tgui/packages/tgui/interfaces/SkillPanel.js index 18bfeae62d..ed9d1c96d4 100644 --- a/tgui/packages/tgui/interfaces/SkillPanel.js +++ b/tgui/packages/tgui/interfaces/SkillPanel.js @@ -1,6 +1,6 @@ import { Fragment } from 'inferno'; import { useBackend } from '../backend'; -import { Box, Button, LabeledList, ProgressBar, Section } from '../components'; +import { Box, Button, LabeledList, ProgressBar, Section, Window } from '../components'; export const SkillPanel = (props, context) => { const { act, data } = useBackend(context); @@ -15,107 +15,111 @@ export const SkillPanel = (props, context) => { fontWeight: 'bold', }; return ( -
act('toggle_mods')} /> - )}> - - {skills.map(skill => ( - - - {skill.desc} -
- `Modifiers: ${skill.modifiers}` - -
- {!!skill.level_based && ( - - {see_mods ? ( - - Level: [ - - {skill.lvl_mod} - ] - - ) : ( - - Level: [ - - {skill.lvl_base} - ] - - )} + + +
act('toggle_mods')} /> + )}> + + {skills.map(skill => ( + + + {skill.desc} +
+ `Modifiers: ${skill.modifiers}` +
- Total Experience: - {see_mods ? ( - [{skill.value_mod} XP] - ) : ( - [{skill.value_base} XP] - )} -
- XP To Next Level: - {skill.max_lvl !== (see_mods - ? skill.lvl_mod_num - : skill.lvl_base_num) ? ( - - {see_mods ? ( - {skill.xp_next_lvl_mod} - ) : ( - {skill.xp_next_lvl_base} - )} - - ) : ( - - [MAXXED] - - )} - - )} - {see_mods ? ( - {skill.mod_readout} - ) : ( - {skill.base_readout} - )} - {see_mods ? ( - - ) : ( - - )} -
- {!!data.admin && ( - -
+ {see_mods ? ( + {skill.mod_readout} + ) : ( + {skill.base_readout} + )} + {see_mods ? ( + + ) : ( + + )} +
+ {!!data.admin && ( + +
+ + ); }; diff --git a/tgui/packages/tgui/interfaces/TelecommsInteraction.js b/tgui/packages/tgui/interfaces/TelecommsInteraction.js index 259e6f9a23..17e82abc10 100644 --- a/tgui/packages/tgui/interfaces/TelecommsInteraction.js +++ b/tgui/packages/tgui/interfaces/TelecommsInteraction.js @@ -2,7 +2,7 @@ import { Fragment } from 'inferno'; import { useBackend } from '../backend'; import { toFixed } from 'common/math'; import { RADIO_CHANNELS } from '../constants'; -import { Button, LabeledList, NumberInput, NoticeBox, Section, Input } from '../components'; +import { Button, LabeledList, NumberInput, NoticeBox, Section, Input, Window } from '../components'; export const TeleInteract = (props, context) => { const { act, data } = useBackend(context); @@ -24,215 +24,221 @@ export const TeleInteract = (props, context) => { isbus = false, } = machine; return ( - - {!!notice && ( - - {notice} - - )} -
- - -
-
-
- - ) : ( - '' - )} - - + ); + }) + ) : ( + '' + )} + + + ) : ( + '' + )} + + + + ); }; diff --git a/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js b/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js index fb67464604..aabda7d6c9 100644 --- a/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js +++ b/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js @@ -1,6 +1,6 @@ import { Fragment } from 'inferno'; import { useBackend } from '../backend'; -import { Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components'; +import { Button, LabeledList, NoticeBox, Section, Tabs, Input, Window } from '../components'; export const TeleLogBrowser = (props, context) => { const { act, data } = useBackend(context); @@ -13,162 +13,167 @@ export const TeleLogBrowser = (props, context) => { } = data; const operational = (selected && selected.status); return ( - - {!!notice && ( - - {notice} - - )} -
- - - act('network', { - 'value': value, - })} /> - - -
- - -
- {(servers && servers.length) ? ( - - {servers.map(server => { - return ( - + + + {!!notice && ( + + {notice} + + )} +
+ + + act('network', { + 'value': value, + })} /> + + +
+ + +
+ {(servers && servers.length) ? ( + + {servers.map(server => { + return ( + act('viewmachine', { - 'value': server.id, - })} /> - )}> - {`${server.name} (${server.id})`} - - ); - })} - - ) : ( - '404 Servers not found. Have you tried scanning the network?' - )} -
- - -
- {(operational && selected_logs) ? ( - selected_logs.map(logs => { - return ( -
- - act('delete', { - 'value': logs.ref, - })} /> - )}> - {logs.name} - - - {logs.input_type} - - {logs.source && ( - - {`[${logs.source.name}] (Job: [${logs.source.job}])`} + onClick={() => act('viewmachine', { + 'value': server.id, + })} /> + )}> + {`${server.name} (${server.id})`} - )} - {logs.race && ( - - {logs.race} - - )} - - {logs.message} - - -
- ); - }) - ) : ( - "No server selected!" - )} -
- - - + ); + })} + + ) : ( + '404 Servers not found. Have you tried scanning the network?' + )} +
+ + +
+ {(operational && selected_logs) ? ( + selected_logs.map(logs => { + return ( +
+ + act('delete', { + 'value': logs.ref, + })} /> + )}> + {logs.name} + + + {logs.input_type} + + {logs.source && ( + + {`[${logs.source.name}] + (Job: [${logs.source.job}])`} + + )} + {logs.race && ( + + {logs.race} + + )} + + {logs.message} + + +
+ ); + }) + ) : ( + "No server selected!" + )} +
+ + + + + ); }; diff --git a/tgui/packages/tgui/interfaces/TelecommsMonitor.js b/tgui/packages/tgui/interfaces/TelecommsMonitor.js index 30aa05f1fe..26454d3f7f 100644 --- a/tgui/packages/tgui/interfaces/TelecommsMonitor.js +++ b/tgui/packages/tgui/interfaces/TelecommsMonitor.js @@ -1,7 +1,7 @@ import { Fragment } from 'inferno'; import { useBackend } from '../backend'; import { RADIO_CHANNELS } from '../constants'; -import { Box, Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components'; +import { Box, Button, LabeledList, NoticeBox, Section, Tabs, Input, Window } from '../components'; export const Telemonitor = (props, context) => { @@ -16,206 +16,212 @@ export const Telemonitor = (props, context) => { const operational = (selected && selected.status); return ( - - {!!notice && ( - - {notice} - - )} -
- - - act('network', { - 'value': value, - })} /> - - -
- - -
- {(servers && servers.length) ? ( - - {servers.map(server => { - return ( - act('viewmachine', { - 'value': server.id, - })} /> - )}> - {`${server.name} (${server.id})`} - - ); - })} - - ) : ( - '404 Servers not found. Have you tried scanning the network?' - )} -
- - -
+ + + + {!!notice && ( + + {notice} + + )} +
- - {operational ? ( - 'Running' - ) : ( - 'Server down!' - )} + + act('network', { + 'value': value, + })} /> +
- - - + + +
+ {(servers && servers.length) ? ( + + {servers.map(server => { + return ( + act('viewmachine', { + 'value': server.id, + })} /> + )}> + {`${server.name} (${server.id})`} + + ); + })} + + ) : ( + '404 Servers not found. Have you tried scanning the network?' + )} +
+ + +
+ + + {operational ? ( + 'Running' + ) : ( + 'Server down!' + )} + + + {operational ? ( // Not to be confused to totaltraffic + selected.traffic <= 1024 ? ( + `${Math.max(selected.traffic, 0)} Gigabytes` + ) : ( + `${Math.round(selected.traffic/1024)} Terrabytes` + ) + ) : ( + '0 Gigabytes' + )} + + + {operational ? ( + selected.netspeed <= 1024 ? ( + `${selected.netspeed} Gigabytes/second` + ) : ( + `${Math.round(selected.netspeed/1024)} + Terrabytes/second` + ) + ) : ( + '0 Gigabytes/second' + )} + + + {(operational && selected.long_range_link) ? ( + 'true' + ) : ( + 'false' + )} + + + + {operational && selected.freq_listening.map(thing => { + const valid = RADIO_CHANNELS + .find(channel => channel.freq === thing); + return ( + (valid) ? ( + + {`[${thing}] (${valid.name}) `} + + ) : ( + `[${thing}] ` + ) + ); + })} + + + +
+ {(operational && selected_servers) ? ( + + {selected_servers.map(server => { + return ( + act('viewmachine', { + 'value': server.id, + })} /> + )}> + {`${server.name} (${server.id})`} + + ); + })} + + ) : ( + !operational ? ( + "Server currently down! Cannot fetch the buffer list!" + ) : ( + "Buffer is empty!" + ) + )} +
+
+ + + + + ); }; diff --git a/tgui/packages/tgui/interfaces/TelecommsPDALog.js b/tgui/packages/tgui/interfaces/TelecommsPDALog.js index d14bf38aa7..5cb8e0196c 100644 --- a/tgui/packages/tgui/interfaces/TelecommsPDALog.js +++ b/tgui/packages/tgui/interfaces/TelecommsPDALog.js @@ -1,7 +1,7 @@ import { Fragment } from 'inferno'; import { useBackend } from '../backend'; import { act as _act } from '../byond'; -import { Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components'; +import { Button, LabeledList, NoticeBox, Section, Tabs, Input, Window } from '../components'; export const TelePDALog = (props, context) => { const { act, data } = useBackend(context); @@ -64,357 +64,362 @@ export const TelePDALog = (props, context) => { } return ( - - {!!notice && ( - - {notice} - - )} -
- - - act('network', { - 'value': value, - })} /> - - -
- - -
- {(servers && servers.length) ? ( - - {servers.map(server => { - return ( - act('viewmachine', { - 'value': server.id, - })} /> - )}> - {`${server.name} (${server.id})`} - - ); - })} - - ) : ( - '404 Servers not found. Have you tried scanning the network?' - )} -
- - -
-
- - -
-
- - -
-
- - - + + +
+ {(servers && servers.length) ? ( + + {servers.map(server => { + return ( + act('viewmachine', { + 'value': server.id, + })} /> + )}> + {`${server.name} (${server.id})`} + + ); + })} + + ) : ( + '404 Servers not found. Have you tried scanning the network?' + )} +
+ + +
+
+ + +
+
+ + +
+
+ + + + + ); };