diff --git a/webview-ui/src/App.tsx b/webview-ui/src/App.tsx index ce85cb5..4e0a6cc 100644 --- a/webview-ui/src/App.tsx +++ b/webview-ui/src/App.tsx @@ -3,7 +3,7 @@ import { useEvent } from "react-use" import { ExtensionMessage } from "../../src/shared/ExtensionMessage" import ChatView from "./components/ChatView" import HistoryView from "./components/HistoryView" -import SettingsView from "./components/SettingsView" +import SettingsView from "./components/settings/SettingsView" import WelcomeView from "./components/WelcomeView" import { ExtensionStateContextProvider, useExtensionState } from "./context/ExtensionStateContext" import { vscode } from "./utils/vscode" diff --git a/webview-ui/src/components/Announcement.tsx b/webview-ui/src/components/chat/Announcement.tsx similarity index 100% rename from webview-ui/src/components/Announcement.tsx rename to webview-ui/src/components/chat/Announcement.tsx diff --git a/webview-ui/src/components/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx similarity index 98% rename from webview-ui/src/components/ChatRow.tsx rename to webview-ui/src/components/chat/ChatRow.tsx index ec79492..e1f179b 100644 --- a/webview-ui/src/components/ChatRow.tsx +++ b/webview-ui/src/components/chat/ChatRow.tsx @@ -2,13 +2,13 @@ import { VSCodeBadge, VSCodeProgressRing } from "@vscode/webview-ui-toolkit/reac import deepEqual from "fast-deep-equal" import React, { memo, useMemo } from "react" import ReactMarkdown from "react-markdown" -import { ClaudeMessage, ClaudeSayTool } from "../../../src/shared/ExtensionMessage" -import { COMMAND_OUTPUT_STRING } from "../../../src/shared/combineCommandSequences" -import { vscode } from "../utils/vscode" -import CodeAccordian, { removeLeadingNonAlphanumeric } from "./CodeAccordian" -import CodeBlock, { CODE_BLOCK_BG_COLOR } from "./CodeBlock" +import { ClaudeMessage, ClaudeSayTool } from "../../../../src/shared/ExtensionMessage" +import { COMMAND_OUTPUT_STRING } from "../../../../src/shared/combineCommandSequences" +import { vscode } from "../../utils/vscode" +import CodeAccordian, { removeLeadingNonAlphanumeric } from "../common/CodeAccordian" +import CodeBlock, { CODE_BLOCK_BG_COLOR } from "../common/CodeBlock" import { highlightMentions } from "./TaskHeader" -import Thumbnails from "./Thumbnails" +import Thumbnails from "../common/Thumbnails" interface ChatRowProps { message: ClaudeMessage diff --git a/webview-ui/src/components/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx similarity index 100% rename from webview-ui/src/components/ChatTextArea.tsx rename to webview-ui/src/components/chat/ChatTextArea.tsx diff --git a/webview-ui/src/components/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx similarity index 100% rename from webview-ui/src/components/ChatView.tsx rename to webview-ui/src/components/chat/ChatView.tsx diff --git a/webview-ui/src/components/ContextMenu.tsx b/webview-ui/src/components/chat/ContextMenu.tsx similarity index 100% rename from webview-ui/src/components/ContextMenu.tsx rename to webview-ui/src/components/chat/ContextMenu.tsx diff --git a/webview-ui/src/components/TaskHeader.tsx b/webview-ui/src/components/chat/TaskHeader.tsx similarity index 97% rename from webview-ui/src/components/TaskHeader.tsx rename to webview-ui/src/components/chat/TaskHeader.tsx index fa80912..a158f6e 100644 --- a/webview-ui/src/components/TaskHeader.tsx +++ b/webview-ui/src/components/chat/TaskHeader.tsx @@ -1,11 +1,11 @@ import { VSCodeButton } from "@vscode/webview-ui-toolkit/react" import React, { memo, useEffect, useMemo, useRef, useState } from "react" import { useWindowSize } from "react-use" -import { ClaudeMessage } from "../../../src/shared/ExtensionMessage" -import { useExtensionState } from "../context/ExtensionStateContext" -import { vscode } from "../utils/vscode" -import Thumbnails from "./Thumbnails" -import { mentionRegexGlobal } from "../../../src/shared/context-mentions" +import { ClaudeMessage } from "../../../../src/shared/ExtensionMessage" +import { useExtensionState } from "../../context/ExtensionStateContext" +import { vscode } from "../../utils/vscode" +import Thumbnails from "../common/Thumbnails" +import { mentionRegexGlobal } from "../../../../src/shared/context-mentions" interface TaskHeaderProps { task: ClaudeMessage diff --git a/webview-ui/src/components/CodeAccordian.tsx b/webview-ui/src/components/common/CodeAccordian.tsx similarity index 98% rename from webview-ui/src/components/CodeAccordian.tsx rename to webview-ui/src/components/common/CodeAccordian.tsx index d88c135..2875782 100644 --- a/webview-ui/src/components/CodeAccordian.tsx +++ b/webview-ui/src/components/common/CodeAccordian.tsx @@ -1,5 +1,5 @@ import { memo, useMemo } from "react" -import { getLanguageFromPath } from "../utils/getLanguageFromPath" +import { getLanguageFromPath } from "../../utils/getLanguageFromPath" import CodeBlock, { CODE_BLOCK_BG_COLOR } from "./CodeBlock" interface CodeAccordianProps { diff --git a/webview-ui/src/components/CodeBlock.tsx b/webview-ui/src/components/common/CodeBlock.tsx similarity index 100% rename from webview-ui/src/components/CodeBlock.tsx rename to webview-ui/src/components/common/CodeBlock.tsx diff --git a/webview-ui/src/components/Demo.tsx b/webview-ui/src/components/common/Demo.tsx similarity index 100% rename from webview-ui/src/components/Demo.tsx rename to webview-ui/src/components/common/Demo.tsx diff --git a/webview-ui/src/components/Thumbnails.tsx b/webview-ui/src/components/common/Thumbnails.tsx similarity index 100% rename from webview-ui/src/components/Thumbnails.tsx rename to webview-ui/src/components/common/Thumbnails.tsx diff --git a/webview-ui/src/components/VSCodeButtonLink.tsx b/webview-ui/src/components/common/VSCodeButtonLink.tsx similarity index 100% rename from webview-ui/src/components/VSCodeButtonLink.tsx rename to webview-ui/src/components/common/VSCodeButtonLink.tsx diff --git a/webview-ui/src/components/HistoryPreview.tsx b/webview-ui/src/components/history/HistoryPreview.tsx similarity index 97% rename from webview-ui/src/components/HistoryPreview.tsx rename to webview-ui/src/components/history/HistoryPreview.tsx index 0a9526d..4c50919 100644 --- a/webview-ui/src/components/HistoryPreview.tsx +++ b/webview-ui/src/components/history/HistoryPreview.tsx @@ -1,6 +1,6 @@ import { VSCodeButton } from "@vscode/webview-ui-toolkit/react" -import { useExtensionState } from "../context/ExtensionStateContext" -import { vscode } from "../utils/vscode" +import { useExtensionState } from "../../context/ExtensionStateContext" +import { vscode } from "../../utils/vscode" import { memo } from "react" type HistoryPreviewProps = { diff --git a/webview-ui/src/components/HistoryView.tsx b/webview-ui/src/components/history/HistoryView.tsx similarity index 100% rename from webview-ui/src/components/HistoryView.tsx rename to webview-ui/src/components/history/HistoryView.tsx diff --git a/webview-ui/src/components/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx similarity index 98% rename from webview-ui/src/components/ApiOptions.tsx rename to webview-ui/src/components/settings/ApiOptions.tsx index 2086216..e09a256 100644 --- a/webview-ui/src/components/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -25,11 +25,11 @@ import { openRouterModels, vertexDefaultModelId, vertexModels, -} from "../../../src/shared/api" -import { ExtensionMessage } from "../../../src/shared/ExtensionMessage" -import { useExtensionState } from "../context/ExtensionStateContext" -import { vscode } from "../utils/vscode" -import VSCodeButtonLink from "./VSCodeButtonLink" +} from "../../../../src/shared/api" +import { ExtensionMessage } from "../../../../src/shared/ExtensionMessage" +import { useExtensionState } from "../../context/ExtensionStateContext" +import { vscode } from "../../utils/vscode" +import VSCodeButtonLink from "../VSCodeButtonLink" interface ApiOptionsProps { showModelOptions: boolean diff --git a/webview-ui/src/components/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx similarity index 96% rename from webview-ui/src/components/SettingsView.tsx rename to webview-ui/src/components/settings/SettingsView.tsx index 5e21e1f..ca86124 100644 --- a/webview-ui/src/components/SettingsView.tsx +++ b/webview-ui/src/components/settings/SettingsView.tsx @@ -1,8 +1,8 @@ import { VSCodeButton, VSCodeCheckbox, VSCodeLink, VSCodeTextArea } from "@vscode/webview-ui-toolkit/react" import { memo, useEffect, useState } from "react" -import { useExtensionState } from "../context/ExtensionStateContext" -import { validateApiConfiguration } from "../utils/validate" -import { vscode } from "../utils/vscode" +import { useExtensionState } from "../../context/ExtensionStateContext" +import { validateApiConfiguration } from "../../utils/validate" +import { vscode } from "../../utils/vscode" import ApiOptions from "./ApiOptions" const IS_DEV = false // FIXME: use flags when packaging diff --git a/webview-ui/src/components/TabNavbar.tsx b/webview-ui/src/components/settings/TabNavbar.tsx similarity index 100% rename from webview-ui/src/components/TabNavbar.tsx rename to webview-ui/src/components/settings/TabNavbar.tsx diff --git a/webview-ui/src/components/WelcomeView.tsx b/webview-ui/src/components/welcome/WelcomeView.tsx similarity index 97% rename from webview-ui/src/components/WelcomeView.tsx rename to webview-ui/src/components/welcome/WelcomeView.tsx index 82c2f08..2005c26 100644 --- a/webview-ui/src/components/WelcomeView.tsx +++ b/webview-ui/src/components/welcome/WelcomeView.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useState } from "react" import { useExtensionState } from "../context/ExtensionStateContext" import { validateApiConfiguration } from "../utils/validate" import { vscode } from "../utils/vscode" -import ApiOptions from "./ApiOptions" +import ApiOptions from "./settings/ApiOptions" const WelcomeView = () => { const { apiConfiguration } = useExtensionState()