From 7ca21235060b46e46f803c85507c687f7c5d6208 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Wed, 20 Aug 2025 16:28:05 -0400 Subject: [PATCH] Move Splitpane / Editor / BrewRenderer into common BasePage (not on /edit yet. That one is a beast.) --- .../pages/basePages/editPage/editPage.jsx | 37 +++++++++++++- client/homebrew/pages/homePage/homePage.jsx | 51 +++++-------------- client/homebrew/pages/newPage/newPage.jsx | 41 ++------------- 3 files changed, 54 insertions(+), 75 deletions(-) diff --git a/client/homebrew/pages/basePages/editPage/editPage.jsx b/client/homebrew/pages/basePages/editPage/editPage.jsx index 9229ad6ea..763fec687 100644 --- a/client/homebrew/pages/basePages/editPage/editPage.jsx +++ b/client/homebrew/pages/basePages/editPage/editPage.jsx @@ -29,7 +29,42 @@ const BaseEditPage = (props)=>{ - {props.children} +
+ + + + +
+ + {props.children?.(welcomeText, brew.text, save)} ); }; diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx index be2244503..814e3f860 100644 --- a/client/homebrew/pages/homePage/homePage.jsx +++ b/client/homebrew/pages/homePage/homePage.jsx @@ -111,44 +111,21 @@ const HomePage = createClass({ className="homePage" errorState={this.state.error} parent={this} - brew={this.state.brew} - navButtons={this.renderNavbar()}> - -
- - - - -
-
- Save current -
+ performSave={this.save} + > + {(welcomeText, brewText, save) => { + return <> + +
+ Save current +
- - Create your own - - + + Create your own + + + }} + } }); diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 4b4040c10..2849f36a1 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -223,43 +223,10 @@ const NewPage = createClass({ className="newPage" errorState={this.state.error} parent={this} - brew={this.state.brew} - navButtons={this.renderNavbar()}> -
- - - - -
- ; + saveButton={this.renderSaveButton} + performSave={this.save} + loadBrew={this.loadBrew}> + ; } });