From caf151a0dd6d943857c7673d697148f9cad234d4 Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Wed, 28 Jul 2021 15:25:17 +1200 Subject: [PATCH 1/6] Initial code pass to not display "Source" and "Get PDF" NavBar buttons on the `/changelog` page. --- client/homebrew/homebrew.jsx | 2 +- client/homebrew/pages/sharePage/sharePage.jsx | 28 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index 94131b1dd..d3cc1e824 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -48,7 +48,7 @@ const Homebrew = createClass({ }/> } /> } /> - }/> + }/> }/> diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 82b948675..3e51aafb0 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -25,7 +25,9 @@ const SharePage = createClass({ updatedAt : null, views : 0, renderer : '' - } + }, + showSource : true, + showPrint : true }; }, @@ -79,6 +81,21 @@ const SharePage = createClass({ ; }, + renderPrint : function(){ + if(!this.state.showPrint) return; + return ; + } + + renderSourceDropdown : function(){ + if(!this.state.showSource) return; + return this.handleDropdown(true)} + onMouseLeave={()=>this.handleDropdown(false)}> + source + {this.renderDropdown()} + ; + }, + render : function(){ return
@@ -88,13 +105,8 @@ const SharePage = createClass({ - - this.handleDropdown(true)} - onMouseLeave={()=>this.handleDropdown(false)}> - source - {this.renderDropdown()} - + {this.renderPrint()} + {this.renderSourceDropdown()} From 189fdb45551efad5a4bf9d51472b4abf0809e7df Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Wed, 28 Jul 2021 15:29:04 +1200 Subject: [PATCH 2/6] Missed a vital comma. --- client/homebrew/pages/sharePage/sharePage.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 3e51aafb0..1b714a147 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -84,7 +84,7 @@ const SharePage = createClass({ renderPrint : function(){ if(!this.state.showPrint) return; return ; - } + }, renderSourceDropdown : function(){ if(!this.state.showSource) return; From fa5bd92406f4aeedd375172df2cc5872bd1348ca Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Wed, 28 Jul 2021 15:37:36 +1200 Subject: [PATCH 3/6] Shift check to presence of `this.props.brew.shareId`. Revert changes to Homebrew.jsx. --- client/homebrew/homebrew.jsx | 2 +- client/homebrew/pages/sharePage/sharePage.jsx | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index d3cc1e824..94131b1dd 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -48,7 +48,7 @@ const Homebrew = createClass({ }/> } /> } /> - }/> + }/> }/>
diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 1b714a147..f8e19a8d1 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -25,9 +25,7 @@ const SharePage = createClass({ updatedAt : null, views : 0, renderer : '' - }, - showSource : true, - showPrint : true + } }; }, @@ -82,12 +80,12 @@ const SharePage = createClass({ }, renderPrint : function(){ - if(!this.state.showPrint) return; + if(!this.props.brew.shareId) return; return ; }, renderSourceDropdown : function(){ - if(!this.state.showSource) return; + if(!this.props.brew.shareId) return; return this.handleDropdown(true)} onMouseLeave={()=>this.handleDropdown(false)}> From 6238ed6b779535bf7a44153fd1c4999d53f06c65 Mon Sep 17 00:00:00 2001 From: Sean Robertson Date: Wed, 28 Jul 2021 16:04:28 +1200 Subject: [PATCH 4/6] Further simplification of code. --- client/homebrew/pages/sharePage/sharePage.jsx | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index f8e19a8d1..6c0771a74 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -79,21 +79,6 @@ const SharePage = createClass({ ; }, - renderPrint : function(){ - if(!this.props.brew.shareId) return; - return ; - }, - - renderSourceDropdown : function(){ - if(!this.props.brew.shareId) return; - return this.handleDropdown(true)} - onMouseLeave={()=>this.handleDropdown(false)}> - source - {this.renderDropdown()} - ; - }, - render : function(){ return
@@ -103,8 +88,13 @@ const SharePage = createClass({ - {this.renderPrint()} - {this.renderSourceDropdown()} + {this.props.shareId && + this.handleDropdown(true)} + onMouseLeave={()=>this.handleDropdown(false)}> + source + {this.renderDropdown()} + } From 72d8b5ea1655a981b939891c66eda8b07d095f98 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Wed, 28 Jul 2021 17:10:53 +1200 Subject: [PATCH 5/6] Linter fixes; correction of condtional JSX element --- client/homebrew/pages/sharePage/sharePage.jsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 6c0771a74..3ea1629af 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -88,13 +88,15 @@ const SharePage = createClass({ - {this.props.shareId && - this.handleDropdown(true)} - onMouseLeave={()=>this.handleDropdown(false)}> - source - {this.renderDropdown()} - } + {this.props.shareId && <> + + this.handleDropdown(true)} + onMouseLeave={()=>this.handleDropdown(false)}> + source + {this.renderDropdown()} + + } From acb750c18a0bc0ae3739963ebadc0fa455b35fbd Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Wed, 28 Jul 2021 17:15:38 +1200 Subject: [PATCH 6/6] Fix logic for enabling Source and Get PDF --- client/homebrew/pages/sharePage/sharePage.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 3ea1629af..5adc25bda 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -88,7 +88,7 @@ const SharePage = createClass({ - {this.props.shareId && <> + {this.props.brew.shareId && <> this.handleDropdown(true)}