Merge pull request #100 from cse442-fall-2019-offering/group

Group Page Exiting Without Saving Popup #99
cse442-fall-2019-offering · Nov 22, 2019 · 85b3587 · 85b3587
2 parents c9e13c7 + a1c7f68
commit 85b3587
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/frontend/app/containers/Pages/Group/Group.js b/frontend/app/containers/Pages/Group/Group.js
@@ -82,6 +82,18 @@ class Group extends Component {
     onGetGroup(payload);
   }
 
+  componentDidUpdate = () => {
+    if (this.state.changed.length > 0) {
+      window.onbeforeunload = () => true;
+    } else {
+      window.onbeforeunload = undefined;
+    }
+  };
+
+  componentWillUnmount() {
+    window.onbeforeunload = undefined;
+  }
+
   handleJoinGroup = () => {
     const { onJoinGroup } = this.props;
     const payload = { groupId: this.props.match.params.groupId };
@@ -92,6 +104,9 @@ class Group extends Component {
     const { onLeaveGroup } = this.props;
     const payload = { groupId: this.props.match.params.groupId };
     onLeaveGroup(payload);
+    this.setState({
+      loading: true,
+    });
   };
 
   handleUpdateGroup = () => {
@@ -185,7 +200,7 @@ class Group extends Component {
                   className={classes.description}
                   text={this.state.description}
                   onChange={this.handleDescriptionChange}
-                  placeholder="Group Description"
+                  placeholder="Group Description - Try Highlighting Your Text!"
                 />
                 <div className={classes.languagesMenu}>
                   <LangMenu
@@ -228,7 +243,7 @@ class Group extends Component {
                     className={classes.contactPopup}
                     text={this.state.contact}
                     onChange={this.handleContactChange}
-                    placeholder="Group Contact"
+                    placeholder="Group Contact - Try Highlighting Your Text!"
                   />
                 </Popup>
               </Grid>

diff --git a/frontend/app/containers/Pages/GroupCreation/GroupCreation.js b/frontend/app/containers/Pages/GroupCreation/GroupCreation.js
@@ -82,7 +82,7 @@ class GroupCreation extends Component {
               className={classes.description}
               text={this.state.description}
               onChange={this.handleDescriptionChange}
-              placeholder="Group Description"
+              placeholder="Group Description - Try Highlighting Your Text!"
             />
             <div className={classes.languages}>
               <LangMenu
@@ -114,7 +114,7 @@ class GroupCreation extends Component {
                 className={classes.contactPopup}
                 text={this.state.contact}
                 onChange={this.handleContactChange}
-                placeholder="Group Contact"
+                placeholder="Group Contact - Try Highlighting Your Text!"
               />
             </Popup>
           </Grid>