From 41ecbb62a24eaa3c483c5855ff32efc5d6162541 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sat, 27 Feb 2021 17:55:29 +1300
Subject: [PATCH] Redirect `new` to `import`.

---
 client/homebrew/homebrew.jsx | 4 ++--
 server.js                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index d8707c72d..d7c963c1c 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -45,11 +45,11 @@ const Homebrew = createClass({
 					<Switch>
 						<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='/import/:id' component={(routeProps)=><ImportPage id={routeProps.match.params.id} brew={this.props.brew} />}/>
+						<Route path='/new/:id' component={(routeProps)=><ImportPage id={routeProps.match.params.id} brew={this.props.brew} />}/>
 						<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' exact component={(routeProps)=><PrintPage query={queryString.parse(routeProps.location.search)} /> } />
-						<Route path='/new' exact component={NewPage}/>
+						//<Route path='/new' exact component={NewPage}/>
 						<Route path='/changelog' exact component={()=><SharePage brew={{ title: 'Changelog', text: this.props.changelog }} />}/>
 						<Route path='/' component={()=><HomePage welcomeText={this.props.welcomeText}/>}/>
 					</Switch>
diff --git a/server.js b/server.js
index 76fec7629..54e61d085 100644
--- a/server.js
+++ b/server.js
@@ -144,7 +144,7 @@ app.get('/edit/:id', (req, res, next)=>{
 });
 
 //Import Page
-app.get('/import/:id', (req, res, next)=>{
+app.get('/new/:id', (req, res, next)=>{
 	res.header('Cache-Control', 'no-cache, no-store');	//reload the latest saved brew when pressing back button, not the cached version before save.
 	if(req.params.id.length > 12) {
 		const googleId = req.params.id.slice(0, -12);