f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-01 15:12:40 +00:00
Code Wiki Activity

Load editorThemes in SnippetBar.jsx

Browse Source
This commit is contained in:
G.Ambatte
2023-09-07 17:33:36 +12:00
parent e16110da6a
commit e909bc8f35
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/homebrew/editor/snippetbar/snippetbar.jsx
View File

@@ -15,6 +15,9 @@ ThemeSnippets['V3_5eDMG'] = require('themes/V3/5eDMG/snippets.js');
ThemeSnippets['V3_Journal'] = require('themes/V3/Journal/snippets.js'); ThemeSnippets['V3_Journal'] = require('themes/V3/Journal/snippets.js');
ThemeSnippets['V3_Blank'] = require('themes/V3/Blank/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){ const execute = function(val, props){
if(_.isFunction(val)) return val(props); if(_.isFunction(val)) return val(props);
return val; return val;
@@ -115,7 +118,7 @@ const Snippetbar = createClass({
renderThemeSelector : function(){ renderThemeSelector : function(){
return <div className='themeSelector'> return <div className='themeSelector'>
<select value={this.props.currentEditorTheme} onChange={this.changeTheme} onMouseDown={(this.changeTheme)}> <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>; return <option key={key} value={theme}>{theme}</option>;
})} })}
</select> </select>
@@ -229,5 +232,4 @@ const SnippetGroup = createClass({
</div> </div>
</div>; </div>;
}, },
}); });

2
scripts/buildHomebrew.js
View File

@@ -115,7 +115,7 @@ fs.emptyDirSync('./build');
stream.end(); stream.end();
await fs.copy('./node_modules/codemirror/theme', './build/homebrew/cm-themes'); 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// //v==----------------------------- BUNDLE PACKAGES --------------------------------==v//

9
server/app.js
View File

@@ -17,8 +17,6 @@ const asyncHandler = require('express-async-handler');
const { DEFAULT_BREW } = require('./brewDefaults.js'); const { DEFAULT_BREW } = require('./brewDefaults.js');
const codeMirrorThemes = require('../themes/codeMirror/editorThemes.json');
const splitTextStyleAndMetadata = (brew)=>{ const splitTextStyleAndMetadata = (brew)=>{
brew.text = brew.text.replaceAll('\r\n', '\n'); brew.text = brew.text.replaceAll('\r\n', '\n');
if(brew.text.startsWith('```metadata')) { if(brew.text.startsWith('```metadata')) {
@@ -419,10 +417,9 @@ const templateFn = require('./../client/template.js');
const renderPage = async (req, res)=>{ const renderPage = async (req, res)=>{
// Create configuration object // Create configuration object
const configuration = { const configuration = {
local : isLocalEnvironment, local : isLocalEnvironment,
publicUrl : config.get('publicUrl') ?? '', publicUrl : config.get('publicUrl') ?? '',
environment : nodeEnv, environment : nodeEnv
codeMirrorThemes : codeMirrorThemes
}; };
const props = { const props = {
version : require('./../package.json').version, version : require('./../package.json').version,