From 7186a94c27b9866a13d6ca3a76ca5fce659e6974 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Fri, 23 Apr 2021 22:10:56 -0400
Subject: [PATCH 1/2] Do not force brew back to Homebrew if a Google save fails

---
 client/homebrew/pages/editPage/editPage.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 19a09c3fe..2fe0ba007 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -187,7 +187,7 @@ const EditPage = createClass({
 				.catch((err)=>{
 					console.log(err.status === 401
 						? 'Not signed in!'
-						: 'Error Saving to Google!');
+						: 'Error Transferring to Google!');
 					this.setState({ errors: err, saveGoogle: false });
 				});
 
@@ -210,7 +210,7 @@ const EditPage = createClass({
 					console.log(err.status === 401
 						? 'Not signed in!'
 						: 'Error Saving to Google!');
-					this.setState({ errors: err, saveGoogle: false });
+					this.setState({ errors: err });
 					return;
 				});
 

From c9a84a1813d77b4681d4f147e6a442a041aaf57b Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sun, 25 Apr 2021 23:38:44 -0400
Subject: [PATCH 2/2] Prevent accidental transfers from google to HB when not
 signed in

---
 client/homebrew/pages/editPage/editPage.jsx | 78 +++++++++++++--------
 1 file changed, 47 insertions(+), 31 deletions(-)

diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 2fe0ba007..b60a318be 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -55,6 +55,7 @@ const EditPage = createClass({
 			isSaving               : false,
 			isPending              : false,
 			alertTrashedGoogleBrew : this.props.brew.trashed,
+			alertLoginToTransfer   : false,
 			saveGoogle             : this.props.brew.googleId ? true : false,
 			confirmGoogleTransfer  : false,
 			errors                 : null,
@@ -140,15 +141,25 @@ const EditPage = createClass({
 	},
 
 	handleGoogleClick : function(){
+		console.log('handlegoogleclick');
+		if(!global.account?.googleId) {
+			this.setState({
+				alertLoginToTransfer : true
+			});
+			return;
+		}
 		this.setState((prevState)=>({
 			confirmGoogleTransfer : !prevState.confirmGoogleTransfer
 		}));
 		this.clearErrors();
 	},
 
-	closeAlerts : function(){
+	closeAlerts : function(event){
+		event.stopPropagation();	//Only handle click once so alert doesn't reopen
 		this.setState({
-			alertTrashedGoogleBrew : false
+			alertTrashedGoogleBrew : false,
+			alertLoginToTransfer   : false,
+			confirmGoogleTransfer  : false
 		});
 	},
 
@@ -260,39 +271,44 @@ const EditPage = createClass({
 	},
 
 	renderGoogleDriveIcon : function(){
-		if(this.state.saveGoogle) {
-			return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
-				<img src={googleDriveActive} alt='googleDriveActive' />
+		return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
+			{this.state.saveGoogle
+				? <img src={googleDriveActive} alt='googleDriveActive'/>
+				: <img src={googleDriveInactive} alt='googleDriveInactive'/>
+			}
 
-				{this.state.confirmGoogleTransfer &&
-					<div className='errorContainer'>
-					Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?<br />
-						<div className='confirm' onClick={this.toggleGoogleStorage}>
-							Yes
-						</div>
-						<div className='deny'>
-							No
-						</div>
+			{this.state.confirmGoogleTransfer &&
+				<div className='errorContainer' onClick={this.closeAlerts}>
+					{ this.state.saveGoogle
+						?	`Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?`
+						: `Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?`
+					}
+					<br />
+					<div className='confirm' onClick={this.toggleGoogleStorage}>
+						Yes
 					</div>
-				}
-			</Nav.item>;
-		} else {
-			return <Nav.item className='googleDriveStorage' onClick={this.handleGoogleClick}>
-				<img src={googleDriveInactive} alt='googleDriveInactive' />
+					<div className='deny'>
+						No
+					</div>
+				</div>
+			}
 
-				{this.state.confirmGoogleTransfer &&
-					<div className='errorContainer'>
-					Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?<br />
-						<div className='confirm' onClick={this.toggleGoogleStorage}>
-							Yes
-						</div>
-						<div className='deny'>
-							No
+			{this.state.alertLoginToTransfer &&
+				<div className='errorContainer' onClick={this.closeAlerts}>
+					You must be signed in to a Google account to transfer
+					between the homebrewery and Google Drive!
+					<a target='_blank' rel='noopener noreferrer'
+						href={`http://naturalcrit.com/login?redirect=${this.state.url}`}>
+						<div className='confirm'>
+							Sign In
 						</div>
+					</a>
+					<div className='deny'>
+						Not Now
 					</div>
-				}
-			</Nav.item>;
-		}
+				</div>
+			}
+		</Nav.item>;
 	},
 
 	renderSaveButton : function(){
@@ -311,7 +327,7 @@ const EditPage = createClass({
 						to save this to<br />Google Drive!<br />
 						<a target='_blank' rel='noopener noreferrer'
 							href={`http://naturalcrit.com/login?redirect=${this.state.url}`}>
-							<div className='confirm' onClick={this.toggleGoogleStorage}>
+							<div className='confirm'>
 								Sign In
 							</div>
 						</a>