From 51aba937f59322dc2b51f1df59c5e44c79d29276 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 7 Jun 2021 11:51:02 -0400 Subject: [PATCH] Fix CSS highlighting --- client/homebrew/brewRenderer/brewRenderer.jsx | 4 ++-- client/homebrew/homebrew.jsx | 2 +- client/homebrew/pages/newPage/newPage.jsx | 16 +++++++++++----- scripts/project.json | 1 + server.js | 9 +++++++++ 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 58981dbf3..440db1ce3 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -124,9 +124,9 @@ const BrewRenderer = createClass({ renderPage : function(pageText, index){ if(this.props.renderer == 'legacy') - return
; + return
; else - return
; + return
; }, renderPages : function(){ diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index ee6949ea0..fbb18a0cc 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -45,7 +45,7 @@ const Homebrew = createClass({ }/> }/> }/> - + }/> }/> } /> } /> diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index baffa0cfc..c2e845945 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -3,6 +3,7 @@ const React = require('react'); const createClass = require('create-react-class'); const _ = require('lodash'); const request = require('superagent'); +const dedent = require('dedent-tabs').default; const Markdown = require('naturalcrit/markdown.js'); @@ -16,15 +17,19 @@ const SplitPane = require('naturalcrit/splitPane/splitPane.jsx'); const Editor = require('../../editor/editor.jsx'); const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); - const KEY = 'homebrewery-new'; const NewPage = createClass({ getDefaultProps : function() { return { brew : { - text : '', - style : '', + text : '', + style : dedent` + /*=======--- Example CSS styling ---=======*/ + /* Any CSS here will apply to your document! */ + .myExampleClass { + color: black; + }`, shareId : null, editId : null, createdAt : null, @@ -52,7 +57,8 @@ const NewPage = createClass({ tags : this.props.brew.tags || '', published : false, authors : [], - systems : this.props.brew.systems || [] + systems : this.props.brew.systems || [], + renderer : this.props.brew.renderer || 'legacy' }, isSaving : false, @@ -214,7 +220,7 @@ const NewPage = createClass({ onMetaChange={this.handleMetaChange} renderer={this.state.brew.renderer} /> - +
; diff --git a/scripts/project.json b/scripts/project.json index 0dff24c6d..9bb6ef1ed 100644 --- a/scripts/project.json +++ b/scripts/project.json @@ -10,6 +10,7 @@ "classnames", "codemirror", "codemirror/mode/gfm/gfm.js", + "codemirror/mode/css/css.js", "codemirror/mode/javascript/javascript.js", "moment", "superagent", diff --git a/server.js b/server.js index b1415f130..b5ffd7ba2 100644 --- a/server.js +++ b/server.js @@ -9,6 +9,7 @@ const GoogleActions = require('./server/googleActions.js'); const serveCompressedStaticAssets = require('./server/static-assets.mv.js'); const sanitizeFilename = require('sanitize-filename'); const asyncHandler = require('express-async-handler'); +const dedent = require('dedent-tabs').default; //Get the brew object from the HB database or Google Drive const getBrewFromId = asyncHandler(async (id, accessType)=>{ @@ -30,6 +31,14 @@ const getBrewFromId = asyncHandler(async (id, accessType)=>{ const index = brew.text.indexOf('```\n\n'); brew.style = brew.text.slice(7, index - 1); brew.text = brew.text.slice(index + 5); + } else { + brew.style = dedent` + /*=======--- Example CSS styling ---=======*/ + /* Any CSS here will apply to your document! */ + + .myExampleClass { + color: black; + }`; } return brew; });