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

added Navigation bar

functions/handlers/post.js

@@ -1,27 +1,28 @@
+const admin = require('firebase-admin');
 /* eslint-disable promise/always-return */
 exports.putPost = (req, res) => {
-    if (req.body.body.trim() === '') {
+    
-        return res.status(400).json({ body: 'Body must not be empty!'});
-    }
 
     const newPost = {
         body: req.body.body,
-        userHandle: req.user.handle,
+        userHandle: req.body.userHandle,
-        userImage: req.user.imageUrl,
+        userImage: req.body.userImage,
+        microBlogTitle: req.body.microBlogTitle,
         createdAt: new Date().toISOString(),
         likeCount: 0,
-        commentCount: 0
+        commentCount: 0,
+        
     };
 
-    db.collection('post').add(newPost)
+    admin.firestore().collection('posts').add(newPost)
-        .then((doc) => {
+            .then((doc) => {
             const resPost = newPost;
             resPost.postId = doc.id;
-            res.json(resPost);
+            return res.status(200).json(resPost);
         })
         .catch((err) => {
-            res.status(500).json({ error: 'something is wrong'});
             console.error(err);
+            return res.status(500).json({ error: 'something is wrong'});
         });
 };
 

functions/handlers/users.js

@@ -10,6 +10,10 @@ exports.getProfileInfo = (req, res) => {
     db.collection('users').doc(req.user.handle).get()
         .then((data) => {
             return res.status(200).json(data.data());
+        })
+        .catch((err) => {
+            console.error(err);
+            return res.status(500).json(err);
         });
 };
 
@@ -42,7 +46,7 @@ exports.updateProfileInfo = (req, res) => {
 
 exports.getUserDetails = (req, res) => {
     let userData = {};
-    db.doc('/users/${req.params.handle}').get().then((doc) => {
+    db.doc(`/users/${req.params.handle}`).get().then((doc) => {
             if (doc.exists) {
                 userData.user = doc.data();
                 return db.collection('post').where('userHandle', '==', req.params.handle)

functions/index.js

@@ -26,6 +26,7 @@ app.post('/updateProfileInfo', updateProfileInfo);
  *------------------------------------------------------------------*/
 const {putPost} = require('./handlers/post');
 
+
 // Adds one post to the database
 app.post('/putPost', fbAuth, putPost);
 

functions/util/validator.js

@@ -4,7 +4,7 @@ const isEmpty = (str) => {
 };
 
 const isEmail = (str) => {
-    const emailRegEx = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    const emailRegEx = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
     if (str.match(emailRegEx)) return true;
     else return false;
 }

twistter-frontend/src/App.js

@@ -12,6 +12,7 @@ import register from './Register.js';
 import login from './Login.js';
 import user from './pages/user';
 import writeMicroblog from './Writing_Microblogs.js';
+import userLine from './Userline.js';
 
 class App extends Component {
   render() {
@@ -25,6 +26,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="/userline" component={userLine}/>
         </div>
 
       </Router>

twistter-frontend/src/Userline.js

@@ -0,0 +1,24 @@
+import React, { Component } from "react";
+import { BrowserRouter as Router } from 'react-router-dom';
+import Route from 'react-router-dom/Route';
+import axios from 'axios';
+
+class Userline extends Component {
+
+    constructor(props)
+    {
+        super(props);
+        this.state = {
+
+        }
+    }
+
+    render() {
+        return (
+            <p>Hi</p>
+        )
+    }
+
+}
+
+export default Userline;

twistter-frontend/src/Writing_Microblogs.js

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import { BrowserRouter as Router } from 'react-router-dom';
 import Route from 'react-router-dom/Route';
+import axios from 'axios';
 
 
 class Writing_Microblogs extends Component {
@@ -25,7 +26,20 @@ class Writing_Microblogs extends Component {
     }
 
     handleSubmit(event) {
-        alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value);
+        // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value);
+        
+        const response = axios.post(
+            'http://localhost:5001/twistter-e4649/us-central1/api/putPost',
+            { body: this.state.value,  
+              userHandle: "new user",
+              userImage: "bing-url",
+              microBlogTitle: this.state.title 
+            
+            },
+            { headers: { 'Content-Type': 'application/json'} }
+        )
+        console.log(response.data);
+        
         event.preventDefault();
     }