diff --git a/src/MainPage.tsx b/src/MainPage.tsx index 4d2a2232..c4bd9c00 100644 --- a/src/MainPage.tsx +++ b/src/MainPage.tsx @@ -3,7 +3,7 @@ import { useDispatch } from "react-redux"; import { Loader, Notification } from "@src/common"; import { ActionsPanel, CodeView, StageView } from "."; import { CodeViewSyncDelay } from "@src/indexTSX"; -import { isUnsavedProject } from "@_node/file"; +import { isUnsavedProject } from "@_api/file"; import { MainContext } from "@_redux/main"; import { setCurrentCommand } from "@_redux/main/cmdk"; import { useAppState } from "@_redux/useAppState"; @@ -12,8 +12,8 @@ import { useCmdk, useHandlers, useInit, useReferneces } from "@src/hooks"; import Processor from "@src/processor"; import ResizablePanels from "@src/ResizablePanels"; import { debounce } from "@src/helper"; -import { CommandDialog } from "@src/cmdkPage/CommandDialog"; -import { TNodeUid, TValidNodeUid } from "@_node/index"; +import { CommandDialog } from "@src/commandMenu/CommandDialog"; +import { TNodeUid, TValidNodeUid } from "@_api/index"; export default function MainPage() { // redux diff --git a/src/_redux/main/codeView/slice.ts b/src/_redux/main/codeView/slice.ts index 81953773..5b90c1d2 100644 --- a/src/_redux/main/codeView/slice.ts +++ b/src/_redux/main/codeView/slice.ts @@ -1,7 +1,7 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { TCodeViewReducerState } from "./types"; -import { TNodeUid } from "@_node/types"; +import { TNodeUid } from "@_api/types"; const codeViewReducerInitialState: TCodeViewReducerState = { editingNodeUid: null, diff --git a/src/_redux/main/codeView/types.ts b/src/_redux/main/codeView/types.ts index ffddf303..78e6575d 100644 --- a/src/_redux/main/codeView/types.ts +++ b/src/_redux/main/codeView/types.ts @@ -1,4 +1,4 @@ -import { TNodeUid } from "@_node/types"; +import { TNodeUid } from "@_api/types"; export type TCodeViewReducerState = { editingNodeUid: TNodeUid | null; diff --git a/src/_redux/main/fileTree/event/types.ts b/src/_redux/main/fileTree/event/types.ts index 13f5ef1a..0f6ad581 100644 --- a/src/_redux/main/fileTree/event/types.ts +++ b/src/_redux/main/fileTree/event/types.ts @@ -1,4 +1,4 @@ -import { TNodeUid } from "@_node/types"; +import { TNodeUid } from "@_api/types"; export type TFileEventReducerState = { fileAction: TFileAction; diff --git a/src/_redux/main/fileTree/slice.ts b/src/_redux/main/fileTree/slice.ts index c07a1cd4..08624739 100644 --- a/src/_redux/main/fileTree/slice.ts +++ b/src/_redux/main/fileTree/slice.ts @@ -1,5 +1,5 @@ -import { TFileNode, TFileNodeTreeData } from "@_node/index"; -import { TNodeUid } from "@_node/types"; +import { TFileNode, TFileNodeTreeData } from "@_api/index"; +import { TNodeUid } from "@_api/types"; import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { TUpdateTreeViewStatePayload } from "../types"; diff --git a/src/_redux/main/fileTree/types.ts b/src/_redux/main/fileTree/types.ts index 0b9a5dca..ded2a40f 100644 --- a/src/_redux/main/fileTree/types.ts +++ b/src/_redux/main/fileTree/types.ts @@ -1,5 +1,5 @@ -import { TFileNodeTreeData } from "@_node/index"; -import { TNodeUid } from "@_node/types"; +import { TFileNodeTreeData } from "@_api/index"; +import { TNodeUid } from "@_api/types"; import { TTreeViewState } from "../types"; import { TFileAction } from "./event"; diff --git a/src/_redux/main/nodeTree/event/slice.ts b/src/_redux/main/nodeTree/event/slice.ts index 5ec369ed..1a1192be 100644 --- a/src/_redux/main/nodeTree/event/slice.ts +++ b/src/_redux/main/nodeTree/event/slice.ts @@ -1,6 +1,6 @@ import undoable from "redux-undo"; -import { TNodeUid } from "@_node/types"; +import { TNodeUid } from "@_api/types"; import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { diff --git a/src/_redux/main/nodeTree/event/types.ts b/src/_redux/main/nodeTree/event/types.ts index 2c8bd457..bef10f1a 100644 --- a/src/_redux/main/nodeTree/event/types.ts +++ b/src/_redux/main/nodeTree/event/types.ts @@ -1,4 +1,4 @@ -import { TNodeUid } from "@_node/types"; +import { TNodeUid } from "@_api/types"; export type TNodeEventReducerState = { currentFileContent: string; diff --git a/src/_redux/main/nodeTree/slice.ts b/src/_redux/main/nodeTree/slice.ts index f5a8779f..6aa1bca7 100644 --- a/src/_redux/main/nodeTree/slice.ts +++ b/src/_redux/main/nodeTree/slice.ts @@ -1,4 +1,4 @@ -import { TNodeTreeData, TNodeUid } from "@_node/types"; +import { TNodeTreeData, TNodeUid } from "@_api/types"; import { createSlice, PayloadAction } from "@reduxjs/toolkit"; import { TUpdateTreeViewStatePayload } from "../types"; diff --git a/src/_redux/main/nodeTree/types.ts b/src/_redux/main/nodeTree/types.ts index 8795c98e..157a883c 100644 --- a/src/_redux/main/nodeTree/types.ts +++ b/src/_redux/main/nodeTree/types.ts @@ -1,4 +1,4 @@ -import { TNodeTreeData, TNodeUid } from "@_node/types"; +import { TNodeTreeData, TNodeUid } from "@_api/types"; import { TTreeViewState } from "../types"; import { TCodeSelection } from "@src/codeView"; diff --git a/src/_redux/main/processor/types.ts b/src/_redux/main/processor/types.ts index 0fa65f8b..9704516f 100644 --- a/src/_redux/main/processor/types.ts +++ b/src/_redux/main/processor/types.ts @@ -1,4 +1,4 @@ -import { TNodeUid } from "@_node/index"; +import { TNodeUid } from "@_api/index"; export type TProcessorReducerState = { navigatorDropdownType: TNavigatorDropdownType; diff --git a/src/_redux/main/project/types.ts b/src/_redux/main/project/types.ts index 368853a3..e62c1e2b 100644 --- a/src/_redux/main/project/types.ts +++ b/src/_redux/main/project/types.ts @@ -1,4 +1,4 @@ -import { TNodeUid } from "@_node/types"; +import { TNodeUid } from "@_api/types"; import { TProjectContext } from "../fileTree"; export type TFileHandlerCollection = { diff --git a/src/_redux/main/types.ts b/src/_redux/main/types.ts index b8dcf6cd..44070809 100644 --- a/src/_redux/main/types.ts +++ b/src/_redux/main/types.ts @@ -1,7 +1,7 @@ import { MutableRefObject } from "react"; import { editor } from "monaco-editor"; -import { TNodeUid, TValidNodeUid } from "@_node/types"; +import { TNodeUid, TValidNodeUid } from "@_api/types"; import { TFileAction, TProjectContext } from "./fileTree"; diff --git a/src/_node/apis.ts b/src/api/apis.ts similarity index 100% rename from src/_node/apis.ts rename to src/api/apis.ts diff --git a/src/_node/file/FileSystemApis.ts b/src/api/file/FileSystemApis.ts similarity index 100% rename from src/_node/file/FileSystemApis.ts rename to src/api/file/FileSystemApis.ts diff --git a/src/_node/file/actions.ts b/src/api/file/actions.ts similarity index 100% rename from src/_node/file/actions.ts rename to src/api/file/actions.ts diff --git a/src/_node/file/apis.ts b/src/api/file/apis.ts similarity index 99% rename from src/_node/file/apis.ts rename to src/api/file/apis.ts index 230f5ea9..96c04b22 100644 --- a/src/_node/file/apis.ts +++ b/src/api/file/apis.ts @@ -9,7 +9,7 @@ import { StagePreviewPathPrefix, } from "@src/indexTSX"; import { TOsType } from "@_redux/global"; -import { SystemDirectories } from "../../cmdkPage/SystemDirectories"; +import { SystemDirectories } from "../../commandMenu/SystemDirectories"; import { verifyFileHandlerPermission } from "../../index"; import { diff --git a/src/_node/file/handlers.ts b/src/api/file/handlers.ts similarity index 100% rename from src/_node/file/handlers.ts rename to src/api/file/handlers.ts diff --git a/src/_node/file/helpers.ts b/src/api/file/helpers.ts similarity index 100% rename from src/_node/file/helpers.ts rename to src/api/file/helpers.ts diff --git a/src/_node/file/index.ts b/src/api/file/index.ts similarity index 100% rename from src/_node/file/index.ts rename to src/api/file/index.ts diff --git a/src/_node/file/nohostApis.ts b/src/api/file/nohostApis.ts similarity index 100% rename from src/_node/file/nohostApis.ts rename to src/api/file/nohostApis.ts diff --git a/src/_node/file/types.ts b/src/api/file/types.ts similarity index 100% rename from src/_node/file/types.ts rename to src/api/file/types.ts diff --git a/src/_node/helpers.ts b/src/api/helpers.ts similarity index 100% rename from src/_node/helpers.ts rename to src/api/helpers.ts diff --git a/src/_node/index.ts b/src/api/index.ts similarity index 100% rename from src/_node/index.ts rename to src/api/index.ts diff --git a/src/_node/node/helpers.ts b/src/api/node/helpers.ts similarity index 100% rename from src/_node/node/helpers.ts rename to src/api/node/helpers.ts diff --git a/src/_node/node/index.ts b/src/api/node/index.ts similarity index 100% rename from src/_node/node/index.ts rename to src/api/node/index.ts diff --git a/src/_node/node/type/html.ts b/src/api/node/type/html.ts similarity index 100% rename from src/_node/node/type/html.ts rename to src/api/node/type/html.ts diff --git a/src/_node/node/type/index.ts b/src/api/node/type/index.ts similarity index 100% rename from src/_node/node/type/index.ts rename to src/api/node/type/index.ts diff --git a/src/_node/node/types.ts b/src/api/node/types.ts similarity index 100% rename from src/_node/node/types.ts rename to src/api/node/types.ts diff --git a/src/_node/types.ts b/src/api/types.ts similarity index 100% rename from src/_node/types.ts rename to src/api/types.ts diff --git a/src/codeView/CodeView.tsx b/src/codeView/CodeView.tsx index b6b5920c..d5e5b334 100644 --- a/src/codeView/CodeView.tsx +++ b/src/codeView/CodeView.tsx @@ -10,7 +10,7 @@ import * as monaco from "monaco-editor"; import { useDispatch } from "react-redux"; import { RootNodeUid } from "@src/indexTSX"; -import { TFileNodeData, TNodeUid } from "@_node/index"; +import { TFileNodeData, TNodeUid } from "@_api/index"; import { MainContext } from "@_redux/main"; import { setSelectedNodeUids } from "@_redux/main/nodeTree"; import { setActivePanel, setShowCodeView } from "@_redux/main/processor"; diff --git a/src/codeView/helpers.ts b/src/codeView/helpers.ts index 72841582..f4f8493c 100644 --- a/src/codeView/helpers.ts +++ b/src/codeView/helpers.ts @@ -1,8 +1,8 @@ import { TTheme } from "@_redux/global"; import { getSystemTheme } from "../index"; import { TCodeSelection } from "./types"; -import { TNodeTreeData, TNodeUid } from "@_node/types"; -import { getSubNodeUidsByBfs } from "@_node/helpers"; +import { TNodeTreeData, TNodeUid } from "@_api/types"; +import { getSubNodeUidsByBfs } from "@_api/helpers"; import { RootNodeUid } from "@src/indexTSX"; export const getLanguageFromExtension = (extension: string) => { diff --git a/src/cmdkPage/Actions.csv b/src/commandMenu/Actions.csv similarity index 100% rename from src/cmdkPage/Actions.csv rename to src/commandMenu/Actions.csv diff --git a/src/cmdkPage/CommandDialog.tsx b/src/commandMenu/CommandDialog.tsx similarity index 99% rename from src/cmdkPage/CommandDialog.tsx rename to src/commandMenu/CommandDialog.tsx index da77b5f9..cf74e6f5 100644 --- a/src/cmdkPage/CommandDialog.tsx +++ b/src/commandMenu/CommandDialog.tsx @@ -4,7 +4,7 @@ import { useDispatch } from "react-redux"; import { useNavigate } from "react-router-dom"; import { LogAllow } from "@src/indexTSX"; import { AddActionPrefix, RenameActionPrefix } from "@src/indexTSX"; -import { confirmFileChanges, TFileNodeData } from "@_node/file"; +import { confirmFileChanges, TFileNodeData } from "@_api/file"; import { setCmdkOpen, setCmdkPages, diff --git a/src/cmdkPage/CommandItem.tsx b/src/commandMenu/CommandItem.tsx similarity index 100% rename from src/cmdkPage/CommandItem.tsx rename to src/commandMenu/CommandItem.tsx diff --git a/src/cmdkPage/Jumpstart.csv b/src/commandMenu/Jumpstart.csv similarity index 100% rename from src/cmdkPage/Jumpstart.csv rename to src/commandMenu/Jumpstart.csv diff --git a/src/cmdkPage/KeyboardShortcut.tsx b/src/commandMenu/KeyboardShortcut.tsx similarity index 100% rename from src/cmdkPage/KeyboardShortcut.tsx rename to src/commandMenu/KeyboardShortcut.tsx diff --git a/src/cmdkPage/SystemDirectories.ts b/src/commandMenu/SystemDirectories.ts similarity index 100% rename from src/cmdkPage/SystemDirectories.ts rename to src/commandMenu/SystemDirectories.ts diff --git a/src/cmdkPage/constants.ts b/src/commandMenu/constants.ts similarity index 100% rename from src/cmdkPage/constants.ts rename to src/commandMenu/constants.ts diff --git a/src/cmdkPage/types.ts b/src/commandMenu/types.ts similarity index 100% rename from src/cmdkPage/types.ts rename to src/commandMenu/types.ts diff --git a/src/common/treeView/types.ts b/src/common/treeView/types.ts index 618738b7..54dc7376 100644 --- a/src/common/treeView/types.ts +++ b/src/common/treeView/types.ts @@ -5,7 +5,7 @@ import { TreeRenderProps, } from "react-complex-tree"; -import { TNodeUid } from "@_node/types"; +import { TNodeUid } from "@_api/types"; export type TreeViewProps = { width: string; diff --git a/src/helper.ts b/src/helper.ts index ee1c60f2..55380672 100644 --- a/src/helper.ts +++ b/src/helper.ts @@ -1,7 +1,7 @@ import { Dispatch } from "react"; import { RootNodeUid } from "@src/indexTSX"; -import { TNodeTreeData, TNodeUid } from "@_node/types"; +import { TNodeTreeData, TNodeUid } from "@_api/types"; import { clearFileTreeViewState, expandFileTreeNodes, @@ -27,8 +27,8 @@ import { THtmlReferenceData, } from "@_types/main"; import { AnyAction } from "@reduxjs/toolkit"; -import { THtmlNodeData } from "@_node/node"; -import { TFileNodeData, TFileNodeTreeData, createURLPath } from "@_node/index"; +import { THtmlNodeData } from "@_api/node"; +import { TFileNodeData, TFileNodeTreeData, createURLPath } from "@_api/index"; import { setActivePanel, setNavigatorDropdownType, diff --git a/src/hooks/useCmdk.ts b/src/hooks/useCmdk.ts index 7f4919f0..cbe2db98 100644 --- a/src/hooks/useCmdk.ts +++ b/src/hooks/useCmdk.ts @@ -11,7 +11,7 @@ import { confirmFileChanges, downloadIDBProject, initIDBProject, -} from "@_node/index"; +} from "@_api/index"; import { setTheme } from "@_redux/global"; import { setCmdkPages, setCurrentCommand } from "@_redux/main/cmdk"; import { setDoingFileAction, TProjectContext } from "@_redux/main/fileTree"; diff --git a/src/hooks/useCmdkReferenceData.ts b/src/hooks/useCmdkReferenceData.ts index 02f8d30a..f6761b56 100644 --- a/src/hooks/useCmdkReferenceData.ts +++ b/src/hooks/useCmdkReferenceData.ts @@ -6,9 +6,9 @@ import { LogAllow } from "@src/indexTSX"; import { useAppState } from "@_redux/useAppState"; //@ts-expect-error csv files -import cmdkRefActions from "../cmdkPage/Actions.csv"; +import cmdkRefActions from "../commandMenu/Actions.csv"; //@ts-expect-error csv files -import cmdkRefJumpstart from "../cmdkPage/Jumpstart.csv"; +import cmdkRefJumpstart from "../commandMenu/Jumpstart.csv"; import { filesReferences } from "@rnbws/rfrncs.design"; import { TCmdkContext, diff --git a/src/hooks/useFileHandlers.ts b/src/hooks/useFileHandlers.ts index 1d18b35c..2a898a36 100644 --- a/src/hooks/useFileHandlers.ts +++ b/src/hooks/useFileHandlers.ts @@ -1,6 +1,6 @@ import { useState } from "react"; -import { TFileHandlerCollection } from "@_node/index"; +import { TFileHandlerCollection } from "@_api/index"; export const useFileHandlers = () => { const [fileHandlers, setFileHandlers] = useState({}); diff --git a/src/hooks/useHandlers.ts b/src/hooks/useHandlers.ts index e72b15dd..29bde138 100644 --- a/src/hooks/useHandlers.ts +++ b/src/hooks/useHandlers.ts @@ -16,7 +16,7 @@ import { getIndexHtmlContent, loadIDBProject, loadLocalProject, -} from "@_node/file"; +} from "@_api/file"; import { focusFileTreeNode, setDoingFileAction, diff --git a/src/processor/helpers.ts b/src/processor/helpers.ts index 1edf7d2f..4b4bb1c4 100644 --- a/src/processor/helpers.ts +++ b/src/processor/helpers.ts @@ -10,11 +10,11 @@ import { TFileNode, TFileNodeData, TFileNodeTreeData, -} from "@_node/file"; -import { _writeIDBFile } from "@_node/file/nohostApis"; -import { getNodeChildIndex, getSubNodeUidsByBfs } from "@_node/helpers"; -import { THtmlNodeData } from "@_node/node"; -import { TNode, TNodeTreeData, TNodeUid } from "@_node/types"; +} from "@_api/file"; +import { _writeIDBFile } from "@_api/file/nohostApis"; +import { getNodeChildIndex, getSubNodeUidsByBfs } from "@_api/helpers"; +import { THtmlNodeData } from "@_api/node"; +import { TNode, TNodeTreeData, TNodeUid } from "@_api/types"; import { setFileTreeNodes, TProject } from "@_redux/main/fileTree"; import { AnyAction } from "@reduxjs/toolkit"; diff --git a/src/processor/hooks/useFileTreeEvent.ts b/src/processor/hooks/useFileTreeEvent.ts index ff186ea1..1f0d33fd 100644 --- a/src/processor/hooks/useFileTreeEvent.ts +++ b/src/processor/hooks/useFileTreeEvent.ts @@ -7,8 +7,8 @@ import { confirmAlert, getFullnameFromUid, getParentUidFromUid, -} from "@_node/index"; -import { TNodeUid } from "@_node/types"; +} from "@_api/index"; +import { TNodeUid } from "@_api/types"; import { addInvalidFileNodes, FileTree_Event_RedoActionType, diff --git a/src/processor/hooks/useNodeTreeEvent.ts b/src/processor/hooks/useNodeTreeEvent.ts index 09af0f0b..3d26e600 100644 --- a/src/processor/hooks/useNodeTreeEvent.ts +++ b/src/processor/hooks/useNodeTreeEvent.ts @@ -6,9 +6,9 @@ import { useDispatch } from "react-redux"; import { getNodeUidByCodeSelection } from "@src/codeView"; import { markSelectedElements } from "@src/stageView/iFrame/helpers"; import { LogAllow } from "@src/indexTSX"; -import { _writeIDBFile, PreserveRnbwNode, StageNodeIdAttr } from "@_node/file"; +import { _writeIDBFile, PreserveRnbwNode, StageNodeIdAttr } from "@_api/file"; -import { TNodeUid } from "@_node/types"; +import { TNodeUid } from "@_api/types"; import { MainContext } from "@_redux/main"; import { setCurrentCommand } from "@_redux/main/cmdk"; import { diff --git a/src/processor/hooks/useSaveCommand.ts b/src/processor/hooks/useSaveCommand.ts index 2e5ef8a1..252194fb 100644 --- a/src/processor/hooks/useSaveCommand.ts +++ b/src/processor/hooks/useSaveCommand.ts @@ -3,7 +3,7 @@ import { useCallback, useContext, useEffect, useRef } from "react"; import { useDispatch } from "react-redux"; import { AutoSaveDelay, RootNodeUid } from "@src/indexTSX"; -import { TFileNodeTreeData } from "@_node/file"; +import { TFileNodeTreeData } from "@_api/file"; import { setFileTree } from "@_redux/main/fileTree"; import { useAppState } from "@_redux/useAppState"; diff --git a/src/services/useElements.tsx b/src/services/useElements.tsx index 69840e94..778873fe 100644 --- a/src/services/useElements.tsx +++ b/src/services/useElements.tsx @@ -1,6 +1,6 @@ import { LogAllow } from "@src/indexTSX"; import { RootNodeUid } from "@src/indexTSX"; -import { StageNodeIdAttr } from "@_node/file"; +import { StageNodeIdAttr } from "@_api/file"; import { getObjKeys } from "@src/helper"; import { MainContext } from "@_redux/main"; diff --git a/src/services/useElementsHelper.tsx b/src/services/useElementsHelper.tsx index a0adafd7..0fdacf55 100644 --- a/src/services/useElementsHelper.tsx +++ b/src/services/useElementsHelper.tsx @@ -15,7 +15,7 @@ import { THtmlNodeAttribs, THtmlNodeTreeData, THtmlParserResponse, -} from "@_node/node"; +} from "@_api/node"; import { DataSequencedUid, PARSING_ERROR_MESSAGES, @@ -24,7 +24,7 @@ import { TNodeUid, TValidNodeUid, ValidStageNodeUid, -} from "@_node/index"; +} from "@_api/index"; import { RootNodeUid } from "@src/indexTSX"; import { useDispatch } from "react-redux"; import { diff --git a/src/services/useFileHelpers.tsx b/src/services/useFileHelpers.tsx index 9cf1b838..934fa31c 100644 --- a/src/services/useFileHelpers.tsx +++ b/src/services/useFileHelpers.tsx @@ -5,8 +5,8 @@ import { TFileNodeTreeData, _path, getTargetHandler, -} from "@_node/file"; -import { TNode, TNodeTreeData, TNodeUid } from "@_node/index"; +} from "@_api/file"; +import { TNode, TNodeTreeData, TNodeUid } from "@_api/index"; import { expandFileTreeNodes, setFileTree } from "@_redux/main/fileTree"; import { useAppState } from "@_redux/useAppState"; import { useDispatch } from "react-redux"; diff --git a/src/services/useFiles.tsx b/src/services/useFiles.tsx index 92c4419a..51eefaca 100644 --- a/src/services/useFiles.tsx +++ b/src/services/useFiles.tsx @@ -31,7 +31,7 @@ import { moveIDBSingleDirectoryOrFile, removeSingleIDBDirectoryOrFile, removeSingleLocalDirectoryOrFile, -} from "@_node/index"; +} from "@_api/index"; import { useCallback, useContext } from "react"; import { MainContext } from "@_redux/main"; diff --git a/src/sidebarView/navigatorPanel/helpers/helpers.ts b/src/sidebarView/navigatorPanel/helpers/helpers.ts index 56e30b24..fea25ff0 100644 --- a/src/sidebarView/navigatorPanel/helpers/helpers.ts +++ b/src/sidebarView/navigatorPanel/helpers/helpers.ts @@ -1,6 +1,6 @@ -import { TFileNode } from "@_node/file"; -import { THtmlNodeData } from "@_node/node"; -import { TNode, TNodeTreeData } from "@_node/types"; +import { TFileNode } from "@_api/file"; +import { THtmlNodeData } from "@_api/node"; +import { TNode, TNodeTreeData } from "@_api/types"; import { TProject, TWorkspace } from "@_redux/main/fileTree"; export const isHomeIcon = (node: TNode) => diff --git a/src/sidebarView/navigatorPanel/hooks/useNavigatorPanelHandlers.ts b/src/sidebarView/navigatorPanel/hooks/useNavigatorPanelHandlers.ts index a6504bbe..24cd32c9 100644 --- a/src/sidebarView/navigatorPanel/hooks/useNavigatorPanelHandlers.ts +++ b/src/sidebarView/navigatorPanel/hooks/useNavigatorPanelHandlers.ts @@ -4,7 +4,7 @@ import { get } from "idb-keyval"; import { useDispatch } from "react-redux"; import { LogAllow } from "@src/indexTSX"; -import { isUnsavedProject } from "@_node/file/helpers"; +import { isUnsavedProject } from "@_api/file/helpers"; import { MainContext } from "@_redux/main"; import { TProject } from "@_redux/main/fileTree"; import { diff --git a/src/sidebarView/nodeTreeView/NodeTreeView.tsx b/src/sidebarView/nodeTreeView/NodeTreeView.tsx index aff8d485..ee71ebd3 100644 --- a/src/sidebarView/nodeTreeView/NodeTreeView.tsx +++ b/src/sidebarView/nodeTreeView/NodeTreeView.tsx @@ -13,8 +13,8 @@ import { useDispatch } from "react-redux"; import { TreeView } from "@src/common"; import { TreeViewData } from "@src/common/treeView/types"; import { DargItemImage, RootNodeUid } from "@src/indexTSX"; -import { THtmlNodeData } from "@_node/index"; -import { TNode, TNodeUid } from "@_node/types"; +import { THtmlNodeData } from "@_api/index"; +import { TNode, TNodeUid } from "@_api/types"; import { debounce, getObjKeys, diff --git a/src/sidebarView/nodeTreeView/helpers/getTree.ts b/src/sidebarView/nodeTreeView/helpers/getTree.ts index efb03838..b439f094 100644 --- a/src/sidebarView/nodeTreeView/helpers/getTree.ts +++ b/src/sidebarView/nodeTreeView/helpers/getTree.ts @@ -1,4 +1,4 @@ -import { TNodeTreeData } from "@_node/types"; +import { TNodeTreeData } from "@_api/types"; export const getTree = (nodeTree: TNodeTreeData): TNodeTreeData => { return structuredClone(nodeTree); diff --git a/src/sidebarView/nodeTreeView/helpers/helpers.ts b/src/sidebarView/nodeTreeView/helpers/helpers.ts index 48480ef7..73c7c656 100644 --- a/src/sidebarView/nodeTreeView/helpers/helpers.ts +++ b/src/sidebarView/nodeTreeView/helpers/helpers.ts @@ -2,8 +2,8 @@ import { editor } from "monaco-editor"; import { DraggingPosition } from "react-complex-tree"; import { LogAllow } from "@src/indexTSX"; -import { StageNodeIdAttr } from "@_node/file/handlers"; -import { TNode, TNodeTreeData, TNodeUid } from "@_node/types"; +import { StageNodeIdAttr } from "@_api/file/handlers"; +import { TNode, TNodeTreeData, TNodeUid } from "@_api/types"; import { RootNodeUid } from "@src/indexTSX"; import { elementsCmdk } from "@src/helper"; import { TCmdkGroupData, THtmlReferenceData } from "@_types/main"; diff --git a/src/sidebarView/nodeTreeView/helpers/isRemovingAllowed.ts b/src/sidebarView/nodeTreeView/helpers/isRemovingAllowed.ts index c220e7b8..11407d5c 100644 --- a/src/sidebarView/nodeTreeView/helpers/isRemovingAllowed.ts +++ b/src/sidebarView/nodeTreeView/helpers/isRemovingAllowed.ts @@ -1,5 +1,5 @@ -import { THtmlNodeData } from "@_node/index"; -import { TNodeTreeData, TNodeUid } from "@_node/types"; +import { THtmlNodeData } from "@_api/index"; +import { TNodeTreeData, TNodeUid } from "@_api/types"; export const isRemovingAllowed = ( nodeTree: TNodeTreeData, diff --git a/src/sidebarView/nodeTreeView/hooks/useCmdk.ts b/src/sidebarView/nodeTreeView/hooks/useCmdk.ts index 77a0e087..7bcede99 100644 --- a/src/sidebarView/nodeTreeView/hooks/useCmdk.ts +++ b/src/sidebarView/nodeTreeView/hooks/useCmdk.ts @@ -1,6 +1,6 @@ import { useEffect, useRef } from "react"; -import { isAddNodeAction, isRenameNodeAction } from "@_node/helpers"; +import { isAddNodeAction, isRenameNodeAction } from "@_api/helpers"; import { useAppState } from "@_redux/useAppState"; import { AddNodeActionPrefix, RenameNodeActionPrefix } from "@src/indexTSX"; import useRnbw from "@_services/useRnbw"; diff --git a/src/sidebarView/nodeTreeView/hooks/useNodeTreeCallback.ts b/src/sidebarView/nodeTreeView/hooks/useNodeTreeCallback.ts index 4e677475..ad644955 100644 --- a/src/sidebarView/nodeTreeView/hooks/useNodeTreeCallback.ts +++ b/src/sidebarView/nodeTreeView/hooks/useNodeTreeCallback.ts @@ -1,7 +1,7 @@ import { DraggingPosition, TreeItem, TreeItemIndex } from "react-complex-tree"; -import { getValidNodeUids } from "@_node/helpers"; -import { TNodeUid } from "@_node/types"; +import { getValidNodeUids } from "@_api/helpers"; +import { TNodeUid } from "@_api/types"; import { useAppState } from "@_redux/useAppState"; import { useNodeViewState } from "./useNodeViewState"; diff --git a/src/sidebarView/nodeTreeView/hooks/useNodeViewState.ts b/src/sidebarView/nodeTreeView/hooks/useNodeViewState.ts index f617794f..65b96bd2 100644 --- a/src/sidebarView/nodeTreeView/hooks/useNodeViewState.ts +++ b/src/sidebarView/nodeTreeView/hooks/useNodeViewState.ts @@ -2,8 +2,8 @@ import { useCallback } from "react"; import { useDispatch } from "react-redux"; -import { getValidNodeUids } from "@_node/helpers"; -import { TNodeUid } from "@_node/types"; +import { getValidNodeUids } from "@_api/helpers"; +import { TNodeUid } from "@_api/types"; import { collapseNodeTreeNodes, expandNodeTreeNodes, diff --git a/src/sidebarView/settingsPanel/SettingsPanel.tsx b/src/sidebarView/settingsPanel/SettingsPanel.tsx index b63201b2..ae19b996 100644 --- a/src/sidebarView/settingsPanel/SettingsPanel.tsx +++ b/src/sidebarView/settingsPanel/SettingsPanel.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useEffect, useMemo, useState } from "react"; import { useDispatch } from "react-redux"; -import { StageNodeIdAttr, DataSequencedUid } from "@_node/file"; +import { StageNodeIdAttr, DataSequencedUid } from "@_api/file"; import { useAppState } from "@_redux/useAppState"; import { setActivePanel } from "@_redux/main/processor"; import { SVGIconI } from "@src/common"; diff --git a/src/sidebarView/workspaceTreeView/WorkspaceTreeView.tsx b/src/sidebarView/workspaceTreeView/WorkspaceTreeView.tsx index 084c0be4..fbb0bb8b 100644 --- a/src/sidebarView/workspaceTreeView/WorkspaceTreeView.tsx +++ b/src/sidebarView/workspaceTreeView/WorkspaceTreeView.tsx @@ -12,9 +12,9 @@ import { createURLPath, TFileNodeData, confirmFileChanges, -} from "@_node/file"; -import { _path } from "@_node/file/nohostApis"; -import { TNode, TNodeUid } from "@_node/types"; +} from "@_api/file"; +import { _path } from "@_api/file/nohostApis"; +import { TNode, TNodeUid } from "@_api/types"; import { MainContext } from "@_redux/main"; import { addInvalidFileNodes, diff --git a/src/sidebarView/workspaceTreeView/hooks/useCmdk.ts b/src/sidebarView/workspaceTreeView/hooks/useCmdk.ts index 0e8f019a..b49d8744 100644 --- a/src/sidebarView/workspaceTreeView/hooks/useCmdk.ts +++ b/src/sidebarView/workspaceTreeView/hooks/useCmdk.ts @@ -1,7 +1,7 @@ import { useEffect, useRef } from "react"; import { AddFileActionPrefix } from "@src/indexTSX"; -import { isAddFileAction } from "@_node/helpers"; +import { isAddFileAction } from "@_api/helpers"; import { useAppState } from "@_redux/useAppState"; import { useNodeActionsHandler } from "./useNodeActionsHandler"; diff --git a/src/sidebarView/workspaceTreeView/hooks/useNodeActionsHandler.ts b/src/sidebarView/workspaceTreeView/hooks/useNodeActionsHandler.ts index 75b85a1d..a93c8567 100644 --- a/src/sidebarView/workspaceTreeView/hooks/useNodeActionsHandler.ts +++ b/src/sidebarView/workspaceTreeView/hooks/useNodeActionsHandler.ts @@ -10,7 +10,7 @@ import { RootNodeUid, TmpFileNodeUidWhenAddNew, } from "@src/indexTSX"; -import { FileActions } from "@_node/apis"; +import { FileActions } from "@_api/apis"; import { _path, confirmAlert, @@ -19,9 +19,9 @@ import { isUnsavedProject, TFileNodeData, TFileNodeTreeData, -} from "@_node/file"; -import { getValidNodeUids } from "@_node/helpers"; -import { TNode, TNodeTreeData, TNodeUid } from "@_node/types"; +} from "@_api/file"; +import { getValidNodeUids } from "@_api/helpers"; +import { TNode, TNodeTreeData, TNodeUid } from "@_api/types"; import { getObjKeys } from "@src/helper"; import { MainContext } from "@_redux/main"; import { diff --git a/src/sidebarView/workspaceTreeView/hooks/useNodeViewState.ts b/src/sidebarView/workspaceTreeView/hooks/useNodeViewState.ts index 394681d7..3266de84 100644 --- a/src/sidebarView/workspaceTreeView/hooks/useNodeViewState.ts +++ b/src/sidebarView/workspaceTreeView/hooks/useNodeViewState.ts @@ -3,8 +3,8 @@ import { useCallback } from "react"; import { useDispatch } from "react-redux"; -import { getValidNodeUids } from "@_node/helpers"; -import { TNodeUid } from "@_node/types"; +import { getValidNodeUids } from "@_api/helpers"; +import { TNodeUid } from "@_api/types"; import { collapseFileTreeNodes, expandFileTreeNodes, diff --git a/src/sidebarView/workspaceTreeView/hooks/useSync.ts b/src/sidebarView/workspaceTreeView/hooks/useSync.ts index 74429735..2896ed0e 100644 --- a/src/sidebarView/workspaceTreeView/hooks/useSync.ts +++ b/src/sidebarView/workspaceTreeView/hooks/useSync.ts @@ -1,7 +1,7 @@ import { useCallback, useEffect, useMemo, useRef } from "react"; import { TreeViewData } from "@src/common/treeView/types"; import { RootNodeUid, ShortDelay } from "@src/indexTSX"; -import { TNode, TNodeUid } from "@_node/types"; +import { TNode, TNodeUid } from "@_api/types"; import { debounce, scrollToElement } from "@src/helper"; import { useAppState } from "@_redux/useAppState"; import { addClass, generateQuerySelector, removeClass } from "../../../index"; diff --git a/src/stageView/iFrame/IFrame.tsx b/src/stageView/iFrame/IFrame.tsx index daf63e4b..75a67463 100644 --- a/src/stageView/iFrame/IFrame.tsx +++ b/src/stageView/iFrame/IFrame.tsx @@ -10,8 +10,8 @@ import React, { import { useDispatch } from "react-redux"; import { LogAllow } from "@src/indexTSX"; -import { PreserveRnbwNode } from "@_node/file/handlers"; -import { TNodeTreeData, TNodeUid } from "@_node/types"; +import { PreserveRnbwNode } from "@_api/file/handlers"; +import { TNodeTreeData, TNodeUid } from "@_api/types"; import { MainContext } from "@_redux/main"; import { setIframeLoading } from "@_redux/main/stageView"; import { useAppState } from "@_redux/useAppState"; diff --git a/src/stageView/iFrame/helpers.ts b/src/stageView/iFrame/helpers.ts index f396ad0d..538b827f 100644 --- a/src/stageView/iFrame/helpers.ts +++ b/src/stageView/iFrame/helpers.ts @@ -1,4 +1,4 @@ -import { StageNodeIdAttr, TNodeTreeData, TNodeUid } from "@_node/index"; +import { StageNodeIdAttr, TNodeTreeData, TNodeUid } from "@_api/index"; export const getValidElementWithUid = ( ele: HTMLElement, diff --git a/src/stageView/iFrame/hooks/useMouseEvents.tsx b/src/stageView/iFrame/hooks/useMouseEvents.tsx index 8af618ad..60d4229b 100644 --- a/src/stageView/iFrame/hooks/useMouseEvents.tsx +++ b/src/stageView/iFrame/hooks/useMouseEvents.tsx @@ -3,9 +3,9 @@ import { useDispatch } from "react-redux"; import { LogAllow } from "@src/indexTSX"; import { ShortDelay } from "@src/indexTSX"; -import { StageNodeIdAttr } from "@_node/file"; -import { getValidNodeUids } from "@_node/helpers"; -import { THtmlNodeData } from "@_node/node"; +import { StageNodeIdAttr } from "@_api/file"; +import { getValidNodeUids } from "@_api/helpers"; +import { THtmlNodeData } from "@_api/node"; import { MainContext } from "@_redux/main"; import { setHoveredNodeUid } from "@_redux/main/nodeTree"; import { setSelectedNodeUids } from "@_redux/main/nodeTree/event"; @@ -27,7 +27,7 @@ import { import { getCommandKey } from "../../../index"; import { eventListenersStatesRefType } from "../IFrame"; -import { TNodeUid } from "@_node/index"; +import { TNodeUid } from "@_api/index"; import { useNavigate } from "react-router-dom"; import useRnbw from "@_services/useRnbw"; diff --git a/src/stageView/iFrame/hooks/useSyncNode.ts b/src/stageView/iFrame/hooks/useSyncNode.ts index 7af9af33..d4d4c21f 100644 --- a/src/stageView/iFrame/hooks/useSyncNode.ts +++ b/src/stageView/iFrame/hooks/useSyncNode.ts @@ -1,8 +1,8 @@ import { useCallback, useEffect, useMemo, useRef } from "react"; import { ShortDelay } from "@src/indexTSX"; -import { StageNodeIdAttr } from "@_node/file/handlers"; -import { TNodeTreeData, TNodeUid } from "@_node/types"; +import { StageNodeIdAttr } from "@_api/file/handlers"; +import { TNodeTreeData, TNodeUid } from "@_api/types"; import { debounce, getObjKeys, scrollToElement } from "@src/helper"; import { useAppState } from "@_redux/useAppState"; diff --git a/src/types/elements.types.ts b/src/types/elements.types.ts index 7798002a..9f8cfd35 100644 --- a/src/types/elements.types.ts +++ b/src/types/elements.types.ts @@ -1,5 +1,5 @@ import { eventListenersStatesRefType } from "@src/stageView/iFrame/IFrame"; -import { TNode, TNodeUid } from "@_node/index"; +import { TNode, TNodeUid } from "@_api/index"; interface Iadd { tagName: string; diff --git a/tsconfig.json b/tsconfig.json index 0ab8b89c..488c5d3e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,7 +18,7 @@ "baseUrl": ".", "paths": { "@src/*": ["src/*"], - "@_node/*": ["src/_node/*"], + "@_api/*": ["src/api/*"], "@_redux/*": ["src/_redux/*"], "@_ref/*": ["src/_ref/*"], "@_app/*": ["src/app/*"], diff --git a/webpack.config.js b/webpack.config.js index 037c570d..0f5565dc 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -18,7 +18,7 @@ module.exports = { extensions: [".csv", ".ts", ".tsx", ".js", ".jsx", ".action.tsx"], alias: { "@src": path.resolve(__dirname, "src/"), - "@_node": path.resolve(__dirname, "src/_node/"), + "@_api": path.resolve(__dirname, "src/api/"), "@_redux": path.resolve(__dirname, "src/_redux/"), "@_ref": path.resolve(__dirname, "src/_ref/"), "@_app": path.resolve(__dirname, "src/app/"),