Merge pull request #111 from ClaytonWWilson/filter_timeli

fixed up add subscription method

functions/handlers/users.js

@@ -1178,8 +1178,12 @@ exports.addSubscription = (req, res) => {
   let userRef = db.doc(`/users/${req.userData.handle}`);
   userRef.get().then(doc => {
     new_following = doc.data().following;
+    const struct = {
+      handle: req.body.following,
+      topics: ["Admin"]
+    }
     new_following
-      ? new_following.push(req.body.following)
+      ? new_following.push(struct)
       : (new_following = req.body.following);
 
     // add stuff

twistter-frontend/src/pages/Home.js

@@ -45,8 +45,13 @@ class Home extends Component {
     let userPromise = axios
       .get("/user")
       .then(res => {
+        console.log(res.data.credentials.following);
+        let list = [];
+        res.data.credentials.following.forEach(element => {
+          list.push(element.handle);
+        });
         this.setState({
-          following: res.data.credentials.following,
+          following: list,
           topics: res.data.credentials.followedTopics
         });
       })
@@ -66,11 +71,11 @@ class Home extends Component {
       .then(() => {
         this.setState({
           loading: false
+        });
       })
-        })
+      .catch(error => {
-        .catch((error) => {
         console.log(error);
-        })
+      });
 
     this.props.getLikes();
   }
@@ -187,9 +192,13 @@ class Home extends Component {
       <p>Loading post...</p>
     );
 
-    return (
+    return authenticated ? (
-      authenticated ? (
+      this.state.loading ? (
-        this.state.loading ? (<CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress>) :
+        <CircularProgress
+          size={60}
+          style={{ marginTop: "300px" }}
+        ></CircularProgress>
+      ) : (
         <Grid container>
           <Grid item sm={4} xs={8}>
             <Writing_Microblogs />
@@ -198,16 +207,21 @@ class Home extends Component {
             {postMarkup}
           </Grid>
         </Grid>
-     ) : loading ?
+      )
-          (<CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress>)
+    ) : loading ? (
-        :
+      <CircularProgress
-          (
+        size={60}
+        style={{ marginTop: "300px" }}
+      ></CircularProgress>
+    ) : (
       <div>
         <div>
           <img src={logo} className="app-logo" alt="logo" />
-                <br/><br/>
+          <br />
+          <br />
           <b>Welcome to Twistter!</b>
-                <br/><br/>
+          <br />
+          <br />
           <b>See the most interesting topics people are following right now.</b>
         </div>
 
@@ -229,7 +243,6 @@ class Home extends Component {
           </form>
         </div>
       </div>
-          )
     );
   }
 }

twistter-frontend/src/pages/otherUser.js

@@ -151,11 +151,10 @@ class user extends Component {
     let userPromise = axios
       .get("/user")
       .then(res => {
-        // console.log(res.data.credentials.following);
         let list = [];
         let fol = false;
         res.data.credentials.following.forEach(follow => {
-          console.log(follow);
+          // console.log(follow);
           if (this.state.profile === follow.handle) {
             fol = true;
             list = follow.topics;
@@ -201,9 +200,9 @@ class user extends Component {
       .then(() => {
         this.setState({ loading: false });
       })
-        .catch((error) => {
+      .catch(error => {
         console.log(error);
-        })
+      });
   }
 
   render() {
@@ -310,8 +309,12 @@ class user extends Component {
       <p>Posts</p>
     );
 
-    return (
+    return this.state.loading ? (
-      this.state.loading ? <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress> :
+      <CircularProgress
+        size={60}
+        style={{ marginTop: "300px" }}
+      ></CircularProgress>
+    ) : (
       <Grid container spacing={24}>
         <Grid item sm={4} xs={8}>
           {imageMarkup}