Client ID
{cdata.clientid}
diff --git a/src/app/common/themes/themes.less b/src/app/common/themes/themes.less
deleted file mode 100644
index 747c50501..000000000
--- a/src/app/common/themes/themes.less
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2024, Command Line Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-@base-color: #eceeec;
-@base-background: rgba(21, 23, 21, 1);
-@base-background-transparent: rgba(15, 17, 15, 0.7);
-@base-background-dev: rgba(21, 23, 48, 1);
-@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);
-@background-session-components-solid: rgb(33, 34, 33);
-@wave-green: rgb(88, 193, 66);
-@disabled-background: rgba(76, 81, 75, 1);
-@disabled-color: #adadad;
-@scrollbar-background: rgba(21, 23, 21, 1);
-@scrollbar-thumb: rgb(134, 134, 134);
-@button-background: rgb(38, 38, 38);
-@button-disabled-background: rgb(30, 29, 29);
-@success-green: rgb(38, 97, 26);
-@error-red: #cc0000;
-@error-red-brightened: #ff8888;
-@warning-yellow: #ffa500;
-@textarea-background: #171717;
-
-@text-primary: #fff;
-@text-secondary: #c3c8c2;
-@text-caption: #8b918a;
-
-@accent-color: #3b3f3a;
-
-@status-outline: #151715;
-@dropdown-menu: rgba(21, 23, 21, 1);
-
-@status-connected: #46a758;
-@status-connecting: #f5d90a;
-@status-error: #e54d2e;
-@status-disconnected: #c3c8c2;
-
-@term-black: #000000;
-@term-red: #cc0000;
-@term-green: #4e9a06;
-@term-yellow: #c4a000;
-@term-blue: #3465a4;
-@term-magenta: #75507b;
-@term-cyan: #06989a;
-@term-white: #d3d7cf;
-@term-bright-black: #555753;
-@term-bright-red: #ef2929;
-@term-bright-green: #58c142;
-@term-bright-yellow: #fce94f;
-@term-bright-blue: #32afff;
-@term-bright-magenta: #ad7fa8;
-@term-bright-cyan: #34e2e2;
-@term-bright-white: #ffffff;
-
-@tab-red: #e54d2e;
-@tab-orange: #ef713b;
-@tab-yellow: #e0b956;
-@tab-green: #58c142;
-@tab-mint: #4bffa9;
-@tab-cyan: #4bdfff;
-@tab-blue: #3971ff;
-@tab-violet: #ba76ff;
-@tab-pink: #e05677;
-@tab-white: #ffffff;
-
-@tab-black-text: #333;
-@tab-white-text: #d7d7d7;
-
-@soft-blue: #729fcf;
-
-@active-menu-color: rgb(0, 71, 171);
-
-// @font-face declaration lives in app.less
-@fixed-font: "Martian Mono", sans-serif;
-@terminal-font: "JetBrains Mono", sans-serif;
-
-@text-s1-font: "Martian Mono", sans-serif;
-
-// to match Github
-@markdown-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif,
- "Apple Color Emoji", "Segoe UI Emoji";
-@markdown-highlight: rgb(35, 35, 35);
-
-@thin-border-color: #333;
-@main-content-bottom-background: #333;
diff --git a/src/app/overrides.less b/src/app/overrides.less
deleted file mode 100644
index 538180ece..000000000
--- a/src/app/overrides.less
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2024, Command Line Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-:root {
- // can put dev overrides for testing here
-}
diff --git a/src/app/sidebar/sidebar.less b/src/app/sidebar/sidebar.less
index 93946fed2..d650933c0 100644
--- a/src/app/sidebar/sidebar.less
+++ b/src/app/sidebar/sidebar.less
@@ -55,7 +55,7 @@
.separator {
height: 1px;
margin: 16px 0;
- background-color: var(--sidebar-separator-color);
+ background-color: var(--app-border-color);
}
.item.workspaces-item {
@@ -64,7 +64,7 @@
.middle {
padding: 4px 6px 8px 6px;
- border-bottom: 1px solid var(--sidebar-separator-color);
+ border-bottom: 1px solid var(--app-border-color);
.item {
&.active {
background-color: var(--sidebar-highlight-color);
diff --git a/src/models/commandrunner.ts b/src/models/commandrunner.ts
index 139c9b2e9..98150ccee 100644
--- a/src/models/commandrunner.ts
+++ b/src/models/commandrunner.ts
@@ -361,6 +361,14 @@ class CommandRunner {
return GlobalModel.submitCommand("client", "set", null, kwargs, interactive);
}
+ setTheme(theme: string, interactive: boolean): Promise
{
+ let kwargs = {
+ nohist: "1",
+ theme: theme,
+ };
+ return GlobalModel.submitCommand("client", "set", null, kwargs, interactive);
+ }
+
setClientOpenAISettings(opts: { model?: string; apitoken?: string; maxtokens?: string }): Promise {
let kwargs = {
nohist: "1",
diff --git a/src/models/model.ts b/src/models/model.ts
index 025fd4e63..ba81d85e3 100644
--- a/src/models/model.ts
+++ b/src/models/model.ts
@@ -14,6 +14,7 @@ import {
isBlank,
} from "@/util/util";
import { loadFonts } from "@/util/fontutil";
+import { loadTheme } from "@/util/themeutil";
import { WSControl } from "./ws";
import { cmdStatusIsRunning } from "@/app/line/lineutil";
import * as appconst from "@/app/appconst";
@@ -340,6 +341,15 @@ class Model {
return ff;
}
+ getTheme(): string {
+ let cdata = this.clientData.get();
+ let theme = cdata?.feopts?.theme;
+ if (theme == null) {
+ theme = appconst.DefaultTheme;
+ }
+ return theme;
+ }
+
getTermFontSize(): number {
return this.termFontSize.get();
}
@@ -1173,6 +1183,12 @@ class Model {
}
const ffUpdated = newFontFamily != this.getTermFontFamily();
const fsUpdated = newFontSize != this.getTermFontSize();
+
+ let newTheme = clientData?.feopts?.theme;
+ if (newTheme == null) {
+ newTheme = appconst.DefaultTheme;
+ }
+ const themeUpdated = newTheme != this.getTheme();
mobx.action(() => {
this.clientData.set(clientData);
})();
@@ -1192,6 +1208,9 @@ class Model {
} else if (fsUpdated) {
this.updateTermFontSizeVars();
}
+ if (themeUpdated) {
+ loadTheme(newTheme);
+ }
}
submitCommandPacket(cmdPk: FeCmdPacketType, interactive: boolean): Promise {
diff --git a/src/types/custom.d.ts b/src/types/custom.d.ts
index 56a286269..c43cacb02 100644
--- a/src/types/custom.d.ts
+++ b/src/types/custom.d.ts
@@ -562,6 +562,7 @@ declare global {
type FeOptsType = {
termfontsize: number;
termfontfamily: string;
+ theme: string;
};
type ConfirmFlagsType = {
diff --git a/src/util/themeutil.ts b/src/util/themeutil.ts
new file mode 100644
index 000000000..1c6222480
--- /dev/null
+++ b/src/util/themeutil.ts
@@ -0,0 +1,10 @@
+function loadTheme(theme: string) {
+ const linkTag: any = document.getElementById("theme-stylesheet");
+ if (theme === "dark") {
+ linkTag.href = "public/themes/default.css";
+ } else {
+ linkTag.href = `public/themes/${theme}.css`;
+ }
+}
+
+export { loadTheme };
diff --git a/wavesrv/pkg/cmdrunner/cmdrunner.go b/wavesrv/pkg/cmdrunner/cmdrunner.go
index 6dfbcc9a1..97a3b8c38 100644
--- a/wavesrv/pkg/cmdrunner/cmdrunner.go
+++ b/wavesrv/pkg/cmdrunner/cmdrunner.go
@@ -97,6 +97,7 @@ var RemoteColorNames = []string{"red", "green", "yellow", "blue", "magenta", "cy
var RemoteSetArgs = []string{"alias", "connectmode", "key", "password", "autoinstall", "color"}
var ConfirmFlags = []string{"hideshellprompt"}
var SidebarNames = []string{"main"}
+var ThemeNames = []string{"light", "dark"}
var ScreenCmds = []string{"run", "comment", "cd", "cr", "clear", "sw", "reset", "signal", "chat"}
var NoHistCmds = []string{"_compgen", "line", "history", "_killserver"}
@@ -5198,6 +5199,26 @@ func ClientSetCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sc
}
varsUpdated = append(varsUpdated, "termfontfamily")
}
+ if themeStr, found := pk.Kwargs["theme"]; found {
+ newTheme := themeStr
+ found := false
+ for _, theme := range ThemeNames {
+ if newTheme == theme {
+ found = true
+ break
+ }
+ }
+ if !found {
+ return nil, fmt.Errorf("invalid theme name")
+ }
+ feOpts := clientData.FeOpts
+ feOpts.Theme = newTheme
+ err = sstore.UpdateClientFeOpts(ctx, feOpts)
+ if err != nil {
+ return nil, fmt.Errorf("error updating client feopts: %v", err)
+ }
+ varsUpdated = append(varsUpdated, "theme")
+ }
if apiToken, found := pk.Kwargs["openaiapitoken"]; found {
err = validateOpenAIAPIToken(apiToken)
if err != nil {
diff --git a/wavesrv/pkg/sstore/sstore.go b/wavesrv/pkg/sstore/sstore.go
index 09dbb20cf..1ae9f9199 100644
--- a/wavesrv/pkg/sstore/sstore.go
+++ b/wavesrv/pkg/sstore/sstore.go
@@ -297,6 +297,7 @@ type ClientOptsType struct {
type FeOptsType struct {
TermFontSize int `json:"termfontsize,omitempty"`
TermFontFamily string `json:"termfontfamily,omitempty"`
+ Theme string `json:"theme,omitempty"`
}
type ReleaseInfoType struct {