Merge branch 'master' into auth-backend-3

twistter-frontend/src/pages/user.js

@@ -3,58 +3,67 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import axios from 'axios';
+//import '../App.css';
 
 // Material UI and React Router
+import { makeStyles, styled } from "@material-ui/core/styles";
 import { Link } from 'react-router-dom';
-import { makeStyles, styled } from '@material-ui/core/styles';
-import Grid from '@material-ui/core/Grid';
-import Card from '@material-ui/core/Card';
+import Card from "@material-ui/core/Card";
 import CardMedia from '@material-ui/core/CardMedia';
 import CardContent from '@material-ui/core/CardContent';
-import Chip from '@material-ui/core/Chip';
 import Button from '@material-ui/core/Button';
+import Grid from "@material-ui/core/Grid";
+
+import Chip from "@material-ui/core/Chip";
 import Typography from "@material-ui/core/Typography";
-import AddCircle from '@material-ui/icons/AddCircle';
-import TextField from '@material-ui/core/TextField';
+import AddCircle from "@material-ui/icons/AddCircle";
+import TextField from "@material-ui/core/TextField";
 
 // component
 import '../App.css';
 import noImage from '../images/no-img.png';
 import Writing_Microblogs from '../Writing_Microblogs';
-
 const MyChip = styled(Chip)({
   margin: 2,
-  color: 'primary'
+  color: "primary"
 });
 
-class user extends Component {  
+class user extends Component {
   state = {
     profile: null,
     imageUrl: null,
     topics: null,
     newTopic: null
   };
-  
-  handleDelete = (topic) => {
-    alert(`Delete topic: ${topic}!`);
-  }
-  
+
+  handleDelete = topic => {
+    axios
+      .delete(`/deleteTopic/${topic.id}`)
+      .then(function() {
+        location.reload();
+      })
+      .catch(function(err) {
+        console.log(err);
+      });
+  };
+
   handleAddCircle = () => {
-    axios.post('/putTopic', {
-      topic: this.state.newTopic
-    })
-    .then(function () {
-      location.reload();
-    })
-    .catch(function (err) {
-      console.log(err);
-    });
-  }
+    axios
+      .post("/putTopic", {
+        topic: this.state.newTopic
+      })
+      .then(function() {
+        location.reload();
+      })
+      .catch(function(err) {
+        console.log(err);
+      });
+  };
 
   handleChange(event) {
     this.setState({
       newTopic: event.target.value
-    })
+    });
   }
 
   componentDidMount() {
@@ -73,7 +82,7 @@ class user extends Component {
       .then(res => {
         this.setState({
           topics: res.data
-        })
+        });
       })
       .catch(err => console.log(err));
 
@@ -95,13 +104,19 @@ class user extends Component {
       <p>
       <Typography variant='h5'>{this.state.profile}</Typography>
       </p>) : (<p>loading username...</p>);
-    
     let topicsMarkup = this.state.topics ? (
-      this.state.topics.map(topic => <MyChip 
-        label={{topic}.topic.topic}
-        key={{topic}.topic.topicId}
-        onDelete={ (topic) => this.handleDelete(topic)}/>)
-    ) : (<p> loading topics...</p>);
+      this.state.topics.map(
+        topic => (
+          <MyChip
+            label={{ topic }.topic.topic}
+            key={{ topic }.topic.id}
+            onDelete={key => this.handleDelete(topic)}
+          />
+        ) // console.log({ topic }.topic.id)
+      )
+    ) : (
+      <p> loading topics...</p>
+    );
 
     let imageMarkup = this.state.imageUrl ? (<img src={this.state.imageUrl} height="150" width="150" />) : 
                                             (<img src={noImage} height="150" width="150"/>);
@@ -159,6 +174,7 @@ class user extends Component {
         <Grid item sm={4} xs={8}>
           <Writing_Microblogs />
         </Grid>
+              
       </Grid>
     );
   }