diff --git a/src/renderer/Generics/redesign/Checkbox/Checkbox.tsx b/src/renderer/Generics/redesign/Checkbox/Checkbox.tsx index edab2713..0d59e20b 100644 --- a/src/renderer/Generics/redesign/Checkbox/Checkbox.tsx +++ b/src/renderer/Generics/redesign/Checkbox/Checkbox.tsx @@ -1,16 +1,16 @@ import { useEffect, useState } from 'react'; +import { Icon } from '../Icon/Icon.js'; import { checkboxContainer, - checkboxLabel, checkboxInput, + checkboxLabel, + checkedCustomCheckbox, customCheckbox, + disabledCheckbox, + indeterminateCustomCheckbox, svgCheckmark, svgIndeterminate, - checkedCustomCheckbox, - indeterminateCustomCheckbox, - disabledCheckbox, } from './checkbox.css'; -import { Icon } from '../Icon/Icon.js'; export interface CheckboxProps { /** diff --git a/src/renderer/Generics/redesign/Checkbox/checkbox.css.ts b/src/renderer/Generics/redesign/Checkbox/checkbox.css.ts index 7756ba3d..38b2d725 100644 --- a/src/renderer/Generics/redesign/Checkbox/checkbox.css.ts +++ b/src/renderer/Generics/redesign/Checkbox/checkbox.css.ts @@ -1,5 +1,5 @@ import { style } from '@vanilla-extract/css'; -import { vars, common } from '../theme.css'; +import { common, vars } from '../theme.css'; export const checkboxContainer = style({ display: 'flex', diff --git a/src/renderer/Presentational/ModalManager/ModalManager.tsx b/src/renderer/Presentational/ModalManager/ModalManager.tsx index 48ee463e..2ff7f6be 100644 --- a/src/renderer/Presentational/ModalManager/ModalManager.tsx +++ b/src/renderer/Presentational/ModalManager/ModalManager.tsx @@ -11,8 +11,8 @@ import { NodeSettingsModal } from './NodeSettingsModal'; import { PodmanModal } from './PodmanModal'; import { PreferencesModal } from './PreferencesModal'; import { RemoveNodeModal } from './RemoveNodeModal'; -import { UpdateModal } from './UpdateModal'; import { ResetConfigModal } from './ResetConfigModal'; +import { UpdateModal } from './UpdateModal'; import { modalRoutes } from './modalUtils'; const ModalManager = () => { diff --git a/src/renderer/Presentational/NodeScreen/NodeScreen.tsx b/src/renderer/Presentational/NodeScreen/NodeScreen.tsx index 5223045f..396c163d 100644 --- a/src/renderer/Presentational/NodeScreen/NodeScreen.tsx +++ b/src/renderer/Presentational/NodeScreen/NodeScreen.tsx @@ -6,6 +6,7 @@ import Button from '../../Generics/redesign/Button/Button'; import CopyButton from '../../Generics/redesign/CopyButton/CopyButton.js'; import { HeaderButton } from '../../Generics/redesign/HeaderButton/HeaderButton'; import type { NodeAction } from '../../Generics/redesign/consts'; +import { SYNC_STATUS } from '../../Generics/redesign/consts.js'; import { getStatusObject } from '../../Generics/redesign/utils.js'; import type { NodeBackgroundId } from '../../assets/images/nodeBackgrounds'; import electron from '../../electronGlobal'; @@ -33,7 +34,6 @@ import { descriptionFont, titleFont, } from './NodeScreen.css'; -import { SYNC_STATUS } from '../../Generics/redesign/consts.js'; let alphaModalRendered = false; diff --git a/src/renderer/Presentational/SidebarNodeItemWrapper/SidebarNodeItemWrapper.tsx b/src/renderer/Presentational/SidebarNodeItemWrapper/SidebarNodeItemWrapper.tsx index 6e049515..ba45c550 100644 --- a/src/renderer/Presentational/SidebarNodeItemWrapper/SidebarNodeItemWrapper.tsx +++ b/src/renderer/Presentational/SidebarNodeItemWrapper/SidebarNodeItemWrapper.tsx @@ -1,7 +1,8 @@ import moment from 'moment'; -import { useEffect, useState, useCallback } from 'react'; +import { useCallback, useEffect, useState } from 'react'; import { type NodePackage, NodeStatus } from '../../../common/node'; import { SidebarNodeItem } from '../../Generics/redesign/SidebarNodeItem/SidebarNodeItem'; +import { SYNC_STATUS } from '../../Generics/redesign/consts.js'; import { getStatusObject, getSyncStatus } from '../../Generics/redesign/utils'; import { useAppDispatch, useAppSelector } from '../../state/hooks'; import { selectUserNodes } from '../../state/node'; @@ -11,7 +12,6 @@ import { useGetExecutionPeersQuery, } from '../../state/services'; import { getSyncDataForServiceAndNode } from '../../utils.js'; -import { SYNC_STATUS } from '../../Generics/redesign/consts.js'; export type SidebarNodeStatus = | 'online' diff --git a/src/renderer/Presentational/UpdateModal/Update.tsx b/src/renderer/Presentational/UpdateModal/Update.tsx index 05d56630..a68eedde 100644 --- a/src/renderer/Presentational/UpdateModal/Update.tsx +++ b/src/renderer/Presentational/UpdateModal/Update.tsx @@ -1,23 +1,23 @@ import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import type { NodePackage } from '../../../common/node'; +import { setModalState } from '../..//state/modal.js'; +import Button from '../../Generics/redesign/Button/Button.js'; +import { Icon } from '../../Generics/redesign/Icon/Icon.js'; +import { UpdateCallout } from '../../Generics/redesign/UpdateCallout/UpdateCallout.js'; +import type { NodeOverviewProps } from '../../Generics/redesign/consts.js'; +import { useAppDispatch } from '../../state/hooks.js'; import type { ModalConfig } from '../ModalManager/modalUtils'; +import { modalRoutes } from '../ModalManager/modalUtils.js'; import { container, + loadingIcon, + statusButton, statusContainer, statusIcon, - successIcon, - loadingIcon, statusText, - statusButton, + successIcon, } from './update.css'; -import { UpdateCallout } from '../../Generics/redesign/UpdateCallout/UpdateCallout.js'; -import Button from '../../Generics/redesign/Button/Button.js'; -import { Icon } from '../../Generics/redesign/Icon/Icon.js'; -import type { NodeOverviewProps } from '../../Generics/redesign/consts.js'; -import { useAppDispatch } from '../../state/hooks.js'; -import { setModalState } from '../..//state/modal.js'; -import { modalRoutes } from '../ModalManager/modalUtils.js'; export interface UpdateProps { updateStatus: string; // The current status of the update process diff --git a/src/renderer/Presentational/UpdateModal/UpdateWrapper.tsx b/src/renderer/Presentational/UpdateModal/UpdateWrapper.tsx index 4b7ff0af..f4f291e1 100644 --- a/src/renderer/Presentational/UpdateModal/UpdateWrapper.tsx +++ b/src/renderer/Presentational/UpdateModal/UpdateWrapper.tsx @@ -1,10 +1,10 @@ import { useEffect, useState } from 'react'; +import electron from '../../../renderer/electronGlobal.js'; +import type { NodeOverviewProps } from '../../Generics/redesign/consts.js'; import { useAppSelector } from '../../state/hooks'; import { selectSelectedNodePackage } from '../../state/node'; import type { ModalConfig } from '../ModalManager/modalUtils'; import Update from './Update'; -import type { NodeOverviewProps } from '../../Generics/redesign/consts.js'; -import electron from '../../../renderer/electronGlobal.js'; export interface UpdateWrapperProps { modalOnClose: () => void; diff --git a/src/renderer/Presentational/UpdateModal/update.css.ts b/src/renderer/Presentational/UpdateModal/update.css.ts index 96004f95..41e19e2d 100644 --- a/src/renderer/Presentational/UpdateModal/update.css.ts +++ b/src/renderer/Presentational/UpdateModal/update.css.ts @@ -1,5 +1,5 @@ -import { style, keyframes } from '@vanilla-extract/css'; -import { vars, common } from '../../Generics/redesign/theme.css'; +import { keyframes, style } from '@vanilla-extract/css'; +import { common, vars } from '../../Generics/redesign/theme.css'; export const container = style({ display: 'flex',