From 3cf4a10e707e143c5e5778782f9eb3dcb68c71f8 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sun, 12 Nov 2023 15:47:46 +0800
Subject: [PATCH] Update README

---
 backend/util-common.ts               |  4 ++--
 frontend/src/components/Terminal.vue |  4 ++--
 frontend/src/main.ts                 |  1 +
 frontend/src/pages/Compose.vue       |  5 ++---
 frontend/src/pages/DashboardHome.vue |  7 +++----
 package.json                         |  2 +-
 pnpm-lock.yaml                       | 14 +++++++-------
 7 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/backend/util-common.ts b/backend/util-common.ts
index 576d8d8..ad963d7 100644
--- a/backend/util-common.ts
+++ b/backend/util-common.ts
@@ -86,8 +86,8 @@ export const TERMINAL_COLS = 105;
 export const TERMINAL_ROWS = 10;
 export const PROGRESS_TERMINAL_ROWS = 8;
 
-export const COMBINED_TERMINAL_COLS = 56;
-export const COMBINED_TERMINAL_ROWS = 15;
+export const COMBINED_TERMINAL_COLS = 58;
+export const COMBINED_TERMINAL_ROWS = 20;
 
 export const ERROR_TYPE_VALIDATION = 1;
 
diff --git a/frontend/src/components/Terminal.vue b/frontend/src/components/Terminal.vue
index fe767a0..41551ba 100644
--- a/frontend/src/components/Terminal.vue
+++ b/frontend/src/components/Terminal.vue
@@ -77,8 +77,8 @@ export default {
         }
 
         this.terminal = new Terminal({
-            fontSize: 16,
-            fontFamily: "monospace",
+            fontSize: 14,
+            fontFamily: "'JetBrains Mono', monospace",
             cursorBlink,
             cols: this.cols,
             rows: this.rows,
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 662517c..a892a73 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -13,6 +13,7 @@ import Toast, { POSITION, useToast } from "vue-toastification";
 import "xterm/lib/xterm.js";
 
 // CSS
+import "@fontsource/jetbrains-mono";
 import "vue-toastification/dist/index.css";
 import "xterm/css/xterm.css";
 import "./styles/main.scss";
diff --git a/frontend/src/pages/Compose.vue b/frontend/src/pages/Compose.vue
index b2cb3fa..d47c6b7 100644
--- a/frontend/src/pages/Compose.vue
+++ b/frontend/src/pages/Compose.vue
@@ -587,14 +587,13 @@ export default {
 </script>
 
 <style scoped lang="scss">
-@import 'firacode/distr/fira_code.css';
-
 .terminal {
     height: 200px;
 }
 
 .editor-box {
-    font-family: 'Fira Code', monospace;
+    font-family: 'JetBrains Mono', monospace;
+    font-size: 14px;
     &.edit-mode {
         background-color: #2c2f38 !important;
     }
diff --git a/frontend/src/pages/DashboardHome.vue b/frontend/src/pages/DashboardHome.vue
index 909eccf..05071a7 100644
--- a/frontend/src/pages/DashboardHome.vue
+++ b/frontend/src/pages/DashboardHome.vue
@@ -24,8 +24,7 @@
 
             <h2 class="mb-3">Docker Run</h2>
             <div class="mb-3">
-                <textarea id="name" v-model="dockerRunCommand" type="text" class="form-control docker-run" required
-                    placeholder="docker run ..."></textarea>
+                <textarea id="name" v-model="dockerRunCommand" type="text" class="form-control docker-run" required placeholder="docker run ..."></textarea>
             </div>
 
             <button class="btn-normal btn" @click="convertDockerRun">Convert to Compose</button>
@@ -192,7 +191,6 @@ export default {
 
 <style lang="scss" scoped>
 @import "../styles/vars";
-@import 'firacode/distr/fira_code.css';
 
 .num {
     font-size: 30px;
@@ -229,6 +227,7 @@ table {
 .docker-run {
     background-color: $dark-bg !important;
     border: none;
-    font-family: 'Fira Code', monospace;
+    font-family: 'JetBrains Mono', monospace;
+    font-size: 15px;
 }
 </style>
diff --git a/package.json b/package.json
index fdeae5a..4dce7ca 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
         "mark-as-nightly": "tsx ./extra/mark-as-nightly.ts"
     },
     "dependencies": {
+        "@fontsource/jetbrains-mono": "^5.0.17",
         "@homebridge/node-pty-prebuilt-multiarch": "~0.11.10",
         "@louislam/sqlite3": "~15.1.6",
         "bcryptjs": "~2.4.3",
@@ -27,7 +28,6 @@
         "dayjs": "~1.11.10",
         "express": "~4.18.2",
         "express-static-gzip": "~2.1.7",
-        "firacode": "^6.2.0",
         "http-graceful-shutdown": "~3.1.13",
         "jsonwebtoken": "~9.0.2",
         "jwt-decode": "~3.1.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d4917a9..32e1345 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@ settings:
   excludeLinksFromLockfile: false
 
 dependencies:
+  '@fontsource/jetbrains-mono':
+    specifier: ^5.0.17
+    version: 5.0.17
   '@homebridge/node-pty-prebuilt-multiarch':
     specifier: ~0.11.10
     version: 0.11.10
@@ -38,9 +41,6 @@ dependencies:
   express-static-gzip:
     specifier: ~2.1.7
     version: 2.1.7
-  firacode:
-    specifier: ^6.2.0
-    version: 6.2.0
   http-graceful-shutdown:
     specifier: ~3.1.13
     version: 3.1.13
@@ -469,6 +469,10 @@ packages:
       - vue
     dev: true
 
+  /@fontsource/jetbrains-mono@5.0.17:
+    resolution: {integrity: sha512-Y/EtdbwKwNQTGpnMrexX8SVW6Jqlh0nX2bNHI9Z9m6FsyjbocZIFNJqwSY9bDUoi7irGtz8nuidAN7FF8wYuJA==}
+    dev: false
+
   /@fortawesome/fontawesome-common-types@6.4.2:
     resolution: {integrity: sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==}
     engines: {node: '>=6'}
@@ -2128,10 +2132,6 @@ packages:
       path-exists: 4.0.0
     dev: true
 
-  /firacode@6.2.0:
-    resolution: {integrity: sha512-t5R3aO2BmhRXnYtKXbImLVNsILuCIbJ/XlDzBufjpi3il8P/CVdpWco83Ud3r2Tl0gitAmyP4o1fbJ52ozV1jw==}
-    dev: false
-
   /flat-cache@3.1.1:
     resolution: {integrity: sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==}
     engines: {node: '>=12.0.0'}