f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-16 10:22:42 +00:00
Code Wiki Activity

Merge pull request #1455 from G-Ambatte/reduceWelcomeTextUsage

Browse Source 
Make WelcomeText and ChangeLogText conditional
This commit is contained in:
Trevor Buckner
2021-07-30 17:50:26 -04:00
committed by GitHub
parent 11d1f5c00e 99d2f6d48d
commit 004f3f184f
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/homebrew/homebrew.jsx
View File

@@ -44,12 +44,12 @@ const Homebrew = createClass({
<Route path='/edit/:id' component={(routeProps)=><EditPage id={routeProps.match.params.id} brew={this.props.brew} />}/> <Route path='/edit/:id' component={(routeProps)=><EditPage id={routeProps.match.params.id} brew={this.props.brew} />}/>
<Route path='/share/:id' component={(routeProps)=><SharePage id={routeProps.match.params.id} brew={this.props.brew} />}/> <Route path='/share/:id' component={(routeProps)=><SharePage id={routeProps.match.params.id} brew={this.props.brew} />}/>
<Route path='/new/:id' component={(routeProps)=><NewPage id={routeProps.match.params.id} brew={this.props.brew} />}/> <Route path='/new/:id' component={(routeProps)=><NewPage id={routeProps.match.params.id} brew={this.props.brew} />}/>
<Route path='/new' exact component={(routeProps)=><NewPage/>}/> <Route path='/new' exact component={(routeProps)=><NewPage />}/>
<Route path='/user/:username' component={(routeProps)=><UserPage username={routeProps.match.params.username} brews={this.props.brews} />}/> <Route path='/user/:username' component={(routeProps)=><UserPage username={routeProps.match.params.username} brews={this.props.brews} />}/>
<Route path='/print/:id' component={(routeProps)=><PrintPage brew={this.props.brew} query={queryString.parse(routeProps.location.search)} /> } /> <Route path='/print/:id' component={(routeProps)=><PrintPage brew={this.props.brew} query={queryString.parse(routeProps.location.search)} />}/>
<Route path='/print' exact component={(routeProps)=><PrintPage query={queryString.parse(routeProps.location.search)} /> } /> <Route path='/print' exact component={(routeProps)=><PrintPage query={queryString.parse(routeProps.location.search)} />}/>
<Route path='/changelog' exact component={()=><SharePage brew={{ title: 'Changelog', text: this.props.changelog }} />}/> <Route path='/changelog' exact component={()=><SharePage brew={this.props.brew} />}/>
<Route path='/' component={()=><HomePage welcomeText={this.props.welcomeText}/>}/> <Route path='/' component={()=><HomePage brew={this.props.brew} />}/>
</Switch> </Switch>
</div> </div>
</Router> </Router>

14
client/homebrew/pages/homePage/homePage.jsx
View File

@@ -23,19 +23,15 @@ const HomePage = createClass({
getDefaultProps : function() { getDefaultProps : function() {
return { return {
brew : { brew : {
text : '' text : '',
}, },
welcomeText : '', ver : '0.0.0'
ver : '0.0.0'
}; };
}, },
getInitialState : function() { getInitialState : function() {
return { return {
brew : { brew : this.props.brew,
text : this.props.welcomeText welcomeText : this.props.brew.text
}
}; };
}, },
handleSave : function(){ handleSave : function(){
@@ -89,7 +85,7 @@ const HomePage = createClass({
</SplitPane> </SplitPane>
</div> </div>
<div className={cx('floatingSaveButton', { show: this.props.welcomeText != this.state.brew.text })} onClick={this.handleSave}> <div className={cx('floatingSaveButton', { show: this.state.welcomeText != this.state.brew.text })} onClick={this.handleSave}>
Save current <i className='fas fa-save' /> Save current <i className='fas fa-save' />
</div> </div>

21
server.js
View File

@@ -105,6 +105,25 @@ app.get('/robots.txt', (req, res)=>{
return res.sendFile(`${__dirname}/robots.txt`); return res.sendFile(`${__dirname}/robots.txt`);
}); });
//Home page
app.get('/', async (req, res, next)=>{
const brew = {
text : welcomeText
};
req.brew = brew;
return next();
});
//Changelog page
app.get('/changelog', async (req, res, next)=>{
const brew = {
title : 'Changelog',
text : changelogText
};
req.brew = brew;
return next();
});
//Source page //Source page
app.get('/source/:id', asyncHandler(async (req, res)=>{ app.get('/source/:id', asyncHandler(async (req, res)=>{
const brew = await getBrewFromId(req.params.id, 'raw'); const brew = await getBrewFromId(req.params.id, 'raw');
@@ -205,8 +224,6 @@ app.use((req, res)=>{
const props = { const props = {
version : require('./package.json').version, version : require('./package.json').version,
url : req.originalUrl, url : req.originalUrl,
welcomeText : welcomeText,
changelog : changelogText,
brew : req.brew, brew : req.brew,
brews : req.brews, brews : req.brews,
googleBrews : req.googleBrews, googleBrews : req.googleBrews,