diff --git a/functions/handlers/post.js b/functions/handlers/post.js index 440031a..292fa47 100644 --- a/functions/handlers/post.js +++ b/functions/handlers/post.js @@ -153,8 +153,8 @@ exports.quoteWithoutPost = (req, res) => { } }) .catch((err) => { - return res.status(500).json({error: 'Something is wrong'}); - + // return res.status(500).json({error: 'Something is wrong'}); + return res.status(500).json({error: err}); }) } @@ -195,7 +195,8 @@ exports.likePost = (req, res) => { } }) .catch((err) => { - return res.status(500).json({error: 'Something is wrong'}); + // return res.status(500).json({error: 'Something is wrong'}); + return res.status(500).json({error: err}); }) } diff --git a/functions/handlers/users.js b/functions/handlers/users.js index a4aea57..88fb87c 100644 --- a/functions/handlers/users.js +++ b/functions/handlers/users.js @@ -1,4 +1,5 @@ -/* eslint-disable promise/catch-or-return */ +/* eslint-disable promise/always-return */ + const { admin, db } = require("../util/admin"); const config = require("../util/config"); const { validateUpdateProfileInfo } = require("../util/validator"); @@ -304,12 +305,19 @@ exports.deleteUser = (req, res) => { }) .then(() => { resolve(); + return; }) .catch((err) => { console.log("error " + err); reject(err); + return; }) }) + .catch((err) => { + console.log(err); + return res.status(500).json({error: err}); + }) + }) } @@ -327,10 +335,12 @@ exports.deleteUser = (req, res) => { }) .then(() => { resolve(); + return; }) .catch((err) => { console.log(err); reject(err); + return; }) }) @@ -558,7 +568,11 @@ exports.addSubscription = (req, res) => { return res.status(500).json({ err }); }); return res.status(500).json({ error: "shouldn't execute" }); - }); + }) + .catch((err) => { + console.log(err); + return res.status(500).json({error: err}); + }) }; exports.getSubs = (req, res) => { @@ -598,5 +612,9 @@ exports.removeSub = (req, res) => { return res.status(500).json({ err }); }); return res.status(500).json({ error: "shouldn't execute" }); - }); + }) + .catch((err) => { + console.log(err); + return res.status(500).json({error: err}); + }) }; diff --git a/twistter-frontend/src/Userline.js b/twistter-frontend/src/Userline.js index 8c95620..6c61d6d 100644 --- a/twistter-frontend/src/Userline.js +++ b/twistter-frontend/src/Userline.js @@ -1,10 +1,10 @@ import React, { Component } from "react"; -import { BrowserRouter as Router } from 'react-router-dom'; -import Route from 'react-router-dom/Route'; +// import { BrowserRouter as Router } from 'react-router-dom'; +// import Route from 'react-router-dom/Route'; import axios from 'axios'; import Box from '@material-ui/core/Box' -import {borders} from '@material-ui/system'; -import { sizing } from '@material-ui/system'; +// import {borders} from '@material-ui/system'; +// import { sizing } from '@material-ui/system'; // var moment = require('moment'); @@ -41,7 +41,7 @@ class Userline extends Component {
Userline
{sortedPosts.map((microBlog) =>
Microblog Title: {microBlog.microBlogTitle}
@@ -50,7 +50,7 @@ class Userline extends Component {
Number of comments: {microBlog.commentCount}
Number of likes: {microBlog.likeCount}
Body of post: {microBlog.body}
-
Tagged topics: {microBlog.microBlogTopics.join("," + " ")}
+
Tagged topics: {microBlog.microBlogTopics.join(", ")}
Characters Left: {this.state.characterCount}