diff --git a/tgui/.eslintrc.yml b/tgui/.eslintrc.yml index dd85d4ca159d..92dfe1320cbf 100644 --- a/tgui/.eslintrc.yml +++ b/tgui/.eslintrc.yml @@ -1,4 +1,5 @@ root: true +extends: prettier parser: '@typescript-eslint/parser' parserOptions: ecmaVersion: 2020 @@ -10,13 +11,14 @@ env: browser: true node: true plugins: - - radar + - sonarjs - react + - unused-imports + - simple-import-sort settings: react: - version: '16.10' + version: '18.2' rules: - ## Possible Errors ## ---------------------------------------- ## Enforce “for” loop update clause moving the counter in the right @@ -307,13 +309,16 @@ rules: ## Enforce or disallow capitalization of the first letter of a comment # capitalized-comments: error ## Require or disallow trailing commas - comma-dangle: [error, { - arrays: always-multiline, - objects: always-multiline, - imports: always-multiline, - exports: always-multiline, - functions: only-multiline, ## Optional on functions - }] + comma-dangle: [ + error, + { + arrays: always-multiline, + objects: always-multiline, + imports: always-multiline, + exports: always-multiline, + functions: only-multiline, ## Optional on functions + }, + ] ## Enforce consistent spacing before and after commas comma-spacing: [error, { before: false, after: true }] ## Enforce consistent comma style @@ -333,7 +338,7 @@ rules: ## Require or disallow named function expressions # func-names: error ## Enforce the consistent use of either function declarations or expressions - func-style: [error, expression] + # func-style: [error, expression] ## Enforce line breaks between arguments of a function call # function-call-argument-newline: error ## Enforce consistent line breaks inside function parentheses @@ -348,15 +353,15 @@ rules: ## Enforce the location of arrow function bodies # implicit-arrow-linebreak: error ## Enforce consistent indentation - indent: [error, 2, { SwitchCase: 1 }] + # indent: [error, 2, { SwitchCase: 1 }] ## Enforce the consistent use of either double or single quotes in JSX ## attributes - jsx-quotes: [error, prefer-double] + # jsx-quotes: [error, prefer-double] ## Enforce consistent spacing between keys and values in object literal ## properties - key-spacing: [error, { beforeColon: false, afterColon: true }] + # key-spacing: [error, { beforeColon: false, afterColon: true }] ## Enforce consistent spacing before and after keywords - keyword-spacing: [error, { before: true, after: true }] + # keyword-spacing: [error, { before: true, after: true }] ## Enforce position of line comments # line-comment-position: error ## Enforce consistent linebreak style @@ -368,14 +373,15 @@ rules: ## Enforce a maximum depth that blocks can be nested # max-depth: error ## Enforce a maximum line length - max-len: [error, { - code: 80, - ## Ignore imports - ignorePattern: '^(import\s.+\sfrom\s|.*require\()', - ignoreUrls: true, - ignoreRegExpLiterals: true, - ignoreStrings: true, - }] + # max-len: [error, { + # code: 80, + # ## Ignore imports + # ignorePattern: '^(import\s.+\sfrom\s|.*require\()', + # ignoreUrls: true, + # ignoreRegExpLiterals: true, + # ignoreStrings: true, + # ignoreTemplateLiterals: true, + # }] ## Enforce a maximum number of lines per file # max-lines: error ## Enforce a maximum number of line of code in a function @@ -412,7 +418,7 @@ rules: ## Disallow mixed binary operators # no-mixed-operators: error ## Disallow mixed spaces and tabs for indentation - no-mixed-spaces-and-tabs: error + # no-mixed-spaces-and-tabs: error ## Disallow use of chained assignment expressions # no-multi-assign: error ## Disallow multiple empty lines @@ -438,7 +444,7 @@ rules: ## Disallow ternary operators when simpler alternatives exist # no-unneeded-ternary: error ## Disallow whitespace before properties - no-whitespace-before-property: error + # no-whitespace-before-property: error ## Enforce the location of single-line statements # nonblock-statement-body-position: error ## Enforce consistent line breaks inside braces @@ -455,7 +461,7 @@ rules: ## Require or disallow assignment operator shorthand where possible # operator-assignment: error ## Enforce consistent linebreak style for operators - operator-linebreak: [error, before] + # operator-linebreak: [error, before] ## Require or disallow padding within blocks # padded-blocks: error ## Require or disallow padding lines between statements @@ -480,11 +486,11 @@ rules: ## Enforce consistent spacing before blocks space-before-blocks: [error, always] ## Enforce consistent spacing before function definition opening parenthesis - space-before-function-paren: [error, { - anonymous: always, - named: never, - asyncArrow: always, - }] + # space-before-function-paren: [error, { + # anonymous: always, + # named: never, + # asyncArrow: always, + # }] ## Enforce consistent spacing inside parentheses space-in-parens: [error, never] ## Require spacing around infix operators @@ -646,7 +652,7 @@ rules: ## Enforce ES5 or ES6 class for React Components react/prefer-es6-class: error ## Enforce that props are read-only - react/prefer-read-only-props: error + react/prefer-read-only-props: off ## Enforce stateless React Components to be written as a pure function react/prefer-stateless-function: error ## Prevent missing props validation in a React component definition @@ -668,7 +674,7 @@ rules: # react/sort-prop-types: error ## Enforce the state initialization style to be either in a constructor or ## with a class property - react/state-in-constructor: error + # react/state-in-constructor: error ## Enforces where React component static properties should be positioned. # react/static-property-placement: error ## Enforce style prop value being an object @@ -693,7 +699,7 @@ rules: react/jsx-closing-tag-location: error ## Enforce or disallow newlines inside of curly braces in JSX attributes and ## expressions (fixable) - react/jsx-curly-newline: error + # react/jsx-curly-newline: error ## Enforce or disallow spaces inside of curly braces in JSX attributes and ## expressions (fixable) react/jsx-curly-spacing: error @@ -706,11 +712,11 @@ rules: ## Enforce event handler naming conventions in JSX react/jsx-handler-names: error ## Validate JSX indentation (fixable) - react/jsx-indent: [error, 2, { - checkAttributes: true, - }] + # react/jsx-indent: [error, 2, { + # checkAttributes: true, + # }] ## Validate props indentation in JSX (fixable) - react/jsx-indent-props: [error, 2] + # react/jsx-indent-props: [error, 2] ## Validate JSX has key prop when in array or iterator react/jsx-key: error ## Validate JSX maximum depth @@ -756,3 +762,9 @@ rules: react/jsx-uses-vars: error ## Prevent missing parentheses around multilines JSX (fixable) react/jsx-wrap-multilines: error + ## Prevents the use of unused imports. + ## This could be done by enabling no-unused-vars, but we're doing this for now + unused-imports/no-unused-imports: error + ## https://github.com/lydell/eslint-plugin-simple-import-sort/ + simple-import-sort/imports: error + simple-import-sort/exports: error diff --git a/tgui/package.json b/tgui/package.json index 3bacb394eeda..9f725461b4dd 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -51,6 +51,8 @@ "eslint-config-prettier": "^8.10.0", "eslint-plugin-radar": "^0.2.1", "eslint-plugin-react": "^7.33.2", + "eslint-plugin-simple-import-sort": "latest", + "eslint-plugin-sonarjs": "latest", "eslint-plugin-unused-imports": "^3.0.0", "globals": "^13.23.0", "inferno": "^8.2.2", @@ -60,6 +62,8 @@ "jsdom": "^22.1.0", "katex": "^0.15.6", "mini-css-extract-plugin": "^2.7.6", + "react": "^18.2.0", + "react-dom": "^18.2.0", "sass": "^1.69.5", "sass-loader": "^13.3.2", "style-loader": "^3.3.3", diff --git a/tgui/packages/tgui-dev-server/dreamseeker.js b/tgui/packages/tgui-dev-server/dreamseeker.js index 21ad32e06451..f861bcde582c 100644 --- a/tgui/packages/tgui-dev-server/dreamseeker.js +++ b/tgui/packages/tgui-dev-server/dreamseeker.js @@ -6,6 +6,7 @@ import { exec } from 'child_process'; import { promisify } from 'util'; + import { createLogger } from './logging.js'; import { require } from './require.js'; diff --git a/tgui/packages/tgui-dev-server/index.js b/tgui/packages/tgui-dev-server/index.js index 199e93d83632..85489ebb0499 100644 --- a/tgui/packages/tgui-dev-server/index.js +++ b/tgui/packages/tgui-dev-server/index.js @@ -4,8 +4,8 @@ * @license MIT */ -import { createCompiler } from './webpack.js'; import { reloadByondCache } from './reloader.js'; +import { createCompiler } from './webpack.js'; const noHot = process.argv.includes('--no-hot'); const noTmp = process.argv.includes('--no-tmp'); diff --git a/tgui/packages/tgui-dev-server/link/retrace.js b/tgui/packages/tgui-dev-server/link/retrace.js index c10ba9cb173c..7eaab96cbb10 100644 --- a/tgui/packages/tgui-dev-server/link/retrace.js +++ b/tgui/packages/tgui-dev-server/link/retrace.js @@ -6,6 +6,7 @@ import fs from 'fs'; import { basename } from 'path'; + import { createLogger } from '../logging.js'; import { require } from '../require.js'; import { resolveGlob } from '../util.js'; diff --git a/tgui/packages/tgui-dev-server/link/server.js b/tgui/packages/tgui-dev-server/link/server.js index 87a8a5911bc0..461d127a5f49 100644 --- a/tgui/packages/tgui-dev-server/link/server.js +++ b/tgui/packages/tgui-dev-server/link/server.js @@ -6,6 +6,7 @@ import http from 'http'; import { inspect } from 'util'; + import { createLogger, directLog } from '../logging.js'; import { require } from '../require.js'; import { loadSourceMaps, retrace } from './retrace.js'; diff --git a/tgui/packages/tgui-dev-server/reloader.js b/tgui/packages/tgui-dev-server/reloader.js index 0f62c60ee5ba..7ab7b3526d36 100644 --- a/tgui/packages/tgui-dev-server/reloader.js +++ b/tgui/packages/tgui-dev-server/reloader.js @@ -7,6 +7,7 @@ import fs from 'fs'; import os from 'os'; import { basename } from 'path'; + import { DreamSeeker } from './dreamseeker.js'; import { createLogger } from './logging.js'; import { resolveGlob, resolvePath } from './util.js'; diff --git a/tgui/packages/tgui-dev-server/util.js b/tgui/packages/tgui-dev-server/util.js index 0fc255ed6744..2660205b8596 100644 --- a/tgui/packages/tgui-dev-server/util.js +++ b/tgui/packages/tgui-dev-server/util.js @@ -6,6 +6,7 @@ import fs from 'fs'; import path from 'path'; + import { require } from './require.js'; const globPkg = require('glob'); diff --git a/tgui/packages/tgui-dev-server/webpack.js b/tgui/packages/tgui-dev-server/webpack.js index 8cba68afcba5..2953c27f4bf1 100644 --- a/tgui/packages/tgui-dev-server/webpack.js +++ b/tgui/packages/tgui-dev-server/webpack.js @@ -7,6 +7,7 @@ import fs from 'fs'; import { createRequire } from 'module'; import { dirname } from 'path'; + import { loadSourceMaps, setupLink } from './link/server.js'; import { createLogger } from './logging.js'; import { reloadByondCache } from './reloader.js'; diff --git a/tgui/packages/tgui-dev-server/winreg.js b/tgui/packages/tgui-dev-server/winreg.js index 669e2aad55d6..95090f534e94 100644 --- a/tgui/packages/tgui-dev-server/winreg.js +++ b/tgui/packages/tgui-dev-server/winreg.js @@ -8,6 +8,7 @@ import { exec } from 'child_process'; import { promisify } from 'util'; + import { createLogger } from './logging.js'; const logger = createLogger('winreg'); diff --git a/tgui/packages/tgui-panel/Panel.js b/tgui/packages/tgui-panel/Panel.js index 6ed6ffb27c3a..607da0e00e59 100644 --- a/tgui/packages/tgui-panel/Panel.js +++ b/tgui/packages/tgui-panel/Panel.js @@ -6,6 +6,7 @@ import { Button, Section, Stack } from 'tgui/components'; import { Pane } from 'tgui/layouts'; + import { NowPlayingWidget, useAudio } from './audio'; import { ChatPanel, ChatTabs } from './chat'; import { useGame } from './game'; diff --git a/tgui/packages/tgui-panel/audio/NowPlayingWidget.js b/tgui/packages/tgui-panel/audio/NowPlayingWidget.js index e4fe04eed167..ff7684a9e71e 100644 --- a/tgui/packages/tgui-panel/audio/NowPlayingWidget.js +++ b/tgui/packages/tgui-panel/audio/NowPlayingWidget.js @@ -7,6 +7,7 @@ import { toFixed } from 'common/math'; import { useDispatch, useSelector } from 'common/redux'; import { Button, Flex, Knob } from 'tgui/components'; + import { useSettings } from '../settings'; import { selectAudio } from './selectors'; diff --git a/tgui/packages/tgui-panel/audio/hooks.js b/tgui/packages/tgui-panel/audio/hooks.js index 17b29a959724..201d83d566f4 100644 --- a/tgui/packages/tgui-panel/audio/hooks.js +++ b/tgui/packages/tgui-panel/audio/hooks.js @@ -4,7 +4,8 @@ * @license MIT */ -import { useSelector, useDispatch } from 'common/redux'; +import { useDispatch, useSelector } from 'common/redux'; + import { selectAudio } from './selectors'; export const useAudio = context => { diff --git a/tgui/packages/tgui-panel/chat/ChatPageSettings.js b/tgui/packages/tgui-panel/chat/ChatPageSettings.js index ba045983d2f3..fd31e70575f3 100644 --- a/tgui/packages/tgui-panel/chat/ChatPageSettings.js +++ b/tgui/packages/tgui-panel/chat/ChatPageSettings.js @@ -6,6 +6,7 @@ import { useDispatch, useSelector } from 'common/redux'; import { Button, Collapsible, Divider, Input, Section, Stack } from 'tgui/components'; + import { removeChatPage, toggleAcceptedType, updateChatPage } from './actions'; import { MESSAGE_TYPES } from './constants'; import { selectCurrentChatPage } from './selectors'; diff --git a/tgui/packages/tgui-panel/chat/ChatPanel.js b/tgui/packages/tgui-panel/chat/ChatPanel.js index 0a5deaf9febe..7fcec3b65566 100644 --- a/tgui/packages/tgui-panel/chat/ChatPanel.js +++ b/tgui/packages/tgui-panel/chat/ChatPanel.js @@ -7,6 +7,7 @@ import { shallowDiffers } from 'common/react'; import { Component, createRef } from 'inferno'; import { Button } from 'tgui/components'; + import { chatRenderer } from './renderer'; export class ChatPanel extends Component { diff --git a/tgui/packages/tgui-panel/chat/ChatTabs.js b/tgui/packages/tgui-panel/chat/ChatTabs.js index a0e6cc59e523..26e34982dc84 100644 --- a/tgui/packages/tgui-panel/chat/ChatTabs.js +++ b/tgui/packages/tgui-panel/chat/ChatTabs.js @@ -5,10 +5,11 @@ */ import { useDispatch, useSelector } from 'common/redux'; -import { Box, Tabs, Flex, Button } from 'tgui/components'; -import { changeChatPage, addChatPage } from './actions'; -import { selectChatPages, selectCurrentChatPage } from './selectors'; +import { Box, Button, Flex, Tabs } from 'tgui/components'; + import { openChatSettings } from '../settings/actions'; +import { addChatPage, changeChatPage } from './actions'; +import { selectChatPages, selectCurrentChatPage } from './selectors'; const UnreadCountWidget = ({ value }) => ( ( type.startsWith(MESSAGE_TYPE_INTERNAL) || page.acceptedTypes[type] diff --git a/tgui/packages/tgui-panel/chat/reducer.js b/tgui/packages/tgui-panel/chat/reducer.js index 6342e0012fca..79dbdf327a9d 100644 --- a/tgui/packages/tgui-panel/chat/reducer.js +++ b/tgui/packages/tgui-panel/chat/reducer.js @@ -4,7 +4,7 @@ * @license MIT */ -import { addChatPage, changeChatPage, loadChat, removeChatPage, toggleAcceptedType, updateChatPage, updateMessageCount, changeScrollTracking } from './actions'; +import { addChatPage, changeChatPage, changeScrollTracking, loadChat, removeChatPage, toggleAcceptedType, updateChatPage, updateMessageCount } from './actions'; import { canPageAcceptType, createMainPage } from './model'; const mainPage = createMainPage(); diff --git a/tgui/packages/tgui-panel/chat/renderer.js b/tgui/packages/tgui-panel/chat/renderer.js index 495ed32228be..801cb664a001 100644 --- a/tgui/packages/tgui-panel/chat/renderer.js +++ b/tgui/packages/tgui-panel/chat/renderer.js @@ -7,7 +7,8 @@ import { EventEmitter } from 'common/events'; import { classes } from 'common/react'; import { createLogger } from 'tgui/logging'; -import { COMBINE_MAX_MESSAGES, COMBINE_MAX_TIME_WINDOW, IMAGE_RETRY_DELAY, IMAGE_RETRY_LIMIT, IMAGE_RETRY_MESSAGE_AGE, MAX_PERSISTED_MESSAGES, MAX_VISIBLE_MESSAGES, MESSAGE_PRUNE_INTERVAL, MESSAGE_TYPES, MESSAGE_TYPE_INTERNAL, MESSAGE_TYPE_UNKNOWN } from './constants'; + +import { COMBINE_MAX_MESSAGES, COMBINE_MAX_TIME_WINDOW, IMAGE_RETRY_DELAY, IMAGE_RETRY_LIMIT, IMAGE_RETRY_MESSAGE_AGE, MAX_PERSISTED_MESSAGES, MAX_VISIBLE_MESSAGES, MESSAGE_PRUNE_INTERVAL, MESSAGE_TYPE_INTERNAL, MESSAGE_TYPE_UNKNOWN, MESSAGE_TYPES } from './constants'; import { canPageAcceptType, createMessage, isSameMessage } from './model'; import { highlightNode, linkifyNode } from './replaceInTextNode'; diff --git a/tgui/packages/tgui-panel/game/hooks.js b/tgui/packages/tgui-panel/game/hooks.js index e9567b916b46..78ac5ebc17bc 100644 --- a/tgui/packages/tgui-panel/game/hooks.js +++ b/tgui/packages/tgui-panel/game/hooks.js @@ -5,6 +5,7 @@ */ import { useSelector } from 'common/redux'; + import { selectGame } from './selectors'; export const useGame = context => { diff --git a/tgui/packages/tgui-panel/game/middleware.js b/tgui/packages/tgui-panel/game/middleware.js index 854369dc54ea..1f48d7ae0820 100644 --- a/tgui/packages/tgui-panel/game/middleware.js +++ b/tgui/packages/tgui-panel/game/middleware.js @@ -6,8 +6,8 @@ import { pingSuccess } from '../ping/actions'; import { connectionLost, connectionRestored, roundRestarted } from './actions'; -import { selectGame } from './selectors'; import { CONNECTION_LOST_AFTER } from './constants'; +import { selectGame } from './selectors'; const withTimestamp = action => ({ ...action, diff --git a/tgui/packages/tgui-panel/index.js b/tgui/packages/tgui-panel/index.js index d635db2b479e..a4db6ca8d477 100644 --- a/tgui/packages/tgui-panel/index.js +++ b/tgui/packages/tgui-panel/index.js @@ -10,11 +10,12 @@ import './styles/themes/light.scss'; import { perf } from 'common/perf'; import { combineReducers } from 'common/redux'; -import { setupHotReloading } from 'tgui-dev-server/link/client.cjs'; import { setupGlobalEvents } from 'tgui/events'; import { captureExternalLinks } from 'tgui/links'; import { createRenderer } from 'tgui/renderer'; import { configureStore, StoreProvider } from 'tgui/store'; +import { setupHotReloading } from 'tgui-dev-server/link/client.cjs'; + import { audioMiddleware, audioReducer } from './audio'; import { chatMiddleware, chatReducer } from './chat'; import { gameMiddleware, gameReducer } from './game'; diff --git a/tgui/packages/tgui-panel/ping/PingIndicator.js b/tgui/packages/tgui-panel/ping/PingIndicator.js index b663cd3a1809..6f1e526a8ba2 100644 --- a/tgui/packages/tgui-panel/ping/PingIndicator.js +++ b/tgui/packages/tgui-panel/ping/PingIndicator.js @@ -8,6 +8,7 @@ import { Color } from 'common/color'; import { toFixed } from 'common/math'; import { useSelector } from 'common/redux'; import { Box } from 'tgui/components'; + import { selectPing } from './selectors'; export const PingIndicator = (props, context) => { diff --git a/tgui/packages/tgui-panel/ping/middleware.js b/tgui/packages/tgui-panel/ping/middleware.js index b7d8e25a7672..70e59e90e225 100644 --- a/tgui/packages/tgui-panel/ping/middleware.js +++ b/tgui/packages/tgui-panel/ping/middleware.js @@ -5,6 +5,7 @@ */ import { sendMessage } from 'tgui/backend'; + import { pingFail, pingSuccess } from './actions'; import { PING_INTERVAL, PING_QUEUE_SIZE, PING_TIMEOUT } from './constants'; diff --git a/tgui/packages/tgui-panel/ping/reducer.js b/tgui/packages/tgui-panel/ping/reducer.js index 22d146f8b815..c808b2df835f 100644 --- a/tgui/packages/tgui-panel/ping/reducer.js +++ b/tgui/packages/tgui-panel/ping/reducer.js @@ -5,6 +5,7 @@ */ import { clamp01, scale } from 'common/math'; + import { pingFail, pingSuccess } from './actions'; import { PING_MAX_FAILS, PING_ROUNDTRIP_BEST, PING_ROUNDTRIP_WORST } from './constants'; diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.js b/tgui/packages/tgui-panel/settings/SettingsPanel.js index 01df419ce21f..93ca1520d2cd 100644 --- a/tgui/packages/tgui-panel/settings/SettingsPanel.js +++ b/tgui/packages/tgui-panel/settings/SettingsPanel.js @@ -5,9 +5,10 @@ */ import { toFixed } from 'common/math'; -import { useLocalState } from 'tgui/backend'; import { useDispatch, useSelector } from 'common/redux'; +import { useLocalState } from 'tgui/backend'; import { Box, Button, ColorBox, Divider, Dropdown, Flex, Input, LabeledList, NumberInput, Section, Stack, Tabs, TextArea } from 'tgui/components'; + import { ChatPageSettings } from '../chat'; import { rebuildChat, saveChatToDisk } from '../chat/actions'; import { THEMES } from '../themes'; diff --git a/tgui/packages/tgui-panel/settings/hooks.js b/tgui/packages/tgui-panel/settings/hooks.js index 1cdcaac7364c..3e3237c331d5 100644 --- a/tgui/packages/tgui-panel/settings/hooks.js +++ b/tgui/packages/tgui-panel/settings/hooks.js @@ -5,7 +5,8 @@ */ import { useDispatch, useSelector } from 'common/redux'; -import { updateSettings, toggleSettings } from './actions'; + +import { toggleSettings, updateSettings } from './actions'; import { selectSettings } from './selectors'; export const useSettings = context => { diff --git a/tgui/packages/tgui-panel/settings/middleware.js b/tgui/packages/tgui-panel/settings/middleware.js index b5ce06c5cc08..1b630c0ad260 100644 --- a/tgui/packages/tgui-panel/settings/middleware.js +++ b/tgui/packages/tgui-panel/settings/middleware.js @@ -5,10 +5,11 @@ */ import { storage } from 'common/storage'; + import { setClientTheme } from '../themes'; import { loadSettings, updateSettings } from './actions'; -import { selectSettings } from './selectors'; import { FONTS_DISABLED } from './constants'; +import { selectSettings } from './selectors'; const setGlobalFontSize = fontSize => { document.documentElement.style diff --git a/tgui/packages/tgui-panel/telemetry.js b/tgui/packages/tgui-panel/telemetry.js index 31b8541c21cf..7648b6c59f12 100644 --- a/tgui/packages/tgui-panel/telemetry.js +++ b/tgui/packages/tgui-panel/telemetry.js @@ -4,8 +4,8 @@ * @license MIT */ -import { sendMessage } from 'tgui/backend'; import { storage } from 'common/storage'; +import { sendMessage } from 'tgui/backend'; import { createLogger } from 'tgui/logging'; const logger = createLogger('telemetry'); diff --git a/tgui/packages/tgui/backend.ts b/tgui/packages/tgui/backend.ts index b5ce52f5e092..ddefc4d752a0 100644 --- a/tgui/packages/tgui/backend.ts +++ b/tgui/packages/tgui/backend.ts @@ -13,6 +13,7 @@ import { perf } from 'common/perf'; import { createAction } from 'common/redux'; + import { setupDrag } from './drag'; import { focusMap } from './focus'; import { createLogger } from './logging'; diff --git a/tgui/packages/tgui/components/BlockQuote.js b/tgui/packages/tgui/components/BlockQuote.js index 62a052157288..ba568ff85c1e 100644 --- a/tgui/packages/tgui/components/BlockQuote.js +++ b/tgui/packages/tgui/components/BlockQuote.js @@ -5,6 +5,7 @@ */ import { classes } from 'common/react'; + import { Box } from './Box'; export const BlockQuote = props => { diff --git a/tgui/packages/tgui/components/Box.tsx b/tgui/packages/tgui/components/Box.tsx index 9b0682661fbd..c4b327a68ef6 100644 --- a/tgui/packages/tgui/components/Box.tsx +++ b/tgui/packages/tgui/components/Box.tsx @@ -7,6 +7,7 @@ import { BooleanLike, classes, pureComponentHooks } from 'common/react'; import { createVNode, InfernoNode } from 'inferno'; import { ChildFlags, VNodeFlags } from 'inferno-vnode-flags'; + import { CSS_COLORS } from '../constants'; export interface BoxProps { diff --git a/tgui/packages/tgui/components/Button.js b/tgui/packages/tgui/components/Button.js index a56c7dfa0dba..68c283adae14 100644 --- a/tgui/packages/tgui/components/Button.js +++ b/tgui/packages/tgui/components/Button.js @@ -7,6 +7,7 @@ import { KEY_ENTER, KEY_ESCAPE, KEY_SPACE } from 'common/keycodes'; import { classes, pureComponentHooks } from 'common/react'; import { Component, createRef } from 'inferno'; + import { createLogger } from '../logging'; import { Box } from './Box'; import { Icon } from './Icon'; diff --git a/tgui/packages/tgui/components/ByondUi.js b/tgui/packages/tgui/components/ByondUi.js index 07be451e9d2f..5ab74ec4a240 100644 --- a/tgui/packages/tgui/components/ByondUi.js +++ b/tgui/packages/tgui/components/ByondUi.js @@ -7,6 +7,7 @@ import { shallowDiffers } from 'common/react'; import { debounce } from 'common/timer'; import { Component, createRef } from 'inferno'; + import { createLogger } from '../logging'; import { computeBoxProps } from './Box'; diff --git a/tgui/packages/tgui/components/Chart.js b/tgui/packages/tgui/components/Chart.js index 77913779db81..6b57ea2880f2 100644 --- a/tgui/packages/tgui/components/Chart.js +++ b/tgui/packages/tgui/components/Chart.js @@ -7,6 +7,7 @@ import { map, zipWith } from 'common/collections'; import { pureComponentHooks } from 'common/react'; import { Component, createRef } from 'inferno'; + import { Box } from './Box'; const normalizeData = (data, scale, rangeX, rangeY) => { diff --git a/tgui/packages/tgui/components/Collapsible.js b/tgui/packages/tgui/components/Collapsible.js index 8b915814ba41..fdfea7754d66 100644 --- a/tgui/packages/tgui/components/Collapsible.js +++ b/tgui/packages/tgui/components/Collapsible.js @@ -5,6 +5,7 @@ */ import { Component } from 'inferno'; + import { Box } from './Box'; import { Button } from './Button'; diff --git a/tgui/packages/tgui/components/ColorBox.js b/tgui/packages/tgui/components/ColorBox.js index 10306cf4654c..578a0d1c24a5 100644 --- a/tgui/packages/tgui/components/ColorBox.js +++ b/tgui/packages/tgui/components/ColorBox.js @@ -5,6 +5,7 @@ */ import { classes, pureComponentHooks } from 'common/react'; + import { computeBoxClassName, computeBoxProps } from './Box'; export const ColorBox = props => { diff --git a/tgui/packages/tgui/components/Dimmer.js b/tgui/packages/tgui/components/Dimmer.js index d97c3626a3eb..2f1aec4fd577 100644 --- a/tgui/packages/tgui/components/Dimmer.js +++ b/tgui/packages/tgui/components/Dimmer.js @@ -5,6 +5,7 @@ */ import { classes } from 'common/react'; + import { Box } from './Box'; export const Dimmer = props => { diff --git a/tgui/packages/tgui/components/DraggableControl.js b/tgui/packages/tgui/components/DraggableControl.js index dfb47e8f4d6b..c9577db5f798 100644 --- a/tgui/packages/tgui/components/DraggableControl.js +++ b/tgui/packages/tgui/components/DraggableControl.js @@ -7,6 +7,7 @@ import { clamp } from 'common/math'; import { pureComponentHooks } from 'common/react'; import { Component, createRef } from 'inferno'; + import { AnimatedNumber } from './AnimatedNumber'; const DEFAULT_UPDATE_RATE = 400; diff --git a/tgui/packages/tgui/components/Dropdown.js b/tgui/packages/tgui/components/Dropdown.js index 7486807e3f35..8e35f5972f26 100644 --- a/tgui/packages/tgui/components/Dropdown.js +++ b/tgui/packages/tgui/components/Dropdown.js @@ -6,6 +6,7 @@ import { classes } from 'common/react'; import { Component } from 'inferno'; + import { Box } from './Box'; import { Icon } from './Icon'; diff --git a/tgui/packages/tgui/components/Flex.tsx b/tgui/packages/tgui/components/Flex.tsx index fbb5ab0b9619..fde35dd81144 100644 --- a/tgui/packages/tgui/components/Flex.tsx +++ b/tgui/packages/tgui/components/Flex.tsx @@ -5,6 +5,7 @@ */ import { BooleanLike, classes, pureComponentHooks } from 'common/react'; + import { Box, BoxProps, unit } from './Box'; export interface FlexProps extends BoxProps { diff --git a/tgui/packages/tgui/components/Grid.js b/tgui/packages/tgui/components/Grid.js index 3269b672006c..5b5b2f974506 100644 --- a/tgui/packages/tgui/components/Grid.js +++ b/tgui/packages/tgui/components/Grid.js @@ -4,9 +4,10 @@ * @license MIT */ -import { Table } from './Table'; import { pureComponentHooks } from 'common/react'; +import { Table } from './Table'; + /** @deprecated */ export const Grid = props => { const { children, ...rest } = props; diff --git a/tgui/packages/tgui/components/Icon.js b/tgui/packages/tgui/components/Icon.js index 13efaffca799..afdaa3548273 100644 --- a/tgui/packages/tgui/components/Icon.js +++ b/tgui/packages/tgui/components/Icon.js @@ -7,6 +7,7 @@ */ import { classes, pureComponentHooks } from 'common/react'; + import { Box } from './Box'; const FA_OUTLINE_REGEX = /-o$/; diff --git a/tgui/packages/tgui/components/InfinitePlane.js b/tgui/packages/tgui/components/InfinitePlane.js index 393ac1de81d1..844fbe7a4225 100644 --- a/tgui/packages/tgui/components/InfinitePlane.js +++ b/tgui/packages/tgui/components/InfinitePlane.js @@ -1,8 +1,9 @@ +import { Component } from 'inferno'; + import { computeBoxProps } from "./Box"; -import { Stack } from "./Stack"; -import { ProgressBar } from "./ProgressBar"; import { Button } from "./Button"; -import { Component } from 'inferno'; +import { ProgressBar } from "./ProgressBar"; +import { Stack } from "./Stack"; const ZOOM_MIN_VAL = 0.5; const ZOOM_MAX_VAL = 1.5; diff --git a/tgui/packages/tgui/components/Input.js b/tgui/packages/tgui/components/Input.js index b0c5f3f0cbc0..b70cc34a398d 100644 --- a/tgui/packages/tgui/components/Input.js +++ b/tgui/packages/tgui/components/Input.js @@ -4,10 +4,11 @@ * @license MIT */ +import { KEY_ENTER, KEY_ESCAPE } from 'common/keycodes'; import { classes } from 'common/react'; import { Component, createRef } from 'inferno'; + import { Box } from './Box'; -import { KEY_ESCAPE, KEY_ENTER } from 'common/keycodes'; export const toInputValue = value => ( typeof value !== 'number' && typeof value !== 'string' diff --git a/tgui/packages/tgui/components/Knob.js b/tgui/packages/tgui/components/Knob.js index 175792471b3d..8b7927362118 100644 --- a/tgui/packages/tgui/components/Knob.js +++ b/tgui/packages/tgui/components/Knob.js @@ -6,6 +6,7 @@ import { keyOfMatchingRange, scale } from 'common/math'; import { classes } from 'common/react'; + import { computeBoxClassName, computeBoxProps } from './Box'; import { DraggableControl } from './DraggableControl'; import { NumberInput } from './NumberInput'; diff --git a/tgui/packages/tgui/components/LabeledList.tsx b/tgui/packages/tgui/components/LabeledList.tsx index 0417fefc8c0a..5808d85e219b 100644 --- a/tgui/packages/tgui/components/LabeledList.tsx +++ b/tgui/packages/tgui/components/LabeledList.tsx @@ -6,6 +6,7 @@ import { BooleanLike, classes, pureComponentHooks } from 'common/react'; import { InfernoNode } from 'inferno'; + import { Box, unit } from './Box'; import { Divider } from './Divider'; diff --git a/tgui/packages/tgui/components/Modal.js b/tgui/packages/tgui/components/Modal.js index aa420af67575..98034d82092d 100644 --- a/tgui/packages/tgui/components/Modal.js +++ b/tgui/packages/tgui/components/Modal.js @@ -5,6 +5,7 @@ */ import { classes } from 'common/react'; + import { computeBoxClassName, computeBoxProps } from './Box'; import { Dimmer } from './Dimmer'; diff --git a/tgui/packages/tgui/components/NoticeBox.js b/tgui/packages/tgui/components/NoticeBox.js index 0277c63b343e..e7393f596b69 100644 --- a/tgui/packages/tgui/components/NoticeBox.js +++ b/tgui/packages/tgui/components/NoticeBox.js @@ -5,6 +5,7 @@ */ import { classes, pureComponentHooks } from 'common/react'; + import { Box } from './Box'; export const NoticeBox = props => { diff --git a/tgui/packages/tgui/components/NumberInput.js b/tgui/packages/tgui/components/NumberInput.js index 306772c8a512..5548cba1e9c3 100644 --- a/tgui/packages/tgui/components/NumberInput.js +++ b/tgui/packages/tgui/components/NumberInput.js @@ -7,6 +7,7 @@ import { clamp } from 'common/math'; import { classes, pureComponentHooks } from 'common/react'; import { Component, createRef } from 'inferno'; + import { AnimatedNumber } from './AnimatedNumber'; import { Box } from './Box'; diff --git a/tgui/packages/tgui/components/ProgressBar.js b/tgui/packages/tgui/components/ProgressBar.js index 1ec2b762930f..2ec784fb79f3 100644 --- a/tgui/packages/tgui/components/ProgressBar.js +++ b/tgui/packages/tgui/components/ProgressBar.js @@ -4,8 +4,9 @@ * @license MIT */ -import { clamp01, scale, keyOfMatchingRange, toFixed } from 'common/math'; +import { clamp01, keyOfMatchingRange, scale, toFixed } from 'common/math'; import { classes, pureComponentHooks } from 'common/react'; + import { computeBoxClassName, computeBoxProps } from './Box'; export const ProgressBar = props => { diff --git a/tgui/packages/tgui/components/RestrictedInput.js b/tgui/packages/tgui/components/RestrictedInput.js index 0a6e2cb440c3..4a38ee87b6b7 100644 --- a/tgui/packages/tgui/components/RestrictedInput.js +++ b/tgui/packages/tgui/components/RestrictedInput.js @@ -1,8 +1,9 @@ -import { classes } from 'common/react'; +import { KEY_ENTER, KEY_ESCAPE } from 'common/keycodes'; import { clamp } from 'common/math'; +import { classes } from 'common/react'; import { Component, createRef } from 'inferno'; + import { Box } from './Box'; -import { KEY_ESCAPE, KEY_ENTER } from 'common/keycodes'; const DEFAULT_MIN = 0; const DEFAULT_MAX = 10000; diff --git a/tgui/packages/tgui/components/RoundGauge.js b/tgui/packages/tgui/components/RoundGauge.js index cbe1f910a661..8df3e923e308 100644 --- a/tgui/packages/tgui/components/RoundGauge.js +++ b/tgui/packages/tgui/components/RoundGauge.js @@ -6,6 +6,7 @@ import { clamp01, keyOfMatchingRange, scale } from 'common/math'; import { classes } from 'common/react'; + import { AnimatedNumber } from './AnimatedNumber'; import { Box, computeBoxClassName, computeBoxProps } from './Box'; diff --git a/tgui/packages/tgui/components/Section.tsx b/tgui/packages/tgui/components/Section.tsx index 77cf03a07639..22df3648d81f 100644 --- a/tgui/packages/tgui/components/Section.tsx +++ b/tgui/packages/tgui/components/Section.tsx @@ -6,6 +6,7 @@ import { canRender, classes } from 'common/react'; import { Component, createRef, InfernoNode, RefObject } from 'inferno'; + import { addScrollableNode, removeScrollableNode } from '../events'; import { BoxProps, computeBoxClassName, computeBoxProps } from './Box'; diff --git a/tgui/packages/tgui/components/Slider.js b/tgui/packages/tgui/components/Slider.js index 005e6c1f8f78..0e93c4952b09 100644 --- a/tgui/packages/tgui/components/Slider.js +++ b/tgui/packages/tgui/components/Slider.js @@ -6,6 +6,7 @@ import { clamp01, keyOfMatchingRange, scale } from 'common/math'; import { classes } from 'common/react'; + import { computeBoxClassName, computeBoxProps } from './Box'; import { DraggableControl } from './DraggableControl'; import { NumberInput } from './NumberInput'; diff --git a/tgui/packages/tgui/components/Stack.tsx b/tgui/packages/tgui/components/Stack.tsx index e486a77c1ea5..1ce9ae0376c0 100644 --- a/tgui/packages/tgui/components/Stack.tsx +++ b/tgui/packages/tgui/components/Stack.tsx @@ -5,6 +5,7 @@ */ import { classes } from 'common/react'; + import { Flex, FlexItemProps, FlexProps } from './Flex'; interface StackProps extends FlexProps { diff --git a/tgui/packages/tgui/components/Table.js b/tgui/packages/tgui/components/Table.js index 545e26f5934f..b108330654e8 100644 --- a/tgui/packages/tgui/components/Table.js +++ b/tgui/packages/tgui/components/Table.js @@ -5,6 +5,7 @@ */ import { classes, pureComponentHooks } from 'common/react'; + import { computeBoxClassName, computeBoxProps } from './Box'; export const Table = props => { diff --git a/tgui/packages/tgui/components/Tabs.js b/tgui/packages/tgui/components/Tabs.js index ca0453f8da34..3e897638f0df 100644 --- a/tgui/packages/tgui/components/Tabs.js +++ b/tgui/packages/tgui/components/Tabs.js @@ -5,6 +5,7 @@ */ import { canRender, classes } from 'common/react'; + import { computeBoxClassName, computeBoxProps } from './Box'; import { Icon } from './Icon'; diff --git a/tgui/packages/tgui/components/TextArea.js b/tgui/packages/tgui/components/TextArea.js index 00e1605a3b31..ed887324a4a1 100644 --- a/tgui/packages/tgui/components/TextArea.js +++ b/tgui/packages/tgui/components/TextArea.js @@ -5,11 +5,12 @@ * @license MIT */ +import { KEY_ESCAPE } from 'common/keycodes'; import { classes } from 'common/react'; import { Component, createRef } from 'inferno'; + import { Box } from './Box'; import { toInputValue } from './Input'; -import { KEY_ESCAPE } from 'common/keycodes'; export class TextArea extends Component { constructor(props, context) { diff --git a/tgui/packages/tgui/components/TimeDisplay.js b/tgui/packages/tgui/components/TimeDisplay.js index fdba84563a8c..d2a49e4de124 100644 --- a/tgui/packages/tgui/components/TimeDisplay.js +++ b/tgui/packages/tgui/components/TimeDisplay.js @@ -1,6 +1,7 @@ -import { formatTime } from '../format'; import { Component } from 'inferno'; +import { formatTime } from '../format'; + // AnimatedNumber Copypaste const isSafeNumber = value => { return typeof value === 'number' diff --git a/tgui/packages/tgui/components/index.js b/tgui/packages/tgui/components/index.js index 94a50d233959..21a82a221907 100644 --- a/tgui/packages/tgui/components/index.js +++ b/tgui/packages/tgui/components/index.js @@ -29,8 +29,8 @@ export { LabeledList } from './LabeledList'; export { Modal } from './Modal'; export { NoticeBox } from './NoticeBox'; export { NumberInput } from './NumberInput'; -export { ProgressBar } from './ProgressBar'; export { Popper } from './Popper'; +export { ProgressBar } from './ProgressBar'; export { RestrictedInput } from './RestrictedInput'; export { RoundGauge } from './RoundGauge'; export { Section } from './Section'; diff --git a/tgui/packages/tgui/debug/hooks.js b/tgui/packages/tgui/debug/hooks.js index 0b1a3f105e35..a09dcb8cb996 100644 --- a/tgui/packages/tgui/debug/hooks.js +++ b/tgui/packages/tgui/debug/hooks.js @@ -5,6 +5,7 @@ */ import { useSelector } from 'common/redux'; + import { selectDebug } from './selectors'; export const useDebug = context => useSelector(context, selectDebug); diff --git a/tgui/packages/tgui/debug/middleware.js b/tgui/packages/tgui/debug/middleware.js index 8dceaf9573ca..519644899dc8 100644 --- a/tgui/packages/tgui/debug/middleware.js +++ b/tgui/packages/tgui/debug/middleware.js @@ -5,6 +5,7 @@ */ import { KEY_BACKSPACE, KEY_F10, KEY_F11, KEY_F12 } from 'common/keycodes'; + import { globalEvents } from '../events'; import { acquireHotKey } from '../hotkeys'; import { openExternalBrowser, toggleDebugLayout, toggleKitchenSink } from './actions'; diff --git a/tgui/packages/tgui/drag.js b/tgui/packages/tgui/drag.js index d6f0967a8ddd..2a0804353a6f 100644 --- a/tgui/packages/tgui/drag.js +++ b/tgui/packages/tgui/drag.js @@ -6,6 +6,7 @@ import { storage } from 'common/storage'; import { vecAdd, vecInverse, vecMultiply, vecScale } from 'common/vector'; + import { createLogger } from './logging'; const logger = createLogger('drag'); diff --git a/tgui/packages/tgui/hotkeys.ts b/tgui/packages/tgui/hotkeys.ts index 1358ff25101a..61113f737d72 100644 --- a/tgui/packages/tgui/hotkeys.ts +++ b/tgui/packages/tgui/hotkeys.ts @@ -5,6 +5,7 @@ */ import * as keycodes from 'common/keycodes'; + import { globalEvents, KeyEvent } from './events'; import { createLogger } from './logging'; diff --git a/tgui/packages/tgui/index.js b/tgui/packages/tgui/index.js index bd6f3f53023d..dc17b56cca61 100644 --- a/tgui/packages/tgui/index.js +++ b/tgui/packages/tgui/index.js @@ -21,11 +21,12 @@ import './styles/themes/clockcult.scss'; import { perf } from 'common/perf'; import { setupHotReloading } from 'tgui-dev-server/link/client.cjs'; + +import { setupGlobalEvents } from './events'; import { setupHotKeys } from './hotkeys'; import { captureExternalLinks } from './links'; import { createRenderer } from './renderer'; import { configureStore, StoreProvider } from './store'; -import { setupGlobalEvents } from './events'; perf.mark('inception', window.performance?.timing?.navigationStart); perf.mark('init'); diff --git a/tgui/packages/tgui/interfaces/AdventureBrowser.tsx b/tgui/packages/tgui/interfaces/AdventureBrowser.tsx index d713f46ac61d..8739e2591e7b 100644 --- a/tgui/packages/tgui/interfaces/AdventureBrowser.tsx +++ b/tgui/packages/tgui/interfaces/AdventureBrowser.tsx @@ -1,8 +1,8 @@ import { useBackend, useLocalState } from '../backend'; -import { Button, LabeledList, Section, Box, NoticeBox, Table } from '../components'; +import { Box, Button, LabeledList, NoticeBox, Section, Table } from '../components'; +import { formatTime } from '../format'; import { Window } from '../layouts'; import { AdventureDataProvider, AdventureScreen } from './ExodroneConsole'; -import { formatTime } from '../format'; type Adventure = { ref: string; diff --git a/tgui/packages/tgui/interfaces/AirAlarm.js b/tgui/packages/tgui/interfaces/AirAlarm.js index 5d5bf0e0f458..fdf731569a2c 100644 --- a/tgui/packages/tgui/interfaces/AirAlarm.js +++ b/tgui/packages/tgui/interfaces/AirAlarm.js @@ -1,5 +1,6 @@ import { toFixed } from 'common/math'; import { Fragment } from 'inferno'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, LabeledList, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/AlertModal.tsx b/tgui/packages/tgui/interfaces/AlertModal.tsx index 965faf68380a..ef99e91b4407 100644 --- a/tgui/packages/tgui/interfaces/AlertModal.tsx +++ b/tgui/packages/tgui/interfaces/AlertModal.tsx @@ -1,8 +1,8 @@ -import { Loader } from './common/Loader'; -import { useBackend, useLocalState } from '../backend'; import { KEY_ENTER, KEY_ESCAPE, KEY_LEFT, KEY_RIGHT, KEY_SPACE, KEY_TAB } from '../../common/keycodes'; +import { useBackend, useLocalState } from '../backend'; import { Autofocus, Box, Button, Flex, Section, Stack } from '../components'; import { Window } from '../layouts'; +import { Loader } from './common/Loader'; type AlertModalData = { autofocus: boolean; diff --git a/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx b/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx index 8e88760ab2c8..1d9fecc6ec27 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx @@ -1,6 +1,7 @@ -import { useBackend, useLocalState } from '../backend'; -import { Blink, BlockQuote, Box, Dimmer, Icon, Section, Stack } from '../components'; import { BooleanLike } from 'common/react'; + +import { useBackend } from '../backend'; +import { Icon, Section, Stack } from '../components'; import { Window } from '../layouts'; type Objective = { diff --git a/tgui/packages/tgui/interfaces/AntagInfoClockwork.tsx b/tgui/packages/tgui/interfaces/AntagInfoClockwork.tsx index 2d03d8f74dce..cd4791c22820 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoClockwork.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoClockwork.tsx @@ -1,4 +1,5 @@ import { BooleanLike } from 'common/react'; + import { useBackend } from '../backend'; import { Section, Stack } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx b/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx index 04a93ccb46e1..9241b3403e76 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx @@ -1,7 +1,8 @@ -import { useBackend, useLocalState } from '../backend'; +import { BooleanLike } from 'common/react'; import { multiline } from 'common/string'; + +import { useBackend } from '../backend'; import { BlockQuote, Button, Dimmer, Section, Stack } from '../components'; -import { BooleanLike } from 'common/react'; import { Window } from '../layouts'; const allystyle = { diff --git a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx index 046030a7bc5f..4186f581bbc4 100644 --- a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx +++ b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx @@ -1,6 +1,7 @@ -import { useBackend, useLocalState } from '../backend'; -import { Blink, BlockQuote, Box, Dimmer, Icon, Section, Stack } from '../components'; import { BooleanLike } from 'common/react'; + +import { useBackend } from '../backend'; +import { Section, Stack } from '../components'; import { Window } from '../layouts'; const teleportstyle = { diff --git a/tgui/packages/tgui/interfaces/ApcControl.js b/tgui/packages/tgui/interfaces/ApcControl.js index 0005476d4a87..b2ff078a8200 100644 --- a/tgui/packages/tgui/interfaces/ApcControl.js +++ b/tgui/packages/tgui/interfaces/ApcControl.js @@ -1,8 +1,9 @@ import { map, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { pureComponentHooks } from 'common/react'; + import { useBackend, useLocalState } from '../backend'; -import { Box, Button, Dimmer, Icon, Table, Tabs, Stack, Section } from '../components'; +import { Box, Button, Dimmer, Icon, Section, Stack, Table, Tabs } from '../components'; import { Window } from '../layouts'; import { AreaCharge, powerRank } from './PowerMonitor'; diff --git a/tgui/packages/tgui/interfaces/Aquarium.js b/tgui/packages/tgui/interfaces/Aquarium.js index a9049b554b1b..5758f8015360 100644 --- a/tgui/packages/tgui/interfaces/Aquarium.js +++ b/tgui/packages/tgui/interfaces/Aquarium.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Button, Dropdown, Flex, Knob, LabeledControls, Section } from '../components'; +import { Button, Flex, Knob, LabeledControls, Section } from '../components'; import { Window } from '../layouts'; export const Aquarium = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/AtmosControlConsole.js b/tgui/packages/tgui/interfaces/AtmosControlConsole.js index 47b5fac47de5..da918458efb6 100644 --- a/tgui/packages/tgui/interfaces/AtmosControlConsole.js +++ b/tgui/packages/tgui/interfaces/AtmosControlConsole.js @@ -1,5 +1,6 @@ import { map } from 'common/collections'; import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Button, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/AtmosControlPanel.js b/tgui/packages/tgui/interfaces/AtmosControlPanel.js index 6982fd065562..c9d4b5815c64 100644 --- a/tgui/packages/tgui/interfaces/AtmosControlPanel.js +++ b/tgui/packages/tgui/interfaces/AtmosControlPanel.js @@ -1,5 +1,6 @@ import { map, sortBy } from 'common/collections'; import { flow } from 'common/fp'; + import { useBackend } from '../backend'; import { Box, Button, Flex, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Autolathe.js b/tgui/packages/tgui/interfaces/Autolathe.js index 2ed62eb52ffa..9bf772773bfb 100644 --- a/tgui/packages/tgui/interfaces/Autolathe.js +++ b/tgui/packages/tgui/interfaces/Autolathe.js @@ -1,7 +1,8 @@ +import { capitalize } from "common/string"; + import { useBackend, useLocalState } from '../backend'; -import { Button, LabeledList, Section, ProgressBar, Flex, Box, Table, Collapsible, Input, Dimmer, Icon } from '../components'; +import { Box, Button, Collapsible, Dimmer, Flex, Icon, Input, LabeledList, ProgressBar, Section, Table } from '../components'; import { Window } from '../layouts'; -import { capitalize } from "common/string"; export const Autolathe = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/AutomatedAnnouncement.js b/tgui/packages/tgui/interfaces/AutomatedAnnouncement.js index 0baea4de97b5..e34506ff18f0 100644 --- a/tgui/packages/tgui/interfaces/AutomatedAnnouncement.js +++ b/tgui/packages/tgui/interfaces/AutomatedAnnouncement.js @@ -1,4 +1,5 @@ import { multiline } from 'common/string'; + import { useBackend } from '../backend'; import { Button, Input, LabeledList, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Biogenerator.js b/tgui/packages/tgui/interfaces/Biogenerator.js index e4fae18abb0c..4486d228448c 100644 --- a/tgui/packages/tgui/interfaces/Biogenerator.js +++ b/tgui/packages/tgui/interfaces/Biogenerator.js @@ -1,5 +1,6 @@ import { classes } from 'common/react'; import { createSearch } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Dimmer, Flex, Icon, Input, NoticeBox, NumberInput, Section, Table, Tabs } from '../components'; import { formatMoney } from '../format'; diff --git a/tgui/packages/tgui/interfaces/BluespaceSender.js b/tgui/packages/tgui/interfaces/BluespaceSender.js index d1deed2a9064..88a1c4bf533f 100644 --- a/tgui/packages/tgui/interfaces/BluespaceSender.js +++ b/tgui/packages/tgui/interfaces/BluespaceSender.js @@ -1,8 +1,9 @@ import { filter, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; -import { Button, Divider, LabeledList, NumberInput, ProgressBar, Section, Stack, Box, AnimatedNumber } from '../components'; +import { Box, Button, Divider, LabeledList, NumberInput, ProgressBar, Section, Stack } from '../components'; import { getGasColor, getGasLabel } from '../constants'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/BluespaceVendor.js b/tgui/packages/tgui/interfaces/BluespaceVendor.js index 7491bc7a1db4..bbdacfbb80b8 100644 --- a/tgui/packages/tgui/interfaces/BluespaceVendor.js +++ b/tgui/packages/tgui/interfaces/BluespaceVendor.js @@ -2,8 +2,9 @@ import { filter, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { toFixed } from 'common/math'; import { multiline } from 'common/string'; + import { useBackend } from '../backend'; -import { Button, Divider, LabeledList, NumberInput, ProgressBar, Section, Stack, Box } from '../components'; +import { Button, Divider, LabeledList, NumberInput, ProgressBar, Section, Stack } from '../components'; import { getGasColor, getGasLabel } from '../constants'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/CameraConsole.js b/tgui/packages/tgui/interfaces/CameraConsole.js index c087e10adc29..d35aed5175bc 100644 --- a/tgui/packages/tgui/interfaces/CameraConsole.js +++ b/tgui/packages/tgui/interfaces/CameraConsole.js @@ -2,6 +2,7 @@ import { filter, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { classes } from 'common/react'; import { createSearch } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; import { Button, ByondUi, Flex, Input, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Canister.js b/tgui/packages/tgui/interfaces/Canister.js index 608ba72e26be..97a300e425d1 100644 --- a/tgui/packages/tgui/interfaces/Canister.js +++ b/tgui/packages/tgui/interfaces/Canister.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Box, Button, Flex, Icon, Knob, LabeledControls, LabeledList, RoundGauge, Section, Tooltip } from '../components'; import { formatSiUnit } from '../format'; diff --git a/tgui/packages/tgui/interfaces/Canvas.js b/tgui/packages/tgui/interfaces/Canvas.js index 4a73fc60558e..6e4ad8766aee 100644 --- a/tgui/packages/tgui/interfaces/Canvas.js +++ b/tgui/packages/tgui/interfaces/Canvas.js @@ -1,4 +1,5 @@ import { Component, createRef } from 'inferno'; + import { useBackend } from '../backend'; import { Box, Button } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Cargo.js b/tgui/packages/tgui/interfaces/Cargo.js index 172e21e7f6c1..b75fc45cbdcd 100644 --- a/tgui/packages/tgui/interfaces/Cargo.js +++ b/tgui/packages/tgui/interfaces/Cargo.js @@ -1,5 +1,6 @@ import { toArray } from 'common/collections'; import { Fragment } from 'inferno'; + import { useBackend, useSharedState } from '../backend'; import { AnimatedNumber, Box, Button, Flex, LabeledList, Section, Table, Tabs } from '../components'; import { formatMoney } from '../format'; diff --git a/tgui/packages/tgui/interfaces/CellularEmporium.tsx b/tgui/packages/tgui/interfaces/CellularEmporium.tsx index 246e93096089..0031ea47bb42 100644 --- a/tgui/packages/tgui/interfaces/CellularEmporium.tsx +++ b/tgui/packages/tgui/interfaces/CellularEmporium.tsx @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Button, Section, Icon, Stack, LabeledList, Box, NoticeBox } from '../components'; +import { Box, Button, Icon, LabeledList, NoticeBox, Section, Stack } from '../components'; import { Window } from '../layouts'; type CellularEmporiumContext = { diff --git a/tgui/packages/tgui/interfaces/CentcomPodLauncher.js b/tgui/packages/tgui/interfaces/CentcomPodLauncher.js index 84811a25eb9a..168d9d9576e0 100644 --- a/tgui/packages/tgui/interfaces/CentcomPodLauncher.js +++ b/tgui/packages/tgui/interfaces/CentcomPodLauncher.js @@ -4,6 +4,7 @@ import { storage } from 'common/storage'; import { multiline } from 'common/string'; import { createUuid } from 'common/uuid'; import { Component, Fragment } from 'inferno'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, ByondUi, Divider, Input, Knob, LabeledControls, NumberInput, Section, Stack } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ChameleonCard.js b/tgui/packages/tgui/interfaces/ChameleonCard.js index 9733ac19b08b..0cb5c6eb20dd 100644 --- a/tgui/packages/tgui/interfaces/ChameleonCard.js +++ b/tgui/packages/tgui/interfaces/ChameleonCard.js @@ -1,6 +1,6 @@ import { useBackend } from '../backend'; -import { AccessList } from './common/AccessList'; import { Window } from '../layouts'; +import { AccessList } from './common/AccessList'; export const ChameleonCard = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/Changelog.js b/tgui/packages/tgui/interfaces/Changelog.js index 6c240c74e28a..41b91809c285 100644 --- a/tgui/packages/tgui/interfaces/Changelog.js +++ b/tgui/packages/tgui/interfaces/Changelog.js @@ -1,6 +1,10 @@ import { classes } from 'common/react'; -import { useBackend } from '../backend'; +import dateformat from 'dateformat'; import { Component, Fragment } from 'inferno'; +import yaml from 'js-yaml'; + +import { resolveAsset } from '../assets'; +import { useBackend } from '../backend'; import { Box, Button, @@ -11,9 +15,6 @@ import { Table, } from '../components'; import { Window } from '../layouts'; -import { resolveAsset } from '../assets'; -import dateformat from 'dateformat'; -import yaml from 'js-yaml'; const icons = { bugfix: { icon: 'bug', color: 'green' }, diff --git a/tgui/packages/tgui/interfaces/CharacterDirectory.js b/tgui/packages/tgui/interfaces/CharacterDirectory.js index a1664eadb2b8..0f9e01b8305b 100644 --- a/tgui/packages/tgui/interfaces/CharacterDirectory.js +++ b/tgui/packages/tgui/interfaces/CharacterDirectory.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Icon, LabeledList, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js b/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js index 7171d42ed8a7..18be6dc9ff81 100644 --- a/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js +++ b/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend } from '../backend'; import { AnimatedNumber, Box, Button, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.js b/tgui/packages/tgui/interfaces/ChemDispenser.js index 0004cdbdf2c4..6e790ab28068 100644 --- a/tgui/packages/tgui/interfaces/ChemDispenser.js +++ b/tgui/packages/tgui/interfaces/ChemDispenser.js @@ -1,8 +1,9 @@ import { toFixed } from 'common/math'; import { toTitleCase } from 'common/string'; import { Fragment } from 'inferno'; + import { useBackend, useLocalState } from '../backend'; -import { AnimatedNumber, Box, Button, Icon, LabeledList, ProgressBar, Section, Table, NumberInput } from '../components'; +import { AnimatedNumber, Box, Button, Icon, LabeledList, NumberInput, ProgressBar, Section, Table } from '../components'; import { Window } from '../layouts'; export const ChemDispenser = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/ChemFilter.js b/tgui/packages/tgui/interfaces/ChemFilter.js index a48215a5a5f2..5cc2726575e8 100644 --- a/tgui/packages/tgui/interfaces/ChemFilter.js +++ b/tgui/packages/tgui/interfaces/ChemFilter.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend, useLocalState } from '../backend'; import { Button, Flex, Input, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ChemHeater.js b/tgui/packages/tgui/interfaces/ChemHeater.js index 0c173407603d..82a442351bd7 100644 --- a/tgui/packages/tgui/interfaces/ChemHeater.js +++ b/tgui/packages/tgui/interfaces/ChemHeater.js @@ -1,5 +1,6 @@ import { round, toFixed } from 'common/math'; import { Fragment } from 'inferno'; + import { useBackend } from '../backend'; import { AnimatedNumber, Box, Button, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ChemMaster.js b/tgui/packages/tgui/interfaces/ChemMaster.js index 450518288ce9..53216b55513d 100644 --- a/tgui/packages/tgui/interfaces/ChemMaster.js +++ b/tgui/packages/tgui/interfaces/ChemMaster.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend, useSharedState } from '../backend'; import { AnimatedNumber, Box, Button, ColorBox, LabeledList, NumberInput, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ChemReactionChamber.js b/tgui/packages/tgui/interfaces/ChemReactionChamber.js index 0507686201c4..60bb3c69c230 100644 --- a/tgui/packages/tgui/interfaces/ChemReactionChamber.js +++ b/tgui/packages/tgui/interfaces/ChemReactionChamber.js @@ -1,5 +1,6 @@ import { map } from 'common/collections'; import { classes } from 'common/react'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Input, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ChemRecipeDebug.js b/tgui/packages/tgui/interfaces/ChemRecipeDebug.js index 5238fc5338ad..369d856123ae 100644 --- a/tgui/packages/tgui/interfaces/ChemRecipeDebug.js +++ b/tgui/packages/tgui/interfaces/ChemRecipeDebug.js @@ -1,4 +1,5 @@ import { round } from 'common/math'; + import { useBackend } from '../backend'; import { AnimatedNumber, Box, Button, Flex, LabeledList, NumberInput, ProgressBar, RoundGauge, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ChemSplitter.js b/tgui/packages/tgui/interfaces/ChemSplitter.js index b45d6bbdba29..a2cdad667637 100644 --- a/tgui/packages/tgui/interfaces/ChemSplitter.js +++ b/tgui/packages/tgui/interfaces/ChemSplitter.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ChemSynthesizer.js b/tgui/packages/tgui/interfaces/ChemSynthesizer.js index 536173f0395c..caf9861bfa2d 100644 --- a/tgui/packages/tgui/interfaces/ChemSynthesizer.js +++ b/tgui/packages/tgui/interfaces/ChemSynthesizer.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Box, Button, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/CircuitAdminPanel.tsx b/tgui/packages/tgui/interfaces/CircuitAdminPanel.tsx index 814a147fc107..74dd4fdb85c6 100644 --- a/tgui/packages/tgui/interfaces/CircuitAdminPanel.tsx +++ b/tgui/packages/tgui/interfaces/CircuitAdminPanel.tsx @@ -1,4 +1,5 @@ import { BooleanLike } from "common/react"; + import { useBackend } from "../backend"; import { Button, Table } from "../components"; import { Window } from "../layouts"; diff --git a/tgui/packages/tgui/interfaces/CircuitModule.js b/tgui/packages/tgui/interfaces/CircuitModule.js index 8636906c99d3..8b1089642591 100644 --- a/tgui/packages/tgui/interfaces/CircuitModule.js +++ b/tgui/packages/tgui/interfaces/CircuitModule.js @@ -1,5 +1,5 @@ import { useBackend } from "../backend"; -import { Stack, Section, Input, Button, Dropdown } from "../components"; +import { Button, Dropdown, Input, Section, Stack } from "../components"; import { Window } from "../layouts"; export const CircuitModule = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/Clipboard.js b/tgui/packages/tgui/interfaces/Clipboard.js index e6e377e6b143..b170ca9fca68 100644 --- a/tgui/packages/tgui/interfaces/Clipboard.js +++ b/tgui/packages/tgui/interfaces/Clipboard.js @@ -3,8 +3,8 @@ import { Box, Button, Divider, - LabeledList, Flex, + LabeledList, Section, } from "../components"; import { Window } from "../layouts"; diff --git a/tgui/packages/tgui/interfaces/ClockworkSlab.js b/tgui/packages/tgui/interfaces/ClockworkSlab.js index 47c8069ade68..d0ce5a38f578 100644 --- a/tgui/packages/tgui/interfaces/ClockworkSlab.js +++ b/tgui/packages/tgui/interfaces/ClockworkSlab.js @@ -6,11 +6,12 @@ * @license MIT */ -import { useBackend, useLocalState, useSharedState } from '../backend'; -import { createSearch } from 'common/string'; import { map } from 'common/collections'; -import { Section, Tabs, Table, Button, Box, NoticeBox, Divider, Input } from '../components'; +import { createSearch } from 'common/string'; import { Fragment } from 'inferno'; + +import { useBackend, useLocalState, useSharedState } from '../backend'; +import { Box, Button, Divider, Input, NoticeBox, Section, Table, Tabs } from '../components'; import { Window } from '../layouts'; const MAX_SEARCH_RESULTS = 25; diff --git a/tgui/packages/tgui/interfaces/CloningConsole.js b/tgui/packages/tgui/interfaces/CloningConsole.js index b37df5fd9aa0..5f8a50080519 100644 --- a/tgui/packages/tgui/interfaces/CloningConsole.js +++ b/tgui/packages/tgui/interfaces/CloningConsole.js @@ -1,4 +1,3 @@ -import { map } from 'common/collections'; import { useBackend } from '../backend'; import { Box, Button, Collapsible, NoticeBox, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Colormate.js b/tgui/packages/tgui/interfaces/Colormate.js index 02810f29435b..0013d7f12ace 100644 --- a/tgui/packages/tgui/interfaces/Colormate.js +++ b/tgui/packages/tgui/interfaces/Colormate.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Button, Icon, NoticeBox, NumberInput, Section, Table, Tabs, Slider } from '../components'; +import { Button, Icon, NoticeBox, NumberInput, Section, Slider, Table, Tabs } from '../components'; import { Window } from '../layouts'; export const Colormate = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/CommunicationsConsole.js b/tgui/packages/tgui/interfaces/CommunicationsConsole.js index 7ab796049ed5..afac8f835bac 100644 --- a/tgui/packages/tgui/interfaces/CommunicationsConsole.js +++ b/tgui/packages/tgui/interfaces/CommunicationsConsole.js @@ -1,10 +1,11 @@ import { sortBy } from "common/collections"; import { capitalize } from "common/string"; + import { useBackend, useLocalState } from "../backend"; -import { Blink, Box, Button, Dimmer, Flex, Icon, Input, Modal, Section, TextArea, LabeledList } from "../components"; +import { Blink, Box, Button, Dimmer, Flex, Icon, Input, LabeledList, Modal, Section, TextArea } from "../components"; +import { formatMoney } from '../format'; import { Window } from "../layouts"; import { sanitizeText } from "../sanitize"; -import { formatMoney } from '../format'; const STATE_BUYING_SHUTTLE = "buying_shuttle"; const STATE_CHANGING_STATUS = "changing_status"; diff --git a/tgui/packages/tgui/interfaces/ComponentPrinter.tsx b/tgui/packages/tgui/interfaces/ComponentPrinter.tsx index 3a0c0a876e86..c0363d082755 100644 --- a/tgui/packages/tgui/interfaces/ComponentPrinter.tsx +++ b/tgui/packages/tgui/interfaces/ComponentPrinter.tsx @@ -1,8 +1,9 @@ import { createSearch } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; -import { Material, MaterialAmount, MaterialFormatting, Materials, MATERIAL_KEYS } from './common/Materials'; -import { Window } from '../layouts'; import { Box, Button, Input, Section, Stack, Tabs } from '../components'; +import { Window } from '../layouts'; +import { Material, MATERIAL_KEYS, MaterialAmount, MaterialFormatting, Materials } from './common/Materials'; const CATEGORY_ALL = "All"; diff --git a/tgui/packages/tgui/interfaces/ComputerFabricator.js b/tgui/packages/tgui/interfaces/ComputerFabricator.js index aa00e084a977..1e8eb204a1c7 100644 --- a/tgui/packages/tgui/interfaces/ComputerFabricator.js +++ b/tgui/packages/tgui/interfaces/ComputerFabricator.js @@ -1,4 +1,5 @@ import { multiline } from 'common/string'; + import { useBackend } from '../backend'; import { Box, Button, Grid, Section, Table, Tooltip } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/CrewConsole.js b/tgui/packages/tgui/interfaces/CrewConsole.js index ec9ec12ed6e5..1fbc9a344169 100644 --- a/tgui/packages/tgui/interfaces/CrewConsole.js +++ b/tgui/packages/tgui/interfaces/CrewConsole.js @@ -1,4 +1,3 @@ -import { sortBy } from 'common/collections'; import { useBackend } from '../backend'; import { Box, Button, ColorBox, Section, Table } from '../components'; import { COLORS } from '../constants'; diff --git a/tgui/packages/tgui/interfaces/CrewManifest.js b/tgui/packages/tgui/interfaces/CrewManifest.js index 21ab5eece508..9b7c03316de6 100644 --- a/tgui/packages/tgui/interfaces/CrewManifest.js +++ b/tgui/packages/tgui/interfaces/CrewManifest.js @@ -1,4 +1,5 @@ import { classes } from 'common/react'; + import { useBackend } from "../backend"; import { Icon, Section, Table, Tooltip } from "../components"; import { Window } from "../layouts"; diff --git a/tgui/packages/tgui/interfaces/Cryo.js b/tgui/packages/tgui/interfaces/Cryo.js index 9c3fcd7967bd..8682a93c6e33 100644 --- a/tgui/packages/tgui/interfaces/Cryo.js +++ b/tgui/packages/tgui/interfaces/Cryo.js @@ -1,7 +1,7 @@ import { useBackend } from '../backend'; import { AnimatedNumber, Button, LabeledList, ProgressBar, Section } from '../components'; -import { BeakerContents } from './common/BeakerContents'; import { Window } from '../layouts'; +import { BeakerContents } from './common/BeakerContents'; const damageTypes = [ { diff --git a/tgui/packages/tgui/interfaces/CryopodConsole.js b/tgui/packages/tgui/interfaces/CryopodConsole.js index d0108e8c7c71..988a08856015 100644 --- a/tgui/packages/tgui/interfaces/CryopodConsole.js +++ b/tgui/packages/tgui/interfaces/CryopodConsole.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Box, Button, LabeledList, NoticeBox, Section, Stack } from '../components'; +import { Button, LabeledList, NoticeBox, Section, Stack } from '../components'; import { Window } from '../layouts'; export const CryopodConsole = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/Crystallizer.js b/tgui/packages/tgui/interfaces/Crystallizer.js index 2656720ca9d7..ff343bc52060 100644 --- a/tgui/packages/tgui/interfaces/Crystallizer.js +++ b/tgui/packages/tgui/interfaces/Crystallizer.js @@ -1,7 +1,8 @@ +import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; -import { AnimatedNumber, Button, Flex, Input, LabeledList, ProgressBar, Section, Table, NumberInput, Box } from '../components'; +import { Box, Button, LabeledList, NumberInput, ProgressBar, Section } from '../components'; import { getGasColor, getGasLabel } from '../constants'; -import { toFixed } from 'common/math'; import { Window } from '../layouts'; const logScale = value => Math.log2(16 + Math.max(0, value)) - 4; diff --git a/tgui/packages/tgui/interfaces/CyborgBootDebug.js b/tgui/packages/tgui/interfaces/CyborgBootDebug.js index f4bfe2ae0bc7..0fb3e58eab37 100644 --- a/tgui/packages/tgui/interfaces/CyborgBootDebug.js +++ b/tgui/packages/tgui/interfaces/CyborgBootDebug.js @@ -1,4 +1,5 @@ import { multiline } from 'common/string'; + import { useBackend } from '../backend'; import { Button, Input, LabeledList, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/DnaConsole.js b/tgui/packages/tgui/interfaces/DnaConsole.js index 06cb2c61d9ea..1a3a16d0a745 100644 --- a/tgui/packages/tgui/interfaces/DnaConsole.js +++ b/tgui/packages/tgui/interfaces/DnaConsole.js @@ -3,6 +3,7 @@ import { flow } from 'common/fp'; import { classes } from 'common/react'; import { capitalize } from 'common/string'; import { Fragment } from 'inferno'; + import { resolveAsset } from '../assets'; import { useBackend } from '../backend'; import { Box, Button, Collapsible, Dimmer, Divider, Dropdown, Flex, Icon, LabeledList, NumberInput, ProgressBar, Section } from '../components'; diff --git a/tgui/packages/tgui/interfaces/DogborgSleeper.js b/tgui/packages/tgui/interfaces/DogborgSleeper.js index ddad8fe0efd6..240f0e8e5ba8 100644 --- a/tgui/packages/tgui/interfaces/DogborgSleeper.js +++ b/tgui/packages/tgui/interfaces/DogborgSleeper.js @@ -1,6 +1,7 @@ -import { useBackend } from '../backend'; -import { Box, Section, LabeledList, Button, ProgressBar, NoticeBox } from '../components'; import { Fragment } from 'inferno'; + +import { useBackend } from '../backend'; +import { Box, Button, LabeledList, NoticeBox, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; const damageTypes = [ diff --git a/tgui/packages/tgui/interfaces/EightBallVote.js b/tgui/packages/tgui/interfaces/EightBallVote.js index f8ce25f6f872..accddc73a5c9 100644 --- a/tgui/packages/tgui/interfaces/EightBallVote.js +++ b/tgui/packages/tgui/interfaces/EightBallVote.js @@ -1,6 +1,7 @@ -import { useBackend } from '../backend'; -import { Box, Button, Grid, Section, NoticeBox } from '../components'; import { toTitleCase } from 'common/string'; + +import { useBackend } from '../backend'; +import { Box, Button, Grid, NoticeBox, Section } from '../components'; import { Window } from '../layouts'; export const EightBallVote = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/Electropack.js b/tgui/packages/tgui/interfaces/Electropack.js index 5778048f456f..b9a4907522e4 100644 --- a/tgui/packages/tgui/interfaces/Electropack.js +++ b/tgui/packages/tgui/interfaces/Electropack.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Button, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/EngravedMessage.js b/tgui/packages/tgui/interfaces/EngravedMessage.js index 89c948b493a7..6ab1de8973f9 100644 --- a/tgui/packages/tgui/interfaces/EngravedMessage.js +++ b/tgui/packages/tgui/interfaces/EngravedMessage.js @@ -1,4 +1,5 @@ import { decodeHtmlEntities } from 'common/string'; + import { useBackend } from '../backend'; import { Box, Button, LabeledList, Section, Stack } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ExodroneConsole.tsx b/tgui/packages/tgui/interfaces/ExodroneConsole.tsx index b70fc369200b..53f37f7fc0bb 100644 --- a/tgui/packages/tgui/interfaces/ExodroneConsole.tsx +++ b/tgui/packages/tgui/interfaces/ExodroneConsole.tsx @@ -1,11 +1,12 @@ +import { capitalize } from 'common/string'; +import { Fragment } from 'inferno'; + +import { resolveAsset } from '../assets'; +import nt_logo from '../assets/bg-nanotrasen.svg'; import { useBackend, useLocalState } from '../backend'; import { BlockQuote, Box, Button, Dimmer, Icon, LabeledList, Modal, ProgressBar, Section, Stack } from '../components'; -import { Window } from '../layouts'; -import { resolveAsset } from '../assets'; import { formatTime } from '../format'; -import { capitalize } from 'common/string'; -import nt_logo from '../assets/bg-nanotrasen.svg'; -import { Fragment } from 'inferno'; +import { Window } from '../layouts'; type ExplorationEventData = { name: string, diff --git a/tgui/packages/tgui/interfaces/ExoscannerConsole.tsx b/tgui/packages/tgui/interfaces/ExoscannerConsole.tsx index af165ce02c45..1442cae6e00f 100644 --- a/tgui/packages/tgui/interfaces/ExoscannerConsole.tsx +++ b/tgui/packages/tgui/interfaces/ExoscannerConsole.tsx @@ -1,7 +1,7 @@ import { useBackend } from '../backend'; -import { BlockQuote, Box, Button, Flex, Icon, Modal, Section, LabeledList, NoticeBox, Stack } from '../components'; -import { Window } from '../layouts'; +import { BlockQuote, Box, Button, Flex, Icon, LabeledList, Modal, NoticeBox, Section, Stack } from '../components'; import { formatTime } from '../format'; +import { Window } from '../layouts'; type SiteData = { diff --git a/tgui/packages/tgui/interfaces/ExosuitControlConsole.js b/tgui/packages/tgui/interfaces/ExosuitControlConsole.js index 18d25a4c662d..7080242ae90f 100644 --- a/tgui/packages/tgui/interfaces/ExosuitControlConsole.js +++ b/tgui/packages/tgui/interfaces/ExosuitControlConsole.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { AnimatedNumber, Box, Button, LabeledList, NoticeBox, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ExosuitFabricator.js b/tgui/packages/tgui/interfaces/ExosuitFabricator.js index cc2a685b566c..5657257dce16 100644 --- a/tgui/packages/tgui/interfaces/ExosuitFabricator.js +++ b/tgui/packages/tgui/interfaces/ExosuitFabricator.js @@ -1,11 +1,12 @@ import { uniqBy } from 'common/collections'; import { createSearch } from 'common/string'; import { Fragment } from 'inferno'; + import { useBackend, useSharedState } from '../backend'; import { Box, Button, Icon, Input, ProgressBar, Section, Stack } from '../components'; -import { Materials, MaterialAmount, MaterialFormatting } from './common/Materials'; import { formatMoney } from '../format'; import { Window } from '../layouts'; +import { MaterialAmount, MaterialFormatting, Materials } from './common/Materials'; const COLOR_NONE = 0; const COLOR_AVERAGE = 1; diff --git a/tgui/packages/tgui/interfaces/ExperimentConfigure.js b/tgui/packages/tgui/interfaces/ExperimentConfigure.js index 22993558c1fe..289b6581100d 100644 --- a/tgui/packages/tgui/interfaces/ExperimentConfigure.js +++ b/tgui/packages/tgui/interfaces/ExperimentConfigure.js @@ -1,8 +1,9 @@ -import { Window } from '../layouts'; -import { useBackend } from '../backend'; -import { Section, Box, Button, Flex, Icon, LabeledList, Table, Tooltip } from '../components'; import { sortBy } from 'common/collections'; +import { useBackend } from '../backend'; +import { Box, Button, Flex, Icon, LabeledList, Section, Table, Tooltip } from '../components'; +import { Window } from '../layouts'; + const ExperimentStages = props => { return ( diff --git a/tgui/packages/tgui/interfaces/Filteriffic.js b/tgui/packages/tgui/interfaces/Filteriffic.js index cf93763471f2..d91e9197bb8a 100644 --- a/tgui/packages/tgui/interfaces/Filteriffic.js +++ b/tgui/packages/tgui/interfaces/Filteriffic.js @@ -1,5 +1,6 @@ import { map } from 'common/collections'; import { toFixed } from 'common/math'; + import { numberOfDecimalDigits } from '../../common/math'; import { useBackend, useLocalState } from '../backend'; import { Box, Button, Collapsible, ColorBox, Dropdown, Input, LabeledList, NoticeBox, NumberInput, Section } from '../components'; diff --git a/tgui/packages/tgui/interfaces/FishCatalog.js b/tgui/packages/tgui/interfaces/FishCatalog.js index 33e6544a5c4c..8c1712d03d26 100644 --- a/tgui/packages/tgui/interfaces/FishCatalog.js +++ b/tgui/packages/tgui/interfaces/FishCatalog.js @@ -1,10 +1,11 @@ import { sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { classes } from 'common/react'; +import { capitalize } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, LabeledList, Section, Stack } from '../components'; import { Window } from '../layouts'; -import { capitalize } from 'common/string'; export const FishCatalog = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/ForbiddenLore.js b/tgui/packages/tgui/interfaces/ForbiddenLore.js index 52699fc78099..fdd2896a36df 100644 --- a/tgui/packages/tgui/interfaces/ForbiddenLore.js +++ b/tgui/packages/tgui/interfaces/ForbiddenLore.js @@ -1,5 +1,6 @@ import { sortBy } from 'common/collections'; import { flow } from 'common/fp'; + import { useBackend } from '../backend'; import { Box, Button, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ForceEvent.tsx b/tgui/packages/tgui/interfaces/ForceEvent.tsx index a486f5248204..1c1b8a732ac5 100644 --- a/tgui/packages/tgui/interfaces/ForceEvent.tsx +++ b/tgui/packages/tgui/interfaces/ForceEvent.tsx @@ -1,6 +1,7 @@ import { paginate } from 'common/collections'; + import { useBackend, useLocalState } from '../backend'; -import { Stack, Button, Icon, Input, Section, Tabs } from '../components'; +import { Button, Icon, Input, Section, Stack, Tabs } from '../components'; import { Window } from '../layouts'; const CATEGORY_PAGE_ITEMS = 4; diff --git a/tgui/packages/tgui/interfaces/GenitalArousalPermission.tsx b/tgui/packages/tgui/interfaces/GenitalArousalPermission.tsx index d3dcb5ee2474..89db0cf1f7db 100644 --- a/tgui/packages/tgui/interfaces/GenitalArousalPermission.tsx +++ b/tgui/packages/tgui/interfaces/GenitalArousalPermission.tsx @@ -1,6 +1,6 @@ /* eslint-disable indent */ import { useBackend } from "../backend"; -import { Button, Flex, Section, Tooltip, Box } from "../components"; +import { Box, Button, Flex, Section, Tooltip } from "../components"; import { Window } from "../layouts"; type ChastityHypno = { diff --git a/tgui/packages/tgui/interfaces/GenitalConfig.tsx b/tgui/packages/tgui/interfaces/GenitalConfig.tsx index 6cb9d1cd1457..3099558f5ddd 100644 --- a/tgui/packages/tgui/interfaces/GenitalConfig.tsx +++ b/tgui/packages/tgui/interfaces/GenitalConfig.tsx @@ -2,8 +2,9 @@ import { filter } from 'common/collections'; import { flow } from 'common/fp'; import { createSearch } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; -import { BlockQuote, Button, LabeledList, Icon, NumberInput, Input, Section, Table, Tabs, Stack, ProgressBar, Divider } from '../components'; +import { Button, Input, NumberInput, ProgressBar, Section, Stack, Table, Tabs } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Gps.js b/tgui/packages/tgui/interfaces/Gps.js index ebc21a7a519d..a7372b1b9f53 100644 --- a/tgui/packages/tgui/interfaces/Gps.js +++ b/tgui/packages/tgui/interfaces/Gps.js @@ -2,6 +2,7 @@ import { map, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { clamp } from 'common/math'; import { vecLength, vecSubtract } from 'common/vector'; + import { useBackend } from '../backend'; import { Box, Button, Icon, LabeledList, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/GreyscaleModifyMenu.tsx b/tgui/packages/tgui/interfaces/GreyscaleModifyMenu.tsx index b09b7eb07ee7..45ca49f87fe0 100644 --- a/tgui/packages/tgui/interfaces/GreyscaleModifyMenu.tsx +++ b/tgui/packages/tgui/interfaces/GreyscaleModifyMenu.tsx @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Box, Button, ColorBox, Flex, Stack, Icon, Input, LabeledList, Section, Table, Divider } from '../components'; +import { Box, Button, ColorBox, Divider, Flex, Icon, Input, LabeledList, Section, Stack, Table } from '../components'; import { Window } from '../layouts'; type ColorEntry = { diff --git a/tgui/packages/tgui/interfaces/Hypertorus.js b/tgui/packages/tgui/interfaces/Hypertorus.js index 6ec2c524e0da..ab3a196922ac 100644 --- a/tgui/packages/tgui/interfaces/Hypertorus.js +++ b/tgui/packages/tgui/interfaces/Hypertorus.js @@ -1,8 +1,9 @@ import { filter, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; -import { Button, LabeledList, NumberInput, ProgressBar, Section, Stack, Box } from '../components'; +import { Box, Button, LabeledList, NumberInput, ProgressBar, Section, Stack } from '../components'; import { getGasColor, getGasLabel } from '../constants'; import { formatSiBaseTenUnit, formatSiUnit } from '../format'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/InfraredEmitter.js b/tgui/packages/tgui/interfaces/InfraredEmitter.js index a81e5ed7675a..3c18bf30adf7 100644 --- a/tgui/packages/tgui/interfaces/InfraredEmitter.js +++ b/tgui/packages/tgui/interfaces/InfraredEmitter.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Button, Section, LabeledList } from '../components'; +import { Button, LabeledList, Section } from '../components'; import { Window } from '../layouts'; export const InfraredEmitter = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/BasicInput.js b/tgui/packages/tgui/interfaces/IntegratedCircuit/BasicInput.js index 4cc9de3e576c..54c5a2268b01 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/BasicInput.js +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/BasicInput.js @@ -1,4 +1,4 @@ -import { Stack, Button } from '../../components'; +import { Button, Stack } from '../../components'; export const BasicInput = (props, context) => { const { children, name, setValue, defaultValue, value } = props; diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/CircuitInfo.js b/tgui/packages/tgui/interfaces/IntegratedCircuit/CircuitInfo.js index 8fd1263b7aaf..8f71ac33e89c 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/CircuitInfo.js +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/CircuitInfo.js @@ -1,4 +1,4 @@ -import { Button, Section, Stack, Box } from '../../components'; +import { Box, Button, Stack } from '../../components'; export const CircuitInfo = (props, context) => { const { diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/Connections.js b/tgui/packages/tgui/interfaces/IntegratedCircuit/Connections.js index 42f511358153..1f7da1bf1158 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/Connections.js +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/Connections.js @@ -1,6 +1,6 @@ +import { classes } from '../../../common/react'; import { CSS_COLORS } from '../../constants'; import { SVG_CURVE_INTENSITY } from './constants'; -import { classes } from '../../../common/react'; export const Connections = (props, context) => { const { connections } = props; diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayName.js b/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayName.js index b281cbd00a08..72999ddce6ef 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayName.js +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/DisplayName.js @@ -1,7 +1,6 @@ import { useBackend } from '../../backend'; import { Box, Button, Flex } from '../../components'; -import { FUNDAMENTAL_DATA_TYPES, DATATYPE_DISPLAY_HANDLERS } from './FundamentalTypes'; -import { NULL_REF } from './constants'; +import { DATATYPE_DISPLAY_HANDLERS, FUNDAMENTAL_DATA_TYPES } from './FundamentalTypes'; export const DisplayName = (props, context) => { const { act } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/FundamentalTypes.js b/tgui/packages/tgui/interfaces/IntegratedCircuit/FundamentalTypes.js index d895e608e711..203c0473c942 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/FundamentalTypes.js +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/FundamentalTypes.js @@ -1,5 +1,5 @@ +import { Button, Dropdown, Input, NumberInput, Stack } from '../../components'; import { BasicInput } from './BasicInput'; -import { NumberInput, Button, Stack, Input, Dropdown, Box } from '../../components'; export const FUNDAMENTAL_DATA_TYPES = { 'string': (props, context) => { diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/ObjectComponent.js b/tgui/packages/tgui/interfaces/IntegratedCircuit/ObjectComponent.js index 08b7e7509409..8a4d44c98543 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/ObjectComponent.js +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/ObjectComponent.js @@ -1,10 +1,11 @@ +import { Component } from 'inferno'; + +import { shallowDiffers } from '../../../common/react'; import { useBackend } from '../../backend'; import { Box, - Stack, Button, Dropdown, -} from '../../components'; -import { Component } from 'inferno'; -import { shallowDiffers } from '../../../common/react'; +Button, + Stack } from '../../components'; import { ABSOLUTE_Y_OFFSET } from './constants'; import { Port } from "./Port"; diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/Port.js b/tgui/packages/tgui/interfaces/IntegratedCircuit/Port.js index 305a3c30d0d1..28480c5e9d72 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/Port.js +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/Port.js @@ -1,8 +1,9 @@ +import { Component, createRef } from 'inferno'; + import { - Stack, Icon, + Stack, } from '../../components'; -import { Component, createRef } from 'inferno'; import { DisplayName } from "./DisplayName"; diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/VariableMenu.js b/tgui/packages/tgui/interfaces/IntegratedCircuit/VariableMenu.js index ee7d19f5a74c..545d527d0688 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/VariableMenu.js +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/VariableMenu.js @@ -1,12 +1,11 @@ import { useLocalState } from '../../backend'; import { Box, - Stack, - Icon, - Section, Button, - Input, Dropdown, + Input, + Section, + Stack, } from '../../components'; export const VariableMenu = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/IntegratedCircuit/index.js b/tgui/packages/tgui/interfaces/IntegratedCircuit/index.js index a2e027e9d03b..7ed4e016b37f 100644 --- a/tgui/packages/tgui/interfaces/IntegratedCircuit/index.js +++ b/tgui/packages/tgui/interfaces/IntegratedCircuit/index.js @@ -1,18 +1,18 @@ +import { Component } from 'inferno'; + +import { resolveAsset } from '../../assets'; import { useBackend } from '../../backend'; import { - Input, - InfinitePlane, - Stack, Box, Button, - Section, + InfinitePlane, + Input, + Stack, } from '../../components'; -import { Component } from 'inferno'; -import { Layout, Window } from '../../layouts'; -import { resolveAsset } from '../../assets'; +import { Window } from '../../layouts'; import { CircuitInfo } from './CircuitInfo'; -import { NULL_REF, ABSOLUTE_Y_OFFSET, MOUSE_BUTTON_LEFT } from './constants'; import { Connections } from './Connections'; +import { ABSOLUTE_Y_OFFSET, MOUSE_BUTTON_LEFT } from './constants'; import { ObjectComponent } from './ObjectComponent'; import { VariableMenu } from './VariableMenu'; diff --git a/tgui/packages/tgui/interfaces/Interview.js b/tgui/packages/tgui/interfaces/Interview.js index 143a4d2e4ddd..9ba61d497fb3 100644 --- a/tgui/packages/tgui/interfaces/Interview.js +++ b/tgui/packages/tgui/interfaces/Interview.js @@ -1,12 +1,12 @@ +import { useBackend } from '../backend'; import { - Button, - TextArea, - Section, BlockQuote, + Button, NoticeBox, + Section, + TextArea, } from '../components'; import { Window } from '../layouts'; -import { useBackend } from '../backend'; export const Interview = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/InterviewManager.js b/tgui/packages/tgui/interfaces/InterviewManager.js index ef4d8b54c94b..fb9597046784 100644 --- a/tgui/packages/tgui/interfaces/InterviewManager.js +++ b/tgui/packages/tgui/interfaces/InterviewManager.js @@ -1,6 +1,6 @@ +import { useBackend } from '../backend'; import { Button, Section } from '../components'; import { Window } from '../layouts'; -import { useBackend } from '../backend'; export const InterviewManager = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/Jukebox.js b/tgui/packages/tgui/interfaces/Jukebox.js index 99ddf90be039..50b2f0dd6bb4 100644 --- a/tgui/packages/tgui/interfaces/Jukebox.js +++ b/tgui/packages/tgui/interfaces/Jukebox.js @@ -1,7 +1,8 @@ import { sortBy } from 'common/collections'; import { flow } from 'common/fp'; + import { useBackend } from '../backend'; -import { Box, Button, Dropdown, Section, Knob, LabeledControls, LabeledList, Stack, Tabs } from '../components'; +import { Box, Button, Dropdown, Knob, LabeledControls, LabeledList, Section, Stack, Tabs } from '../components'; import { Window } from '../layouts'; export const Jukebox = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/LaborClaimConsole.js b/tgui/packages/tgui/interfaces/LaborClaimConsole.js index 4b539685069e..337fd5d47288 100644 --- a/tgui/packages/tgui/interfaces/LaborClaimConsole.js +++ b/tgui/packages/tgui/interfaces/LaborClaimConsole.js @@ -1,4 +1,5 @@ import { toTitleCase } from 'common/string'; + import { useBackend } from '../backend'; import { Box, Button, LabeledList, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Limbgrower.js b/tgui/packages/tgui/interfaces/Limbgrower.js index 549865f6c3f8..2fe4f07f9c99 100644 --- a/tgui/packages/tgui/interfaces/Limbgrower.js +++ b/tgui/packages/tgui/interfaces/Limbgrower.js @@ -1,5 +1,5 @@ import { useBackend, useSharedState } from '../backend'; -import { Box, Button, Dimmer, Icon, LabeledList, Section, Tabs, ProgressBar } from '../components'; +import { Box, Button, Dimmer, Icon, LabeledList, ProgressBar, Section, Tabs } from '../components'; import { Window } from '../layouts'; export const Limbgrower = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/ListInputModal.tsx b/tgui/packages/tgui/interfaces/ListInputModal.tsx index ddfa50062a20..337a33397189 100644 --- a/tgui/packages/tgui/interfaces/ListInputModal.tsx +++ b/tgui/packages/tgui/interfaces/ListInputModal.tsx @@ -1,9 +1,9 @@ -import { Loader } from './common/Loader'; -import { InputButtons } from './common/InputButtons'; -import { Button, Input, Section, Stack } from '../components'; +import { KEY_A, KEY_DOWN, KEY_ENTER, KEY_ESCAPE, KEY_UP, KEY_Z } from '../../common/keycodes'; import { useBackend, useLocalState } from '../backend'; -import { KEY_A, KEY_DOWN, KEY_ESCAPE, KEY_ENTER, KEY_UP, KEY_Z } from '../../common/keycodes'; +import { Button, Input, Section, Stack } from '../components'; import { Window } from '../layouts'; +import { InputButtons } from './common/InputButtons'; +import { Loader } from './common/Loader'; type ListInputData = { init_value: string; diff --git a/tgui/packages/tgui/interfaces/MODpaint.js b/tgui/packages/tgui/interfaces/MODpaint.js index 9a329688eb51..13bbf76132f8 100644 --- a/tgui/packages/tgui/interfaces/MODpaint.js +++ b/tgui/packages/tgui/interfaces/MODpaint.js @@ -1,7 +1,8 @@ +import { capitalize } from 'common/string'; + import { useBackend } from '../backend'; -import { Box, Stack, Section, ByondUi, Slider, Flex, Button } from '../components'; +import { Box, Button, ByondUi, Flex, Section, Slider, Stack } from '../components'; import { Window } from '../layouts'; -import { capitalize } from 'common/string'; const colorToMatrix = (param) => { switch (param) { diff --git a/tgui/packages/tgui/interfaces/MODsuit.js b/tgui/packages/tgui/interfaces/MODsuit.js index 7975facad69b..2457cb7e16c7 100644 --- a/tgui/packages/tgui/interfaces/MODsuit.js +++ b/tgui/packages/tgui/interfaces/MODsuit.js @@ -1,5 +1,5 @@ import { useBackend, useLocalState } from '../backend'; -import { Button, ColorBox, LabeledList, ProgressBar, Section, Collapsible, Box, Icon, Stack, Table, Dimmer, NumberInput, Flex, AnimatedNumber, Dropdown } from '../components'; +import { AnimatedNumber, Box, Button, Collapsible, ColorBox, Dimmer, Dropdown, Flex, Icon, LabeledList, NumberInput, ProgressBar, Section, Stack, Table } from '../components'; import { Window } from '../layouts'; const ConfigureNumberEntry = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/MafiaPanel.js b/tgui/packages/tgui/interfaces/MafiaPanel.js index 1a09f4584399..2d288f9feccf 100644 --- a/tgui/packages/tgui/interfaces/MafiaPanel.js +++ b/tgui/packages/tgui/interfaces/MafiaPanel.js @@ -1,5 +1,6 @@ import { classes } from 'common/react'; import { multiline } from 'common/string'; + import { useBackend } from '../backend'; import { Box, Button, Collapsible, Flex, NoticeBox, Section, Stack, TimeDisplay } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/MassDriverControl.js b/tgui/packages/tgui/interfaces/MassDriverControl.js index 7f7136bcbe73..86f8a954bb48 100644 --- a/tgui/packages/tgui/interfaces/MassDriverControl.js +++ b/tgui/packages/tgui/interfaces/MassDriverControl.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Box, Button, Section, LabeledList, NumberInput } from '../components'; +import { Box, Button, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; export const MassDriverControl = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/MassSpec.js b/tgui/packages/tgui/interfaces/MassSpec.js index 310400a50987..caf3dadb392f 100644 --- a/tgui/packages/tgui/interfaces/MassSpec.js +++ b/tgui/packages/tgui/interfaces/MassSpec.js @@ -1,4 +1,5 @@ import { round } from 'common/math'; + import { useBackend } from '../backend'; import { Box, Button, Dimmer, Icon, Section, Slider, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/MechpadConsole.js b/tgui/packages/tgui/interfaces/MechpadConsole.js index c8eb90473529..3beb6504a1f5 100644 --- a/tgui/packages/tgui/interfaces/MechpadConsole.js +++ b/tgui/packages/tgui/interfaces/MechpadConsole.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Box, Button, Divider, Flex, Grid, Input, NoticeBox, NumberInput, Section } from '../components'; +import { Box, Button, Divider, Flex, Input, NoticeBox, Section } from '../components'; import { Window } from '../layouts'; export const MechpadControl = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/MedicalKiosk.js b/tgui/packages/tgui/interfaces/MedicalKiosk.js index 19e38c78fb15..d8a57b2efd41 100644 --- a/tgui/packages/tgui/interfaces/MedicalKiosk.js +++ b/tgui/packages/tgui/interfaces/MedicalKiosk.js @@ -1,4 +1,5 @@ import { multiline } from 'common/string'; + import { useBackend, useSharedState } from '../backend'; import { AnimatedNumber, Box, Button, Flex, Icon, LabeledList, ProgressBar, Section, Stack } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/MiningVendor.js b/tgui/packages/tgui/interfaces/MiningVendor.js index 98b0db1a28de..7edbb9777ac5 100644 --- a/tgui/packages/tgui/interfaces/MiningVendor.js +++ b/tgui/packages/tgui/interfaces/MiningVendor.js @@ -1,4 +1,5 @@ import { classes } from 'common/react'; + import { useBackend } from '../backend'; import { Box, Button, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/MobInteraction.tsx b/tgui/packages/tgui/interfaces/MobInteraction.tsx index 5e3aa9ad4299..98e9c19352ca 100644 --- a/tgui/packages/tgui/interfaces/MobInteraction.tsx +++ b/tgui/packages/tgui/interfaces/MobInteraction.tsx @@ -1,10 +1,11 @@ -import { filter, map, sortBy } from 'common/collections'; +import { filter, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { clamp } from 'common/math'; import { createSearch } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; -import { BlockQuote, Button, Flex, LabeledList, Icon, Input, Section, Table, Tabs, Stack, ProgressBar, Divider } from '../components'; -import { TableCell, TableRow } from '../components/Table'; +import { BlockQuote, Button, Flex, Icon, Input, LabeledList, ProgressBar, Section, Stack, Table, Tabs } from '../components'; +import { TableCell } from '../components/Table'; import { Window } from '../layouts'; type HeaderInfo = { diff --git a/tgui/packages/tgui/interfaces/NaniteChamberControl.js b/tgui/packages/tgui/interfaces/NaniteChamberControl.js index 9088db9486c6..c6756be56928 100644 --- a/tgui/packages/tgui/interfaces/NaniteChamberControl.js +++ b/tgui/packages/tgui/interfaces/NaniteChamberControl.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend } from '../backend'; import { Box, Button, Collapsible, Grid, LabeledList, NoticeBox, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/NaniteCloudControl.js b/tgui/packages/tgui/interfaces/NaniteCloudControl.js index 3fe62afc49a4..0eca464e1bf5 100644 --- a/tgui/packages/tgui/interfaces/NaniteCloudControl.js +++ b/tgui/packages/tgui/interfaces/NaniteCloudControl.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend } from '../backend'; import { Box, Button, Collapsible, Grid, LabeledList, NoticeBox, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/NaniteProgramHub.js b/tgui/packages/tgui/interfaces/NaniteProgramHub.js index fa3e59a1de7c..dc578a0c8e03 100644 --- a/tgui/packages/tgui/interfaces/NaniteProgramHub.js +++ b/tgui/packages/tgui/interfaces/NaniteProgramHub.js @@ -1,5 +1,6 @@ import { map } from 'common/collections'; import { Fragment } from 'inferno'; + import { useBackend, useSharedState } from '../backend'; import { Button, Flex, LabeledList, NoticeBox, Section, Tabs } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/NaniteProgrammer.js b/tgui/packages/tgui/interfaces/NaniteProgrammer.js index 9f85a94a27fa..87d9a85b2e08 100644 --- a/tgui/packages/tgui/interfaces/NaniteProgrammer.js +++ b/tgui/packages/tgui/interfaces/NaniteProgrammer.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend } from '../backend'; import { Button, Dropdown, Grid, Input, LabeledList, NoticeBox, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/NaniteRemote.js b/tgui/packages/tgui/interfaces/NaniteRemote.js index 3f911074c092..318d827dbe61 100644 --- a/tgui/packages/tgui/interfaces/NaniteRemote.js +++ b/tgui/packages/tgui/interfaces/NaniteRemote.js @@ -1,6 +1,7 @@ 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/NotificationPreferences.js b/tgui/packages/tgui/interfaces/NotificationPreferences.js index bb0306e33c5a..97b13b21d328 100644 --- a/tgui/packages/tgui/interfaces/NotificationPreferences.js +++ b/tgui/packages/tgui/interfaces/NotificationPreferences.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Section, Button } from '../components'; +import { Button, Section } from '../components'; import { Window } from '../layouts'; export const NotificationPreferences = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/NtnetRelay.js b/tgui/packages/tgui/interfaces/NtnetRelay.js index b41723edade0..5df837741828 100644 --- a/tgui/packages/tgui/interfaces/NtnetRelay.js +++ b/tgui/packages/tgui/interfaces/NtnetRelay.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Box, Button, ProgressBar, Section, AnimatedNumber } from '../components'; +import { AnimatedNumber, Box, Button, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; export const NtnetRelay = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/NtosAtmos.js b/tgui/packages/tgui/interfaces/NtosAtmos.js index 3d357ab7ccc8..3236c72ec47e 100644 --- a/tgui/packages/tgui/interfaces/NtosAtmos.js +++ b/tgui/packages/tgui/interfaces/NtosAtmos.js @@ -1,6 +1,7 @@ import { filter, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { LabeledList, ProgressBar, Section } from '../components'; import { getGasColor, getGasLabel } from '../constants'; diff --git a/tgui/packages/tgui/interfaces/NtosCard.js b/tgui/packages/tgui/interfaces/NtosCard.js index abdfb21e9295..60c0380bae28 100644 --- a/tgui/packages/tgui/interfaces/NtosCard.js +++ b/tgui/packages/tgui/interfaces/NtosCard.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Flex, Input, NoticeBox, Section, Tabs } from '../components'; import { NtosWindow } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/NtosCargo.js b/tgui/packages/tgui/interfaces/NtosCargo.js index b5cf7392f938..5a99ec718a75 100644 --- a/tgui/packages/tgui/interfaces/NtosCargo.js +++ b/tgui/packages/tgui/interfaces/NtosCargo.js @@ -1,5 +1,5 @@ -import { CargoContent } from './Cargo.js'; import { NtosWindow } from '../layouts'; +import { CargoContent } from './Cargo.js'; export const NtosCargo = (props, context) => { return ( diff --git a/tgui/packages/tgui/interfaces/NtosCrewManifest.js b/tgui/packages/tgui/interfaces/NtosCrewManifest.js index 11239f365a62..50cad6c8682d 100644 --- a/tgui/packages/tgui/interfaces/NtosCrewManifest.js +++ b/tgui/packages/tgui/interfaces/NtosCrewManifest.js @@ -1,4 +1,5 @@ import { map } from 'common/collections'; + import { useBackend } from '../backend'; import { Button, Section, Table } from '../components'; import { NtosWindow } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/NtosJobManager.js b/tgui/packages/tgui/interfaces/NtosJobManager.js index d8ca2d94b062..f83e679bde7c 100644 --- a/tgui/packages/tgui/interfaces/NtosJobManager.js +++ b/tgui/packages/tgui/interfaces/NtosJobManager.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Button, Section, Table, NoticeBox, Dimmer, Box } from '../components'; +import { Box, Button, Dimmer, NoticeBox, Section, Table } from '../components'; import { NtosWindow } from '../layouts'; export const NtosJobManager = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/NtosNetDownloader.js b/tgui/packages/tgui/interfaces/NtosNetDownloader.js index 287b5b8ba8b6..6fd4896ceee5 100644 --- a/tgui/packages/tgui/interfaces/NtosNetDownloader.js +++ b/tgui/packages/tgui/interfaces/NtosNetDownloader.js @@ -1,8 +1,9 @@ +import { filter, sortBy } from 'common/collections'; +import { flow } from 'common/fp'; import { scale, toFixed } from 'common/math'; + import { useBackend, useLocalState } from '../backend'; -import { Box, Button, Stack, Icon, LabeledList, NoticeBox, ProgressBar, Section, Tabs } from '../components'; -import { flow } from 'common/fp'; -import { filter, sortBy } from 'common/collections'; +import { Box, Button, Icon, LabeledList, NoticeBox, ProgressBar, Section, Stack, Tabs } from '../components'; import { NtosWindow } from '../layouts'; export const NtosNetDownloader = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/NtosRadar.js b/tgui/packages/tgui/interfaces/NtosRadar.js index 8662499e7893..ebd4227f664e 100644 --- a/tgui/packages/tgui/interfaces/NtosRadar.js +++ b/tgui/packages/tgui/interfaces/NtosRadar.js @@ -1,4 +1,5 @@ import { classes } from 'common/react'; + import { resolveAsset } from '../assets'; import { useBackend } from '../backend'; import { Box, Button, Flex, Icon, NoticeBox, Section } from '../components'; diff --git a/tgui/packages/tgui/interfaces/NtosRbmkStats.js b/tgui/packages/tgui/interfaces/NtosRbmkStats.js index 9d44e0b9e9dc..d0b4ba03db93 100644 --- a/tgui/packages/tgui/interfaces/NtosRbmkStats.js +++ b/tgui/packages/tgui/interfaces/NtosRbmkStats.js @@ -1,11 +1,7 @@ -import { map, sortBy } from 'common/collections'; -import { flow } from 'common/fp'; -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 { useBackend } from '../backend'; +import { Button, Chart, ProgressBar, Section } from '../components'; import { NtosWindow } from '../layouts'; -import { useBackend, useLocalState } from '../backend'; export const NtosRbmkStats = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/NtosRequestKiosk.js b/tgui/packages/tgui/interfaces/NtosRequestKiosk.js index 13178114f210..cd7ff5ff27c6 100644 --- a/tgui/packages/tgui/interfaces/NtosRequestKiosk.js +++ b/tgui/packages/tgui/interfaces/NtosRequestKiosk.js @@ -1,5 +1,5 @@ -import { RequestKioskContent } from './RequestKiosk'; import { NtosWindow } from '../layouts'; +import { RequestKioskContent } from './RequestKiosk'; export const NtosRequestKiosk = (props, context) => { return ( diff --git a/tgui/packages/tgui/interfaces/NtosRevelation.js b/tgui/packages/tgui/interfaces/NtosRevelation.js index 643137501149..d7d67ee7d69a 100644 --- a/tgui/packages/tgui/interfaces/NtosRevelation.js +++ b/tgui/packages/tgui/interfaces/NtosRevelation.js @@ -1,5 +1,5 @@ -import { Section, Button, LabeledList } from '../components'; import { useBackend } from '../backend'; +import { Button, LabeledList, Section } from '../components'; import { NtosWindow } from '../layouts'; export const NtosRevelation = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/NtosSecurEye.js b/tgui/packages/tgui/interfaces/NtosSecurEye.js index 8d4bc6274528..fc8b040e3d4f 100644 --- a/tgui/packages/tgui/interfaces/NtosSecurEye.js +++ b/tgui/packages/tgui/interfaces/NtosSecurEye.js @@ -1,13 +1,8 @@ -import { filter, sortBy } from 'common/collections'; -import { flow } from 'common/fp'; -import { classes } from 'common/react'; -import { createSearch } from 'common/string'; -import { Fragment } from 'inferno'; -import { useBackend, useLocalState } from '../backend'; -import { Button, ByondUi, Input, Section } from '../components'; + +import { useBackend } from '../backend'; +import { Button, ByondUi } from '../components'; import { NtosWindow } from '../layouts'; -import { prevNextCamera, selectCameras, CameraConsoleContent } from './CameraConsole'; -import { logger } from "../logging"; +import { CameraConsoleContent, prevNextCamera, selectCameras } from './CameraConsole'; export const NtosSecurEye = (props, context) => { const { act, data, config } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/NtosSignaler.js b/tgui/packages/tgui/interfaces/NtosSignaler.js index 5f948c85470e..440273e99dcf 100644 --- a/tgui/packages/tgui/interfaces/NtosSignaler.js +++ b/tgui/packages/tgui/interfaces/NtosSignaler.js @@ -1,5 +1,5 @@ -import { SignalerContent } from './Signaler'; import { NtosWindow } from '../layouts'; +import { SignalerContent } from './Signaler'; export const NtosSignaler = (props, context) => { return ( diff --git a/tgui/packages/tgui/interfaces/NtosTechweb.js b/tgui/packages/tgui/interfaces/NtosTechweb.js index a7ff19c8f023..2eb6e063d204 100644 --- a/tgui/packages/tgui/interfaces/NtosTechweb.js +++ b/tgui/packages/tgui/interfaces/NtosTechweb.js @@ -1,6 +1,6 @@ -import { AppTechweb } from './Techweb.js'; -import { useBackend, useLocalState } from '../backend'; +import { useBackend } from '../backend'; import { createLogger } from '../logging'; +import { AppTechweb } from './Techweb.js'; const logger = createLogger('backend'); diff --git a/tgui/packages/tgui/interfaces/NuclearBomb.js b/tgui/packages/tgui/interfaces/NuclearBomb.js index 0a4a3324b143..c2d291ecd3af 100644 --- a/tgui/packages/tgui/interfaces/NuclearBomb.js +++ b/tgui/packages/tgui/interfaces/NuclearBomb.js @@ -1,4 +1,5 @@ import { classes } from 'common/react'; + import { useBackend } from '../backend'; import { Box, Button, Flex, Grid, Icon } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/NumberInputModal.tsx b/tgui/packages/tgui/interfaces/NumberInputModal.tsx index b662205a634d..d953e999a9d7 100644 --- a/tgui/packages/tgui/interfaces/NumberInputModal.tsx +++ b/tgui/packages/tgui/interfaces/NumberInputModal.tsx @@ -1,9 +1,9 @@ -import { Loader } from './common/Loader'; -import { InputButtons } from './common/InputButtons'; import { KEY_ENTER, KEY_ESCAPE } from '../../common/keycodes'; import { useBackend, useLocalState } from '../backend'; import { Box, Button, RestrictedInput, Section, Stack } from '../components'; import { Window } from '../layouts'; +import { InputButtons } from './common/InputButtons'; +import { Loader } from './common/Loader'; type NumberInputData = { init_value: number; diff --git a/tgui/packages/tgui/interfaces/OperatingComputer.js b/tgui/packages/tgui/interfaces/OperatingComputer.js index 068d85e3f047..074ca394053e 100644 --- a/tgui/packages/tgui/interfaces/OperatingComputer.js +++ b/tgui/packages/tgui/interfaces/OperatingComputer.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend, useSharedState } from '../backend'; import { AnimatedNumber, Button, LabeledList, NoticeBox, ProgressBar, Section, Tabs } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Orbit.js b/tgui/packages/tgui/interfaces/Orbit.js index 0ade3eb71608..e3964da80a8c 100644 --- a/tgui/packages/tgui/interfaces/Orbit.js +++ b/tgui/packages/tgui/interfaces/Orbit.js @@ -1,6 +1,7 @@ import { classes } from 'common/react'; import { createSearch } from 'common/string'; import { multiline } from 'common/string'; + import { resolveAsset } from '../assets'; import { useBackend, useLocalState } from '../backend'; import { Box, Button, Divider, Flex, Icon, Input, Section } from '../components'; diff --git a/tgui/packages/tgui/interfaces/OreBox.js b/tgui/packages/tgui/interfaces/OreBox.js index e670a8beefbf..1cc4291f111a 100644 --- a/tgui/packages/tgui/interfaces/OreBox.js +++ b/tgui/packages/tgui/interfaces/OreBox.js @@ -1,6 +1,7 @@ import { toTitleCase } from 'common/string'; -import { Box, Button, Section, Table } from '../components'; + import { useBackend } from '../backend'; +import { Box, Button, Section, Table } from '../components'; import { Window } from '../layouts'; export const OreBox = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/OreRedemptionMachine.js b/tgui/packages/tgui/interfaces/OreRedemptionMachine.js index 05a2e8a99325..1664536a4767 100644 --- a/tgui/packages/tgui/interfaces/OreRedemptionMachine.js +++ b/tgui/packages/tgui/interfaces/OreRedemptionMachine.js @@ -1,4 +1,5 @@ import { toTitleCase } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; import { BlockQuote, Box, Button, NumberInput, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/OrionGame.js b/tgui/packages/tgui/interfaces/OrionGame.js index e4902bcfe37c..8824cb56b296 100644 --- a/tgui/packages/tgui/interfaces/OrionGame.js +++ b/tgui/packages/tgui/interfaces/OrionGame.js @@ -1,6 +1,5 @@ -import { multiline } from 'common/string'; -import { useBackend, useLocalState } from '../backend'; -import { Box, Button, Dimmer, Divider, Icon, NumberInput, Section, Stack } from '../components'; +import { useBackend } from '../backend'; +import { Box, Button, Divider, Section, Stack } from '../components'; import { Window } from '../layouts'; const buttonWidth = 2; diff --git a/tgui/packages/tgui/interfaces/PaintingMachine.js b/tgui/packages/tgui/interfaces/PaintingMachine.js index da2cc5996364..30b17781a16f 100644 --- a/tgui/packages/tgui/interfaces/PaintingMachine.js +++ b/tgui/packages/tgui/interfaces/PaintingMachine.js @@ -1,6 +1,6 @@ import { useBackend, useSharedState } from '../backend'; -import { Window } from '../layouts'; import { Button, Dropdown, Section, Stack } from '../components'; +import { Window } from '../layouts'; export const PaintingMachine = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/Pandemic.js b/tgui/packages/tgui/interfaces/Pandemic.js index 3ff26951ef65..a319339305df 100644 --- a/tgui/packages/tgui/interfaces/Pandemic.js +++ b/tgui/packages/tgui/interfaces/Pandemic.js @@ -1,4 +1,5 @@ import { map } from 'common/collections'; + import { useBackend } from '../backend'; import { Box, Button, Collapsible, Grid, Input, LabeledList, NoticeBox, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/PaperSheet.js b/tgui/packages/tgui/interfaces/PaperSheet.js index f9bf30fa6c3a..4d56aadd216e 100644 --- a/tgui/packages/tgui/interfaces/PaperSheet.js +++ b/tgui/packages/tgui/interfaces/PaperSheet.js @@ -9,15 +9,16 @@ * @license MIT */ +import { clamp } from 'common/math'; import { classes } from 'common/react'; import { Component } from 'inferno'; +import katex from 'katex'; import { marked } from 'marked'; + import { useBackend } from '../backend'; import { Box, Flex, Tabs, TextArea } from '../components'; import { Window } from '../layouts'; -import { clamp } from 'common/math'; import { sanitizeText } from '../sanitize'; -import katex from 'katex'; const MAX_PAPER_LENGTH = 5000; // Question, should we send this with ui_data? diff --git a/tgui/packages/tgui/interfaces/ParticleAccelerator.js b/tgui/packages/tgui/interfaces/ParticleAccelerator.js index 480fdbe05ece..7a49222a5e74 100644 --- a/tgui/packages/tgui/interfaces/ParticleAccelerator.js +++ b/tgui/packages/tgui/interfaces/ParticleAccelerator.js @@ -1,4 +1,3 @@ -import { Fragment } from 'inferno'; import { useBackend } from '../backend'; import { Box, Button, LabeledList, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Photocopier.js b/tgui/packages/tgui/interfaces/Photocopier.js index 583778f51207..e667d4491b28 100644 --- a/tgui/packages/tgui/interfaces/Photocopier.js +++ b/tgui/packages/tgui/interfaces/Photocopier.js @@ -1,5 +1,5 @@ -import { ProgressBar, NumberInput, Button, Section, Box, Flex } from '../components'; import { useBackend } from '../backend'; +import { Box, Button, Flex, NumberInput, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; export const Photocopier = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/PlayerPanel2.js b/tgui/packages/tgui/interfaces/PlayerPanel2.js index b3178d959afa..20fc9d34b4d2 100644 --- a/tgui/packages/tgui/interfaces/PlayerPanel2.js +++ b/tgui/packages/tgui/interfaces/PlayerPanel2.js @@ -1,6 +1,7 @@ import { Fragment } from "inferno"; + import { useBackend, useLocalState } from '../backend'; -import { Input, Button, Flex, Section, Tabs, Box, NoticeBox, NumberInput, Collapsible, LabeledList, Dropdown, Slider, Tooltip } from '../components'; +import { Box, Button, Collapsible, Dropdown, Flex, Input, LabeledList, NoticeBox, NumberInput, Section, Slider, Tabs } from '../components'; import { Window } from '../layouts'; const PAGES = [ diff --git a/tgui/packages/tgui/interfaces/PortableChemMixer.js b/tgui/packages/tgui/interfaces/PortableChemMixer.js index 48f465dc47f2..354b1bf2fe78 100644 --- a/tgui/packages/tgui/interfaces/PortableChemMixer.js +++ b/tgui/packages/tgui/interfaces/PortableChemMixer.js @@ -1,5 +1,6 @@ import { sortBy } from 'common/collections'; import { toTitleCase } from 'common/string'; + import { useBackend } from '../backend'; import { AnimatedNumber, Box, Button, LabeledList, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/PowerMonitor.js b/tgui/packages/tgui/interfaces/PowerMonitor.js index 038695d0f48b..61de69e3c573 100644 --- a/tgui/packages/tgui/interfaces/PowerMonitor.js +++ b/tgui/packages/tgui/interfaces/PowerMonitor.js @@ -2,6 +2,7 @@ import { map, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { toFixed } from 'common/math'; import { pureComponentHooks } from 'common/react'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Chart, ColorBox, Flex, Icon, LabeledList, ProgressBar, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/ProduceConsole.js b/tgui/packages/tgui/interfaces/ProduceConsole.js index c1bd4a907572..64d2b89ab480 100644 --- a/tgui/packages/tgui/interfaces/ProduceConsole.js +++ b/tgui/packages/tgui/interfaces/ProduceConsole.js @@ -1,4 +1,5 @@ import { multiline } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Dimmer, Divider, Icon, NumberInput, Section, Stack } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Radio.js b/tgui/packages/tgui/interfaces/Radio.js index 738826ba63b0..c094b507de65 100644 --- a/tgui/packages/tgui/interfaces/Radio.js +++ b/tgui/packages/tgui/interfaces/Radio.js @@ -1,5 +1,6 @@ import { map } from 'common/collections'; import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Box, Button, LabeledList, NumberInput, Section } from '../components'; import { RADIO_CHANNELS } from '../constants'; diff --git a/tgui/packages/tgui/interfaces/RadioactiveMicrolaser.js b/tgui/packages/tgui/interfaces/RadioactiveMicrolaser.js index 2fd20aa65877..be7bbf3025b5 100644 --- a/tgui/packages/tgui/interfaces/RadioactiveMicrolaser.js +++ b/tgui/packages/tgui/interfaces/RadioactiveMicrolaser.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Button, Box, NumberInput, Section, LabeledList } from '../components'; +import { Box, Button, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; export const RadioactiveMicrolaser = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/RapidPipeDispenser.js b/tgui/packages/tgui/interfaces/RapidPipeDispenser.js index c85256f862a3..368100a3fc07 100644 --- a/tgui/packages/tgui/interfaces/RapidPipeDispenser.js +++ b/tgui/packages/tgui/interfaces/RapidPipeDispenser.js @@ -1,4 +1,5 @@ import { classes } from 'common/react'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, ColorBox, Flex, LabeledList, Section, Tabs } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/RbmkControlRods.js b/tgui/packages/tgui/interfaces/RbmkControlRods.js index 13b4a95ca985..656bb60af6a3 100644 --- a/tgui/packages/tgui/interfaces/RbmkControlRods.js +++ b/tgui/packages/tgui/interfaces/RbmkControlRods.js @@ -1,6 +1,5 @@ -import { Fragment } from 'inferno'; -import { useBackend, useLocalState } from '../backend'; -import { Section, ProgressBar, Slider } from '../components'; +import { useBackend } from '../backend'; +import { ProgressBar, Section, Slider } from '../components'; import { Window } from '../layouts'; export const RbmkControlRods = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/RbmkStats.js b/tgui/packages/tgui/interfaces/RbmkStats.js index c168023db541..2798e3f7e179 100644 --- a/tgui/packages/tgui/interfaces/RbmkStats.js +++ b/tgui/packages/tgui/interfaces/RbmkStats.js @@ -1,11 +1,7 @@ -import { map, sortBy } from 'common/collections'; -import { flow } from 'common/fp'; -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 { useBackend } from '../backend'; +import { Chart, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; -import { useBackend, useLocalState } from '../backend'; export const RbmkStats = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/ReligiousTool.js b/tgui/packages/tgui/interfaces/ReligiousTool.js index 981889507f2c..874bc7464ab8 100644 --- a/tgui/packages/tgui/interfaces/ReligiousTool.js +++ b/tgui/packages/tgui/interfaces/ReligiousTool.js @@ -1,6 +1,5 @@ -import { capitalize } from 'common/string'; import { useBackend, useSharedState } from '../backend'; -import { AnimatedNumber, BlockQuote, Box, Button, Collapsible, Dimmer, Icon, LabeledList, NoticeBox, ProgressBar, Section, Stack, Tabs } from '../components'; +import { BlockQuote, Box, Button, Collapsible, Dimmer, Icon, Section, Stack, Tabs } from '../components'; import { Window } from '../layouts'; const ALIGNMENT2COLOR = { diff --git a/tgui/packages/tgui/interfaces/RemoteRobotControl.js b/tgui/packages/tgui/interfaces/RemoteRobotControl.js index 37faa9bd776b..93f86ed8f226 100644 --- a/tgui/packages/tgui/interfaces/RemoteRobotControl.js +++ b/tgui/packages/tgui/interfaces/RemoteRobotControl.js @@ -1,6 +1,7 @@ import { decodeHtmlEntities } from 'common/string'; + import { useBackend } from '../backend'; -import { Box, Button, NoticeBox, Section, LabeledList } from '../components'; +import { Box, Button, LabeledList, NoticeBox, Section } from '../components'; import { Window } from '../layouts'; export const RemoteRobotControl = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/Roulette.js b/tgui/packages/tgui/interfaces/Roulette.js index 3a60b48c708b..0086270e81f4 100644 --- a/tgui/packages/tgui/interfaces/Roulette.js +++ b/tgui/packages/tgui/interfaces/Roulette.js @@ -1,4 +1,5 @@ import { classes } from 'common/react'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Grid, NumberInput, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Safe.js b/tgui/packages/tgui/interfaces/Safe.js index 7394c133805b..c83c9dcd89fd 100644 --- a/tgui/packages/tgui/interfaces/Safe.js +++ b/tgui/packages/tgui/interfaces/Safe.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { resolveAsset } from '../assets'; import { useBackend } from '../backend'; import { Box, Button, Icon, Section } from '../components'; diff --git a/tgui/packages/tgui/interfaces/ScannerGate.js b/tgui/packages/tgui/interfaces/ScannerGate.js index 3ade2a96f27a..6afae61b49cc 100644 --- a/tgui/packages/tgui/interfaces/ScannerGate.js +++ b/tgui/packages/tgui/interfaces/ScannerGate.js @@ -1,8 +1,9 @@ import { Fragment } from 'inferno'; + import { useBackend } from '../backend'; import { Box, Button, LabeledList, NumberInput, Section } from '../components'; -import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox'; import { Window } from '../layouts'; +import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox'; const DISEASE_THEASHOLD_LIST = [ 'Positive', diff --git a/tgui/packages/tgui/interfaces/Secrets.js b/tgui/packages/tgui/interfaces/Secrets.js index b08e7c175baf..7bdf4f4c276d 100644 --- a/tgui/packages/tgui/interfaces/Secrets.js +++ b/tgui/packages/tgui/interfaces/Secrets.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend, useLocalState } from '../backend'; import { Button, Flex, LabeledControls, NoticeBox, RoundGauge, Section, Stack } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/SeedExtractor.js b/tgui/packages/tgui/interfaces/SeedExtractor.js index aeac46057f45..2491f2c14d65 100644 --- a/tgui/packages/tgui/interfaces/SeedExtractor.js +++ b/tgui/packages/tgui/interfaces/SeedExtractor.js @@ -1,6 +1,7 @@ import { sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { toTitleCase } from 'common/string'; + import { useBackend } from '../backend'; import { Button, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/SelectEquipment.js b/tgui/packages/tgui/interfaces/SelectEquipment.js index 274f3efce4bf..9b84d296d7cd 100644 --- a/tgui/packages/tgui/interfaces/SelectEquipment.js +++ b/tgui/packages/tgui/interfaces/SelectEquipment.js @@ -1,6 +1,7 @@ import { filter, map, sortBy, uniq } from 'common/collections'; import { flow } from 'common/fp'; import { createSearch } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Dropdown, Icon, Input, Section, Stack, Tabs } from '../components'; import { ButtonCheckbox } from '../components/Button'; diff --git a/tgui/packages/tgui/interfaces/SentienceFunBalloon.js b/tgui/packages/tgui/interfaces/SentienceFunBalloon.js index 8a9ddc239953..9ac42080eb19 100644 --- a/tgui/packages/tgui/interfaces/SentienceFunBalloon.js +++ b/tgui/packages/tgui/interfaces/SentienceFunBalloon.js @@ -1,5 +1,5 @@ import { useBackend } from "../backend"; -import { Button, NumberInput, Section, Stack, Input, LabeledList } from '../components'; +import { Button, Input, LabeledList, NumberInput, Section, Stack } from '../components'; import { Window } from "../layouts"; export const SentienceFunBalloon = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/ShuttleManipulator.js b/tgui/packages/tgui/interfaces/ShuttleManipulator.js index 49f7afd64b4b..e128da918c70 100644 --- a/tgui/packages/tgui/interfaces/ShuttleManipulator.js +++ b/tgui/packages/tgui/interfaces/ShuttleManipulator.js @@ -1,4 +1,5 @@ import { map } from 'common/collections'; + import { useBackend, useLocalState } from '../backend'; import { Button, Flex, LabeledList, Section, Table, Tabs } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Signaler.js b/tgui/packages/tgui/interfaces/Signaler.js index 1eaf98683717..ce03a9ffb06e 100644 --- a/tgui/packages/tgui/interfaces/Signaler.js +++ b/tgui/packages/tgui/interfaces/Signaler.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Button, Grid, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/SkillPanel.js b/tgui/packages/tgui/interfaces/SkillPanel.js index f83e3cac0955..2c93521c9a24 100644 --- a/tgui/packages/tgui/interfaces/SkillPanel.js +++ b/tgui/packages/tgui/interfaces/SkillPanel.js @@ -1,7 +1,8 @@ +import { Fragment } from 'inferno'; + import { useBackend } from '../backend'; import { Box, Button, LabeledList, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; -import { Fragment } from 'inferno'; const skillgreen = { color: 'lightgreen', diff --git a/tgui/packages/tgui/interfaces/SkillStation.js b/tgui/packages/tgui/interfaces/SkillStation.js index c3ff64ed9714..5733bc3d30a1 100644 --- a/tgui/packages/tgui/interfaces/SkillStation.js +++ b/tgui/packages/tgui/interfaces/SkillStation.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Box, Button, Flex, Icon, LabeledList, NoticeBox, Section, Stack, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/SlaveConsole.js b/tgui/packages/tgui/interfaces/SlaveConsole.js index d133b4363bf8..bff0fbd563bd 100644 --- a/tgui/packages/tgui/interfaces/SlaveConsole.js +++ b/tgui/packages/tgui/interfaces/SlaveConsole.js @@ -1,11 +1,12 @@ import { map, sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { vecLength, vecSubtract } from 'common/vector'; + import { useBackend, useSharedState } from '../backend'; -import { Box, Button, Icon, LabeledList, Section, Tabs, Flex, NoticeBox, Fragment } from '../components'; +import { Box, Button, Flex, Fragment, Icon, LabeledList, NoticeBox, Section, Tabs } from '../components'; +import { formatMoney } from '../format'; import { Window } from '../layouts'; import { GenericUplink } from './Uplink'; -import { formatMoney } from '../format'; const coordsToVec = coords => map(parseFloat)(coords.split(', ')); diff --git a/tgui/packages/tgui/interfaces/SlimeBodySwapper.js b/tgui/packages/tgui/interfaces/SlimeBodySwapper.js index 6ec031c26954..169bf814be5d 100644 --- a/tgui/packages/tgui/interfaces/SlimeBodySwapper.js +++ b/tgui/packages/tgui/interfaces/SlimeBodySwapper.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Section, LabeledList, Button, Box } from '../components'; +import { Box, Button, LabeledList, Section } from '../components'; import { Window } from '../layouts'; const statusMap = { diff --git a/tgui/packages/tgui/interfaces/SmartVend.js b/tgui/packages/tgui/interfaces/SmartVend.js index e27dde98052f..f4499f0a2db4 100644 --- a/tgui/packages/tgui/interfaces/SmartVend.js +++ b/tgui/packages/tgui/interfaces/SmartVend.js @@ -1,4 +1,5 @@ import { map } from 'common/collections'; + import { useBackend } from '../backend'; import { Button, NoticeBox, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/SpaceHeater.js b/tgui/packages/tgui/interfaces/SpaceHeater.js index 3c3aedf54db2..2e92a28a640a 100644 --- a/tgui/packages/tgui/interfaces/SpaceHeater.js +++ b/tgui/packages/tgui/interfaces/SpaceHeater.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend } from '../backend'; import { Box, Button, LabeledList, NumberInput, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Spellbook.js b/tgui/packages/tgui/interfaces/Spellbook.js index f054c6fad26d..e699f89c589f 100644 --- a/tgui/packages/tgui/interfaces/Spellbook.js +++ b/tgui/packages/tgui/interfaces/Spellbook.js @@ -1,6 +1,7 @@ import { multiline } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; -import { Blink, Box, Button, Dimmer, Divider, Icon, Modal, NoticeBox, ProgressBar, Section, Stack } from '../components'; +import { Box, Button, Dimmer, Divider, Icon, NoticeBox, ProgressBar, Section, Stack } from '../components'; import { Window } from '../layouts'; const TAB2NAME = [ diff --git a/tgui/packages/tgui/interfaces/SplurtCrewManifest.js b/tgui/packages/tgui/interfaces/SplurtCrewManifest.js index 68e98a3a1753..87f94ca10b9b 100644 --- a/tgui/packages/tgui/interfaces/SplurtCrewManifest.js +++ b/tgui/packages/tgui/interfaces/SplurtCrewManifest.js @@ -1,4 +1,5 @@ import { classes } from 'common/react'; + import { useBackend } from "../backend"; import { Icon, Section, Table, Tooltip } from "../components"; import { Window } from "../layouts"; diff --git a/tgui/packages/tgui/interfaces/Stack.js b/tgui/packages/tgui/interfaces/Stack.js index a38e5dde81f3..6c08ade20f9b 100644 --- a/tgui/packages/tgui/interfaces/Stack.js +++ b/tgui/packages/tgui/interfaces/Stack.js @@ -1,7 +1,8 @@ -import { createSearch } from 'common/string'; import { sortBy } from 'common/collections'; +import { createSearch } from 'common/string'; + import { useBackend, useLocalState } from "../backend"; -import { Box, Button, Input, NoticeBox, Section, Collapsible, Table } from "../components"; +import { Box, Button, Collapsible, Input, NoticeBox, Section, Table } from "../components"; import { Window } from "../layouts"; export const Stack = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/StationTraitsPanel.tsx b/tgui/packages/tgui/interfaces/StationTraitsPanel.tsx index d09d109d6283..02b87ccbb411 100644 --- a/tgui/packages/tgui/interfaces/StationTraitsPanel.tsx +++ b/tgui/packages/tgui/interfaces/StationTraitsPanel.tsx @@ -1,6 +1,7 @@ import { filterMap } from 'common/collections'; import { exhaustiveCheck } from 'common/exhaustive'; import { BooleanLike } from 'common/react'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Divider, Dropdown, Stack, Tabs } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/StripMenu.tsx b/tgui/packages/tgui/interfaces/StripMenu.tsx index 048bf7f469f1..abf7c8ed2f72 100644 --- a/tgui/packages/tgui/interfaces/StripMenu.tsx +++ b/tgui/packages/tgui/interfaces/StripMenu.tsx @@ -1,5 +1,6 @@ import { range } from "common/collections"; import { BooleanLike } from "common/react"; + import { resolveAsset } from "../assets"; import { useBackend } from "../backend"; import { Box, Button, Icon, Stack } from "../components"; diff --git a/tgui/packages/tgui/interfaces/SuitStorageUnit.js b/tgui/packages/tgui/interfaces/SuitStorageUnit.js index 70bec672f72d..6ae303569b52 100644 --- a/tgui/packages/tgui/interfaces/SuitStorageUnit.js +++ b/tgui/packages/tgui/interfaces/SuitStorageUnit.js @@ -1,4 +1,5 @@ import { Fragment } from 'inferno'; + import { useBackend } from '../backend'; import { Box, Button, Icon, LabeledList, NoticeBox, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/SupermatterMonitor.js b/tgui/packages/tgui/interfaces/SupermatterMonitor.js index 0ef276999d49..ce659a86cb49 100644 --- a/tgui/packages/tgui/interfaces/SupermatterMonitor.js +++ b/tgui/packages/tgui/interfaces/SupermatterMonitor.js @@ -1,6 +1,7 @@ import { sortBy } from 'common/collections'; import { flow } from 'common/fp'; import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Button, LabeledList, ProgressBar, Section, Stack, Table } from '../components'; import { getGasColor, getGasLabel } from '../constants'; diff --git a/tgui/packages/tgui/interfaces/SyndContractor.js b/tgui/packages/tgui/interfaces/SyndContractor.js index 3bba93345a16..359a549e330c 100644 --- a/tgui/packages/tgui/interfaces/SyndContractor.js +++ b/tgui/packages/tgui/interfaces/SyndContractor.js @@ -1,4 +1,5 @@ import { Component, Fragment } from 'inferno'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Flex, Grid, Icon, LabeledList, Modal, NoticeBox, Section, Table, Tabs } from '../components'; import { NtosWindow } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Tank.js b/tgui/packages/tgui/interfaces/Tank.js index 7b5f20b83459..f7b660125865 100644 --- a/tgui/packages/tgui/interfaces/Tank.js +++ b/tgui/packages/tgui/interfaces/Tank.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Button, LabeledControls, NumberInput, RoundGauge, Section } from '../components'; import { formatSiUnit } from '../format'; diff --git a/tgui/packages/tgui/interfaces/Techweb.js b/tgui/packages/tgui/interfaces/Techweb.js index f1590dcccaf8..d564eee4643b 100644 --- a/tgui/packages/tgui/interfaces/Techweb.js +++ b/tgui/packages/tgui/interfaces/Techweb.js @@ -1,8 +1,9 @@ import { filter, map, sortBy } from 'common/collections'; import { flow } from 'common/fp'; + import { useBackend, useLocalState } from '../backend'; -import { Button, Section, Modal, Dropdown, Tabs, Box, Input, Flex, ProgressBar, Collapsible, Icon, Divider } from '../components'; -import { Window, NtosWindow } from '../layouts'; +import { Box, Button, Collapsible, Divider, Dropdown, Flex, Icon, Input, Modal, ProgressBar, Section, Tabs } from '../components'; +import { NtosWindow, Window } from '../layouts'; import { Experiment } from './ExperimentConfigure'; // Data reshaping / ingestion (thanks stylemistake for the help, very cool!) diff --git a/tgui/packages/tgui/interfaces/Telecomms.js b/tgui/packages/tgui/interfaces/Telecomms.js index 6b182a6b6607..67371268d17c 100644 --- a/tgui/packages/tgui/interfaces/Telecomms.js +++ b/tgui/packages/tgui/interfaces/Telecomms.js @@ -1,7 +1,6 @@ -import { map, sortBy } from 'common/collections'; -import { flow } from 'common/fp'; + import { useBackend } from '../backend'; -import { Button, Input, LabeledList, Section, Table, NoticeBox, NumberInput, LabeledControls, Box } from '../components'; +import { Box, Button, Input, LabeledControls, LabeledList, NoticeBox, NumberInput, Section, Table } from '../components'; import { RADIO_CHANNELS } from '../constants'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/TelecommsInteraction.js b/tgui/packages/tgui/interfaces/TelecommsInteraction.js index 6fcb322a9f7f..cdb733b84c80 100644 --- a/tgui/packages/tgui/interfaces/TelecommsInteraction.js +++ b/tgui/packages/tgui/interfaces/TelecommsInteraction.js @@ -3,11 +3,12 @@ * @copyright 2020 LetterN (https://github.com/LetterN) * @license MIT */ -import { Window } from '../layouts'; -import { useBackend } from '../backend'; import { toFixed } from 'common/math'; + +import { useBackend } from '../backend'; +import { Button, Input, LabeledList, NoticeBox, NumberInput, Section } from '../components'; import { RADIO_CHANNELS } from '../constants'; -import { Button, LabeledList, NumberInput, NoticeBox, Section, Input } from '../components'; +import { Window } from '../layouts'; export const TelecommsInteraction = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js b/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js index 3c5eda1244a0..301109adb0c0 100644 --- a/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js +++ b/tgui/packages/tgui/interfaces/TelecommsLogBrowser.js @@ -4,9 +4,10 @@ * @license MIT */ import { Fragment } from 'inferno'; -import { Window } from '../layouts'; + import { useBackend, useSharedState } from '../backend'; -import { Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components'; +import { Button, Input, LabeledList, NoticeBox, Section, Tabs } from '../components'; +import { Window } from '../layouts'; export const TelecommsLogBrowser = (props, context) => { const { act, data } = useBackend(context); diff --git a/tgui/packages/tgui/interfaces/TelecommsMonitor.js b/tgui/packages/tgui/interfaces/TelecommsMonitor.js index 0251e6e93651..94507c9f54aa 100644 --- a/tgui/packages/tgui/interfaces/TelecommsMonitor.js +++ b/tgui/packages/tgui/interfaces/TelecommsMonitor.js @@ -4,10 +4,11 @@ * @license MIT */ import { Fragment } from 'inferno'; -import { Window } from '../layouts'; + import { useBackend, useSharedState } from '../backend'; +import { Box, Button, Input, LabeledList, NoticeBox, ProgressBar, Section, Tabs } from '../components'; import { RADIO_CHANNELS } from '../constants'; -import { Box, Button, LabeledList, NoticeBox, Section, Tabs, Input, ProgressBar } from '../components'; +import { Window } from '../layouts'; export const TelecommsMonitor = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/TelecommsPDALog.js b/tgui/packages/tgui/interfaces/TelecommsPDALog.js index 98cad21e7b18..f875868171af 100644 --- a/tgui/packages/tgui/interfaces/TelecommsPDALog.js +++ b/tgui/packages/tgui/interfaces/TelecommsPDALog.js @@ -4,9 +4,10 @@ * @license MIT */ import { Fragment } from 'inferno'; -import { Window } from '../layouts'; + import { useBackend, useSharedState } from '../backend'; -import { Button, LabeledList, NoticeBox, Section, Tabs, Input } from '../components'; +import { Button, Input, LabeledList, NoticeBox, Section, Tabs } from '../components'; +import { Window } from '../layouts'; // This is the entrypoint, don't mind the others export const TelecommsPDALog = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/Telesci.js b/tgui/packages/tgui/interfaces/Telesci.js index fa20c9ea9c78..0d92eac166fc 100644 --- a/tgui/packages/tgui/interfaces/Telesci.js +++ b/tgui/packages/tgui/interfaces/Telesci.js @@ -1,6 +1,5 @@ -import { map } from 'common/collections'; import { useBackend } from '../backend'; -import { Box, Blink, Button, Section, Slider } from '../components'; +import { Blink, Box, Button, Section, Slider } from '../components'; import { Window } from '../layouts'; export const Telesci = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/TextInputModal.tsx b/tgui/packages/tgui/interfaces/TextInputModal.tsx index ee9881c6e429..c7b31354b27e 100644 --- a/tgui/packages/tgui/interfaces/TextInputModal.tsx +++ b/tgui/packages/tgui/interfaces/TextInputModal.tsx @@ -1,9 +1,9 @@ -import { Loader } from './common/Loader'; -import { InputButtons } from './common/InputButtons'; -import { useBackend, useLocalState } from '../backend'; import { KEY_ENTER, KEY_ESCAPE } from '../../common/keycodes'; +import { useBackend, useLocalState } from '../backend'; import { Box, Section, Stack, TextArea } from '../components'; import { Window } from '../layouts'; +import { InputButtons } from './common/InputButtons'; +import { Loader } from './common/Loader'; type TextInputData = { large_buttons: boolean; diff --git a/tgui/packages/tgui/interfaces/ThermoMachine.js b/tgui/packages/tgui/interfaces/ThermoMachine.js index bac4f91d4d41..3f85a38a8bb3 100644 --- a/tgui/packages/tgui/interfaces/ThermoMachine.js +++ b/tgui/packages/tgui/interfaces/ThermoMachine.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { AnimatedNumber, Button, LabeledList, NumberInput, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Thermometer.js b/tgui/packages/tgui/interfaces/Thermometer.js index 3ddbd4e604d6..6fe3f326e93f 100644 --- a/tgui/packages/tgui/interfaces/Thermometer.js +++ b/tgui/packages/tgui/interfaces/Thermometer.js @@ -1,4 +1,5 @@ import { Component } from 'inferno'; + import { useBackend } from '../backend'; import { Box, Stack } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/TrackedPlaytime.js b/tgui/packages/tgui/interfaces/TrackedPlaytime.js index a490053b6e23..9b0c49137ff8 100644 --- a/tgui/packages/tgui/interfaces/TrackedPlaytime.js +++ b/tgui/packages/tgui/interfaces/TrackedPlaytime.js @@ -1,4 +1,5 @@ import { sortBy } from "common/collections"; + import { useBackend } from "../backend"; import { Box, Button, Flex, ProgressBar, Section, Table } from "../components"; import { Window } from "../layouts"; diff --git a/tgui/packages/tgui/interfaces/TramControl.js b/tgui/packages/tgui/interfaces/TramControl.js index f6590b011d08..43b7016f85d1 100644 --- a/tgui/packages/tgui/interfaces/TramControl.js +++ b/tgui/packages/tgui/interfaces/TramControl.js @@ -1,4 +1,3 @@ -import { classes } from 'common/react'; import { useBackend, useLocalState } from '../backend'; import { Box, Button, Dimmer, Icon, Section, Stack } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Uplink.js b/tgui/packages/tgui/interfaces/Uplink.js index 5b9720107b58..10f95b34ec48 100644 --- a/tgui/packages/tgui/interfaces/Uplink.js +++ b/tgui/packages/tgui/interfaces/Uplink.js @@ -1,6 +1,7 @@ import { createSearch, decodeHtmlEntities } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; -import { Box, Button, Flex, Input, Section, Table, Tabs, NoticeBox } from '../components'; +import { Box, Button, Flex, Input, NoticeBox, Section, Table, Tabs } from '../components'; import { formatMoney } from '../format'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/VaultController.js b/tgui/packages/tgui/interfaces/VaultController.js index 510c6029547e..868f482b074b 100644 --- a/tgui/packages/tgui/interfaces/VaultController.js +++ b/tgui/packages/tgui/interfaces/VaultController.js @@ -1,4 +1,5 @@ import { toFixed } from 'common/math'; + import { useBackend } from '../backend'; import { Button, LabeledList, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/Vending.tsx b/tgui/packages/tgui/interfaces/Vending.tsx index 53a6e77f407d..e5fc27baa6e8 100644 --- a/tgui/packages/tgui/interfaces/Vending.tsx +++ b/tgui/packages/tgui/interfaces/Vending.tsx @@ -2,6 +2,7 @@ import { filter } from 'common/collections'; import { flow } from 'common/fp'; import { classes } from 'common/react'; import { createSearch } from 'common/string'; + import { useBackend, useLocalState } from '../backend'; import { Box, Button, Icon, Input, Section, Table } from '../components'; import { Window } from '../layouts'; diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 81afdbaa17b7..0d8614496788 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -1,7 +1,8 @@ /* eslint-disable max-len */ import { Fragment } from 'inferno'; + import { useBackend, useLocalState } from "../backend"; -import { Box, Button, Flex, Collapsible, Icon, LabeledList, NoticeBox, Section, Tabs } from "../components"; +import { Box, Button, Collapsible, Flex, Icon, LabeledList, NoticeBox, Section, Tabs } from "../components"; import { Window } from "../layouts"; const stats = [ diff --git a/tgui/packages/tgui/interfaces/Vote.js b/tgui/packages/tgui/interfaces/Vote.js index 9d16a6614b3f..99b6812492e7 100644 --- a/tgui/packages/tgui/interfaces/Vote.js +++ b/tgui/packages/tgui/interfaces/Vote.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Box, Icon, Stack, Button, Section, NoticeBox, LabeledList, Collapsible } from '../components'; +import { Box, Button, Collapsible, Icon, LabeledList, NoticeBox, Section, Stack } from '../components'; import { Window } from '../layouts'; export const Vote = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/VrSleeper.js b/tgui/packages/tgui/interfaces/VrSleeper.js index 58de36fab256..40385715c7ad 100644 --- a/tgui/packages/tgui/interfaces/VrSleeper.js +++ b/tgui/packages/tgui/interfaces/VrSleeper.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Button, ProgressBar, Section, Box, LabeledList } from '../components'; +import { Box, Button, LabeledList, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; export const VrSleeper = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/Wires.js b/tgui/packages/tgui/interfaces/Wires.js index eb6734aab7ad..0ab2ae17dac5 100644 --- a/tgui/packages/tgui/interfaces/Wires.js +++ b/tgui/packages/tgui/interfaces/Wires.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Box, Button, LabeledList, Section, NoticeBox } from '../components'; +import { Box, Button, LabeledList, NoticeBox, Section } from '../components'; import { Window } from '../layouts'; export const Wires = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/centcomCommunications.js b/tgui/packages/tgui/interfaces/centcomCommunications.js index 41334c07030a..941fbded3f36 100644 --- a/tgui/packages/tgui/interfaces/centcomCommunications.js +++ b/tgui/packages/tgui/interfaces/centcomCommunications.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Fragment, Button, Section, Box, LabeledList, ColorBox } from '../components'; +import { Box, Button, ColorBox, Fragment, LabeledList, Section } from '../components'; import { Window } from '../layouts'; export const centcomCommunications = (props, context) => { diff --git a/tgui/packages/tgui/interfaces/common/AccessList.js b/tgui/packages/tgui/interfaces/common/AccessList.js index a0fe605be839..f00fc97c2901 100644 --- a/tgui/packages/tgui/interfaces/common/AccessList.js +++ b/tgui/packages/tgui/interfaces/common/AccessList.js @@ -1,5 +1,6 @@ import { sortBy } from 'common/collections'; import { Fragment } from 'inferno'; + import { useLocalState } from '../../backend'; import { Button, Flex, Grid, Section, Tabs } from '../../components'; diff --git a/tgui/packages/tgui/interfaces/common/AtmosControls.js b/tgui/packages/tgui/interfaces/common/AtmosControls.js index fcca00188ab9..d560e0085c1b 100644 --- a/tgui/packages/tgui/interfaces/common/AtmosControls.js +++ b/tgui/packages/tgui/interfaces/common/AtmosControls.js @@ -1,4 +1,5 @@ import { decodeHtmlEntities } from 'common/string'; + import { useBackend } from '../../backend'; import { Button, LabeledList, NumberInput, Section } from '../../components'; import { getGasLabel } from '../../constants'; diff --git a/tgui/packages/tgui/interfaces/common/Loader.tsx b/tgui/packages/tgui/interfaces/common/Loader.tsx index 13ec588b0021..d46edd6e439a 100644 --- a/tgui/packages/tgui/interfaces/common/Loader.tsx +++ b/tgui/packages/tgui/interfaces/common/Loader.tsx @@ -1,6 +1,7 @@ -import { Box } from '../../components'; import { clamp01 } from 'common/math'; +import { Box } from '../../components'; + export const Loader = (props) => { const { value } = props; diff --git a/tgui/packages/tgui/interfaces/common/Materials.tsx b/tgui/packages/tgui/interfaces/common/Materials.tsx index 0d06c950914d..10c277f14f67 100644 --- a/tgui/packages/tgui/interfaces/common/Materials.tsx +++ b/tgui/packages/tgui/interfaces/common/Materials.tsx @@ -1,9 +1,10 @@ import { BooleanLike } from 'common/react'; -import { Box, Button, NumberInput, Flex } from '../../components'; import { classes } from 'common/react'; -import { formatMoney, formatSiUnit } from '../../format'; + import { useSharedState } from '../../backend'; +import { Box, Button, Flex, NumberInput } from '../../components'; import { BoxProps } from '../../components/Box'; +import { formatMoney, formatSiUnit } from '../../format'; export const MATERIAL_KEYS = { "iron": "sheet-metal_3", diff --git a/tgui/packages/tgui/layouts/Layout.js b/tgui/packages/tgui/layouts/Layout.js index cd253ae2575b..e954fbfc226a 100644 --- a/tgui/packages/tgui/layouts/Layout.js +++ b/tgui/packages/tgui/layouts/Layout.js @@ -5,6 +5,7 @@ */ import { classes } from 'common/react'; + import { computeBoxClassName, computeBoxProps } from '../components/Box'; import { addScrollableNode, removeScrollableNode } from '../events'; diff --git a/tgui/packages/tgui/layouts/Pane.js b/tgui/packages/tgui/layouts/Pane.js index 3cb1af048cbe..e2c53963a7bd 100644 --- a/tgui/packages/tgui/layouts/Pane.js +++ b/tgui/packages/tgui/layouts/Pane.js @@ -5,6 +5,7 @@ */ import { classes } from 'common/react'; + import { useBackend } from '../backend'; import { Box } from '../components'; import { useDebug } from '../debug'; diff --git a/tgui/packages/tgui/layouts/Window.js b/tgui/packages/tgui/layouts/Window.js index a291cc6d5a35..a740142d0564 100644 --- a/tgui/packages/tgui/layouts/Window.js +++ b/tgui/packages/tgui/layouts/Window.js @@ -8,8 +8,9 @@ import { classes } from 'common/react'; import { useDispatch } from 'common/redux'; import { decodeHtmlEntities, toTitleCase } from 'common/string'; import { Component } from 'inferno'; + import { backendSuspendStart, useBackend } from '../backend'; -import { Icon, Flex } from '../components'; +import { Icon } from '../components'; import { UI_DISABLED, UI_INTERACTIVE, UI_UPDATE } from '../constants'; import { useDebug } from '../debug'; import { toggleKitchenSink } from '../debug/actions'; diff --git a/tgui/packages/tgui/renderer.js b/tgui/packages/tgui/renderer.js index 4abb7b0e6f03..0a624b75d23a 100644 --- a/tgui/packages/tgui/renderer.js +++ b/tgui/packages/tgui/renderer.js @@ -1,5 +1,6 @@ import { perf } from 'common/perf'; import { render } from 'inferno'; + import { createLogger } from './logging'; const logger = createLogger('renderer'); diff --git a/tgui/packages/tgui/store.js b/tgui/packages/tgui/store.js index 4035b4d1d85e..d085e64b4b8a 100644 --- a/tgui/packages/tgui/store.js +++ b/tgui/packages/tgui/store.js @@ -7,6 +7,7 @@ import { flow } from 'common/fp'; import { applyMiddleware, combineReducers, createStore } from 'common/redux'; import { Component } from 'inferno'; + import { assetMiddleware } from './assets'; import { backendMiddleware, backendReducer } from './backend'; import { debugMiddleware, debugReducer, relayMiddleware } from './debug'; diff --git a/tgui/packages/tgui/stories/Popper.stories.js b/tgui/packages/tgui/stories/Popper.stories.js index 2f86fa023113..65340f0de45b 100644 --- a/tgui/packages/tgui/stories/Popper.stories.js +++ b/tgui/packages/tgui/stories/Popper.stories.js @@ -1,4 +1,4 @@ -import { Component, forwardRef } from "inferno"; + import { Box, Popper } from "../components"; export const meta = { diff --git a/tgui/packages/tgui/stories/Storage.stories.js b/tgui/packages/tgui/stories/Storage.stories.js index f00899f1db71..8950476756b9 100644 --- a/tgui/packages/tgui/stories/Storage.stories.js +++ b/tgui/packages/tgui/stories/Storage.stories.js @@ -5,6 +5,7 @@ */ import { storage } from 'common/storage'; + import { Button, LabeledList, NoticeBox, Section } from '../components'; import { formatSiUnit } from '../format'; diff --git a/tgui/packages/tgui/stories/Tabs.stories.js b/tgui/packages/tgui/stories/Tabs.stories.js index 44ee1218bcb4..67efa65f2597 100644 --- a/tgui/packages/tgui/stories/Tabs.stories.js +++ b/tgui/packages/tgui/stories/Tabs.stories.js @@ -5,7 +5,7 @@ */ import { useLocalState } from '../backend'; -import { Box, Button, Divider, Section, Tabs } from '../components'; +import { Button, Section, Tabs } from '../components'; export const meta = { title: 'Tabs', diff --git a/tgui/packages/tgui/stories/Tooltip.stories.js b/tgui/packages/tgui/stories/Tooltip.stories.js index a5c4b54e9987..03425a222a9d 100644 --- a/tgui/packages/tgui/stories/Tooltip.stories.js +++ b/tgui/packages/tgui/stories/Tooltip.stories.js @@ -4,7 +4,6 @@ * @license MIT */ -import { Placement } from '@popperjs/core'; import { Box, Button, Section, Tooltip } from '../components'; export const meta = { diff --git a/tgui/yarn.lock b/tgui/yarn.lock index 6d3fa91689f5..a00824418b61 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -4846,6 +4846,24 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-simple-import-sort@npm:latest": + version: 12.0.0 + resolution: "eslint-plugin-simple-import-sort@npm:12.0.0" + peerDependencies: + eslint: ">=5.0.0" + checksum: 1b97055a9e8782099a788d030d3ceb03729bd7c9fe145eb617e5857c8c429d3124f1926621f4a363e1f2fad23037285b5b43ee01c6597eedb5f19b1d2f50604b + languageName: node + linkType: hard + +"eslint-plugin-sonarjs@npm:latest": + version: 0.24.0 + resolution: "eslint-plugin-sonarjs@npm:0.24.0" + peerDependencies: + eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: 14e81d2b9efa9d309a0cf1758955708a3f73b1cdf129140607db983bb36027f1442a99fc0b254303307cf743bd241f88b07f95a68013502fbceca9565960ca02 + languageName: node + linkType: hard + "eslint-plugin-unused-imports@npm:^3.0.0": version: 3.0.0 resolution: "eslint-plugin-unused-imports@npm:3.0.0" @@ -7314,7 +7332,7 @@ __metadata: languageName: node linkType: hard -"loose-envify@npm:^1.4.0": +"loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0": version: 1.4.0 resolution: "loose-envify@npm:1.4.0" dependencies: @@ -8412,6 +8430,18 @@ __metadata: languageName: node linkType: hard +"react-dom@npm:^18.2.0": + version: 18.2.0 + resolution: "react-dom@npm:18.2.0" + dependencies: + loose-envify: ^1.1.0 + scheduler: ^0.23.0 + peerDependencies: + react: ^18.2.0 + checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc + languageName: node + linkType: hard + "react-is@npm:^16.13.1": version: 16.13.1 resolution: "react-is@npm:16.13.1" @@ -8433,6 +8463,15 @@ __metadata: languageName: node linkType: hard +"react@npm:^18.2.0": + version: 18.2.0 + resolution: "react@npm:18.2.0" + dependencies: + loose-envify: ^1.1.0 + checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b + languageName: node + linkType: hard + "readable-stream@npm:^1.0.33": version: 1.1.14 resolution: "readable-stream@npm:1.1.14" @@ -8902,6 +8941,15 @@ __metadata: languageName: node linkType: hard +"scheduler@npm:^0.23.0": + version: 0.23.0 + resolution: "scheduler@npm:0.23.0" + dependencies: + loose-envify: ^1.1.0 + checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a + languageName: node + linkType: hard + "schema-utils@npm:^2.6.5": version: 2.7.1 resolution: "schema-utils@npm:2.7.1" @@ -9759,6 +9807,8 @@ __metadata: eslint-config-prettier: ^8.10.0 eslint-plugin-radar: ^0.2.1 eslint-plugin-react: ^7.33.2 + eslint-plugin-simple-import-sort: latest + eslint-plugin-sonarjs: latest eslint-plugin-unused-imports: ^3.0.0 globals: ^13.23.0 inferno: ^8.2.2 @@ -9768,6 +9818,8 @@ __metadata: jsdom: ^22.1.0 katex: ^0.15.6 mini-css-extract-plugin: ^2.7.6 + react: ^18.2.0 + react-dom: ^18.2.0 sass: ^1.69.5 sass-loader: ^13.3.2 style-loader: ^3.3.3