From f39accabb647ec16abe8f3d1fd743dc8f13254fc Mon Sep 17 00:00:00 2001 From: Amarsh Anand Date: Thu, 5 Oct 2023 14:41:42 -0700 Subject: [PATCH] refactored plugin --- src/app/app.less | 3 --- src/app/line/linecomps.tsx | 6 +++--- src/app/sidebar/sidebar.less | 4 ++++ src/index.less | 2 +- src/model/model.ts | 2 +- .../{prompt-core/renderer => core}/basicrenderer.tsx | 6 +++--- .../renderer => core}/incrementalrenderer.tsx | 0 src/plugins/{prompt-core => core}/ptydata.ts | 0 src/plugins/openai/openai.tsx | 2 +- src/plugins/{prompt-core => }/terminal/term.ts | 8 ++++---- src/plugins/{prompt-core => }/terminal/terminal.less | 2 +- src/plugins/{prompt-core => }/terminal/terminal.tsx | 8 ++++---- src/plugins/{prompt-core => }/terminal/xterm.less | 0 13 files changed, 22 insertions(+), 21 deletions(-) rename src/plugins/{prompt-core/renderer => core}/basicrenderer.tsx (98%) rename src/plugins/{prompt-core/renderer => core}/incrementalrenderer.tsx (100%) rename src/plugins/{prompt-core => core}/ptydata.ts (100%) rename src/plugins/{prompt-core => }/terminal/term.ts (98%) rename src/plugins/{prompt-core => }/terminal/terminal.less (97%) rename src/plugins/{prompt-core => }/terminal/terminal.tsx (95%) rename src/plugins/{prompt-core => }/terminal/xterm.less (100%) diff --git a/src/app/app.less b/src/app/app.less index 1ce2a23f..0b4e36bd 100644 --- a/src/app/app.less +++ b/src/app/app.less @@ -81,9 +81,6 @@ svg.icon { top: 0; left: 0; } -.is-dev #title-bar { - background: @base-background-dev; -} .content { a:hover { diff --git a/src/app/line/linecomps.tsx b/src/app/line/linecomps.tsx index 8285138c..d3e9c9f0 100644 --- a/src/app/line/linecomps.tsx +++ b/src/app/line/linecomps.tsx @@ -28,9 +28,9 @@ import { ReactComponent as MinusIcon } from "../assets/icons/minus.svg"; import type { LineContainerModel } from "../../model/model"; import { renderCmdText } from "../common/common"; -import { SimpleBlobRenderer } from "../../plugins/prompt-core/renderer/basicrenderer"; -import { IncrementalRenderer } from "../../plugins/prompt-core/renderer/incrementalrenderer"; -import { TerminalRenderer } from "../../plugins/prompt-core/terminal/terminal"; +import { SimpleBlobRenderer } from "../../plugins/core/basicrenderer"; +import { IncrementalRenderer } from "../../plugins/core/incrementalrenderer"; +import { TerminalRenderer } from "../../plugins/terminal/terminal"; import { isBlank } from "../../util/util"; import { PluginModel } from "../../plugins/plugins"; import { Prompt } from "../common/prompt/prompt"; diff --git a/src/app/sidebar/sidebar.less b/src/app/sidebar/sidebar.less index 0b8d20bf..e00bed46 100644 --- a/src/app/sidebar/sidebar.less +++ b/src/app/sidebar/sidebar.less @@ -254,3 +254,7 @@ } } } + +.is-dev .main-sidebar { + background-color: @base-background-dev; +} diff --git a/src/index.less b/src/index.less index b1afc799..0c04ca23 100644 --- a/src/index.less +++ b/src/index.less @@ -1,7 +1,7 @@ @base-color: #eceeec; @base-background: rgba(21, 23, 21, 1); @base-background-transparent: rgba(21, 23, 21, 0.7); -@base-background-dev: rgba(21, 23, 21, 1); +@base-background-dev: rgb(27, 0, 30); @base-border: rgba(241, 246, 243, 0.08); @background-session: rgba(13, 13, 13, 0.85); @background-session-components: rgba(48, 49, 48, 0.6); diff --git a/src/model/model.ts b/src/model/model.ts index 0dbc102c..10ddd1bb 100644 --- a/src/model/model.ts +++ b/src/model/model.ts @@ -11,7 +11,7 @@ import { boundInt, isModKeyPress, } from "../util/util"; -import { TermWrap } from "../plugins/prompt-core/terminal/term"; +import { TermWrap } from "../plugins/terminal/term"; import type { SessionDataType, LineType, diff --git a/src/plugins/prompt-core/renderer/basicrenderer.tsx b/src/plugins/core/basicrenderer.tsx similarity index 98% rename from src/plugins/prompt-core/renderer/basicrenderer.tsx rename to src/plugins/core/basicrenderer.tsx index 032011c7..866dbc4a 100644 --- a/src/plugins/prompt-core/renderer/basicrenderer.tsx +++ b/src/plugins/core/basicrenderer.tsx @@ -13,10 +13,10 @@ import type { LineStateType, TermContextUnion, RendererContainerType, -} from "../../../types/types"; +} from "../../types/types"; import { debounce, throttle } from "throttle-debounce"; -import * as util from "../../../util/util"; -import { GlobalModel } from "../../../model/model"; +import * as util from "../../util/util"; +import { GlobalModel } from "../../model/model"; type OV = mobx.IObservableValue; type CV = mobx.IComputedValue; diff --git a/src/plugins/prompt-core/renderer/incrementalrenderer.tsx b/src/plugins/core/incrementalrenderer.tsx similarity index 100% rename from src/plugins/prompt-core/renderer/incrementalrenderer.tsx rename to src/plugins/core/incrementalrenderer.tsx diff --git a/src/plugins/prompt-core/ptydata.ts b/src/plugins/core/ptydata.ts similarity index 100% rename from src/plugins/prompt-core/ptydata.ts rename to src/plugins/core/ptydata.ts diff --git a/src/plugins/openai/openai.tsx b/src/plugins/openai/openai.tsx index b06bb653..68be150a 100644 --- a/src/plugins/openai/openai.tsx +++ b/src/plugins/openai/openai.tsx @@ -4,7 +4,7 @@ import * as mobxReact from "mobx-react"; import * as T from "../../types/types"; import { debounce } from "throttle-debounce"; import { boundMethod } from "autobind-decorator"; -import { PacketDataBuffer } from "../prompt-core/ptydata"; +import { PacketDataBuffer } from "../core/ptydata"; import { Markdown } from "../../app/common/common"; import "./openai.less"; diff --git a/src/plugins/prompt-core/terminal/term.ts b/src/plugins/terminal/term.ts similarity index 98% rename from src/plugins/prompt-core/terminal/term.ts rename to src/plugins/terminal/term.ts index 0c66252a..b093c167 100644 --- a/src/plugins/prompt-core/terminal/term.ts +++ b/src/plugins/terminal/term.ts @@ -2,8 +2,8 @@ import * as mobx from "mobx"; import { Terminal } from "xterm"; import { sprintf } from "sprintf-js"; import { boundMethod } from "autobind-decorator"; -import { windowWidthToCols, windowHeightToRows } from "../../../util/textmeasure"; -import { boundInt } from "../../../util/util"; +import { windowWidthToCols, windowHeightToRows } from "../../util/textmeasure"; +import { boundInt } from "../../util/util"; import type { TermContextUnion, TermOptsType, @@ -11,8 +11,8 @@ import type { RendererContext, WindowSize, PtyDataType, -} from "../../../types/types"; -import { getTheme } from "../../../app/common/themes"; +} from "../../types/types"; +import { getTheme } from "../../app/common/themes"; type DataUpdate = { data: Uint8Array; diff --git a/src/plugins/prompt-core/terminal/terminal.less b/src/plugins/terminal/terminal.less similarity index 97% rename from src/plugins/prompt-core/terminal/terminal.less rename to src/plugins/terminal/terminal.less index dd677a9a..7875aed7 100644 --- a/src/plugins/prompt-core/terminal/terminal.less +++ b/src/plugins/terminal/terminal.less @@ -1,4 +1,4 @@ -@import "../../../index.less"; +@import "../../index.less"; @import "./xterm.less"; .terminal-wrapper { diff --git a/src/plugins/prompt-core/terminal/terminal.tsx b/src/plugins/terminal/terminal.tsx similarity index 95% rename from src/plugins/prompt-core/terminal/terminal.tsx rename to src/plugins/terminal/terminal.tsx index 5a8e4815..578afb8a 100644 --- a/src/plugins/prompt-core/terminal/terminal.tsx +++ b/src/plugins/terminal/terminal.tsx @@ -5,11 +5,11 @@ import { boundMethod } from "autobind-decorator"; import dayjs from "dayjs"; import localizedFormat from "dayjs/plugin/localizedFormat"; import { If } from "tsx-control-statements/components"; -import { GlobalModel, LineContainerModel } from "../../../model/model"; -import { termHeightFromRows } from "../../../util/textmeasure"; -import type { LineType } from "../../../types/types"; +import { GlobalModel, LineContainerModel } from "../../model/model"; +import { termHeightFromRows } from "../../util/textmeasure"; +import type { LineType } from "../../types/types"; import cn from "classnames"; -import * as lineutil from "../../../app/line/lineutil"; +import * as lineutil from "../../app/line/lineutil"; import "./terminal.less"; diff --git a/src/plugins/prompt-core/terminal/xterm.less b/src/plugins/terminal/xterm.less similarity index 100% rename from src/plugins/prompt-core/terminal/xterm.less rename to src/plugins/terminal/xterm.less