mirror of
https://github.com/ClaytonWWilson/CS307-Team24.git
synced 2026-03-10 13:15:05 +00:00
Fix merge issues
This commit is contained in:
@@ -238,7 +238,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 });
|
||||
});
|
||||
};
|
||||
|
||||
@@ -259,7 +260,11 @@ exports.checkforLikePost = (req, res) => {
|
||||
result = true;
|
||||
return res.status(200).json(result);
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
return res.status(500).json({error: err});
|
||||
})
|
||||
};
|
||||
|
||||
exports.likePost = (req, res) => {
|
||||
@@ -303,7 +308,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 });
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -52,8 +52,6 @@ exports.signup = (req, res) => {
|
||||
return res.status(400).json(errors);
|
||||
}
|
||||
|
||||
const noImg = 'no-img.png';
|
||||
|
||||
let token, userId;
|
||||
|
||||
db.doc(`/users/${newUser.handle}`)
|
||||
@@ -79,7 +77,6 @@ exports.signup = (req, res) => {
|
||||
email: newUser.email,
|
||||
handle: newUser.handle,
|
||||
createdAt: newUser.createdAt,
|
||||
imageUrl: `https://firebasestorage.googleapis.com/v0/b/${config.storageBucket}/o/${noImg}?alt=media`,
|
||||
userId,
|
||||
followedTopics: [],
|
||||
imageUrl: defaultImageUrl,
|
||||
|
||||
Reference in New Issue
Block a user