From 27c52fc244671931f9d4ebd27f0b049ea8c05c3e Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 23 Jul 2024 17:11:48 -0400 Subject: [PATCH] Fix loading CSS for Legacy --- client/homebrew/editor/metadataEditor/metadataEditor.jsx | 2 +- client/homebrew/pages/editPage/editPage.jsx | 2 +- client/homebrew/pages/newPage/newPage.jsx | 2 +- server/app.js | 3 ++- server/homebrew.api.js | 4 +--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index 0c5b56304..473b2ab69 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx @@ -99,7 +99,7 @@ const MetadataEditor = createClass({ if(renderer == 'legacy') this.props.metadata.theme = '5ePHB'; } - this.props.onChange(this.props.metadata); + this.props.onChange(this.props.metadata, 'renderer'); }, handlePublish : function(val){ this.props.onChange({ diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index e3e7990df..05bd79d4d 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -134,7 +134,7 @@ const EditPage = createClass({ }, handleMetaChange : function(metadata, field=undefined){ - if(field == 'theme') // Fetch theme bundle only if theme was changed + if(field == 'theme' || field == 'renderer') // Fetch theme bundle only if theme or renderer was changed this.fetchThemeBundle(metadata.renderer, metadata.theme); this.setState((prevState)=>({ diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 4b223faa7..e8c2636b0 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -137,7 +137,7 @@ const NewPage = createClass({ }, handleMetaChange : function(metadata, field=undefined){ - if(field == 'theme') // Fetch theme bundle only if theme was changed + if(field == 'theme' || field == 'renderer') // Fetch theme bundle only if theme or renderer was changed this.fetchThemeBundle(metadata.renderer, metadata.theme); this.setState((prevState)=>({ diff --git a/server/app.js b/server/app.js index 0de404c1e..8ad35ca35 100644 --- a/server/app.js +++ b/server/app.js @@ -101,7 +101,8 @@ app.get('/', (req, res, next)=>{ app.get('/legacy', (req, res, next)=>{ req.brew = { text : welcomeTextLegacy, - renderer : 'legacy' + renderer : 'legacy', + theme : '5ePHB' }, req.ogMeta = { ...defaultMetaTags, diff --git a/server/homebrew.api.js b/server/homebrew.api.js index aa3eded0a..0b6218597 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -8,8 +8,6 @@ const Markdown = require('../shared/naturalcrit/markdown.js'); const yaml = require('js-yaml'); const asyncHandler = require('express-async-handler'); const { nanoid } = require('nanoid'); -const path = require('path'); -const fs = require('fs'); const { splitTextStyleAndMetadata } = require('../shared/helpers.js'); const { DEFAULT_BREW, DEFAULT_BREW_LOAD } = require('./brewDefaults.js'); @@ -263,7 +261,7 @@ const api = { req.params.renderer: This is the Markdown+ version for the static theme. If a User theme the value will come from the User Theme metadata. */ - + req.params.renderer = _.upperFirst(req.params.renderer); let currentTheme; const completeStyles = []; const completeSnippets = [];