Merge branch 'master' into delete_topic

twistter-frontend/src/App.js

@@ -69,11 +69,9 @@ class App extends Component {
                 <AuthRoute exact path="/login" component={login} />
                 <Route exact path="/logout" component={logout} />
                 <Route exact path="/delete" component={Delete} />
-
                 <Route exact path="/user" component={user} />
                 <Route exact path="/home" component={writeMicroblog} />
                 <Route exact path="/edit" component={editProfile} />
-                {/* <Route exact path="/user" component={userLine} /> */}
 
                 <AuthRoute exact path="/" component={home} />
               </Switch>

twistter-frontend/src/Writing_Microblogs.js

@@ -4,20 +4,23 @@ import Route from "react-router-dom/Route";
 import axios from "axios";
 
 class Writing_Microblogs extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      value: "",
-      title: "",
-      topics: "",
-      characterCount: 250
-    };
+    constructor(props) {
+        super(props);
+        this.state = {
+            value: '',
+            title: '',
+            topics: '',
+            characterCount: 250
+            
+        };
 
-    this.handleChange = this.handleChange.bind(this);
-    this.handleSubmit = this.handleSubmit.bind(this);
-    this.handleChangeforPost = this.handleChangeforPost.bind(this);
-    this.handleChangeforTopics = this.handleChangeforTopics.bind(this);
-  }
+        
+        this.handleChange = this.handleChange.bind(this);
+        this.handleSubmit = this.handleSubmit.bind(this);
+        this.handleChangeforPost = this.handleChangeforPost.bind(this);
+        this.handleChangeforTopics = this.handleChangeforTopics.bind(this);
+    
+    }
 
   handleChange(event) {
     this.setState({ title: event.target.value });
@@ -34,21 +37,33 @@ class Writing_Microblogs extends Component {
     const headers = {
       headers: { "Content-Type": "application/json" }
     };
+    
+    handleSubmit(event) {
 
-    axios
-      .post("/putPost", postData, headers)
-      .then(res => {
-        alert("Post was shared successfully!");
-        console.log(res.data);
-      })
-      .catch(err => {
-        alert("An error occured.");
-        console.error(err);
-      });
-    event.preventDefault();
-    this.setState({ value: "", title: "", characterCount: 250, topics: "" });
-  }
-
+        const postData = {
+            body: this.state.value,  
+            userImage: "bing-url",
+            microBlogTitle: this.state.title,
+            microBlogTopics: this.state.topics.split(', ')
+        }
+        const headers = {
+            headers: { 'Content-Type': 'application/json'}
+        }
+        
+        axios
+            .post("/putPost", postData, headers)
+            .then((res) =>{
+                alert('Post was shared successfully!')
+                console.log(res.data);
+            })
+            .catch((err) => {
+                alert('An error occured.');
+                console.error(err);
+            })
+        event.preventDefault();
+        this.setState({value: '', title: '',characterCount: 250, topics: ''})
+    }
+  
   handleSubmit(event) {
     // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value);
     const postData = {

twistter-frontend/src/components/layout/NavBar.js

@@ -31,13 +31,9 @@ const styles = {
       position: "absolute"
     }
   };
-
-
-
-
   
-  export class Navbar extends Component {
-      render() {
+export class Navbar extends Component {
+    render() {
         const authenticated = this.props.user.authenticated;
         return (
             <AppBar>
@@ -54,11 +50,9 @@ const styles = {
                     {authenticated && <Button component={ Link } to='/logout'>
                         Logout
                     </Button>}
-                    {/* Commented out the delete button, because it should probably go on
-                        the profile or editProfile page instead of the NavBar */}
-                    {/* <Button component={ Link } to='/delete'>
+                    {authenticated && <Button component={ Link } to='/delete'>
                         Delete Account
-                    </Button> */}
+                    </Button>}
                 </ToolBar>
             </AppBar>
         )

twistter-frontend/src/pages/Delete.js

@@ -7,7 +7,8 @@ import Button from "@material-ui/core/Button";
 import withStyles from "@material-ui/core/styles/withStyles";
 
 // Redux stuff
-import { logoutUser } from "../redux/actions/userActions";
+//import { logoutUser } from "../redux/actions/userActions";
+import { deleteUser } from "../redux/actions/userActions";
 import { connect } from "react-redux";
 
 const styles = {
@@ -32,7 +33,8 @@ const styles = {
 export class Delete extends Component {
 
   componentDidMount() {
-    this.props.logoutUser();
+    //this.props.logoutUser();
+    this.props.deleteUser();
     this.props.history.push('/');
   }
 
@@ -45,10 +47,12 @@ const mapStateToProps = (state) => ({
   user: state.user
 });
 
-const mapActionsToProps = { logoutUser };
+//const mapActionsToProps = { logoutUser };
+const mapActionsToProps = { deleteUser };
 
 Delete.propTypes = {
-  logoutUser: PropTypes.func.isRequired,
+  //logoutUser: PropTypes.func.isRequired,
+  deleteUser: PropTypes.func.isRequired,
   user: PropTypes.object.isRequired,
   classes: PropTypes.object.isRequired
 };