From a4a607768a2571ceb0d42721d9cf9604bd347366 Mon Sep 17 00:00:00 2001 From: Ari Date: Mon, 5 Sep 2022 15:09:41 -0400 Subject: [PATCH] rename --- webapp/src/App.tsx | 2 +- webapp/src/components/AutomationEditor/NodesRow/index.tsx | 2 +- webapp/src/components/AutomationManager/index.stories.tsx | 4 ++-- webapp/src/components/AutomationManager/index.tsx | 6 +++--- webapp/src/components/BottomBar/UserProfile.tsx | 4 ++-- webapp/src/components/BottomBar/index.tsx | 2 +- webapp/src/components/ConditionEditor/ConditionNodeBase.tsx | 2 +- webapp/src/components/ConditionEditor/editorRender.tsx | 2 +- webapp/src/components/DAGGraph/elements/index.stories.tsx | 2 +- webapp/src/components/DAGGraph/index.tsx | 2 +- webapp/src/components/DeviceEditor/index.tsx | 2 +- webapp/src/components/Inputs/AutoComplete/InputArea.tsx | 2 +- webapp/src/components/Inputs/AutoComplete/InputDevice.tsx | 2 +- .../Inputs/AutoComplete/InputDeviceCapabilties.tsx | 2 +- webapp/src/components/Inputs/AutoComplete/InputEntities.tsx | 2 +- webapp/src/components/Inputs/AutoComplete/InputService.tsx | 2 +- .../components/NodeEditor/OptionManager/OptionManager.ts | 4 ++-- webapp/src/components/NodeEditor/OptionManager/index.tsx | 2 +- webapp/src/components/Page/index.tsx | 6 +++--- webapp/src/components/ServiceEditor/ServiceEditorField.tsx | 2 +- webapp/src/components/ServiceEditor/ServiceEditorTarget.tsx | 2 +- webapp/src/components/ServiceEditor/index.stories.tsx | 2 +- webapp/src/components/ServiceEditor/index.tsx | 2 +- webapp/src/components/ServiceEditor/options.ts | 2 +- webapp/src/devUtils/index.tsx | 4 ++-- webapp/src/routes/automation.stories.tsx | 2 +- webapp/src/routes/automation.tsx | 4 ++-- webapp/src/services/{apiService => api}/automations.ts | 0 webapp/src/services/{apiService => api}/base.ts | 0 webapp/src/services/{apiService => api}/core.ts | 0 webapp/src/services/{apiService => api}/index.ts | 0 webapp/src/services/{apiService => api}/mock.test.ts | 0 webapp/src/services/{apiService => api}/mock.ts | 0 webapp/src/services/{apiService => api}/paths.ts | 0 webapp/src/services/{apiService => api}/profile.ts | 0 webapp/src/services/{apiService => api}/types.ts | 0 webapp/src/services/{apiService => api}/util.ts | 2 +- webapp/src/services/{haService => ha}/AreaRegistry.ts | 0 webapp/src/services/{haService => ha}/HAEntities.mock.ts | 0 webapp/src/services/{haService => ha}/HAEntities.ts | 0 .../src/services/{haService => ha}/additionalCollections.ts | 0 .../src/services/{haService => ha}/automation.stories.tsx | 2 +- webapp/src/services/{haService => ha}/connection.ts | 2 +- webapp/src/services/{haService => ha}/dr.stories.tsx | 2 +- webapp/src/services/{haService => ha}/entities.stories.tsx | 2 +- webapp/src/services/{haService => ha}/er.stories.tsx | 2 +- webapp/src/services/{haService => ha}/extras.ts | 0 webapp/src/services/{haService => ha}/fieldTypes.ts | 0 webapp/src/services/{haService => ha}/index.ts | 0 webapp/src/services/{haService => ha}/services.stories.tsx | 2 +- webapp/src/services/{haService => ha}/types.ts | 0 webapp/src/services/{haService => ha}/useHassCollection.ts | 0 webapp/src/services/lang/index.ts | 2 +- 53 files changed, 44 insertions(+), 44 deletions(-) rename webapp/src/services/{apiService => api}/automations.ts (100%) rename webapp/src/services/{apiService => api}/base.ts (100%) rename webapp/src/services/{apiService => api}/core.ts (100%) rename webapp/src/services/{apiService => api}/index.ts (100%) rename webapp/src/services/{apiService => api}/mock.test.ts (100%) rename webapp/src/services/{apiService => api}/mock.ts (100%) rename webapp/src/services/{apiService => api}/paths.ts (100%) rename webapp/src/services/{apiService => api}/profile.ts (100%) rename webapp/src/services/{apiService => api}/types.ts (100%) rename webapp/src/services/{apiService => api}/util.ts (97%) rename webapp/src/services/{haService => ha}/AreaRegistry.ts (100%) rename webapp/src/services/{haService => ha}/HAEntities.mock.ts (100%) rename webapp/src/services/{haService => ha}/HAEntities.ts (100%) rename webapp/src/services/{haService => ha}/additionalCollections.ts (100%) rename webapp/src/services/{haService => ha}/automation.stories.tsx (98%) rename webapp/src/services/{haService => ha}/connection.ts (98%) rename webapp/src/services/{haService => ha}/dr.stories.tsx (95%) rename webapp/src/services/{haService => ha}/entities.stories.tsx (96%) rename webapp/src/services/{haService => ha}/er.stories.tsx (95%) rename webapp/src/services/{haService => ha}/extras.ts (100%) rename webapp/src/services/{haService => ha}/fieldTypes.ts (100%) rename webapp/src/services/{haService => ha}/index.ts (100%) rename webapp/src/services/{haService => ha}/services.stories.tsx (98%) rename webapp/src/services/{haService => ha}/types.ts (100%) rename webapp/src/services/{haService => ha}/useHassCollection.ts (100%) diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx index addb0ac..611be96 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 "services/apiService"; +import { useConnectedApiService } from "services/api"; import { ErrorBoundary } from "components/ErrorBoundary"; import { CookiesProvider } from "react-cookie"; import { Page } from "components/Page"; diff --git a/webapp/src/components/AutomationEditor/NodesRow/index.tsx b/webapp/src/components/AutomationEditor/NodesRow/index.tsx index 86e42f8..9530ae3 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 "services/haService"; +import { useHA } from "services/ha"; 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/AutomationManager/index.stories.tsx b/webapp/src/components/AutomationManager/index.stories.tsx index 91631e1..3767672 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 "services/apiService"; +import { useMockApiService } from "services/api"; import { AutomationManager } from "."; import { MockHAEntitiesProps, useMockHAEntities, -} from "services/haService/HAEntities.mock"; +} from "services/ha/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 a2688ba..9aa11af 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 "services/apiService/core"; -import { HAEntitiesState } from "services/haService/HAEntities"; +import { ApiService } from "services/api/core"; +import { HAEntitiesState } from "services/ha/HAEntities"; import { AutomationManagerLoaded } from "./Loaded"; import { Alert } from "@mui/material"; import { useSnackbar } from "notistack"; @@ -14,7 +14,7 @@ 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 "services/apiService/types"; +import { APIResponse } from "services/api/types"; import { useLang } from "services/lang"; export type AutomationManagerProps = { diff --git a/webapp/src/components/BottomBar/UserProfile.tsx b/webapp/src/components/BottomBar/UserProfile.tsx index 8652484..dd752e9 100644 --- a/webapp/src/components/BottomBar/UserProfile.tsx +++ b/webapp/src/components/BottomBar/UserProfile.tsx @@ -1,7 +1,7 @@ import Alert from "@mui/material/Alert"; import Skeleton from "@mui/material/Skeleton"; -import { ApiService } from "services/apiService/core"; -import { UserProfile } from "services/apiService/types"; +import { ApiService } from "services/api/core"; +import { UserProfile } from "services/api/types"; import { InputList } from "components/Inputs/InputList"; import { useLang } from "services/lang"; import { FC, useState } from "react"; diff --git a/webapp/src/components/BottomBar/index.tsx b/webapp/src/components/BottomBar/index.tsx index 599a485..864fec5 100644 --- a/webapp/src/components/BottomBar/index.tsx +++ b/webapp/src/components/BottomBar/index.tsx @@ -1,6 +1,6 @@ import "./index.css"; import { FC, useState } from "react"; -import { useHAConnection } from "services/haService/connection"; +import { useHAConnection } from "services/ha/connection"; import { Button } from "components/Inputs/Buttons/Button"; import SettingsSuggestOutlinedIcon from "@mui/icons-material/SettingsSuggestOutlined"; import { useLang } from "services/lang"; diff --git a/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx b/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx index 0a886e5..b302c9f 100644 --- a/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx +++ b/webapp/src/components/ConditionEditor/ConditionNodeBase.tsx @@ -6,7 +6,7 @@ import { FC, useState } from "react"; import { AutomationCondition } from "types/automations/conditions"; import { getSubTypeList } from "utils/automations"; import { getConditionDefaultValues } from "utils/defaults"; -import { useHA } from "services/haService"; +import { useHA } from "services/ha"; import InputYaml from "components/Inputs/Base/InputYaml"; import { getViewer } from "./viewRender"; import { getEditor } from "./editorRender"; diff --git a/webapp/src/components/ConditionEditor/editorRender.tsx b/webapp/src/components/ConditionEditor/editorRender.tsx index 2e491bb..dd80d46 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 "services/haService"; +import { HAService } from "services/ha"; import { DeviceEditor } from "components/DeviceEditor"; import { ButtonIcon } from "components/Icons/ButtonIcons"; import AddIcon from "@mui/icons-material/Add"; diff --git a/webapp/src/components/DAGGraph/elements/index.stories.tsx b/webapp/src/components/DAGGraph/elements/index.stories.tsx index 3f76c6a..f432867 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 "services/haService"; +import { useHA } from "services/ha"; 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 32c6220..057abaf 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 "services/haService"; +import { useHA } from "services/ha"; import { ModalState } from "./board/types"; import { createUpdater } from "./updater"; import { useAutomationNodes } from "./elements"; diff --git a/webapp/src/components/DeviceEditor/index.tsx b/webapp/src/components/DeviceEditor/index.tsx index 4c9b877..2ac89e9 100644 --- a/webapp/src/components/DeviceEditor/index.tsx +++ b/webapp/src/components/DeviceEditor/index.tsx @@ -6,7 +6,7 @@ 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 "services/haService/types"; +import { DeviceBaseType, DeviceTypeCapability } from "services/ha/types"; import { AutomationDeviceState } from "types/automations/common"; import { useLang } from "services/lang"; diff --git a/webapp/src/components/Inputs/AutoComplete/InputArea.tsx b/webapp/src/components/Inputs/AutoComplete/InputArea.tsx index 2022dcb..a609446 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputArea.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputArea.tsx @@ -3,7 +3,7 @@ import { InputAutoComplete, InputAutoCompletePropsBase, } from "./InputAutoComplete"; -import { useHAAreas } from "services/haService/AreaRegistry"; +import { useHAAreas } from "services/ha/AreaRegistry"; import { useLang } from "services/lang"; export type InputAreaProps = InputAutoCompletePropsBase & { diff --git a/webapp/src/components/Inputs/AutoComplete/InputDevice.tsx b/webapp/src/components/Inputs/AutoComplete/InputDevice.tsx index 75c234d..c87b6ab 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputDevice.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputDevice.tsx @@ -1,5 +1,5 @@ import { FC } from "react"; -import { useHADeviceRegistry } from "services/haService"; +import { useHADeviceRegistry } from "services/ha"; import { useLang } from "services/lang"; import { InputAutoComplete, diff --git a/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx b/webapp/src/components/Inputs/AutoComplete/InputDeviceCapabilties.tsx index a41975a..2651ee2 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 "services/haService/types"; +import { HaFormSchema } from "services/ha/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 887260b..2486202 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 "services/haService/HAEntities"; +import { useHAEntities } from "services/ha/HAEntities"; import { InputAutoComplete, InputAutoCompletePropsBase, diff --git a/webapp/src/components/Inputs/AutoComplete/InputService.tsx b/webapp/src/components/Inputs/AutoComplete/InputService.tsx index c5c0694..6d783b6 100644 --- a/webapp/src/components/Inputs/AutoComplete/InputService.tsx +++ b/webapp/src/components/Inputs/AutoComplete/InputService.tsx @@ -1,5 +1,5 @@ import { FC } from "react"; -import { useHAServices } from "services/haService"; +import { useHAServices } from "services/ha"; import { InputAutoComplete, InputAutoCompletePropsBase, diff --git a/webapp/src/components/NodeEditor/OptionManager/OptionManager.ts b/webapp/src/components/NodeEditor/OptionManager/OptionManager.ts index b26979b..fbdd8d7 100644 --- a/webapp/src/components/NodeEditor/OptionManager/OptionManager.ts +++ b/webapp/src/components/NodeEditor/OptionManager/OptionManager.ts @@ -1,5 +1,5 @@ -import { HAService } from "services/haService"; -import { HAEntitiesState } from "services/haService/HAEntities"; +import { HAService } from "services/ha"; +import { HAEntitiesState } from "services/ha/HAEntities"; import { LangStore } from "services/lang"; import { FC } from "react"; import { AutomationAction } from "types/automations/actions"; diff --git a/webapp/src/components/NodeEditor/OptionManager/index.tsx b/webapp/src/components/NodeEditor/OptionManager/index.tsx index a181cbc..cbb4905 100644 --- a/webapp/src/components/NodeEditor/OptionManager/index.tsx +++ b/webapp/src/components/NodeEditor/OptionManager/index.tsx @@ -10,7 +10,7 @@ import { import InputYaml from "components/Inputs/Base/InputYaml"; import InputText from "components/Inputs/Base/InputText"; import { getDescriptionFromAutomationNode } from "utils/formatting"; -import { useHA } from "services/haService"; +import { useHA } from "services/ha"; import { Generic } from "./Generic"; import { getNodeTypeAndValidate } from "utils/automations"; import { useLang } from "services/lang"; diff --git a/webapp/src/components/Page/index.tsx b/webapp/src/components/Page/index.tsx index f8c12e1..376d7ea 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 "services/haService/connection"; +import { useHAConnection } from "services/ha/connection"; import { ConfirmProvider } from "material-ui-confirm"; import { Color } from "@mui/material"; import useWindowSize from "utils/useWindowSize"; -import { ApiService } from "services/apiService/core"; -import { ApiStateProvider, useMockApiService } from "services/apiService"; +import { ApiService } from "services/api/core"; +import { ApiStateProvider, useMockApiService } from "services/api"; export type PageProps = PropsWithChildren<{ api: ApiService; diff --git a/webapp/src/components/ServiceEditor/ServiceEditorField.tsx b/webapp/src/components/ServiceEditor/ServiceEditorField.tsx index 4beab94..157ec0b 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 "services/haService/fieldTypes"; +import { SelectorNumber, SelectorText } from "services/ha/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 09fc974..6f602d8 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 "services/haService/fieldTypes"; +import { Targets } from "services/ha/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 6ccfa05..3e2c240 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 "services/haService/fieldTypes"; +import { TypedHassService } from "services/ha/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 ded87bb..653772b 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 "services/haService/fieldTypes"; +import { TypedHassService } from "services/ha/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 2658dd9..bebaca5 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 "services/haService/fieldTypes"; +import { FieldData, TypedHassService } from "services/ha/fieldTypes"; import { prettyName } from "utils/formatting"; export type ServiceEditorData = { diff --git a/webapp/src/devUtils/index.tsx b/webapp/src/devUtils/index.tsx index fc21381..ab84860 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 "services/apiService/core"; -import { useConnectedApiService, useMockApiService } from "services/apiService"; +import { ApiService } from "services/api/core"; +import { useConnectedApiService, useMockApiService } from "services/api"; 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 3c3d734..7d5ec63 100644 --- a/webapp/src/routes/automation.stories.tsx +++ b/webapp/src/routes/automation.stories.tsx @@ -1,4 +1,4 @@ -import { useConnectedApiService } from "services/apiService"; +import { useConnectedApiService } from "services/api"; import { makeStory } from "devUtils"; import { AutomationRoute } from "./automation"; diff --git a/webapp/src/routes/automation.tsx b/webapp/src/routes/automation.tsx index d7b2be8..f2bfc84 100644 --- a/webapp/src/routes/automation.tsx +++ b/webapp/src/routes/automation.tsx @@ -1,6 +1,6 @@ -import { ApiService } from "services/apiService/core"; +import { ApiService } from "services/api/core"; import { FC } from "react"; -import { useHA } from "services/haService"; +import { useHA } from "services/ha"; import { AutomationManager } from "components/AutomationManager"; export const AutomationRoute: FC<{ api: ApiService }> = ({ api }) => { diff --git a/webapp/src/services/apiService/automations.ts b/webapp/src/services/api/automations.ts similarity index 100% rename from webapp/src/services/apiService/automations.ts rename to webapp/src/services/api/automations.ts diff --git a/webapp/src/services/apiService/base.ts b/webapp/src/services/api/base.ts similarity index 100% rename from webapp/src/services/apiService/base.ts rename to webapp/src/services/api/base.ts diff --git a/webapp/src/services/apiService/core.ts b/webapp/src/services/api/core.ts similarity index 100% rename from webapp/src/services/apiService/core.ts rename to webapp/src/services/api/core.ts diff --git a/webapp/src/services/apiService/index.ts b/webapp/src/services/api/index.ts similarity index 100% rename from webapp/src/services/apiService/index.ts rename to webapp/src/services/api/index.ts diff --git a/webapp/src/services/apiService/mock.test.ts b/webapp/src/services/api/mock.test.ts similarity index 100% rename from webapp/src/services/apiService/mock.test.ts rename to webapp/src/services/api/mock.test.ts diff --git a/webapp/src/services/apiService/mock.ts b/webapp/src/services/api/mock.ts similarity index 100% rename from webapp/src/services/apiService/mock.ts rename to webapp/src/services/api/mock.ts diff --git a/webapp/src/services/apiService/paths.ts b/webapp/src/services/api/paths.ts similarity index 100% rename from webapp/src/services/apiService/paths.ts rename to webapp/src/services/api/paths.ts diff --git a/webapp/src/services/apiService/profile.ts b/webapp/src/services/api/profile.ts similarity index 100% rename from webapp/src/services/apiService/profile.ts rename to webapp/src/services/api/profile.ts diff --git a/webapp/src/services/apiService/types.ts b/webapp/src/services/api/types.ts similarity index 100% rename from webapp/src/services/apiService/types.ts rename to webapp/src/services/api/types.ts diff --git a/webapp/src/services/apiService/util.ts b/webapp/src/services/api/util.ts similarity index 97% rename from webapp/src/services/apiService/util.ts rename to webapp/src/services/api/util.ts index de597d2..cfd1afa 100644 --- a/webapp/src/services/apiService/util.ts +++ b/webapp/src/services/api/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 "services/apiService/types"; +import { UserProfile } from "services/api/types"; export const useDefaultApiState = () => useState({ diff --git a/webapp/src/services/haService/AreaRegistry.ts b/webapp/src/services/ha/AreaRegistry.ts similarity index 100% rename from webapp/src/services/haService/AreaRegistry.ts rename to webapp/src/services/ha/AreaRegistry.ts diff --git a/webapp/src/services/haService/HAEntities.mock.ts b/webapp/src/services/ha/HAEntities.mock.ts similarity index 100% rename from webapp/src/services/haService/HAEntities.mock.ts rename to webapp/src/services/ha/HAEntities.mock.ts diff --git a/webapp/src/services/haService/HAEntities.ts b/webapp/src/services/ha/HAEntities.ts similarity index 100% rename from webapp/src/services/haService/HAEntities.ts rename to webapp/src/services/ha/HAEntities.ts diff --git a/webapp/src/services/haService/additionalCollections.ts b/webapp/src/services/ha/additionalCollections.ts similarity index 100% rename from webapp/src/services/haService/additionalCollections.ts rename to webapp/src/services/ha/additionalCollections.ts diff --git a/webapp/src/services/haService/automation.stories.tsx b/webapp/src/services/ha/automation.stories.tsx similarity index 98% rename from webapp/src/services/haService/automation.stories.tsx rename to webapp/src/services/ha/automation.stories.tsx index 6ab9bad..8be6044 100644 --- a/webapp/src/services/haService/automation.stories.tsx +++ b/webapp/src/services/ha/automation.stories.tsx @@ -1,6 +1,6 @@ import React, { FC, useEffect, useState } from "react"; import { makeStory } from "devUtils"; -import { useHA } from "services/haService"; +import { useHA } from "services/ha"; 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/services/haService/connection.ts b/webapp/src/services/ha/connection.ts similarity index 98% rename from webapp/src/services/haService/connection.ts rename to webapp/src/services/ha/connection.ts index c7011b1..4ff2c81 100644 --- a/webapp/src/services/haService/connection.ts +++ b/webapp/src/services/ha/connection.ts @@ -9,7 +9,7 @@ import { ERR_INVALID_HTTPS_TO_HTTP, createConnection as _createConnection, } from "home-assistant-js-websocket"; -import { wsURL } from "services/apiService"; +import { wsURL } from "services/api"; export type HAConnection = | { diff --git a/webapp/src/services/haService/dr.stories.tsx b/webapp/src/services/ha/dr.stories.tsx similarity index 95% rename from webapp/src/services/haService/dr.stories.tsx rename to webapp/src/services/ha/dr.stories.tsx index 1d752d0..890a2a7 100644 --- a/webapp/src/services/haService/dr.stories.tsx +++ b/webapp/src/services/ha/dr.stories.tsx @@ -1,5 +1,5 @@ import React, { FC } from "react"; -import { useHADeviceRegistry } from "services/haService"; +import { useHADeviceRegistry } from "services/ha"; import InputYaml from "components/Inputs/Base/InputYaml"; import { makeStory } from "devUtils"; diff --git a/webapp/src/services/haService/entities.stories.tsx b/webapp/src/services/ha/entities.stories.tsx similarity index 96% rename from webapp/src/services/haService/entities.stories.tsx rename to webapp/src/services/ha/entities.stories.tsx index cfd335c..104be2b 100644 --- a/webapp/src/services/haService/entities.stories.tsx +++ b/webapp/src/services/ha/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 "services/haService/HAEntities"; +import { useHAEntities } from "services/ha/HAEntities"; const Test: FC<{ onRender: () => void }> = ({ onRender }) => { const [searchTerm, setSearch] = useState(""); diff --git a/webapp/src/services/haService/er.stories.tsx b/webapp/src/services/ha/er.stories.tsx similarity index 95% rename from webapp/src/services/haService/er.stories.tsx rename to webapp/src/services/ha/er.stories.tsx index 1d25e2a..849f77c 100644 --- a/webapp/src/services/haService/er.stories.tsx +++ b/webapp/src/services/ha/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 "services/haService"; +import { useHAEntityRegistry } from "services/ha"; const Test: FC<{ onRender: () => void }> = ({ onRender }) => { const conn = useHAEntityRegistry(); diff --git a/webapp/src/services/haService/extras.ts b/webapp/src/services/ha/extras.ts similarity index 100% rename from webapp/src/services/haService/extras.ts rename to webapp/src/services/ha/extras.ts diff --git a/webapp/src/services/haService/fieldTypes.ts b/webapp/src/services/ha/fieldTypes.ts similarity index 100% rename from webapp/src/services/haService/fieldTypes.ts rename to webapp/src/services/ha/fieldTypes.ts diff --git a/webapp/src/services/haService/index.ts b/webapp/src/services/ha/index.ts similarity index 100% rename from webapp/src/services/haService/index.ts rename to webapp/src/services/ha/index.ts diff --git a/webapp/src/services/haService/services.stories.tsx b/webapp/src/services/ha/services.stories.tsx similarity index 98% rename from webapp/src/services/haService/services.stories.tsx rename to webapp/src/services/ha/services.stories.tsx index bf470de..798f970 100644 --- a/webapp/src/services/haService/services.stories.tsx +++ b/webapp/src/services/ha/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 "services/haService"; +import { useHA } from "services/ha"; 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/services/haService/types.ts b/webapp/src/services/ha/types.ts similarity index 100% rename from webapp/src/services/haService/types.ts rename to webapp/src/services/ha/types.ts diff --git a/webapp/src/services/haService/useHassCollection.ts b/webapp/src/services/ha/useHassCollection.ts similarity index 100% rename from webapp/src/services/haService/useHassCollection.ts rename to webapp/src/services/ha/useHassCollection.ts diff --git a/webapp/src/services/lang/index.ts b/webapp/src/services/lang/index.ts index d947b9f..6603e2a 100644 --- a/webapp/src/services/lang/index.ts +++ b/webapp/src/services/lang/index.ts @@ -1,4 +1,4 @@ -import { useApiState } from "services/apiService"; +import { useApiState } from "services/api"; import { useEffect, useState } from "react"; const MISSING_TEXT = "<>";