From f31fe6cbf0d1204932bc14c361c497d75ce4bcc6 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sun, 25 Jul 2021 16:54:24 +1200 Subject: [PATCH 1/3] Prepend 'CLONE:- ' to title of cloned brew --- server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server.js b/server.js index 45e073065..3b9ff6b04 100644 --- a/server.js +++ b/server.js @@ -170,6 +170,7 @@ app.get('/edit/:id', asyncHandler(async (req, res, next)=>{ //New Page app.get('/new/:id', asyncHandler(async (req, res, next)=>{ const brew = await getBrewFromId(req.params.id, 'share'); + brew.title = `CLONE:- ${brew.title}`; req.brew = brew; return next(); })); From db3bec9e2bb3067006b43dec6a99527a5e007d55 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Jul 2021 21:05:55 +1200 Subject: [PATCH 2/3] Combine `setState` calls in `componentDidMount` --- client/homebrew/pages/newPage/newPage.jsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index d29a858a2..76cab5292 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -26,6 +26,7 @@ const NewPage = createClass({ return { brew : { text : '', + style : undefined, shareId : null, editId : null, createdAt : null, @@ -46,6 +47,7 @@ const NewPage = createClass({ return { brew : { text : this.props.brew.text || '', + style : this.props.brew.style || undefined, gDrive : false, title : this.props.brew.title || '', description : this.props.brew.description || '', @@ -67,16 +69,15 @@ const NewPage = createClass({ const brewStorage = localStorage.getItem(BREWKEY); const styleStorage = localStorage.getItem(STYLEKEY); + const brew = this.state.brew; + if(!this.props.brew.text || !this.props.brew.style){ - this.setState({ - brew : { - text : this.props.brew.text || (brewStorage ?? ''), - style : this.props.brew.style || (styleStorage ?? undefined) - } - }); + brew.text = this.props.brew.text || (brewStorage ?? ''); + brew.style = this.props.brew.style || (styleStorage ?? undefined); } this.setState((prevState)=>({ + brew : brew, htmlErrors : Markdown.validate(prevState.brew.text) })); From ebd28f41a2f2eb35ba6ba3e85e9f7b65e6458758 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 30 Jul 2021 17:29:36 -0400 Subject: [PATCH 3/3] replace :- with just - --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 3b9ff6b04..f16418828 100644 --- a/server.js +++ b/server.js @@ -170,7 +170,7 @@ app.get('/edit/:id', asyncHandler(async (req, res, next)=>{ //New Page app.get('/new/:id', asyncHandler(async (req, res, next)=>{ const brew = await getBrewFromId(req.params.id, 'share'); - brew.title = `CLONE:- ${brew.title}`; + brew.title = `CLONE - ${brew.title}`; req.brew = brew; return next(); }));