From e909bc8f356c1f54f63a090882eb24cb4e7dbd99 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Thu, 7 Sep 2023 17:33:36 +1200
Subject: [PATCH] Load editorThemes in SnippetBar.jsx

---
 client/homebrew/editor/snippetbar/snippetbar.jsx | 6 ++++--
 scripts/buildHomebrew.js                         | 2 +-
 server/app.js                                    | 9 +++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx
index c14c3e8a2..ad4c7d466 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.jsx
+++ b/client/homebrew/editor/snippetbar/snippetbar.jsx
@@ -15,6 +15,9 @@ ThemeSnippets['V3_5eDMG']     = require('themes/V3/5eDMG/snippets.js');
 ThemeSnippets['V3_Journal']   = require('themes/V3/Journal/snippets.js');
 ThemeSnippets['V3_Blank']     = require('themes/V3/Blank/snippets.js');
 
+// const EditorThemes = require('../themes/codeMirror/editorThemes.json');
+const EditorThemes = require('build/homebrew/codeMirror/editorThemes.json');
+
 const execute = function(val, props){
 	if(_.isFunction(val)) return val(props);
 	return val;
@@ -115,7 +118,7 @@ const Snippetbar = createClass({
 	renderThemeSelector : function(){
 		return <div className='themeSelector'>
 			<select value={this.props.currentEditorTheme} onChange={this.changeTheme} onMouseDown={(this.changeTheme)}>
-				{global.config.codeMirrorThemes.map((theme, key)=>{
+				{EditorThemes.map((theme, key)=>{
 					return <option key={key} value={theme}>{theme}</option>;
 				})}
 			</select>
@@ -229,5 +232,4 @@ const SnippetGroup = createClass({
 			</div>
 		</div>;
 	},
-
 });
diff --git a/scripts/buildHomebrew.js b/scripts/buildHomebrew.js
index 701240f31..e78759168 100644
--- a/scripts/buildHomebrew.js
+++ b/scripts/buildHomebrew.js
@@ -115,7 +115,7 @@ fs.emptyDirSync('./build');
 	stream.end();
 
 	await fs.copy('./node_modules/codemirror/theme', './build/homebrew/cm-themes');
-	// await fs.copy('./themes/codeMirror', './build/themes/codeMirror');
+	await fs.copy('./themes/codeMirror', './build/homebrew/codeMirror');
 
 	//v==----------------------------- BUNDLE PACKAGES --------------------------------==v//
 
diff --git a/server/app.js b/server/app.js
index 5b72774c5..520dd154e 100644
--- a/server/app.js
+++ b/server/app.js
@@ -17,8 +17,6 @@ const asyncHandler = require('express-async-handler');
 
 const { DEFAULT_BREW } = require('./brewDefaults.js');
 
-const codeMirrorThemes = require('../themes/codeMirror/editorThemes.json');
-
 const splitTextStyleAndMetadata = (brew)=>{
 	brew.text = brew.text.replaceAll('\r\n', '\n');
 	if(brew.text.startsWith('```metadata')) {
@@ -419,10 +417,9 @@ const templateFn = require('./../client/template.js');
 const renderPage = async (req, res)=>{
 	// Create configuration object
 	const configuration = {
-		local            : isLocalEnvironment,
-		publicUrl        : config.get('publicUrl') ?? '',
-		environment      : nodeEnv,
-		codeMirrorThemes : codeMirrorThemes
+		local       : isLocalEnvironment,
+		publicUrl   : config.get('publicUrl') ?? '',
+		environment : nodeEnv
 	};
 	const props = {
 		version       : require('./../package.json').version,