Fixed conflicts with Sprint 2 checkpoint and the most up-to-date version

twistter-frontend/src/App.js

@@ -10,11 +10,11 @@ import jwtDecode from "jwt-decode";
 // Redux
 import { Provider } from "react-redux";
 import store from "./redux/store";
-import MuiThemeProvider from "@material-ui/core/styles/MuiThemeProvider";
-import createMuiTheme from "@material-ui/core/styles/createMuiTheme";
-import themeObject from "./util/theme";
-import { SET_AUTHENTICATED } from "./redux/types";
-import { logoutUser, getUserData } from "./redux/actions/userActions";
+import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider';
+import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
+import themeObject from './util/theme';
+import { SET_AUTHENTICATED } from './redux/types';
+import { logoutUser, getUserData } from './redux/actions/userActions';
 
 // Components
 import AuthRoute from "./util/AuthRoute";
@@ -22,22 +22,21 @@ import AuthRoute from "./util/AuthRoute";
 // axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api';
 
 // Pages
-import home from "./pages/Home";
-import signup from "./pages/Signup";
-import login from "./pages/Login";
-import user from "./pages/user";
-import logout from "./pages/Logout";
-import Delete from "./pages/Delete";
-import writeMicroblog from "./Writing_Microblogs.js";
-import editProfile from "./pages/editProfile";
-import userLine from "./Userline.js";
-import verify from "./pages/verify";
-import Search from "./pages/Search.js";
+import home from './pages/Home';
+import signup from './pages/Signup';
+import login from './pages/Login';
+import user from './pages/user';
+import logout from './pages/Logout';
+import Delete from './pages/Delete';
+import writeMicroblog from './Writing_Microblogs.js';
+import editProfile from './pages/editProfile';
+import userLine from './Userline.js';
 
 const theme = createMuiTheme(themeObject);
 
 const token = localStorage.FBIdToken;
 if (token) {
+
   try {
     const decodedToken = jwtDecode(token);
     if (decodedToken.exp * 1000 < Date.now()) {
@@ -45,7 +44,7 @@ if (token) {
       window.location.href = "/login";
     } else {
       store.dispatch({ type: SET_AUTHENTICATED });
-      axios.defaults.headers.common["Authorization"] = token;
+      axios.defaults.headers.common['Authorization'] = token;
       store.dispatch(getUserData());
     }
   } catch (invalidTokenError) {
@@ -54,19 +53,18 @@ if (token) {
   }
 }
 
+
 class App extends Component {
   render() {
     return (
       <MuiThemeProvider theme={theme}>
         <Provider store={store}>
           <Router>
-            <div className="container">
+            <div className='container' >
               <Navbar />
             </div>
             <div className="app">
               <Switch>
-
-                {/* AuthRoute checks if the user is logged in and if they are it redirects them to /home */}
                 <AuthRoute exact path="/signup" component={signup} />
                 <AuthRoute exact path="/login" component={login} />
                 <AuthRoute exact path="/" component={home}/>
@@ -77,11 +75,6 @@ class App extends Component {
                 <Route exact path="/home" component={home} />
                 <Route exact path="/user" component={user} />
                 <Route exact path="/edit" component={editProfile} />
-                <Route exact path="/verify" component={verify}/>
-                <Route exact path="/search" component={Search} />
-
-                <AuthRoute exact path="/" component={home} />
-
               </Switch>
             </div>
           </Router>

twistter-frontend/src/Writing_Microblogs.js

@@ -1,128 +1,107 @@
 import React, { Component } from "react";
-import { BrowserRouter as Router } from "react-router-dom";
-import Route from "react-router-dom/Route";
-import axios from "axios";
+import { BrowserRouter as Router } from 'react-router-dom';
+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
-    };
 
-    this.handleChange = this.handleChange.bind(this);
-    this.handleSubmit = this.handleSubmit.bind(this);
-    this.handleChangeforPost = this.handleChangeforPost.bind(this);
-    this.handleChangeforTopics = this.handleChangeforTopics.bind(this);
-  }
+    constructor(props) {
+        super(props);
+        this.state = {
+            value: '',
+            title: '',
+            topics: '',
+            characterCount: 250
+            
+        };
 
-  handleChange(event) {
-    this.setState({ title: event.target.value });
-  }
+        
+        this.handleChange = this.handleChange.bind(this);
+        this.handleSubmit = this.handleSubmit.bind(this);
+        this.handleChangeforPost = this.handleChangeforPost.bind(this);
+        this.handleChangeforTopics = this.handleChangeforTopics.bind(this);
+    
+    }
 
-  handleChangeforTopics(event) {
-    this.setState({ topics: event.target.value });
-  }
+    handleChange(event) {
+        this.setState( {title: event.target.value });
+    }
 
-  handleSubmit(event) {
-    // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value);
-    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" }
-    };
+    handleChangeforTopics(event) {
+        this.setState( {topics: event.target.value});
+    }
 
-    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) {
 
-  handleChangeforPost(event) {
-    this.setState({ value: event.target.value });
-  }
+        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: ''})
+    }
 
-  handleChangeforCharacterCount(event) {
-    const charCount = event.target.value.length;
-    const charRemaining = 250 - charCount;
-    this.setState({ characterCount: charRemaining });
-  }
+    handleChangeforPost(event) {
+        this.setState({value: event.target.value })
+    }
 
-  render() {
-    return (
-      <div>
-        <div
-          style={{
-            width: "200px",
-            height: "50px",
-            marginTop: "180px",
-            marginLeft: "50px"
-          }}
-        >
-          <form>
-            <textarea
-              placeholder="Enter Microblog Title"
-              value={this.state.title}
-              required
-              onChange={this.handleChange}
-              cols={30}
-              rows={1}
-            />
-          </form>
-        </div>
-        <div style={{ width: "200px", height: "50px", marginLeft: "50px" }}>
-          <form>
-            <textarea
-              placeholder="Enter topics seperated by a comma"
-              value={this.state.topics}
-              required
-              onChange={this.handleChangeforTopics}
-              cols={40}
-              rows={1}
-            />
-          </form>
-        </div>
+    handleChangeforCharacterCount(event) {
+        const charCount = event.target.value.length
+        const charRemaining = 250 - charCount
+        this.setState({characterCount: charRemaining })
+    
+    }
 
-        <div style={{ width: "200px", marginLeft: "50px" }}>
-          <form onSubmit={this.handleSubmit}>
-            <textarea
-              value={this.state.value}
-              required
-              maxLength="250"
-              placeholder="Write Microblog here..."
-              onChange={e => {
-                this.handleChangeforPost(e);
-                this.handleChangeforCharacterCount(e);
-              }}
-              cols={40}
-              rows={20}
-            />
-            <div style={{ fontSize: "14px", marginRight: "-100px" }}>
-              <p2>Characters Left: {this.state.characterCount}</p2>
+    render() {
+        return (
+            <div>
+            <div style={{ width: "200px", height: "50px", marginTop: "180px", marginLeft: "50px" }}>         
+             <form>
+                    <textarea placeholder="Enter Microblog Title" value={this.state.title} required onChange={this.handleChange} cols={30} rows={1} />
+
+            </form>
             </div>
-            <div style={{ marginRight: "-100px" }}>
-              <button onClick>Share Post</button>
-            </div>
-          </form>
-        </div>
-      </div>
-    );
-  }
+            <div style={{ width: "200px", height: "50px", marginLeft: "50px"}} >         
+            <form>                    
+                <textarea placeholder="Enter topics seperated by a comma" value={this.state.topics} required onChange={this.handleChangeforTopics} cols={40} rows={1} />
+            </form>
+             </div>
+             
+             <div style={{ width: "200px", marginLeft: "50px"}}>        
+                <form onSubmit={this.handleSubmit}>
+                    <textarea value={this.state.value} required maxLength="250" placeholder= "Write Microblog here..." 
+                        onChange = { (e) => { this.handleChangeforPost(e); this.handleChangeforCharacterCount(e) } } cols={40} rows={20} />      
+                 <div style={{ fontSize: "14px", marginRight: "-100px"}} >
+                    <p2>Characters Left: {this.state.characterCount}</p2>
+                 </div>
+                 <div style={{ marginRight: "-100px"  }}>        
+                    <button onClick>Share Post</button> 
+                 </div>
+                </form>
+             </div>
+             </div>
+            
+        );
+    }
+
+    
 }
 
-export default Writing_Microblogs;
+export default Writing_Microblogs;

twistter-frontend/src/pages/Login.js

@@ -16,15 +16,13 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // Redux stuff
 import { connect } from 'react-redux';
 import { loginUser } from '../redux/actions/userActions';
-import { fontFamily } from '@material-ui/system';
 
-//Theme
 const styles = {
   form: {
     textAlign: "center"
   },
   textField: {
-    marginBottom: 20
+    marginBottom: 30
   },
   pageTitle: {
     // marginTop: 20,
@@ -36,9 +34,6 @@ const styles = {
   },
   progress: {
     position: "absolute"
-  },
-  p: {
-    fontFamily: "cursive",
   }
 };
 
@@ -109,12 +104,9 @@ export class Login extends Component {
         <Grid item sm />
         <Grid item sm>
         <img src={logo} className="app-logo" alt="logo" />
-          <br></br>
-          <Typography variant="p" className={classes.pageTitle} fontFamily = "Georgia, serif">
-            <b>Log in to Twistter</b>
-            <br></br>
+          <Typography variant="h2" className={classes.pageTitle}>
+            Log in to Twistter
           </Typography>
-          <br></br>
           <form noValidate onSubmit={this.handleSubmit}>
             <TextField
               id="email"

twistter-frontend/src/pages/Signup.js

@@ -16,17 +16,13 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // Redux stuff
 import { connect } from 'react-redux';
 import { signupUser } from '../redux/actions/userActions';
-import { border } from '@material-ui/system';
 
 const styles = {
   form: {
     textAlign: "center"
   },
   textField: {
-    marginBottom: 20,
-    //border: "1px solid #234",
-    display: "inline-block",
-    boxSizing: "border-box",
+    marginBottom: 30
   },
   pageTitle: {
     marginBottom: 40
@@ -37,14 +33,6 @@ const styles = {
   },
   progress: {
     position: "absolute"
-  },
-  div: {
-    borderRadius: "5px",
-    backgroundColor: "grey",
-    padding: "20px",
-  },
-  p: {
-    fontFamily: "Segoe UI",
   }
 };
 
@@ -104,12 +92,9 @@ export class Signup extends Component {
         <Grid item sm />
         <Grid item sm>
         <img src={logo} className="app-logo" alt="logo" />
-          <br></br>
-          <Typography variant="p" className={classes.pageTitle}>
-            <b>Create a new account</b>
-            <br></br>
+          <Typography variant="h2" className={classes.pageTitle}>
+            Create a new account
           </Typography>
-          <br></br>
           <form noValidate onSubmit={this.handleSubmit}>
           <TextField
               id="handle"
@@ -161,8 +146,6 @@ export class Signup extends Component {
               onChange={this.handleChange}
               fullWidth
             />
-            <br></br>
-            <br></br>
             <Button
               type="submit"
               variant="contained"

twistter-frontend/src/pages/user.js

@@ -3,68 +3,58 @@ 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 Card from "@material-ui/core/Card";
+import { makeStyles, styled } from '@material-ui/core/styles';
+import Grid from '@material-ui/core/Grid';
+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 VerifiedIcon from '@material-ui/icons/CheckSharp';
 
 // 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 => {
-    axios
-      .delete(`/deleteTopic/${topic.id}`)
-      .then(function() {
-        location.reload();
-      })
-      .catch(function(err) {
-        console.log(err);
-      });
-  };
-
+  
+  handleDelete = (topic) => {
+    alert(`Delete topic: ${topic}!`);
+  }
+  
   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,8 +63,7 @@ class user extends Component {
       .then(res => {
         this.setState({
           profile: res.data.credentials.handle,
-          imageUrl: res.data.credentials.imageUrl,
-          verified: res.data.credentials.verified ? res.data.credentials.verified : false
+          imageUrl: res.data.credentials.imageUrl
         });
       })
       .catch(err => console.log(err));
@@ -84,7 +73,7 @@ class user extends Component {
       .then(res => {
         this.setState({
           topics: res.data
-        });
+        })
       })
       .catch(err => console.log(err));
 
@@ -102,25 +91,17 @@ class user extends Component {
   render() {
     let authenticated = this.props.user.authenticated;
     let classes = this.props;
-
     let profileMarkup = this.state.profile ? (
-      <div>
-        <Typography variant='h5'>@{this.state.profile} {this.state.verified ? (<VerifiedIcon style={{fill: "#1397D5"}}/>): (null)}</Typography>
-      </div>) : (<p>loading username...</p>);
+      <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.id}
-            onDelete={key => this.handleDelete(topic)}
-          />
-        ) // console.log({ topic }.topic.id)
-      )
-    ) : (
-      <p> loading topics...</p>
-    );
+      this.state.topics.map(topic => <MyChip 
+        label={{topic}.topic.topic}
+        key={{topic}.topic.topicId}
+        onDelete={ (topic) => this.handleDelete(topic)}/>)
+    ) : (<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"/>);
@@ -170,36 +151,7 @@ class user extends Component {
             onClick={this.handleAddCircle}
           />
           <br />
-          <Grid container direction="column">
-            <Grid item>
-              {
-                authenticated && 
-                <Button 
-                style={{width:150, marginBottom: 10, marginTop: 5}}
-                component={ Link } 
-                to='/edit' 
-                variant="outlined" 
-                color="primary"
-                >
-                  Edit Profile
-                </Button>}
-            </Grid>
-            <Grid item>
-              {
-                authenticated && 
-                this.state.profile === 'Admin' && 
-                <Button
-                style={{width:150}}
-                component={ Link } 
-                variant="outlined" 
-                color="primary"
-                
-                to='/verify'
-                >
-                  Verify Users
-                </Button>}
-            </Grid>
-          </Grid>
+          {authenticated && <Button component={ Link } to='/edit'>Edit Profile Info</Button>}
         </Grid>
         <Grid item sm={4} xs={8}>
           {postMarkup}
@@ -207,7 +159,6 @@ class user extends Component {
         <Grid item sm={4} xs={8}>
           <Writing_Microblogs />
         </Grid>
-              
       </Grid>
     );
   }