Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24

twistter-frontend/package.json

@@ -5,6 +5,7 @@
   "dependencies": {
     "@material-ui/core": "^4.4.3",
     "axios": "^0.19.0",
+    "clsx": "^1.0.4",
     "create-react-app": "^3.1.2",
     "install": "^0.13.0",
     "node-pre-gyp": "^0.13.0",
@@ -34,5 +35,6 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  }
+  },
+   "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
 }

twistter-frontend/src/App.css

@@ -1,3 +1,7 @@
+/* body {
+
+} */
+
 .app {
   font-family: "Segoe UI";
   font-size: large;

twistter-frontend/src/App.js

@@ -5,14 +5,15 @@ import './App.css';
 
 import { BrowserRouter as Router } from 'react-router-dom';
 import Route from 'react-router-dom/Route';
-
 import NavBar, { Navbar } from './components/layout/NavBar';
 
+// Pages
 import home from './Home.js';
 import register from './Register.js';
 import login from './Login.js';
 import user from './pages/user';
 import writeMicroblog from './Writing_Microblogs.js';
+import edit from './pages/edit.js';
 import userLine from './Userline.js';
 
 class App extends Component {
@@ -29,6 +30,7 @@ class App extends Component {
           <Route exact path="/login" component={login}/>
           <Route exact path="/user" component={user}/>
           <Route exact path="/home" component={writeMicroblog}/>
+          <Route exact path="/edit" component={edit}/>
           <Route exact path="/userline" component={userLine}/>
         </div>
 

twistter-frontend/src/Userline.js

@@ -9,16 +9,29 @@ class Userline extends Component {
     {
         super(props);
         this.state = {
-
+            microBlogs : []
         }
+        
     }
 
-    render() {
+     componentDidMount() {
+
+         axios.get('http://localhost:5001/twistter-e4649/us-central1/api/getallPostsforUser')
+            .then(res => {
+                const post = res.data;
+                this.setState({microBlogs : post})
+
+            }) 
+
+            
+     }
+
+     render() {
         return (
-            <p>Hi</p>
+            <ul>
+                { this.state.microBlogs.map(microBlog => <p>{microBlog.body}</p>)}
+            </ul>
         )
-    }
-
+     }
 }
-
-export default Userline;
+export default Userline;

twistter-frontend/src/Writing_Microblogs.js

@@ -37,10 +37,11 @@ class Writing_Microblogs extends Component {
             
             },
             { headers: { 'Content-Type': 'application/json'} }
+            
         )
         console.log(response.data);
-        
         event.preventDefault();
+        this.setState({value: '', title: '',characterCount: 10})
     }
 
     handleChangeforPost(event) {
@@ -51,6 +52,7 @@ class Writing_Microblogs extends Component {
         const charCount = event.target.value.length
         const charRemaining = 10 - charCount
         this.setState({characterCount: charRemaining })
+    
     }
 
 

twistter-frontend/src/pages/edit.js

@@ -0,0 +1,215 @@
+import React, { Component } from "react";
+import axios from "axios";
+import PropTypes from "prop-types";
+// TODO: Fix font, so that it is roboto
+// TODO: Add a read-only '@' in the left side of the handle input
+// TODO: Add a cancel button, that takes the user back to their profile page
+// TODO: Sort imports
+// TODO: Add comments
+
+// Material-UI stuff
+import TextField from "@material-ui/core/TextField";
+import Typography from "@material-ui/core/Typography";
+import withStyles from "@material-ui/core/styles/withStyles";
+import Grid from "@material-ui/core/Grid";
+import Button from "@material-ui/core/Button";
+import CircularProgress from '@material-ui/core/CircularProgress';
+
+const styles = {
+  form: {
+    textAlign: "center"
+  },
+  textField: {
+    marginBottom: 40
+  },
+  pageTitle: {
+    marginTop: 40,
+    marginBottom: 40
+  },
+  button: {
+    positon: 'relative',
+  },
+  progress: {
+    position: 'absolute',
+  }
+};
+
+export class edit extends Component {
+
+  componentDidMount() {
+    axios
+      .get("/getProfileInfo")
+      .then((res) => {
+        this.setState({
+          firstName: res.data.firstName,
+          lastName: res.data.lastName,
+          email: res.data.email,
+          handle: res.data.handle,
+          bio: res.data.bio
+        });
+      })
+      .catch((err) => {
+        console.error(err);
+      });
+  }
+
+  constructor() {
+    super();
+    this.state = {
+      firstName: "",
+      lastName: "",
+      email: "",
+      handle: "",
+      bio: "",
+      loading: false,
+      errors: {}
+    };
+  }
+
+  handleSubmit = (event) => {
+    event.preventDefault();
+    this.setState({
+      loading: true
+    });
+    const newProfileData = {
+      firstName: this.state.firstName,
+      lastName: this.state.lastName,
+      email: this.state.email,
+      handle: this.state.handle,
+      bio: this.state.bio
+    };
+    axios
+      .post("/updateProfileInfo", newProfileData)
+      .then((res) => {
+        this.setState({
+          loading: false
+        });
+        // this.props.history.push('/');
+        // TODO: Need to redirect user to their profile page
+      })
+      .catch((err) => {
+        this.setState({
+          errors: err.response.data,
+          loading: false
+        });
+      });
+  };
+
+  handleChange = (event) => {
+    this.setState({
+      [event.target.name]: event.target.value,
+      errors: {
+        [event.target.name]: null,
+      }
+    });
+  };
+
+  render() {
+    const { classes } = this.props;
+    const { errors, loading } = this.state;
+
+    return (
+      <Grid container className={classes.form}>
+        <Grid item sm />
+        <Grid item sm>
+          <Typography variant="h2" className={classes.pageTitle}>
+            Edit Profile
+          </Typography>
+          <form noValidate onSubmit={this.handleSubmit}>
+            <Grid container className={classes.form} spacing={4}>
+              <Grid item sm>
+                <TextField
+                  id="firstName"
+                  name="firstName"
+                  label="First Name"
+                  className={classes.textField}
+                  value={this.state.firstName}
+                  helperText={errors.firstName}
+                  error={errors.firstName ? true : false}
+                  variant="outlined"
+                  onChange={this.handleChange}
+                  fullWidth
+                />
+              </Grid>
+              <Grid item sm>
+                <TextField
+                  id="lastName"
+                  name="lastName"
+                  label="Last Name"
+                  className={classes.textField}
+                  value={this.state.lastName}
+                  helperText={errors.lastname}
+                  error={errors.lastName ? true : false}
+                  variant="outlined"
+                  onChange={this.handleChange}
+                  fullWidth
+                />
+              </Grid>
+            </Grid>
+            <TextField
+              id="email"
+              name="email"
+              label="Email*"
+              className={classes.textField}
+              value={this.state.email}
+              disabled
+              helperText="(disabled)"
+              // helperText={errors.email}
+              // error={errors.email ? true : false}
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <TextField
+              id="handle"
+              name="handle"
+              label="Handle*"
+              className={classes.textField}
+              value={this.state.handle}
+              disabled
+              helperText="(disabled)"
+              // helperText={errors.handle}
+              // error={errors.handle ? true : false}
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <TextField
+              id="bio"
+              name="bio"
+              label="Bio"
+              className={classes.textField}
+              value={this.state.bio}
+              helperText={errors.bio}
+              error={errors.bio ? true : false}
+              multiline
+              rows="8"
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <Button
+              type="submit"
+              variant="contained"
+              color="primary"
+              className={classes.button}
+              disabled={loading}
+            >
+              Submit
+              {loading && (
+                <CircularProgress size={30} className={classes.progress}/>
+              )}
+            </Button>
+          </form>
+        </Grid>
+        <Grid item sm />
+      </Grid>
+    );
+  }
+}
+
+edit.propTypes = {
+  classes: PropTypes.object.isRequired
+};
+
+export default withStyles(styles)(edit);