{terminalFontLabels[name]}

} diff --git a/site/src/pages/UserSettingsPage/AppearancePage/AppearancePage.test.tsx b/site/src/pages/UserSettingsPage/AppearancePage/AppearancePage.test.tsx index 59dc62980b9f0..6f78fec6b58a0 100644 --- a/site/src/pages/UserSettingsPage/AppearancePage/AppearancePage.test.tsx +++ b/site/src/pages/UserSettingsPage/AppearancePage/AppearancePage.test.tsx @@ -51,8 +51,8 @@ describe("appearance page", () => { theme_preference: "dark", }); - const ibmPlex = await screen.findByText("Fira Code"); - await userEvent.click(ibmPlex); + const firaCode = await screen.findByText("Fira Code"); + await userEvent.click(firaCode); // Check if the API was called correctly expect(API.updateAppearanceSettings).toHaveBeenCalledTimes(1); @@ -61,4 +61,44 @@ describe("appearance page", () => { theme_preference: "dark", }); }); + + it("changes font to fira code, then back to web terminal font", async () => { + renderWithAuth(); + + // given + jest + .spyOn(API, "updateAppearanceSettings") + .mockResolvedValueOnce({ + ...MockUser, + terminal_font: "fira-code", + theme_preference: "dark", + }) + .mockResolvedValueOnce({ + ...MockUser, + terminal_font: "ibm-plex-mono", + theme_preference: "dark", + }); + + // when + const firaCode = await screen.findByText("Fira Code"); + await userEvent.click(firaCode); + + // then + expect(API.updateAppearanceSettings).toHaveBeenCalledTimes(1); + expect(API.updateAppearanceSettings).toHaveBeenCalledWith({ + terminal_font: "fira-code", + theme_preference: "dark", + }); + + // when + const ibmPlex = await screen.findByText("Web Terminal Font"); + await userEvent.click(ibmPlex); + + // then + expect(API.updateAppearanceSettings).toHaveBeenCalledTimes(2); + expect(API.updateAppearanceSettings).toHaveBeenNthCalledWith(2, { + terminal_font: "ibm-plex-mono", + theme_preference: "dark", + }); + }); }); diff --git a/site/src/theme/constants.ts b/site/src/theme/constants.ts index 162e67310749c..8a3c6375dce3a 100644 --- a/site/src/theme/constants.ts +++ b/site/src/theme/constants.ts @@ -7,13 +7,23 @@ export const BODY_FONT_FAMILY = `"Inter Variable", system-ui, sans-serif`; export const terminalFonts: Record = { "fira-code": MONOSPACE_FONT_FAMILY.replace("IBM Plex Mono", "Fira Code"), + "jetbrains-mono": MONOSPACE_FONT_FAMILY.replace( + "IBM Plex Mono", + "JetBrains Mono", + ), + "source-code-pro": MONOSPACE_FONT_FAMILY.replace( + "IBM Plex Mono", + "Source Code Pro", + ), "ibm-plex-mono": MONOSPACE_FONT_FAMILY, "": MONOSPACE_FONT_FAMILY, }; export const terminalFontLabels: Record = { "fira-code": "Fira Code", - "ibm-plex-mono": "IBM Plex Mono", + "jetbrains-mono": "JetBrains Mono", + "source-code-pro": "Source Code Pro", + "ibm-plex-mono": "Web Terminal Font", "": "", // needed for enum completeness, otherwise fails the build }; export const DEFAULT_TERMINAL_FONT = "ibm-plex-mono"; diff --git a/site/src/theme/globalFonts.ts b/site/src/theme/globalFonts.ts index db8089f9db266..c30bccca63d53 100644 --- a/site/src/theme/globalFonts.ts +++ b/site/src/theme/globalFonts.ts @@ -3,6 +3,10 @@ import "@fontsource/ibm-plex-mono/400.css"; import "@fontsource/ibm-plex-mono/600.css"; // Main body copy font import "@fontsource-variable/inter"; -// Alternative font for Terminal +// Alternative fonts for Terminal import "@fontsource/fira-code/400.css"; import "@fontsource/fira-code/600.css"; +import "@fontsource/source-code-pro/400.css"; +import "@fontsource/source-code-pro/600.css"; +import "@fontsource/jetbrains-mono/400.css"; +import "@fontsource/jetbrains-mono/600.css"; From e13a76cbdef5ba9333a90aadb613bc97199910c2 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 8 Apr 2025 09:53:43 +0000 Subject: [PATCH 2/3] fix --- cli/testdata/TestProvisioners_Golden/list.golden | 2 +- cli/testdata/coder_provisioner_list.golden | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/testdata/TestProvisioners_Golden/list.golden b/cli/testdata/TestProvisioners_Golden/list.golden index 35844d8b9c50e..3f50f90746744 100644 --- a/cli/testdata/TestProvisioners_Golden/list.golden +++ b/cli/testdata/TestProvisioners_Golden/list.golden @@ -1,4 +1,4 @@ -ID CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION +ID CREATED AT LAST SEEN AT NAME VERSION TAGS KEY NAME STATUS CURRENT JOB ID CURRENT JOB STATUS PREVIOUS JOB ID PREVIOUS JOB STATUS ORGANIZATION 00000000-0000-0000-aaaa-000000000000 ====[timestamp]===== ====[timestamp]===== default-provisioner v0.0.0-devel map[owner: scope:organization] built-in idle 00000000-0000-0000-bbbb-000000000001 succeeded Coder 00000000-0000-0000-aaaa-000000000001 ====[timestamp]===== ====[timestamp]===== provisioner-1 v0.0.0 map[foo:bar owner: scope:organization] built-in busy 00000000-0000-0000-bbbb-000000000002 running Coder 00000000-0000-0000-aaaa-000000000002 ====[timestamp]===== ====[timestamp]===== provisioner-2 v0.0.0 map[owner: scope:organization] built-in offline 00000000-0000-0000-bbbb-000000000003 succeeded Coder diff --git a/cli/testdata/coder_provisioner_list.golden b/cli/testdata/coder_provisioner_list.golden index e34db5605fd81..64941eebf5b89 100644 --- a/cli/testdata/coder_provisioner_list.golden +++ b/cli/testdata/coder_provisioner_list.golden @@ -1,2 +1,2 @@ -CREATED AT LAST SEEN AT KEY NAME NAME VERSION STATUS TAGS +CREATED AT LAST SEEN AT KEY NAME NAME VERSION STATUS TAGS ====[timestamp]===== ====[timestamp]===== built-in test v0.0.0-devel idle map[owner: scope:organization] From d6f431228a2efad8294fa2e3ec677e50df3556d1 Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 8 Apr 2025 12:09:53 +0200 Subject: [PATCH 3/3] make fmt --- codersdk/users.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/codersdk/users.go b/codersdk/users.go index 9c46be1ded3f8..ab51775e5494d 100644 --- a/codersdk/users.go +++ b/codersdk/users.go @@ -192,7 +192,8 @@ type ValidateUserPasswordResponse struct { // TerminalFontName is the name of supported terminal font type TerminalFontName string -var TerminalFontNames = []TerminalFontName{TerminalFontUnknown, TerminalFontIBMPlexMono, TerminalFontFiraCode, +var TerminalFontNames = []TerminalFontName{ + TerminalFontUnknown, TerminalFontIBMPlexMono, TerminalFontFiraCode, TerminalFontSourceCodePro, TerminalFontJetBrainsMono, } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy