Merge pull request #1290 from naturalcrit/NotifyTrashedGoogleBrew

Popup warning when opening a trashed google brew

client/homebrew/pages/editPage/editPage.jsx

@@ -36,6 +36,7 @@ const EditPage = createClass({
 				createdAt : null,
 				updatedAt : null,
 				gDrive    : false,
+				trashed   : false,
 
 				title       : '',
 				description : '',
@@ -50,15 +51,15 @@ const EditPage = createClass({
 
 	getInitialState : function() {
 		return {
-			brew                  : this.props.brew,
+			brew                   : this.props.brew,
-			isSaving              : false,
+			isSaving               : false,
-			isPending             : false,
+			isPending              : false,
-			alertRenderChange     : false,
+			alertTrashedGoogleBrew : this.props.brew.trashed,
-			saveGoogle            : this.props.brew.googleId ? true : false,
+			saveGoogle             : this.props.brew.googleId ? true : false,
-			confirmGoogleTransfer : false,
+			confirmGoogleTransfer  : false,
-			errors                : null,
+			errors                 : null,
-			htmlErrors            : Markdown.validate(this.props.brew.text),
+			htmlErrors             : Markdown.validate(this.props.brew.text),
-			url                   : ''
+			url                    : ''
 		};
 	},
 	savedBrew : null,
@@ -105,11 +106,6 @@ const EditPage = createClass({
 	},
 
 	handleMetadataChange : function(metadata){
-		if(metadata.renderer != this.savedBrew.renderer){
-			this.setState({
-				alertRenderChange : true
-			});
-		}
 		this.setState((prevState)=>({
 			brew      : _.merge({}, prevState.brew, metadata),
 			isPending : true,
@@ -152,7 +148,7 @@ const EditPage = createClass({
 
 	closeAlerts : function(){
 		this.setState({
-			alertRenderChange : false
+			alertTrashedGoogleBrew : false
 		});
 	},
 
@@ -349,15 +345,6 @@ const EditPage = createClass({
 		}
 	},
 
-	// {this.state.alertRenderChange &&
-	// 	<div className='errorContainer' onClick={this.closeAlerts}>
-	// 	Rendering mode for this brew has been changed! Refresh the page to load the new renderer.<br />
-	// 		<div className='confirm'>
-	// 			OK
-	// 		</div>
-	// 	</div>
-	// }
-
 	processShareId : function() {
 		return this.state.brew.googleId ?
 					 this.state.brew.googleId + this.state.brew.shareId :
@@ -366,6 +353,16 @@ const EditPage = createClass({
 
 	renderNavbar : function(){
 		return <Navbar>
+
+			{this.state.alertTrashedGoogleBrew &&
+				<div className='errorContainer' onClick={this.closeAlerts}>
+				This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br />
+					<div className='confirm'>
+						OK
+					</div>
+				</div>
+			}
+
 			<Nav.section>
 				<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
 			</Nav.section>
@@ -382,6 +379,7 @@ const EditPage = createClass({
 				<RecentNavItem brew={this.state.brew} storageKey='edit' />
 				<Account />
 			</Nav.section>
+
 		</Navbar>;
 	},
 

client/homebrew/pages/editPage/editPage.less

@@ -41,6 +41,9 @@
 		border-radius    : 5px;
 		transform        : translate(-50% + 3px, 10px);
 		text-align       : center;
+		font-size        : 10px;
+		font-weight      : 800;
+		text-transform   : uppercase;
 		a{
 			color : @teal;
 		}

server/googleActions.js

@@ -244,7 +244,7 @@ GoogleActions = {
 
 		const obj = await drive.files.get({
 			fileId : id,
-			fields : 'properties, createdTime, modifiedTime, description'
+			fields : 'properties, createdTime, modifiedTime, description, trashed'
 		})
 		.catch((err)=>{
 			console.log('Error loading from Google');
@@ -291,6 +291,7 @@ GoogleActions = {
 				systems     : obj.data.properties.systems ? obj.data.properties.systems.split(',') : [],
 				authors     : [],
 				published   : obj.data.properties.published ? obj.data.properties.published == 'true' : false,
+				trashed     : obj.data.trashed,
 
 				createdAt  : obj.data.createdTime,
 				updatedAt  : obj.data.modifiedTime,

shared/naturalcrit/nav/nav.less

@@ -1,6 +1,7 @@
 nav{
 	background-color : #333;
 	.navContent{
+		position			  : relative;
 		display         : flex;
 		justify-content : space-between;
 	}