From c105fd0c3e7b41d94d95d90ac324d5f59ab08c15 Mon Sep 17 00:00:00 2001
From: sadnub <josh@torchlake.com>
Date: Tue, 16 Nov 2021 20:45:42 -0500
Subject: [PATCH] move imports for styles and select light or dark theme for
 editor depending on if dark mode is enabled

---
 src/App.vue                                       | 7 +++++++
 src/components/scripts/ScriptFormModal.vue        | 9 +--------
 src/components/scripts/ScriptSnippetFormModal.vue | 9 ++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 29b30e7..7c1472c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,6 +3,13 @@
 </template>
 
 <script>
+// imports for ace editor
+import "ace-builds/src-noconflict/mode-powershell";
+import "ace-builds/src-noconflict/mode-python";
+import "ace-builds/src-noconflict/mode-batchfile";
+import "ace-builds/src-noconflict/theme-tomorrow_night_eighties";
+import "ace-builds/src-noconflict/theme-tomorrow";
+
 export default {
   name: "App",
 };
diff --git a/src/components/scripts/ScriptFormModal.vue b/src/components/scripts/ScriptFormModal.vue
index f4319fe..abd43e8 100644
--- a/src/components/scripts/ScriptFormModal.vue
+++ b/src/components/scripts/ScriptFormModal.vue
@@ -84,7 +84,7 @@
         <v-ace-editor
           v-model:value="code"
           :lang="formScript.shell === 'cmd' ? 'batchfile' : formScript.shell"
-          theme="tomorrow_night"
+          :theme="$q.dark.isActive ? 'tomorrow_night_eighties' : 'tomorrow'"
           :style="{ height: `${maximized ? '72vh' : '64vh'}` }"
           wrap
         />
@@ -131,15 +131,8 @@ import { notifySuccess } from "@/utils/notify";
 // ui imports
 import TestScriptModal from "@/components/scripts/TestScriptModal";
 import TacticalDropdown from "@/components/ui/TacticalDropdown";
-
-// ace editor imports
 import { VAceEditor } from "vue3-ace-editor";
 
-import "ace-builds/src-noconflict/mode-powershell";
-import "ace-builds/src-noconflict/mode-python";
-import "ace-builds/src-noconflict/mode-batchfile";
-import "ace-builds/src-noconflict/theme-tomorrow_night";
-
 // static data
 import { shellOptions } from "@/composables/scripts";
 
diff --git a/src/components/scripts/ScriptSnippetFormModal.vue b/src/components/scripts/ScriptSnippetFormModal.vue
index 154f55c..fd39e92 100644
--- a/src/components/scripts/ScriptSnippetFormModal.vue
+++ b/src/components/scripts/ScriptSnippetFormModal.vue
@@ -41,7 +41,7 @@
         <v-ace-editor
           v-model:value="formSnippet.code"
           :lang="formSnippet.shell === 'cmd' ? 'batchfile' : formSnippet.shell"
-          theme="tomorrow_night"
+          :theme="$q.dark.isActive ? 'tomorrow_night_eighties' : 'tomorrow'"
           :style="{ height: `${maximized ? '80vh' : '70vh'}` }"
           wrap
         />
@@ -61,14 +61,9 @@ import { useDialogPluginComponent } from "quasar";
 import { saveScriptSnippet, editScriptSnippet } from "@/api/scripts";
 import { notifySuccess } from "@/utils/notify";
 
-// ace editor imports
+// ui imports
 import { VAceEditor } from "vue3-ace-editor";
 
-import "ace-builds/src-noconflict/mode-powershell";
-import "ace-builds/src-noconflict/mode-python";
-import "ace-builds/src-noconflict/mode-batchfile";
-import "ace-builds/src-noconflict/theme-tomorrow_night";
-
 // static data
 import { shellOptions } from "@/composables/scripts";