diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx index 79668e0..addb0ac 100644 --- a/webapp/src/App.tsx +++ b/webapp/src/App.tsx @@ -1,7 +1,7 @@ import "./App.css"; import { Routes, Route, BrowserRouter } from "react-router-dom"; import { AutomationRoute } from "routes/automation"; -import { useConnectedApiService } from "apiService"; +import { useConnectedApiService } from "services/apiService"; import { ErrorBoundary } from "components/ErrorBoundary"; import { CookiesProvider } from "react-cookie"; import { Page } from "components/Page"; diff --git a/webapp/src/components/AutomationEditor/AutoInfoBox.tsx b/webapp/src/components/AutomationEditor/AutoInfoBox.tsx index 9a1dbbc..74e24ef 100644 --- a/webapp/src/components/AutomationEditor/AutoInfoBox.tsx +++ b/webapp/src/components/AutomationEditor/AutoInfoBox.tsx @@ -10,7 +10,7 @@ import { AddIcon, TrashIcon } from "components/Icons"; import InputAutoText from "components/Inputs/InputAutoText"; import { TagDB } from "components/AutomationManager/TagDB"; import { ButtonIcon } from "components/Icons/ButtonIcons"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export interface AutoInfoBoxProps { metadata: AutomationMetadata & Partial; diff --git a/webapp/src/components/AutomationEditor/NodesRow/index.tsx b/webapp/src/components/AutomationEditor/NodesRow/index.tsx index b4b5fc5..86e42f8 100644 --- a/webapp/src/components/AutomationEditor/NodesRow/index.tsx +++ b/webapp/src/components/AutomationEditor/NodesRow/index.tsx @@ -1,7 +1,7 @@ import "./index.css"; import { AutomationNode, AutomationNodeMapping } from "types/automations"; -import { useHA } from "haService"; +import { useHA } from "services/haService"; import { CollectionNodeElement } from "components/DAGGraph/nodes/CollectionNode/CollectionNodeElement"; import { getDescriptionFromAutomationNode } from "utils/formatting"; import { Size } from "components/DAGGraph/elements/types"; diff --git a/webapp/src/components/AutomationEditor/index.tsx b/webapp/src/components/AutomationEditor/index.tsx index ad490b4..54ac2aa 100644 --- a/webapp/src/components/AutomationEditor/index.tsx +++ b/webapp/src/components/AutomationEditor/index.tsx @@ -31,7 +31,7 @@ import { MiniFailure } from "types/validators/helper"; import { AutoInfoBox } from "./AutoInfoBox"; import { useAutomatioEditorState, EditorData } from "./state"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; import { useSnackbar } from "notistack"; import { Alert } from "@mui/material"; diff --git a/webapp/src/components/AutomationManager/Loaded/automationDB.ts b/webapp/src/components/AutomationManager/Loaded/automationDB.ts index 88133cb..4e05139 100644 --- a/webapp/src/components/AutomationManager/Loaded/automationDB.ts +++ b/webapp/src/components/AutomationManager/Loaded/automationDB.ts @@ -1,5 +1,5 @@ import { HassEntities } from "home-assistant-js-websocket"; -import { LangStore, useLang } from "lang"; +import { LangStore, useLang } from "services/lang"; import { useEffect, useState } from "react"; import { AutomationData, BareAutomationData } from "types/automations"; import { defaultAutomation } from "utils/defaults"; diff --git a/webapp/src/components/AutomationManager/Loaded/index.tsx b/webapp/src/components/AutomationManager/Loaded/index.tsx index 6c41356..a21cf65 100644 --- a/webapp/src/components/AutomationManager/Loaded/index.tsx +++ b/webapp/src/components/AutomationManager/Loaded/index.tsx @@ -10,7 +10,7 @@ import { } from "./state"; import Alert from "@mui/material/Alert"; import { useConfirm } from "material-ui-confirm"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type AutomationManagerLoadedProps = UseAutomationManagerStateArgs & { onAutomationDelete: (aid: string, eid: string) => void; diff --git a/webapp/src/components/AutomationManager/Loaded/state.ts b/webapp/src/components/AutomationManager/Loaded/state.ts index 1927833..bba147c 100644 --- a/webapp/src/components/AutomationManager/Loaded/state.ts +++ b/webapp/src/components/AutomationManager/Loaded/state.ts @@ -7,7 +7,7 @@ import { useAutomationDB } from "./automationDB"; import { useConfirm } from "material-ui-confirm"; import { AutomationManagerAutoUpdatable } from "../types"; import { useSnackbar } from "notistack"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type UseAutomationManagerStateArgs = { configAutomations: AutomationData[]; diff --git a/webapp/src/components/AutomationManager/MetadataBox/Tags.tsx b/webapp/src/components/AutomationManager/MetadataBox/Tags.tsx index 0a467f8..0cc42a1 100644 --- a/webapp/src/components/AutomationManager/MetadataBox/Tags.tsx +++ b/webapp/src/components/AutomationManager/MetadataBox/Tags.tsx @@ -12,7 +12,7 @@ import { Button } from "components/Inputs/Buttons/Button"; import InputAutoText from "components/Inputs/InputAutoText"; import { TagDB } from "../TagDB"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type TagsProps = { automationId: string; diff --git a/webapp/src/components/AutomationManager/MetadataBox/index.tsx b/webapp/src/components/AutomationManager/MetadataBox/index.tsx index 7fee24e..019c251 100644 --- a/webapp/src/components/AutomationManager/MetadataBox/index.tsx +++ b/webapp/src/components/AutomationManager/MetadataBox/index.tsx @@ -18,7 +18,7 @@ import { ButtonIcon } from "components/Icons/ButtonIcons"; import { AutomationManagerAuto } from "../types"; import { Tags } from "./Tags"; import { TagDB } from "../TagDB"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type MetadataBoxProps = AutomationManagerAuto & { onDelete: () => void; diff --git a/webapp/src/components/AutomationManager/Sidebar/index.tsx b/webapp/src/components/AutomationManager/Sidebar/index.tsx index 4bb09aa..255a5d5 100644 --- a/webapp/src/components/AutomationManager/Sidebar/index.tsx +++ b/webapp/src/components/AutomationManager/Sidebar/index.tsx @@ -18,7 +18,7 @@ import { } from "../types"; import { Button } from "components/Inputs/Buttons/Button"; import { ButtonIcon } from "components/Icons/ButtonIcons"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type AutomationManagerSidebarProps = { tagsDB: TagDB; diff --git a/webapp/src/components/AutomationManager/index.stories.tsx b/webapp/src/components/AutomationManager/index.stories.tsx index 01e0934..91631e1 100644 --- a/webapp/src/components/AutomationManager/index.stories.tsx +++ b/webapp/src/components/AutomationManager/index.stories.tsx @@ -1,10 +1,10 @@ import { makeStory } from "devUtils"; -import { useMockApiService } from "apiService"; +import { useMockApiService } from "services/apiService"; import { AutomationManager } from "."; import { MockHAEntitiesProps, useMockHAEntities, -} from "haService/HAEntities.mock"; +} from "services/haService/HAEntities.mock"; import { AutomationData } from "types/automations"; import { createMockAuto } from "utils/mocks"; import { useState } from "react"; diff --git a/webapp/src/components/AutomationManager/index.tsx b/webapp/src/components/AutomationManager/index.tsx index 9be3a08..a2688ba 100644 --- a/webapp/src/components/AutomationManager/index.tsx +++ b/webapp/src/components/AutomationManager/index.tsx @@ -4,8 +4,8 @@ import { FC, useEffect, useRef, useState } from "react"; import LinearProgress from "@mui/material/LinearProgress"; import Skeleton from "@mui/material/Skeleton"; -import { ApiService } from "apiService/core"; -import { HAEntitiesState } from "haService/HAEntities"; +import { ApiService } from "services/apiService/core"; +import { HAEntitiesState } from "services/haService/HAEntities"; import { AutomationManagerLoaded } from "./Loaded"; import { Alert } from "@mui/material"; import { useSnackbar } from "notistack"; @@ -14,8 +14,8 @@ import { getFailures } from "types/validators/helper"; import * as av from "types/validators/autmation"; import { useConfirm } from "material-ui-confirm"; import InputYaml from "components/Inputs/Base/InputYaml"; -import { APIResponse } from "apiService/types"; -import { useLang } from "lang"; +import { APIResponse } from "services/apiService/types"; +import { useLang } from "services/lang"; export type AutomationManagerProps = { onAutomationStateChange: (eid: string, on: boolean) => Promise; diff --git a/webapp/src/components/BottomBar/UserProfile.tsx b/webapp/src/components/BottomBar/UserProfile.tsx index 013af60..8652484 100644 --- a/webapp/src/components/BottomBar/UserProfile.tsx +++ b/webapp/src/components/BottomBar/UserProfile.tsx @@ -1,9 +1,9 @@ import Alert from "@mui/material/Alert"; import Skeleton from "@mui/material/Skeleton"; -import { ApiService } from "apiService/core"; -import { UserProfile } from "apiService/types"; +import { ApiService } from "services/apiService/core"; +import { UserProfile } from "services/apiService/types"; import { InputList } from "components/Inputs/InputList"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; import { FC, useState } from "react"; import LinearProgress from "@mui/material/LinearProgress"; diff --git a/webapp/src/components/BottomBar/index.tsx b/webapp/src/components/BottomBar/index.tsx index 61fdf43..599a485 100644 --- a/webapp/src/components/BottomBar/index.tsx +++ b/webapp/src/components/BottomBar/index.tsx @@ -1,9 +1,9 @@ import "./index.css"; import { FC, useState } from "react"; -import { useHAConnection } from "haService/connection"; +import { useHAConnection } from "services/haService/connection"; import { Button } from "components/Inputs/Buttons/Button"; import SettingsSuggestOutlinedIcon from "@mui/icons-material/SettingsSuggestOutlined"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; import { Modal } from "components/Modal"; import { UserProfileEditor, UserProfileProps } from "./UserProfile"; diff --git a/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx b/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx index e5987e1..0a886e5 100644 --- a/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx +++ b/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx @@ -6,13 +6,13 @@ import { FC, useState } from "react"; import { AutomationCondition } from "types/automations/conditions"; import { getSubTypeList } from "utils/automations"; import { getConditionDefaultValues } from "utils/defaults"; -import { useHA } from "haService"; +import { useHA } from "services/haService"; import InputYaml from "components/Inputs/Base/InputYaml"; import { getViewer } from "./viewRender"; import { getEditor } from "./editorRender"; import useWindowSize from "utils/useWindowSize"; import { ConditionNodeSettings } from "./ConditionNodeSettings"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type ConditionNodeBaseProps = { condition: AutomationCondition; diff --git a/webapp/src/components/ConditionEditor/editorRender.tsx b/webapp/src/components/ConditionEditor/editorRender.tsx index 9e505a7..2e491bb 100644 --- a/webapp/src/components/ConditionEditor/editorRender.tsx +++ b/webapp/src/components/ConditionEditor/editorRender.tsx @@ -20,7 +20,7 @@ import { import { genUpdateMethods } from "./nestedUpdater"; import { InputTime } from "components/Inputs/Base/InputTime"; import InputYaml from "components/Inputs/Base/InputYaml"; -import { HAService } from "haService"; +import { HAService } from "services/haService"; import { DeviceEditor } from "components/DeviceEditor"; import { ButtonIcon } from "components/Icons/ButtonIcons"; import AddIcon from "@mui/icons-material/Add"; @@ -31,7 +31,7 @@ import { prettyName } from "utils/formatting"; import { InputList } from "components/Inputs/InputList"; import { Button } from "components/Inputs/Buttons/Button"; import { RemoveCircle } from "@mui/icons-material"; -import { LangStore } from "lang"; +import { LangStore } from "services/lang"; interface Editor extends FC<{ diff --git a/webapp/src/components/DAGGraph/elements/index.stories.tsx b/webapp/src/components/DAGGraph/elements/index.stories.tsx index a4b0019..3f76c6a 100644 --- a/webapp/src/components/DAGGraph/elements/index.stories.tsx +++ b/webapp/src/components/DAGGraph/elements/index.stories.tsx @@ -3,7 +3,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { Page } from "components/Page"; import { DAGGraphBoard } from "components/DAGGraph/board"; import { useAutomationNodes } from "./index"; -import { useHA } from "haService"; +import { useHA } from "services/haService"; import { AutomationActionData } from "types/automations"; import { createUpdaterFromAutomationData } from "../updater"; import { ModalState } from "../board/types"; diff --git a/webapp/src/components/DAGGraph/index.tsx b/webapp/src/components/DAGGraph/index.tsx index d6ad849..32c6220 100644 --- a/webapp/src/components/DAGGraph/index.tsx +++ b/webapp/src/components/DAGGraph/index.tsx @@ -1,6 +1,6 @@ import { FC, useState, ReactNode } from "react"; import { AutomationSequenceNode } from "types/automations"; -import { useHA } from "haService"; +import { useHA } from "services/haService"; import { ModalState } from "./board/types"; import { createUpdater } from "./updater"; import { useAutomationNodes } from "./elements"; diff --git a/webapp/src/components/DAGGraph/nodes/CollectionNode/CollectionNodeElement.tsx b/webapp/src/components/DAGGraph/nodes/CollectionNode/CollectionNodeElement.tsx index a4d3cba..0428c9f 100644 --- a/webapp/src/components/DAGGraph/nodes/CollectionNode/CollectionNodeElement.tsx +++ b/webapp/src/components/DAGGraph/nodes/CollectionNode/CollectionNodeElement.tsx @@ -13,7 +13,7 @@ import { prettyName } from "utils/formatting"; import DeleteForeverIcon from "@mui/icons-material/DeleteForever"; import { useConfirm } from "material-ui-confirm"; import { useSnackbar } from "notistack"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export const CollectionNodeElement: FC> = ({ diff --git a/webapp/src/components/DAGGraph/nodes/SequenceNode/SequenceNodeElement.tsx b/webapp/src/components/DAGGraph/nodes/SequenceNode/SequenceNodeElement.tsx index b5a5d0e..ea7bb1e 100644 --- a/webapp/src/components/DAGGraph/nodes/SequenceNode/SequenceNodeElement.tsx +++ b/webapp/src/components/DAGGraph/nodes/SequenceNode/SequenceNodeElement.tsx @@ -16,7 +16,7 @@ import InputBoolean from "components/Inputs/Base/InputBoolean"; import { SpeedDial } from "components/SpeedDial"; import { SequenceNodeElementProps } from "./types"; import { useSequenceNodeColor } from "./util"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export const SequenceNodeElement: FC< PropsWithChildren diff --git a/webapp/src/components/DeviceEditor/index.tsx b/webapp/src/components/DeviceEditor/index.tsx index a73d8b5..4c9b877 100644 --- a/webapp/src/components/DeviceEditor/index.tsx +++ b/webapp/src/components/DeviceEditor/index.tsx @@ -6,9 +6,9 @@ import { InputDevice } from "components/Inputs/AutoComplete/InputDevice"; import { InputDeviceCapabilties } from "components/Inputs/AutoComplete/InputDeviceCapabilties"; import { InputEntity } from "components/Inputs/AutoComplete/InputEntities"; import { cleanUpUndefined } from "utils/helpers"; -import { DeviceBaseType, DeviceTypeCapability } from "haService/types"; +import { DeviceBaseType, DeviceTypeCapability } from "services/haService/types"; import { AutomationDeviceState } from "types/automations/common"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type DeviceEditorProps = { type: "action" | "condition" | "trigger"; diff --git a/webapp/src/components/Icons/ButtonIcons.tsx b/webapp/src/components/Icons/ButtonIcons.tsx index 6e74d8a..75fe76f 100644 --- a/webapp/src/components/Icons/ButtonIcons.tsx +++ b/webapp/src/components/Icons/ButtonIcons.tsx @@ -2,7 +2,7 @@ import "./ButtonIcons.css"; import Tooltip from "@mui/material/Tooltip"; import { FC, ReactNode } from "react"; import IconButton, { IconButtonTypeMap } from "@mui/material/IconButton"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type ButtonIconProps = { icon: ReactNode; diff --git a/webapp/src/components/Inputs/AutoComplete/InputArea.tsx b/webapp/src/components/Inputs/AutoComplete/InputArea.tsx index 5ba11d3..2022dcb 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputArea.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputArea.tsx @@ -3,8 +3,8 @@ import { InputAutoComplete, InputAutoCompletePropsBase, } from "./InputAutoComplete"; -import { useHAAreas } from "haService/AreaRegistry"; -import { useLang } from "lang"; +import { useHAAreas } from "services/haService/AreaRegistry"; +import { useLang } from "services/lang"; export type InputAreaProps = InputAutoCompletePropsBase & { restrictToDomain?: string[]; diff --git a/webapp/src/components/Inputs/AutoComplete/InputAutoComplete.tsx b/webapp/src/components/Inputs/AutoComplete/InputAutoComplete.tsx index 1998674..43aa718 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputAutoComplete.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputAutoComplete.tsx @@ -7,7 +7,7 @@ import Popper from "@mui/material/Popper"; import { SearchItem } from "./extras"; import { ReactNode } from "react"; import { prettyName } from "utils/formatting"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type BaseOption = { id: string; diff --git a/webapp/src/components/Inputs/AutoComplete/InputDevice.tsx b/webapp/src/components/Inputs/AutoComplete/InputDevice.tsx index 0226e14..75c234d 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputDevice.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputDevice.tsx @@ -1,6 +1,6 @@ import { FC } from "react"; -import { useHADeviceRegistry } from "haService"; -import { useLang } from "lang"; +import { useHADeviceRegistry } from "services/haService"; +import { useLang } from "services/lang"; import { InputAutoComplete, InputAutoCompletePropsBase, diff --git a/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx b/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx index bb0edd5..a41975a 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx @@ -1,5 +1,5 @@ import "./InputDeviceCapabilties.css"; -import { HaFormSchema } from "haService/types"; +import { HaFormSchema } from "services/haService/types"; import { useSnackbar } from "notistack"; import { useRef } from "react"; import { prettyName } from "utils/formatting"; diff --git a/webapp/src/components/Inputs/AutoComplete/InputEntities.tsx b/webapp/src/components/Inputs/AutoComplete/InputEntities.tsx index f9d4cca..887260b 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputEntities.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputEntities.tsx @@ -1,5 +1,5 @@ import { FC } from "react"; -import { useHAEntities } from "haService/HAEntities"; +import { useHAEntities } from "services/haService/HAEntities"; import { InputAutoComplete, InputAutoCompletePropsBase, diff --git a/webapp/src/components/Inputs/AutoComplete/InputService.tsx b/webapp/src/components/Inputs/AutoComplete/InputService.tsx index f854370..c5c0694 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputService.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputService.tsx @@ -1,11 +1,11 @@ import { FC } from "react"; -import { useHAServices } from "haService"; +import { useHAServices } from "services/haService"; import { InputAutoComplete, InputAutoCompletePropsBase, } from "./InputAutoComplete"; import { prettyName } from "utils/formatting"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type InputServiceProps = InputAutoCompletePropsBase & { multiple?: false; diff --git a/webapp/src/components/Inputs/AutoComplete/InputTimeEntity.tsx b/webapp/src/components/Inputs/AutoComplete/InputTimeEntity.tsx index 3c5ab08..76b429a 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputTimeEntity.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputTimeEntity.tsx @@ -12,7 +12,7 @@ import { } from "utils/time"; import { InputEntity } from "./InputEntities"; import { InputTime } from "components/Inputs/Base/InputTime"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type InputTimeEntityProps = { value: string; diff --git a/webapp/src/components/Inputs/Base/InputTime.tsx b/webapp/src/components/Inputs/Base/InputTime.tsx index 23ae714..9fe68cb 100644 --- a/webapp/src/components/Inputs/Base/InputTime.tsx +++ b/webapp/src/components/Inputs/Base/InputTime.tsx @@ -12,7 +12,7 @@ import { } from "utils/time"; import { prettyName } from "utils/formatting"; import { ButtonIcon } from "components/Icons/ButtonIcons"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; // constants const fields: Array = [ diff --git a/webapp/src/components/Inputs/Base/InputYaml.tsx b/webapp/src/components/Inputs/Base/InputYaml.tsx index 9899c99..864fa19 100644 --- a/webapp/src/components/Inputs/Base/InputYaml.tsx +++ b/webapp/src/components/Inputs/Base/InputYaml.tsx @@ -9,7 +9,7 @@ import FormHelperText from "@mui/material/FormHelperText"; import InputAdornment from "@mui/material/InputAdornment"; import { Save } from "@mui/icons-material"; import { ButtonIcon } from "components/Icons/ButtonIcons"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export interface Props { label: string; diff --git a/webapp/src/components/Inputs/InputList.tsx b/webapp/src/components/Inputs/InputList.tsx index 93208ac..e7acd78 100644 --- a/webapp/src/components/Inputs/InputList.tsx +++ b/webapp/src/components/Inputs/InputList.tsx @@ -7,7 +7,7 @@ import FormControl from "@mui/material/FormControl"; import Select from "@mui/material/Select"; import { prettyName } from "utils/formatting"; import { ReactNode } from "react"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type Props = { current?: T; diff --git a/webapp/src/components/Inputs/InputMultiSelect.tsx b/webapp/src/components/Inputs/InputMultiSelect.tsx index 7dd1841..1aee779 100644 --- a/webapp/src/components/Inputs/InputMultiSelect.tsx +++ b/webapp/src/components/Inputs/InputMultiSelect.tsx @@ -5,7 +5,7 @@ import Autocomplete from "@mui/material/Autocomplete"; import TextField from "@mui/material/TextField"; import Checkbox from "@mui/material/Checkbox"; import { useSnackbar } from "notistack"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export interface Props { label: string; diff --git a/webapp/src/components/Inputs/InputTextView.tsx b/webapp/src/components/Inputs/InputTextView.tsx index ed16c30..4852f9d 100644 --- a/webapp/src/components/Inputs/InputTextView.tsx +++ b/webapp/src/components/Inputs/InputTextView.tsx @@ -5,7 +5,7 @@ import CheckCircleOutlineOutlinedIcon from "@mui/icons-material/CheckCircleOutli import ModeEditOutlineOutlinedIcon from "@mui/icons-material/ModeEditOutlineOutlined"; import TextField from "@mui/material/TextField"; import Tooltip from "@mui/material/Tooltip"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type InputTextViewProps = { className?: string; diff --git a/webapp/src/components/NodeEditor/OptionManager/OptionManager.ts b/webapp/src/components/NodeEditor/OptionManager/OptionManager.ts index 01faaa8..b26979b 100644 --- a/webapp/src/components/NodeEditor/OptionManager/OptionManager.ts +++ b/webapp/src/components/NodeEditor/OptionManager/OptionManager.ts @@ -1,6 +1,6 @@ -import { HAService } from "haService"; -import { HAEntitiesState } from "haService/HAEntities"; -import { LangStore } from "lang"; +import { HAService } from "services/haService"; +import { HAEntitiesState } from "services/haService/HAEntities"; +import { LangStore } from "services/lang"; import { FC } from "react"; import { AutomationAction } from "types/automations/actions"; import { AutomationCondition } from "types/automations/conditions"; diff --git a/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx b/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx index cfa7f48..e5c8aa9 100644 --- a/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/TriggerTime.tsx @@ -15,7 +15,7 @@ import { Button } from "components/Inputs/Buttons/Button"; import { useState } from "react"; import AddIcon from "@mui/icons-material/Add"; import { InputTimeEntity } from "components/Inputs/AutoComplete/InputTimeEntity"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export const TriggerTime: OptionManager = { defaultState: () => ({ diff --git a/webapp/src/components/NodeEditor/OptionManager/index.tsx b/webapp/src/components/NodeEditor/OptionManager/index.tsx index 8c1b12f..a181cbc 100644 --- a/webapp/src/components/NodeEditor/OptionManager/index.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/index.tsx @@ -10,10 +10,10 @@ import { import InputYaml from "components/Inputs/Base/InputYaml"; import InputText from "components/Inputs/Base/InputText"; import { getDescriptionFromAutomationNode } from "utils/formatting"; -import { useHA } from "haService"; +import { useHA } from "services/haService"; import { Generic } from "./Generic"; import { getNodeTypeAndValidate } from "utils/automations"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; type UseState = (s: S) => [S, Dispatch>]; diff --git a/webapp/src/components/NodeEditor/index.tsx b/webapp/src/components/NodeEditor/index.tsx index 2d999a5..0a701d4 100644 --- a/webapp/src/components/NodeEditor/index.tsx +++ b/webapp/src/components/NodeEditor/index.tsx @@ -8,7 +8,7 @@ import { Button } from "components/Inputs/Buttons/Button"; import InputBoolean from "components/Inputs/Base/InputBoolean"; import { useConfirm } from "material-ui-confirm"; import { getNodeSubTypeDescription } from "./utils"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export interface NodeEditorProps { node: AutomationNode; diff --git a/webapp/src/components/Page/index.tsx b/webapp/src/components/Page/index.tsx index ce1b969..f8c12e1 100644 --- a/webapp/src/components/Page/index.tsx +++ b/webapp/src/components/Page/index.tsx @@ -10,12 +10,12 @@ import { import { BottomBar } from "components/BottomBar"; import { SnackbarKey, SnackbarProvider, useSnackbar } from "notistack"; import Button from "@mui/material/Button"; -import { useHAConnection } from "haService/connection"; +import { useHAConnection } from "services/haService/connection"; import { ConfirmProvider } from "material-ui-confirm"; import { Color } from "@mui/material"; import useWindowSize from "utils/useWindowSize"; -import { ApiService } from "apiService/core"; -import { ApiStateProvider, useMockApiService } from "apiService"; +import { ApiService } from "services/apiService/core"; +import { ApiStateProvider, useMockApiService } from "services/apiService"; export type PageProps = PropsWithChildren<{ api: ApiService; diff --git a/webapp/src/components/ServiceEditor/ServiceEditorField.tsx b/webapp/src/components/ServiceEditor/ServiceEditorField.tsx index ab39141..4beab94 100644 --- a/webapp/src/components/ServiceEditor/ServiceEditorField.tsx +++ b/webapp/src/components/ServiceEditor/ServiceEditorField.tsx @@ -10,7 +10,7 @@ import { } from "components/Inputs/AutoComplete/InputAutoComplete"; import { prettyName } from "utils/formatting"; import InputBoolean from "components/Inputs/Base/InputBoolean"; -import { SelectorNumber, SelectorText } from "haService/fieldTypes"; +import { SelectorNumber, SelectorText } from "services/haService/fieldTypes"; import InputYaml from "components/Inputs/Base/InputYaml"; import { useSnackbar } from "notistack"; import { InputEntity } from "components/Inputs/AutoComplete/InputEntities"; diff --git a/webapp/src/components/ServiceEditor/ServiceEditorTarget.tsx b/webapp/src/components/ServiceEditor/ServiceEditorTarget.tsx index 1cc8b41..09fc974 100644 --- a/webapp/src/components/ServiceEditor/ServiceEditorTarget.tsx +++ b/webapp/src/components/ServiceEditor/ServiceEditorTarget.tsx @@ -1,7 +1,7 @@ import "./ServiceEditorTarget.css"; import { InputDevice } from "components/Inputs/AutoComplete/InputDevice"; import { InputEntity } from "components/Inputs/AutoComplete/InputEntities"; -import { Targets } from "haService/fieldTypes"; +import { Targets } from "services/haService/fieldTypes"; import { FC } from "react"; import { InputArea } from "components/Inputs/AutoComplete/InputArea"; diff --git a/webapp/src/components/ServiceEditor/index.stories.tsx b/webapp/src/components/ServiceEditor/index.stories.tsx index bee7eea..6ccfa05 100644 --- a/webapp/src/components/ServiceEditor/index.stories.tsx +++ b/webapp/src/components/ServiceEditor/index.stories.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import { ServiceEditor } from "."; -import { TypedHassService } from "haService/fieldTypes"; +import { TypedHassService } from "services/haService/fieldTypes"; import InputYaml from "components/Inputs/Base/InputYaml"; import { makeStory } from "devUtils"; diff --git a/webapp/src/components/ServiceEditor/index.tsx b/webapp/src/components/ServiceEditor/index.tsx index bf2ae40..ded87bb 100644 --- a/webapp/src/components/ServiceEditor/index.tsx +++ b/webapp/src/components/ServiceEditor/index.tsx @@ -1,7 +1,7 @@ import "./index.css"; import { cleanUpUndefined } from "utils/helpers"; -import { TypedHassService } from "haService/fieldTypes"; +import { TypedHassService } from "services/haService/fieldTypes"; import { FC, useState } from "react"; import { ServiceEditorOption, diff --git a/webapp/src/components/ServiceEditor/options.ts b/webapp/src/components/ServiceEditor/options.ts index c11181d..2658dd9 100644 --- a/webapp/src/components/ServiceEditor/options.ts +++ b/webapp/src/components/ServiceEditor/options.ts @@ -1,5 +1,5 @@ import { BaseOption } from "components/Inputs/AutoComplete/InputAutoComplete"; -import { FieldData, TypedHassService } from "haService/fieldTypes"; +import { FieldData, TypedHassService } from "services/haService/fieldTypes"; import { prettyName } from "utils/formatting"; export type ServiceEditorData = { diff --git a/webapp/src/devUtils/index.tsx b/webapp/src/devUtils/index.tsx index aab68e2..fc21381 100644 --- a/webapp/src/devUtils/index.tsx +++ b/webapp/src/devUtils/index.tsx @@ -2,8 +2,8 @@ import "styles/root.css"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { Page } from "components/Page"; import { ComponentProps, JSXElementConstructor } from "react"; -import { ApiService } from "apiService/core"; -import { useConnectedApiService, useMockApiService } from "apiService"; +import { ApiService } from "services/apiService/core"; +import { useConnectedApiService, useMockApiService } from "services/apiService"; export type MakeStoryArgs< T extends keyof JSX.IntrinsicElements | JSXElementConstructor diff --git a/webapp/src/routes/automation.stories.tsx b/webapp/src/routes/automation.stories.tsx index 0471433..3c3d734 100644 --- a/webapp/src/routes/automation.stories.tsx +++ b/webapp/src/routes/automation.stories.tsx @@ -1,4 +1,4 @@ -import { useConnectedApiService } from "apiService"; +import { useConnectedApiService } from "services/apiService"; import { makeStory } from "devUtils"; import { AutomationRoute } from "./automation"; diff --git a/webapp/src/routes/automation.tsx b/webapp/src/routes/automation.tsx index e2dadee..d7b2be8 100644 --- a/webapp/src/routes/automation.tsx +++ b/webapp/src/routes/automation.tsx @@ -1,6 +1,6 @@ -import { ApiService } from "apiService/core"; +import { ApiService } from "services/apiService/core"; import { FC } from "react"; -import { useHA } from "haService"; +import { useHA } from "services/haService"; import { AutomationManager } from "components/AutomationManager"; export const AutomationRoute: FC<{ api: ApiService }> = ({ api }) => { diff --git a/webapp/src/apiService/automations.ts b/webapp/src/services/apiService/automations.ts similarity index 100% rename from webapp/src/apiService/automations.ts rename to webapp/src/services/apiService/automations.ts diff --git a/webapp/src/apiService/base.ts b/webapp/src/services/apiService/base.ts similarity index 100% rename from webapp/src/apiService/base.ts rename to webapp/src/services/apiService/base.ts diff --git a/webapp/src/apiService/core.ts b/webapp/src/services/apiService/core.ts similarity index 100% rename from webapp/src/apiService/core.ts rename to webapp/src/services/apiService/core.ts diff --git a/webapp/src/apiService/index.ts b/webapp/src/services/apiService/index.ts similarity index 100% rename from webapp/src/apiService/index.ts rename to webapp/src/services/apiService/index.ts diff --git a/webapp/src/apiService/mock.test.ts b/webapp/src/services/apiService/mock.test.ts similarity index 98% rename from webapp/src/apiService/mock.test.ts rename to webapp/src/services/apiService/mock.test.ts index daa8456..1ddc2ab 100644 --- a/webapp/src/apiService/mock.test.ts +++ b/webapp/src/services/apiService/mock.test.ts @@ -1,6 +1,6 @@ import { useAutoMockAPI } from "./mock"; import { makeAutomationAPI } from "./automations"; -import { createMockAuto } from "../utils/mocks"; +import { createMockAuto } from "utils/mocks"; import { AutomationData } from "types/automations"; const fakeUseRef = (a: any) => ({ current: a }); diff --git a/webapp/src/apiService/mock.ts b/webapp/src/services/apiService/mock.ts similarity index 100% rename from webapp/src/apiService/mock.ts rename to webapp/src/services/apiService/mock.ts diff --git a/webapp/src/apiService/paths.ts b/webapp/src/services/apiService/paths.ts similarity index 100% rename from webapp/src/apiService/paths.ts rename to webapp/src/services/apiService/paths.ts diff --git a/webapp/src/apiService/profile.ts b/webapp/src/services/apiService/profile.ts similarity index 100% rename from webapp/src/apiService/profile.ts rename to webapp/src/services/apiService/profile.ts diff --git a/webapp/src/apiService/types.ts b/webapp/src/services/apiService/types.ts similarity index 100% rename from webapp/src/apiService/types.ts rename to webapp/src/services/apiService/types.ts diff --git a/webapp/src/apiService/util.ts b/webapp/src/services/apiService/util.ts similarity index 97% rename from webapp/src/apiService/util.ts rename to webapp/src/services/apiService/util.ts index ef5f3e5..de597d2 100644 --- a/webapp/src/apiService/util.ts +++ b/webapp/src/services/apiService/util.ts @@ -2,7 +2,7 @@ import { useState } from "react"; import { ApiState } from "./types"; import { AutomationAPI } from "./automations"; import { UserProfileAPI } from "./profile"; -import { UserProfile } from "apiService/types"; +import { UserProfile } from "services/apiService/types"; export const useDefaultApiState = () => useState({ diff --git a/webapp/src/haService/AreaRegistry.ts b/webapp/src/services/haService/AreaRegistry.ts similarity index 100% rename from webapp/src/haService/AreaRegistry.ts rename to webapp/src/services/haService/AreaRegistry.ts diff --git a/webapp/src/haService/HAEntities.mock.ts b/webapp/src/services/haService/HAEntities.mock.ts similarity index 100% rename from webapp/src/haService/HAEntities.mock.ts rename to webapp/src/services/haService/HAEntities.mock.ts diff --git a/webapp/src/haService/HAEntities.ts b/webapp/src/services/haService/HAEntities.ts similarity index 100% rename from webapp/src/haService/HAEntities.ts rename to webapp/src/services/haService/HAEntities.ts diff --git a/webapp/src/haService/additionalCollections.ts b/webapp/src/services/haService/additionalCollections.ts similarity index 100% rename from webapp/src/haService/additionalCollections.ts rename to webapp/src/services/haService/additionalCollections.ts diff --git a/webapp/src/haService/automation.stories.tsx b/webapp/src/services/haService/automation.stories.tsx similarity index 98% rename from webapp/src/haService/automation.stories.tsx rename to webapp/src/services/haService/automation.stories.tsx index 3565f23..6ab9bad 100644 --- a/webapp/src/haService/automation.stories.tsx +++ b/webapp/src/services/haService/automation.stories.tsx @@ -1,6 +1,6 @@ import React, { FC, useEffect, useState } from "react"; import { makeStory } from "devUtils"; -import { useHA } from "haService"; +import { useHA } from "services/haService"; import InputYaml from "components/Inputs/Base/InputYaml"; import { InputList } from "components/Inputs/InputList"; import { Button } from "components/Inputs/Buttons/Button"; diff --git a/webapp/src/haService/connection.ts b/webapp/src/services/haService/connection.ts similarity index 98% rename from webapp/src/haService/connection.ts rename to webapp/src/services/haService/connection.ts index 6f8b753..c7011b1 100644 --- a/webapp/src/haService/connection.ts +++ b/webapp/src/services/haService/connection.ts @@ -9,7 +9,7 @@ import { ERR_INVALID_HTTPS_TO_HTTP, createConnection as _createConnection, } from "home-assistant-js-websocket"; -import { wsURL } from "apiService"; +import { wsURL } from "services/apiService"; export type HAConnection = | { diff --git a/webapp/src/haService/dr.stories.tsx b/webapp/src/services/haService/dr.stories.tsx similarity index 95% rename from webapp/src/haService/dr.stories.tsx rename to webapp/src/services/haService/dr.stories.tsx index 65c5997..1d752d0 100644 --- a/webapp/src/haService/dr.stories.tsx +++ b/webapp/src/services/haService/dr.stories.tsx @@ -1,5 +1,5 @@ import React, { FC } from "react"; -import { useHADeviceRegistry } from "haService"; +import { useHADeviceRegistry } from "services/haService"; import InputYaml from "components/Inputs/Base/InputYaml"; import { makeStory } from "devUtils"; diff --git a/webapp/src/haService/entities.stories.tsx b/webapp/src/services/haService/entities.stories.tsx similarity index 96% rename from webapp/src/haService/entities.stories.tsx rename to webapp/src/services/haService/entities.stories.tsx index 60c74b2..cfd335c 100644 --- a/webapp/src/haService/entities.stories.tsx +++ b/webapp/src/services/haService/entities.stories.tsx @@ -1,7 +1,7 @@ import React, { FC, useState } from "react"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { MockPage } from "components/Page"; -import { useHAEntities } from "haService/HAEntities"; +import { useHAEntities } from "services/haService/HAEntities"; const Test: FC<{ onRender: () => void }> = ({ onRender }) => { const [searchTerm, setSearch] = useState(""); diff --git a/webapp/src/haService/er.stories.tsx b/webapp/src/services/haService/er.stories.tsx similarity index 95% rename from webapp/src/haService/er.stories.tsx rename to webapp/src/services/haService/er.stories.tsx index 8f8c334..1d25e2a 100644 --- a/webapp/src/haService/er.stories.tsx +++ b/webapp/src/services/haService/er.stories.tsx @@ -1,7 +1,7 @@ import React, { FC } from "react"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { MockPage } from "components/Page"; -import { useHAEntityRegistry } from "haService"; +import { useHAEntityRegistry } from "services/haService"; const Test: FC<{ onRender: () => void }> = ({ onRender }) => { const conn = useHAEntityRegistry(); diff --git a/webapp/src/haService/extras.ts b/webapp/src/services/haService/extras.ts similarity index 100% rename from webapp/src/haService/extras.ts rename to webapp/src/services/haService/extras.ts diff --git a/webapp/src/haService/fieldTypes.ts b/webapp/src/services/haService/fieldTypes.ts similarity index 100% rename from webapp/src/haService/fieldTypes.ts rename to webapp/src/services/haService/fieldTypes.ts diff --git a/webapp/src/haService/index.ts b/webapp/src/services/haService/index.ts similarity index 99% rename from webapp/src/haService/index.ts rename to webapp/src/services/haService/index.ts index 72a09ef..dbc85d0 100644 --- a/webapp/src/haService/index.ts +++ b/webapp/src/services/haService/index.ts @@ -12,7 +12,7 @@ import { TypedHassService } from "./fieldTypes"; import { Option } from "components/Inputs/AutoComplete/InputAutoComplete"; import { getDeviceExtraWsCalls } from "./extras"; import { useHAEntities } from "./HAEntities"; -import { useLang } from "lang"; +import { useLang } from "services/lang"; export type ServiceOption = Option<{ domain: string; diff --git a/webapp/src/haService/services.stories.tsx b/webapp/src/services/haService/services.stories.tsx similarity index 98% rename from webapp/src/haService/services.stories.tsx rename to webapp/src/services/haService/services.stories.tsx index 98277b9..bf470de 100644 --- a/webapp/src/haService/services.stories.tsx +++ b/webapp/src/services/haService/services.stories.tsx @@ -1,7 +1,7 @@ import React, { FC, useEffect, useState } from "react"; import { ComponentMeta, ComponentStory } from "@storybook/react"; import { MockPage } from "components/Page"; -import { useHA } from "haService"; +import { useHA } from "services/haService"; import InputYaml from "components/Inputs/Base/InputYaml"; import { InputList } from "components/Inputs/InputList"; import { Button } from "components/Inputs/Buttons/Button"; diff --git a/webapp/src/haService/types.ts b/webapp/src/services/haService/types.ts similarity index 100% rename from webapp/src/haService/types.ts rename to webapp/src/services/haService/types.ts diff --git a/webapp/src/haService/useHassCollection.ts b/webapp/src/services/haService/useHassCollection.ts similarity index 100% rename from webapp/src/haService/useHassCollection.ts rename to webapp/src/services/haService/useHassCollection.ts diff --git a/webapp/src/lang/eng.json b/webapp/src/services/lang/eng.json similarity index 100% rename from webapp/src/lang/eng.json rename to webapp/src/services/lang/eng.json diff --git a/webapp/src/lang/fra.json b/webapp/src/services/lang/fra.json similarity index 100% rename from webapp/src/lang/fra.json rename to webapp/src/services/lang/fra.json diff --git a/webapp/src/lang/index.ts b/webapp/src/services/lang/index.ts similarity index 96% rename from webapp/src/lang/index.ts rename to webapp/src/services/lang/index.ts index 77e3709..d947b9f 100644 --- a/webapp/src/lang/index.ts +++ b/webapp/src/services/lang/index.ts @@ -1,4 +1,4 @@ -import { useApiState } from "apiService"; +import { useApiState } from "services/apiService"; import { useEffect, useState } from "react"; const MISSING_TEXT = "<>"; diff --git a/webapp/src/lang/ita.json b/webapp/src/services/lang/ita.json similarity index 100% rename from webapp/src/lang/ita.json rename to webapp/src/services/lang/ita.json