From 2613d43f3cea41b6a4f9d6b8a07eed494ff5048d Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 21 Jun 2021 19:38:02 +1200 Subject: [PATCH] Shift CSS processing from `newPage.jsx/save` to `homebrew.api.js/newBrew`, as this function is only called when saving new Brews. --- client/homebrew/pages/newPage/newPage.jsx | 9 +-------- server/homebrew.api.js | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 13509f53c..50393f731 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -135,14 +135,7 @@ const NewPage = createClass({ }); console.log('saving new brew'); - - // Split out CSS to Style if CSS codefence exists - if(brew.text.startsWith('```css') && brew.text.indexOf('```\n\n') > 0) { - const index = brew.text.indexOf('```\n\n'); - brew.style = `${brew.style}\n${brew.text.slice(7, index - 1)}`; - brew.text = brew.text.slice(index + 5); - } - + if(this.state.saveGoogle) { const res = await request .post('/api/newGoogle/') diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 51c9903db..0df6a15ac 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -28,8 +28,16 @@ const mergeBrewText = (text, style)=>{ }; const newBrew = (req, res)=>{ + const brew = req.body; + // Split out CSS to Style if CSS codefence exists + if(brew.text.startsWith('```css') && brew.text.indexOf('```\n\n') > 0) { + const index = brew.text.indexOf('```\n\n'); + brew.style = `${brew.style ? brew.style + '\n' : ''}${brew.text.slice(7, index - 1)}`; + brew.text = brew.text.slice(index + 5); + }; + if(!brew.title) { brew.title = getGoodBrewTitle(brew.text); }