From c6d0a2e2add5b0ff89ae51572b179e8459df275c Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 26 Jul 2021 09:55:04 +1200 Subject: [PATCH 1/5] Make WelcomeText and ChangeLogText conditional --- server.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index 45e073065..32576e4f6 100644 --- a/server.js +++ b/server.js @@ -105,6 +105,18 @@ app.get('/robots.txt', (req, res)=>{ return res.sendFile(`${__dirname}/robots.txt`); }); +//Home page +app.get('/', async (req, res, next)=>{ + req.welcomeText = welcomeText; + return next(); +}); + +//Changelog page +app.get('/changelog', async (req, res, next)=>{ + req.changelogText = changelogText; + return next(); +}); + //Source page app.get('/source/:id', asyncHandler(async (req, res)=>{ const brew = await getBrewFromId(req.params.id, 'raw'); @@ -204,8 +216,8 @@ app.use((req, res)=>{ const props = { version : require('./package.json').version, url : req.originalUrl, - welcomeText : welcomeText, - changelog : changelogText, + welcomeText : req.welcomeText, + changelog : req.changelogText, brew : req.brew, brews : req.brews, googleBrews : req.googleBrews, From 7fa1e16b5a4129295497725b4d4adcab37724658 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Wed, 28 Jul 2021 17:51:35 +1200 Subject: [PATCH 2/5] Create minimal Changelog brew --- client/homebrew/homebrew.jsx | 2 +- client/homebrew/pages/homePage/homePage.jsx | 2 -- server.js | 6 +++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 94131b1dd..164369083 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -48,7 +48,7 @@ const Homebrew = createClass({ }/> } /> } /> - }/> + }/> }/> diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index d1e749482..6349883f2 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -28,8 +28,6 @@ const HomePage = createClass({ welcomeText : '', ver : '0.0.0' }; - - }, getInitialState : function() { return { diff --git a/server.js b/server.js index 32576e4f6..a508a6e42 100644 --- a/server.js +++ b/server.js @@ -113,7 +113,11 @@ app.get('/', async (req, res, next)=>{ //Changelog page app.get('/changelog', async (req, res, next)=>{ - req.changelogText = changelogText; + const brew = { + title : 'Changelog', + text : changelogText + }; + req.brew = brew; return next(); }); From fdfea3661422940d728d2463729101d3917f6e08 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Jul 2021 19:00:26 +1200 Subject: [PATCH 3/5] Shift HomePage to use a minimal brew --- client/homebrew/homebrew.jsx | 8 ++++---- client/homebrew/pages/homePage/homePage.jsx | 12 +++++------- server.js | 6 +++++- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 164369083..118c21e91 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -44,12 +44,12 @@ const Homebrew = createClass({ }/> }/> }/> - }/> + }/> }/> - } /> - } /> + }/> + }/> }/> - }/> + }/> diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index 6349883f2..c89f6c95b 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -23,17 +23,15 @@ const HomePage = createClass({ getDefaultProps : function() { return { brew : { - text : '' + text : '', + welcomeText : '' }, - welcomeText : '', - ver : '0.0.0' + ver : '0.0.0' }; }, getInitialState : function() { return { - brew : { - text : this.props.welcomeText - } + brew : this.props.brew }; }, handleSave : function(){ @@ -87,7 +85,7 @@ const HomePage = createClass({ -
+
Save current
diff --git a/server.js b/server.js index a508a6e42..6d3006016 100644 --- a/server.js +++ b/server.js @@ -107,7 +107,11 @@ app.get('/robots.txt', (req, res)=>{ //Home page app.get('/', async (req, res, next)=>{ - req.welcomeText = welcomeText; + const brew = { + text : welcomeText, + welcomeText : welcomeText + }; + req.brew = brew; return next(); }); From 85fa73b9bf03cba012447935e8a072b19c9f0d41 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Thu, 29 Jul 2021 19:02:48 +1200 Subject: [PATCH 4/5] Remove welcomText+changelogText from default props --- server.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/server.js b/server.js index 6d3006016..88019de4b 100644 --- a/server.js +++ b/server.js @@ -224,8 +224,6 @@ app.use((req, res)=>{ const props = { version : require('./package.json').version, url : req.originalUrl, - welcomeText : req.welcomeText, - changelog : req.changelogText, brew : req.brew, brews : req.brews, googleBrews : req.googleBrews, From 99d2f6d48d71707945a1bcb86e42fa6b91e8c58c Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 30 Jul 2021 17:47:11 -0400 Subject: [PATCH 5/5] avoid sending two copies of welcome text in the same brew --- client/homebrew/pages/homePage/homePage.jsx | 8 ++++---- server.js | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index c89f6c95b..b8ee5634b 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -23,15 +23,15 @@ const HomePage = createClass({ getDefaultProps : function() { return { brew : { - text : '', - welcomeText : '' + text : '', }, ver : '0.0.0' }; }, getInitialState : function() { return { - brew : this.props.brew + brew : this.props.brew, + welcomeText : this.props.brew.text }; }, handleSave : function(){ @@ -85,7 +85,7 @@ const HomePage = createClass({
-
+
Save current
diff --git a/server.js b/server.js index 88019de4b..648a08cd1 100644 --- a/server.js +++ b/server.js @@ -108,8 +108,7 @@ app.get('/robots.txt', (req, res)=>{ //Home page app.get('/', async (req, res, next)=>{ const brew = { - text : welcomeText, - welcomeText : welcomeText + text : welcomeText }; req.brew = brew; return next();