From 0cd4b730d7e90b122675efb5f1077641b899bd47 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 28 Jun 2021 19:37:06 +1200 Subject: [PATCH 1/4] Attempt to fix issue with saving Google brews. --- client/homebrew/pages/newPage/newPage.jsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index ccbaf5ff7..1ded0e5ae 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -135,18 +135,18 @@ const NewPage = createClass({ console.log('saving new brew'); - const brew = this.state.brew; + const saveBrew = this.state.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 ? `${brew.style}\n` : ''}${brew.text.slice(7, index - 1)}`; - brew.text = brew.text.slice(index + 5); + if(saveBrew.text.startsWith('```css') && saveBrew.text.indexOf('```\n\n') > 0) { + const index = saveBrew.text.indexOf('```\n\n'); + saveBrew.style = `${saveBrew.style ? `${saveBrew.style}\n` : ''}${saveBrew.text.slice(7, index - 1)}`; + saveBrew.text = saveBrew.text.slice(index + 5); }; if(this.state.saveGoogle) { const res = await request - .post('/api/newGoogle/') - .send(brew) + .post('/api/newGoogle') + .send(saveBrew) .catch((err)=>{ console.log(err.status === 401 ? 'Not signed in!' @@ -158,10 +158,10 @@ const NewPage = createClass({ const brew = res.body; localStorage.removeItem(BREWKEY); localStorage.removeItem(STYLEKEY); - window.location = `/edit/${brew.googleId}${brew.editId}`; + window.location = `/edit/${saveBrew.googleId}${saveBrew.editId}`; } else { request.post('/api') - .send(brew) + .send(saveBrew) .end((err, res)=>{ if(err){ this.setState({ @@ -173,7 +173,7 @@ const NewPage = createClass({ const brew = res.body; localStorage.removeItem(BREWKEY); localStorage.removeItem(STYLEKEY); - window.location = `/edit/${brew.editId}`; + window.location = `/edit/${saveBrew.editId}`; }); } }, From c18eb948b479059a516bb495be2695bcbb5ab094 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 28 Jun 2021 19:43:15 +1200 Subject: [PATCH 2/4] Accidentally was overzealous with replacing `brew` with `saveBrew`. --- client/homebrew/pages/newPage/newPage.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 1ded0e5ae..75abe7749 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -158,7 +158,7 @@ const NewPage = createClass({ const brew = res.body; localStorage.removeItem(BREWKEY); localStorage.removeItem(STYLEKEY); - window.location = `/edit/${saveBrew.googleId}${saveBrew.editId}`; + window.location = `/edit/${brew.googleId}${brew.editId}`; } else { request.post('/api') .send(saveBrew) @@ -173,7 +173,7 @@ const NewPage = createClass({ const brew = res.body; localStorage.removeItem(BREWKEY); localStorage.removeItem(STYLEKEY); - window.location = `/edit/${saveBrew.editId}`; + window.location = `/edit/${brew.editId}`; }); } }, From 496ab26972370f4b5625830bfcf5348911729710 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 28 Jun 2021 11:50:12 -0400 Subject: [PATCH 3/4] Use let instead of const --- client/homebrew/pages/newPage/newPage.jsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 75abe7749..8dec6e80c 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -135,18 +135,18 @@ const NewPage = createClass({ console.log('saving new brew'); - const saveBrew = this.state.brew; + let brew = this.state.brew; // Split out CSS to Style if CSS codefence exists - if(saveBrew.text.startsWith('```css') && saveBrew.text.indexOf('```\n\n') > 0) { - const index = saveBrew.text.indexOf('```\n\n'); - saveBrew.style = `${saveBrew.style ? `${saveBrew.style}\n` : ''}${saveBrew.text.slice(7, index - 1)}`; - saveBrew.text = saveBrew.text.slice(index + 5); + 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(this.state.saveGoogle) { const res = await request .post('/api/newGoogle') - .send(saveBrew) + .send(brew) .catch((err)=>{ console.log(err.status === 401 ? 'Not signed in!' @@ -155,13 +155,13 @@ const NewPage = createClass({ return; }); - const brew = res.body; + brew = res.body; localStorage.removeItem(BREWKEY); localStorage.removeItem(STYLEKEY); window.location = `/edit/${brew.googleId}${brew.editId}`; } else { request.post('/api') - .send(saveBrew) + .send(brew) .end((err, res)=>{ if(err){ this.setState({ @@ -170,7 +170,7 @@ const NewPage = createClass({ return; } window.onbeforeunload = function(){}; - const brew = res.body; + brew = res.body; localStorage.removeItem(BREWKEY); localStorage.removeItem(STYLEKEY); window.location = `/edit/${brew.editId}`; From 017bccc9370aeaea281017710f6cdab45af27233 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 28 Jun 2021 12:07:56 -0400 Subject: [PATCH 4/4] replace trailing slash --- client/homebrew/pages/newPage/newPage.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 8dec6e80c..d29a858a2 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -145,7 +145,7 @@ const NewPage = createClass({ if(this.state.saveGoogle) { const res = await request - .post('/api/newGoogle') + .post('/api/newGoogle/') .send(brew) .catch((err)=>{ console.log(err.status === 401