diff --git a/frontend/src/app/Main.tsx b/frontend/src/app/Main.tsx index e5f4cdd4..03000715 100644 --- a/frontend/src/app/Main.tsx +++ b/frontend/src/app/Main.tsx @@ -22,7 +22,7 @@ import Tools from './pages/Tools/Tools'; import Modes from './pages/Modes/Modes'; import Views from './pages/Views/Views'; import Customization from './pages/Customization/Customization'; -import OnboardingModal from './components/OnboardingModal'; +import OnboardingModal from './components/OnboardingModal/OnboardingModal'; import { useKeyboardShortcuts } from '@/shared/hooks/useKeyboardShortcuts'; import KeyboardShortcutsHelp from './components/KeyboardShortcutsHelp'; import { ThemeProvider, useThemeMode, useClaudeTokens } from '@/shared/styles/ThemeContext'; diff --git a/frontend/src/app/components/DynamicIsland/CompactActionablePill.tsx b/frontend/src/app/components/DynamicIsland/CompactActionablePill.tsx index 02d74afa..bd660894 100644 --- a/frontend/src/app/components/DynamicIsland/CompactActionablePill.tsx +++ b/frontend/src/app/components/DynamicIsland/CompactActionablePill.tsx @@ -9,7 +9,7 @@ import CheckIcon from '@mui/icons-material/Check'; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; import { motion } from 'framer-motion'; import { parseMcpToolName } from '@/app/pages/AgentChat/toolkit/approvalToolkit/utils'; -import { useMcpToolMeta } from '@/app/pages/AgentChat/toolkit/approvalToolkit/components/useMcpToolMeta'; +import { useMcpToolMeta } from '@/app/pages/AgentChat/toolkit/approvalToolkit/utils/useMcpToolMeta'; import { SPRING_BOUNCE } from './islandTypes'; import type { ClaudeTokens } from './islandTypes'; import type { ApprovalRequest } from '@/shared/state/agentsSlice'; diff --git a/frontend/src/app/components/onboardingConstants.ts b/frontend/src/app/components/OnboardingModal/components/onboardingConstants.ts similarity index 100% rename from frontend/src/app/components/onboardingConstants.ts rename to frontend/src/app/components/OnboardingModal/components/onboardingConstants.ts diff --git a/frontend/src/app/components/useSubscriptionConnect.ts b/frontend/src/app/components/OnboardingModal/components/useSubscriptionConnect.ts similarity index 100% rename from frontend/src/app/components/useSubscriptionConnect.ts rename to frontend/src/app/components/OnboardingModal/components/useSubscriptionConnect.ts diff --git a/frontend/src/app/pages/AgentChat/AgentChat.tsx b/frontend/src/app/pages/AgentChat/AgentChat.tsx index c7ae5743..05fae16b 100644 --- a/frontend/src/app/pages/AgentChat/AgentChat.tsx +++ b/frontend/src/app/pages/AgentChat/AgentChat.tsx @@ -10,7 +10,7 @@ import OpenSwarmThread from './OpenSwarmThread/OpenSwarmThread'; import ChatInput from './ChatInput/ChatInput'; import { useAgentChat } from './hooks/useAgentChat'; import { useOpenSwarmRuntime, type ComposerExtras, type DispatchableMessage } from './runtime/useOpenSwarmRuntime'; -import { toolkit } from './toolkit'; +import { toolkit } from './toolkit/toolkit'; import type { ContextPath } from '@/shared/state/agentsTypes'; import { useClaudeTokens } from '@/shared/styles/ThemeContext'; diff --git a/frontend/src/app/pages/AgentChat/ChatInput/components/ModelModeSelector/ModelModeSelector.tsx b/frontend/src/app/pages/AgentChat/ChatInput/components/ModelModeSelector/ModelModeSelector.tsx index e18427d5..c2237421 100644 --- a/frontend/src/app/pages/AgentChat/ChatInput/components/ModelModeSelector/ModelModeSelector.tsx +++ b/frontend/src/app/pages/AgentChat/ChatInput/components/ModelModeSelector/ModelModeSelector.tsx @@ -18,7 +18,7 @@ import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward'; import StopIcon from '@mui/icons-material/Stop'; import AttachFileIcon from '@mui/icons-material/AttachFile'; import AdsClickIcon from '@mui/icons-material/AdsClick'; -import { useElementSelection } from '@/app/components/ElementSelectionContext'; +import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection'; import { useAppDispatch, useAppSelector } from '@/shared/hooks'; import { LIST_MODES } from '@/shared/state/modesSlice'; import { useClaudeTokens } from '@/shared/styles/ThemeContext'; diff --git a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/ApprovalRouter.tsx b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/ApprovalRouter.tsx index 07dae280..9945502b 100644 --- a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/ApprovalRouter.tsx +++ b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/ApprovalRouter.tsx @@ -1,7 +1,7 @@ import React from 'react'; import type { ApprovalRequest } from '@/shared/state/agentsSlice'; import { ToolQuestion } from './components/ToolQuestion/ToolQuestion'; -import { ToolApproval } from './components/ToolApproval'; +import { ToolApproval } from './components/ToolApproval/ToolApproval'; interface ApprovalRouterProps { request: ApprovalRequest; diff --git a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/BatchApprovalWrapper.tsx b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/BatchApprovalWrapper.tsx index 9dab79e1..2fbd7090 100644 --- a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/BatchApprovalWrapper.tsx +++ b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/BatchApprovalWrapper.tsx @@ -1,7 +1,7 @@ import React, { useMemo, useCallback } from 'react'; import type { ApprovalRequest } from '@/shared/state/agentsSlice'; import { ToolQuestion } from './components/ToolQuestion/ToolQuestion'; -import { ToolApproval } from './components/ToolApproval'; +import { ToolApproval } from './components/ToolApproval/ToolApproval'; import { ApprovalRouter } from './ApprovalRouter'; interface BatchApprovalWrapperProps { diff --git a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/OptionList/OptionList.tsx b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/OptionList/OptionList.tsx index 864efe61..b92b36fb 100644 --- a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/OptionList/OptionList.tsx +++ b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/OptionList/OptionList.tsx @@ -18,7 +18,7 @@ import { normalizeSelectionForOptions, parseSelectionToIdSet, } from "./selection"; -import { ActionButtons } from "../../ActionButtons"; +import { ActionButtons } from "../../ActionButtons/ActionButtons"; import { normalizeActionsConfig } from "./utils/actions-config"; import type { Action } from "../../../utils/types"; diff --git a/frontend/src/app/pages/Dashboard/Dashboard.tsx b/frontend/src/app/pages/Dashboard/Dashboard.tsx index a267197e..c60a369f 100644 --- a/frontend/src/app/pages/Dashboard/Dashboard.tsx +++ b/frontend/src/app/pages/Dashboard/Dashboard.tsx @@ -5,8 +5,8 @@ import { toggleExpandSession } from '@/shared/state/agentsSlice'; import { UPDATE_DASHBOARD } from '@/shared/backend-bridge/apps/dashboards'; import { useCanvasControls } from './hooks/useCanvasControls/useCanvasControls'; import { useDashboardSelection } from './hooks/useDashboardSelection'; -import { ElementSelectionProvider } from './_shared/element_selection/ElementSelectionProvider'; -import { useElementSelection } from './_shared/element_selection/useElementSelection'; +import { ElementSelectionProvider } from '@/app/pages/_shared/element_selection/ElementSelectionProvider'; +import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection'; import { useDomElementSelector } from './hooks/useDomElementSelector/useDomElementSelector'; import SelectionOverlay from './SelectionOverlay'; import { useDashboardDrag } from './hooks/useDashboardDrag'; diff --git a/frontend/src/app/pages/Dashboard/DashboardCanvas/cards/BrowserCard/BrowserCard.tsx b/frontend/src/app/pages/Dashboard/DashboardCanvas/cards/BrowserCard/BrowserCard.tsx index 3068bb65..eb227c82 100644 --- a/frontend/src/app/pages/Dashboard/DashboardCanvas/cards/BrowserCard/BrowserCard.tsx +++ b/frontend/src/app/pages/Dashboard/DashboardCanvas/cards/BrowserCard/BrowserCard.tsx @@ -8,7 +8,7 @@ import { useBrowserActivity } from '@/shared/useBrowserActivity'; import { resolveInput, isGoogleSearch } from '@/shared/resolveUrl'; import BrowserAgentOverlay from './components/BrowserAgentOverlay/BrowserAgentOverlay'; import { useOverlayScrollPassthrough } from '../shared/useOverlayScrollPassthrough'; -import { useElementSelection } from '@/app/pages/Dashboard/_shared/element_selection/useElementSelection'; +import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection'; import { type ResizeDir, CURSOR_MAP, HANDLE_DEFS, DRAG_THRESHOLD } from '../shared/cardLayoutConstants'; import { useWebviewLifecycle, isElectron, chromeUserAgent, webviewPreloadPath, type WebviewElement } from './hooks/useWebviewLifecycle'; import type { TabLocalState } from './TabLocalState'; diff --git a/frontend/src/app/pages/Dashboard/DashboardCanvas/components/DashboardToolbar/components/HistoryPanel.tsx b/frontend/src/app/pages/Dashboard/DashboardCanvas/components/DashboardToolbar/components/HistoryPanel.tsx index 627867b2..58f4a1d3 100644 --- a/frontend/src/app/pages/Dashboard/DashboardCanvas/components/DashboardToolbar/components/HistoryPanel.tsx +++ b/frontend/src/app/pages/Dashboard/DashboardCanvas/components/DashboardToolbar/components/HistoryPanel.tsx @@ -5,7 +5,7 @@ import InputBase from '@mui/material/InputBase'; import CircularProgress from '@mui/material/CircularProgress'; import SearchIcon from '@mui/icons-material/Search'; import type { ClaudeTokens } from '@/shared/styles/claudeTokens'; -import { formatRelativeTime } from '@/app/pages/Dashboard/utils/formatRelativeTime'; +import { formatRelativeTime } from '@/app/pages/Dashboard/_shared/formatRelativeTime'; interface HistoryPanelProps { historyInputRef: React.RefObject; diff --git a/frontend/src/app/pages/Dashboard/DashboardCanvas/components/DashboardToolbar/useDashboardToolbar.ts b/frontend/src/app/pages/Dashboard/DashboardCanvas/components/DashboardToolbar/useDashboardToolbar.ts index 75e36f4a..4e2d1224 100644 --- a/frontend/src/app/pages/Dashboard/DashboardCanvas/components/DashboardToolbar/useDashboardToolbar.ts +++ b/frontend/src/app/pages/Dashboard/DashboardCanvas/components/DashboardToolbar/useDashboardToolbar.ts @@ -1,6 +1,6 @@ import { useState, useRef, useEffect, useCallback, useMemo } from 'react'; import type { ContextPath } from '@/shared/state/agentsTypes'; -import { useElementSelection } from '@/app/components/ElementSelectionContext'; +import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection'; import { useClaudeTokens } from '@/shared/styles/ThemeContext'; import { useAppDispatch, useAppSelector } from '@/shared/hooks'; import { clearHistorySearch } from '@/shared/state/agentsSlice'; diff --git a/frontend/src/app/pages/Dashboard/SelectionOverlay.tsx b/frontend/src/app/pages/Dashboard/SelectionOverlay.tsx index 164236b5..edca3e58 100644 --- a/frontend/src/app/pages/Dashboard/SelectionOverlay.tsx +++ b/frontend/src/app/pages/Dashboard/SelectionOverlay.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState, useRef } from 'react'; import ReactDOM from 'react-dom'; import { type OverlayState, type DragRect, type DragPreviewElement } from './_shared/types'; -import { useElementSelection } from './_shared/useElementSelection'; +import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection'; const HIGHLIGHT_COLOR = '#3b82f6'; const HIGHLIGHT_BG = 'rgba(59, 130, 246, 0.08)'; diff --git a/frontend/src/app/pages/Dashboard/hooks/useDomElementSelector/useDomElementSelector.ts b/frontend/src/app/pages/Dashboard/hooks/useDomElementSelector/useDomElementSelector.ts index d11ac4f5..9f50611c 100644 --- a/frontend/src/app/pages/Dashboard/hooks/useDomElementSelector/useDomElementSelector.ts +++ b/frontend/src/app/pages/Dashboard/hooks/useDomElementSelector/useDomElementSelector.ts @@ -1,5 +1,5 @@ import { useEffect, useRef, useState, useCallback } from 'react'; -import { useElementSelection } from '@/app/pages/Dashboard/_shared/element_selection/useElementSelection'; +import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection'; import { type SelectMeta, type DomSelectorState, diff --git a/frontend/src/app/pages/DashboardSelection/DashboardCard.tsx b/frontend/src/app/pages/DashboardSelection/DashboardCard.tsx index d72732dd..e158faee 100644 --- a/frontend/src/app/pages/DashboardSelection/DashboardCard.tsx +++ b/frontend/src/app/pages/DashboardSelection/DashboardCard.tsx @@ -8,7 +8,7 @@ import DashboardIcon from '@mui/icons-material/Dashboard'; import MoreVertIcon from '@mui/icons-material/MoreVert'; import { Dashboard } from '@/shared/state/dashboardsSlice'; import { useClaudeTokens } from '@/shared/styles/ThemeContext'; -import { formatRelativeTime } from '@/app/pages/Dashboard/utils/formatRelativeTime'; +import { formatRelativeTime } from '@/app/pages/Dashboard/_shared/formatRelativeTime'; interface DashboardCardProps { dashboard: Dashboard; diff --git a/frontend/src/app/pages/Views/ViewEditor.tsx b/frontend/src/app/pages/Views/ViewEditor.tsx index aa253b46..13615281 100644 --- a/frontend/src/app/pages/Views/ViewEditor.tsx +++ b/frontend/src/app/pages/Views/ViewEditor.tsx @@ -8,7 +8,7 @@ import ViewPreview, { ViewPreviewHandle } from './ViewPreview'; import InputSchemaForm, { getDefault, getStubbed } from './InputSchemaForm'; import CodeEditor from './CodeEditor'; // TODO: Fix this import, also the the element selection in this component doesnt seem to work so for now its chillin -import { ElementSelectionProvider } from '@/app/pages/Dashboard/_shared/element_selection/ElementSelectionProvider'; +import { ElementSelectionProvider } from '@/app/pages/_shared/element_selection/ElementSelectionProvider'; import { FileTreeItem, getEditorLanguage } from './FileTree'; import { ConsolePanel } from './ConsolePanel'; import { useViewWorkspace } from './hooks/useViewWorkspace'; diff --git a/frontend/src/app/pages/Views/ViewPreview.tsx b/frontend/src/app/pages/Views/ViewPreview.tsx index 74e0008b..15489f95 100644 --- a/frontend/src/app/pages/Views/ViewPreview.tsx +++ b/frontend/src/app/pages/Views/ViewPreview.tsx @@ -1,6 +1,6 @@ import React, { useRef, useEffect, useMemo, forwardRef, useImperativeHandle, useState } from 'react'; import Box from '@mui/material/Box'; -import { useElementSelection } from '@/app/components/ElementSelectionContext'; +import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection'; import { useIframeElementSelector } from './useIframeElementSelector'; export interface ViewPreviewHandle { diff --git a/frontend/src/app/pages/Views/useIframeElementSelector.ts b/frontend/src/app/pages/Views/useIframeElementSelector.ts index af106c49..2460954b 100644 --- a/frontend/src/app/pages/Views/useIframeElementSelector.ts +++ b/frontend/src/app/pages/Views/useIframeElementSelector.ts @@ -1,6 +1,6 @@ import { useEffect, useRef, useCallback, RefObject } from 'react'; -import { useElementSelection } from '@/app/pages/Dashboard/_shared/element_selection/useElementSelection'; -import { type SelectedElement } from '@/app/pages/Dashboard/_shared/element_selection/SelectedElement'; +import { useElementSelection } from '@/app/pages/_shared/element_selection/useElementSelection'; +import { type SelectedElement } from '@/app/pages/_shared/element_selection/SelectedElement'; import { OVERLAY_ID, LABEL_ID, STYLE_ID, HIGHLIGHT_COLOR, HIGHLIGHT_BG, FLASH_COLOR, SELECTED_CLASS, diff --git a/frontend/src/app/pages/Dashboard/_shared/element_selection/ElementSelectionProvider.tsx b/frontend/src/app/pages/_shared/element_selection/ElementSelectionProvider.tsx similarity index 100% rename from frontend/src/app/pages/Dashboard/_shared/element_selection/ElementSelectionProvider.tsx rename to frontend/src/app/pages/_shared/element_selection/ElementSelectionProvider.tsx diff --git a/frontend/src/app/pages/Dashboard/_shared/element_selection/SelectedElement.ts b/frontend/src/app/pages/_shared/element_selection/SelectedElement.ts similarity index 100% rename from frontend/src/app/pages/Dashboard/_shared/element_selection/SelectedElement.ts rename to frontend/src/app/pages/_shared/element_selection/SelectedElement.ts diff --git a/frontend/src/app/pages/Dashboard/_shared/element_selection/useElementSelection.tsx b/frontend/src/app/pages/_shared/element_selection/useElementSelection.tsx similarity index 100% rename from frontend/src/app/pages/Dashboard/_shared/element_selection/useElementSelection.tsx rename to frontend/src/app/pages/_shared/element_selection/useElementSelection.tsx