From 98e0e5113a73bacab931d11c2aaee68ba090a125 Mon Sep 17 00:00:00 2001 From: balaharisankar Date: Tue, 30 Jul 2024 23:00:43 +0530 Subject: [PATCH 1/2] Upvote and Downvotes fixed --- backend/app.js | 16 +- backend/app/models/question.js | 4 + .../routes/Q&A/question/downvoteQuestion.js | 26 +-- .../app/routes/Q&A/question/upvoteQuestion.js | 2 +- frontend/src/pages/Q&A/Q&A.jsx | 2 +- frontend/src/service/Faq.jsx | 210 +++++++++--------- 6 files changed, 131 insertions(+), 129 deletions(-) diff --git a/backend/app.js b/backend/app.js index 2c6a34c5..ea39cea0 100644 --- a/backend/app.js +++ b/backend/app.js @@ -15,8 +15,20 @@ app.use(express.static('uploads')); // Set security headers app.use(helmet()); +// cookie +app.use(cookieParser()); + // CORS -app.use(cors()); +// app.use(cors()); +app.use(cors({credentials:true,origin:process.env.FRONTEND_URL})); + +app.use(function(req, res, next) { + res.header('Access-Control-Allow-Credentials', true); + res.header('Access-Control-Allow-Origin', process.env.FRONTEND_URL); + res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,UPDATE,OPTIONS'); + res.header('Access-Control-Allow-Headers', 'X-Requested-With, X-HTTP-Method-Override, Content-Type, Accept'); + next(); +}); // Body Parser app.use(express.json({ limit: '50mb' })); @@ -25,8 +37,6 @@ app.use(express.urlencoded({ limit: '50mb', extended: true })); // Response time app.use(responseTime({ suffix: false })); -// cookie -app.use(cookieParser()); // Use routes app.use('/', routes); diff --git a/backend/app/models/question.js b/backend/app/models/question.js index 43051a07..4fe46114 100644 --- a/backend/app/models/question.js +++ b/backend/app/models/question.js @@ -25,6 +25,10 @@ const questionSchema = new Schema( type: Number, default: 0, }, + downvotes:{ + type:Number, + default:0 + } }, { timestamps: { createdAt: 'createdAt', updatedAt: 'updatedAt' } } ); diff --git a/backend/app/routes/Q&A/question/downvoteQuestion.js b/backend/app/routes/Q&A/question/downvoteQuestion.js index d29b7869..3dcc23b9 100644 --- a/backend/app/routes/Q&A/question/downvoteQuestion.js +++ b/backend/app/routes/Q&A/question/downvoteQuestion.js @@ -6,25 +6,11 @@ const { getVoteCookieName } = require('../../../../helpers/middlewares/cookie'); module.exports = async (req, res, next) => { const { questionId } = req.body; - const [err] = await to( - question.updateOne({ _id: questionId }, [ - { - $set: { - upvotes: { - $cond: [ - { - $gt: ['$upvotes', 0], - }, - { - $subtract: ['$upvotes', 1], - }, - 0, - ], - }, - }, - }, - ]) - ); + const existingQues=await question.findById(questionId) + if(!existingQues.downvotes){ + const [err] = await to(question.updateOne({ _id: questionId },{$set:{downvotes:0}})); + } + const [err] = await to(question.updateOne({ _id: questionId }, { $inc: { downvotes: 1 } })); if (err) { console.log(err); const error = new ErrorHandler(constants.ERRORS.DATABASE, { @@ -36,7 +22,7 @@ module.exports = async (req, res, next) => { return next(error); } - res.cookie(getVoteCookieName('question', questionId), true, { maxAge: 20 * 365 * 24 * 60 * 60 * 1000 }); + res.cookie(getVoteCookieName('question', questionId), true, { maxAge: 20 * 365 * 24 * 60 * 60 * 1000, sameSite: "none", secure: true }); res.status(200).send({ message: 'Question has been down voted', }); diff --git a/backend/app/routes/Q&A/question/upvoteQuestion.js b/backend/app/routes/Q&A/question/upvoteQuestion.js index 77a1b2a2..671dca9d 100644 --- a/backend/app/routes/Q&A/question/upvoteQuestion.js +++ b/backend/app/routes/Q&A/question/upvoteQuestion.js @@ -16,7 +16,7 @@ module.exports = async (req, res, next) => { return next(error); } - res.cookie(getVoteCookieName('question', questionId), true, { maxAge: 20 * 365 * 24 * 60 * 60 * 1000 }); + res.cookie(getVoteCookieName('question', questionId), true, { maxAge: 20 * 365 * 24 * 60 * 60 * 1000,sameSite:"none",secure:true }); res.status(200).send({ message: 'Question has been upvoted', diff --git a/frontend/src/pages/Q&A/Q&A.jsx b/frontend/src/pages/Q&A/Q&A.jsx index d9d2e1bb..0423c21d 100644 --- a/frontend/src/pages/Q&A/Q&A.jsx +++ b/frontend/src/pages/Q&A/Q&A.jsx @@ -191,7 +191,7 @@ function Ques(props) { className="vote-btn" onClick={() => handleDownvote(item._id)} > - 👎 {item?.downvote} + 👎 {item?.downvotes} diff --git a/frontend/src/service/Faq.jsx b/frontend/src/service/Faq.jsx index f23e7c8b..d3ee876c 100644 --- a/frontend/src/service/Faq.jsx +++ b/frontend/src/service/Faq.jsx @@ -2,127 +2,127 @@ import { END_POINT } from "../config/api"; import { showToast } from "./toastService"; export async function postFaq(formData, setToast, toast) { - try { - const response = await fetch(`${END_POINT}/faq/postFaq`, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${localStorage.getItem("token")}`, - }, - body: JSON.stringify(formData), + try { + const response = await fetch(`${END_POINT}/faq/postFaq`, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${localStorage.getItem("token")}`, + }, + body: JSON.stringify(formData), + }); + + if (response.ok) { + setToast({ + ...toast, + toastMessage: "FAQ has been added", + toastStatus: true, + toastType: "success", }); - - if (response.ok) { - setToast({ - ...toast, - toastMessage: "FAQ has been added", - toastStatus: true, - toastType: "success", - }); - return { success: true }; - } else { - setToast({ - ...toast, - toastMessage: "Database Error", - toastStatus: true, - toastType: "error", - }); - return { success: false, error: "Database Error" }; - } - } catch (error) { + return { success: true }; + } else { setToast({ ...toast, - toastMessage: "Network Error", + toastMessage: "Database Error", toastStatus: true, toastType: "error", }); - return { success: false, error: "Network Error" }; + return { success: false, error: "Database Error" }; } + } catch (error) { + setToast({ + ...toast, + toastMessage: "Network Error", + toastStatus: true, + toastType: "error", + }); + return { success: false, error: "Network Error" }; } +} export async function getFaq() { - try { - const response = await fetch(`${END_POINT}/faq/getFaq`); - if (!response.ok) { - throw new Error("Failed to fetch FAQs"); - } - const data = await response.json(); - return data.Faq; - } catch (error) { - console.error("Failed to fetch FAQs:", error.message); + try { + const response = await fetch(`${END_POINT}/faq/getFaq`); + if (!response.ok) { throw new Error("Failed to fetch FAQs"); } + const data = await response.json(); + return data.Faq; + } catch (error) { + console.error("Failed to fetch FAQs:", error.message); + throw new Error("Failed to fetch FAQs"); + } } -export const deleteFaq = async (faqId, setToast, toast) => { - const url = `${END_POINT}/faq/deleteFaq`; - const body = { faqId: faqId }; - const headers = { - "Content-Type": "application/json", - authorization: `Bearer ${localStorage.getItem("token")}`, - }; - try { - const response = await fetch(url, { - method: "PUT", - headers: headers, - body: JSON.stringify(body), - }); - if (!response.ok) { - throw new Error(`HTTP error! status: ${response.status}`); - } - const data = await response.json(); - setToast({ - ...toast, - toastMessage: data.message, - toastStatus: true, - toastType: "success", - }); - return data.message; - } catch (error) { - console.error("Failed to delete FAQ:", error.message); - setToast({ - ...toast, - toastMessage: "Failed to delete FAQ", - toastStatus: true, - toastType: "error", - }); - throw new Error("Failed to delete FAQ"); +export const deleteFaq = async (faqId, setToast, toast) => { + const url = `${END_POINT}/faq/deleteFaq`; + const body = { faqId: faqId }; + const headers = { + "Content-Type": "application/json", + authorization: `Bearer ${localStorage.getItem("token")}`, + }; + try { + const response = await fetch(url, { + method: "PUT", + headers: headers, + body: JSON.stringify(body), + }); + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); } + const data = await response.json(); + setToast({ + ...toast, + toastMessage: data.message, + toastStatus: true, + toastType: "success", + }); + return data.message; + } catch (error) { + console.error("Failed to delete FAQ:", error.message); + setToast({ + ...toast, + toastMessage: "Failed to delete FAQ", + toastStatus: true, + toastType: "error", + }); + throw new Error("Failed to delete FAQ"); + } }; export const updateFaq = async (faqId, updatedFaqDetails, setToast, toast) => { - try { - const response = await fetch(`${END_POINT}/faq/updateFaq`, { - method: "PATCH", - headers: { - "Content-Type": "application/json", - authorization: `Bearer ${localStorage.getItem("token")}`, - }, - body: JSON.stringify({ faqId, ...updatedFaqDetails }), - }); - - if (!response.ok) { - throw new Error("Failed to update FAQ"); - } + try { + const response = await fetch(`${END_POINT}/faq/updateFaq`, { + method: "PATCH", + headers: { + "Content-Type": "application/json", + authorization: `Bearer ${localStorage.getItem("token")}`, + }, + body: JSON.stringify({ faqId, ...updatedFaqDetails }), + }); - const data = await response.json(); - setToast({ - ...toast, - toastMessage: data.message, - toastStatus: true, - toastType: "success", - }); - return data.message; - } catch (error) { - console.error("Failed to update FAQ:", error.message); - setToast({ - ...toast, - toastMessage: "Failed to update FAQ", - toastStatus: true, - toastType: "error", - }); - throw new Error("Failed to update FAQ"); + if (!response.ok) { + throw new Error("Failed to update FAQ"); } + + const data = await response.json(); + setToast({ + ...toast, + toastMessage: data.message, + toastStatus: true, + toastType: "success", + }); + return data.message; + } catch (error) { + console.error("Failed to update FAQ:", error.message); + setToast({ + ...toast, + toastMessage: "Failed to update FAQ", + toastStatus: true, + toastType: "error", + }); + throw new Error("Failed to update FAQ"); + } }; export const getAllQuestions = async (setToast, toast) => { @@ -292,6 +292,7 @@ export const upvote = async (questionId, handleToast) => { headers: { "Content-Type": "application/json", }, + credentials: "include", body: JSON.stringify({ questionId }), }); if (!response.ok) { @@ -300,7 +301,7 @@ export const upvote = async (questionId, handleToast) => { showToast(handleToast, "Upvote Successfully"); return response.json(); } catch (error) { - showToast(handleToast, "Failed to upvote question", "error"); + showToast(handleToast, "You have already voted", "error"); throw new Error("Failed to upvote question"); } }; @@ -312,6 +313,7 @@ export const downvote = async (questionId, handleToast) => { headers: { "Content-Type": "application/json", }, + credentials: "include", body: JSON.stringify({ questionId }), }); if (!response.ok) { @@ -320,7 +322,7 @@ export const downvote = async (questionId, handleToast) => { showToast(handleToast, "Downvote Successfully"); return response.json(); } catch (error) { - showToast(handleToast, "Failed to downvote question", "error"); + showToast(handleToast, "You have already voted", "error"); throw new Error("Failed to downvote question"); } -}; \ No newline at end of file +}; From 94a7451f72523fbf8249e21bb3116ef95f895d1d Mon Sep 17 00:00:00 2001 From: balaharisankar Date: Tue, 6 Aug 2024 15:10:07 +0530 Subject: [PATCH 2/2] Upvote/downvote functionality added in frontend --- .../src/pages/Q&A/AnswerModel/AnswerModel.jsx | 117 +++++++++++------- .../pages/Q&A/AnswerModel/AnswerModel.scss | 20 ++- frontend/src/pages/Q&A/Q&A.jsx | 35 +++++- frontend/src/pages/Q&A/Ques.scss | 5 + frontend/src/service/Faq.jsx | 48 ++++++- 5 files changed, 175 insertions(+), 50 deletions(-) diff --git a/frontend/src/pages/Q&A/AnswerModel/AnswerModel.jsx b/frontend/src/pages/Q&A/AnswerModel/AnswerModel.jsx index aaf075af..f7d087e4 100644 --- a/frontend/src/pages/Q&A/AnswerModel/AnswerModel.jsx +++ b/frontend/src/pages/Q&A/AnswerModel/AnswerModel.jsx @@ -1,31 +1,34 @@ import React, { useEffect, useState } from "react"; import { Modal, Backdrop, Fade } from '@material-ui/core'; import { SimpleToast } from '../../../components/util/Toast' -import {postAnswer,getAnswers} from '../../../service/Faq' +import { postAnswer, getAnswers,upvoteAnswer,downvoteAnswer } from '../../../service/Faq' import style from './AnswerModel.scss' export function AnswerModel(props) { + let dark=props.theme const [answer, setAnswer] = useState("") - const[answers,setAnswers]=useState([]) + const [author, setAuthor] = useState("") + const [answers, setAnswers] = useState([]) const [toast, setToast] = useState({ toastStatus: false, toastType: "", toastMessage: "", }); - const filterAnswers=(fetchedAnswers)=>{ - return fetchedAnswers.filter((ans)=>{return ans.isApproved==true}) + const filterAnswers = (fetchedAnswers) => { + return fetchedAnswers.filter((ans) => { return ans.isApproved == true }) } - async function fetchAnswers(){ - const data=await getAnswers(props.data._id,setToast) + async function fetchAnswers() { + const data = await getAnswers(props.data._id, setToast) setAnswers(filterAnswers(data)) } - useEffect(()=>{ - fetchAnswers() - },[props]) - function timeStampFormatter(time){ - const months=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"] - const messageTime=new Date(time) - return `${String(messageTime.getDate())} ${String(months[messageTime.getMonth()])} ${String(messageTime.getFullYear())} ${String(messageTime.getHours()%12 || 12).padStart(2,'0')}:${String(messageTime.getMinutes()).padStart(2,'0')} ${messageTime.getHours()>=12?'pm':'am'}` + useEffect(() => { + if (props.open) + fetchAnswers() + }, [props]) + function timeStampFormatter(time) { + const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] + const messageTime = new Date(time) + return `${String(messageTime.getDate())} ${String(months[messageTime.getMonth()])} ${String(messageTime.getFullYear())} ${String(messageTime.getHours() % 12 || 12).padStart(2, '0')}:${String(messageTime.getMinutes()).padStart(2, '0')} ${messageTime.getHours() >= 12 ? 'pm' : 'am'}` } const Tags = [ { value: "ml" }, @@ -43,22 +46,31 @@ export function AnswerModel(props) { ]; function handleSubmit(e) { e.preventDefault() - if(answer!=""){ - let data={question_id:props.data._id,answer,created_on:new Date(),created_by:"Anonymous"} - postAnswer(data,setToast) + if (answer != "" && author != "") { + let data = { question_id: props.data._id, answer, created_on: new Date(), created_by: author } + postAnswer(data, setToast) setAnswer("") + setAuthor("") props.handleClose(false) - }else{ - setToast({toastStatus:true,toastMessage:"Please enter your answer",toastType:"error"}) + } else { + setToast({ toastStatus: true, toastMessage: "Please fill both the fields", toastType: "error" }) } } + const handleUpvote=async(answerId)=>{ + await upvoteAnswer(answerId,setToast) + fetchAnswers() + } + const handleDownvote=async(answerId)=>{ + await downvoteAnswer(answerId,setToast) + fetchAnswers() + } return (
{toast.toastStatus && ( {setToast({toastMessage:"",toastStatus:false,toastType:""})}} + handleCloseToast={() => { setToast({ toastMessage: "", toastStatus: false, toastType: "" }) }} severity={toast.toastType} /> )} @@ -75,18 +87,18 @@ export function AnswerModel(props) { }} > -
+
- { + { setAnswer("") props.handleClose(false) - }}> - + }}> +
-

{props.data?.title}

-

{props.data?.description}

-
+

{props.data?.title}

+

{props.data?.description}

+
{ props && props.data?.tags?.map((tag, index) => { if (tag) @@ -97,29 +109,44 @@ export function AnswerModel(props) { }
+ { setAuthor(e.target.value) }} value={author} type="text" placeholder="Your Name" /> { setAnswer(e.target.value) }} value={answer} type="text" placeholder="Post your answer" /> - +
-

Answers ({answers.length})

+

Answers ({answers.length})

{ - answers.length==0? -

No answers found...

- : -
- { - answers.map((ans,index)=>{ - return( -
-
-
{ans.created_by}
-

{timeStampFormatter(ans.created_on)}

+ answers.length == 0 ? +

No answers found...

+ : +
+ { + answers.map((ans, index) => { + return ( +
+
+
{ans.created_by || "Anonymous"}
+

{timeStampFormatter(ans.created_on)}

+
+

{ans.answer}

+
+ + +
-

{ans.answer}

-
- ) - }) - } -
+ ) + }) + } +
}
diff --git a/frontend/src/pages/Q&A/AnswerModel/AnswerModel.scss b/frontend/src/pages/Q&A/AnswerModel/AnswerModel.scss index 3524d2a8..0f486d26 100644 --- a/frontend/src/pages/Q&A/AnswerModel/AnswerModel.scss +++ b/frontend/src/pages/Q&A/AnswerModel/AnswerModel.scss @@ -94,6 +94,7 @@ p { margin-top: 8px; + margin-bottom: 8px; font-size: 16px; } } @@ -112,6 +113,17 @@ margin: 0; } } +.vote-btn { + background-color: #69a9dd; + outline: 1px solid white; + color: white; + border: none; + border-radius: 5px; + padding: 5px; + margin: 5px; + cursor: pointer; + } + @media screen and (max-width:768px) { .modal-container { @@ -127,6 +139,12 @@ } .post-answer-btn { - width: 25%; + width: 100%; + } + .answer-form{ + flex-direction: column; + } + .answer-field{ + width: 100%; } } \ No newline at end of file diff --git a/frontend/src/pages/Q&A/Q&A.jsx b/frontend/src/pages/Q&A/Q&A.jsx index 26698e49..6b6cae33 100644 --- a/frontend/src/pages/Q&A/Q&A.jsx +++ b/frontend/src/pages/Q&A/Q&A.jsx @@ -50,6 +50,7 @@ function Ques(props) { title: "", description: "", tags: [], + created_by:"" }); const handleCloseToast = () => { @@ -79,6 +80,7 @@ function Ques(props) { title: Joi.string().required(), body: Joi.string().required(), tags: Joi.required(), + created_by:Joi.string().required() }; const validate = () => { @@ -188,6 +190,9 @@ function Ques(props) { ))}
+
+

- {item?.created_by||"Anonymous"}

+
@@ -214,7 +219,7 @@ function Ques(props) { }}>Answers
) - )}; + )}
} {toast.toastStatus && ( @@ -251,6 +256,34 @@ function Ques(props) {
+
+
+ + +
+ {formerrors["title"] ? ( +
* {formerrors["title"]}
+ ) : ( +
   
+ )} +
+
+
{ export const postAnswer = async (data, setToast) => { try { - showToast(setToast,"Posting...","info") + showToast(setToast, "Posting...", "info") const url = `${END_POINT}/answers/`; const response = await fetch(url, { method: "POST", @@ -339,8 +339,8 @@ export const postAnswer = async (data, setToast) => { body: JSON.stringify(data), }); const res = await response.json(); - if(response.status==200) - showToast(setToast, "Thanks for answering, it has been sent to admins for review and will appear here on approval","success"); + if (response.status == 200) + showToast(setToast, "Thanks for answering, it has been sent to admins for review and will appear here on approval", "success"); else showToast(setToast, "Failed to Post Answer", "error"); return res; @@ -349,3 +349,45 @@ export const postAnswer = async (data, setToast) => { throw new Error("Failed to post answer"); } } + +export const upvoteAnswer = async (answerId, handleToast) => { + try { + const response = await fetch(`${END_POINT}/answers/upvote`, { + method: "PATCH", + headers: { + "Content-Type": "application/json", + }, + credentials: "include", + body: JSON.stringify({ answerId }), + }); + if (!response.ok) { + throw new Error("Failed to upvote question"); + } + showToast(handleToast, "Upvote Successfully"); + return response.json(); + } catch (error) { + showToast(handleToast, "You have already voted", "error"); + throw new Error("Failed to upvote answer"); + } +} + +export const downvoteAnswer = async(answerId, handleToast) => { + try { + const response = await fetch(`${END_POINT}/answers/downvote`, { + method: "PATCH", + headers: { + "Content-Type": "application/json", + }, + credentials: "include", + body: JSON.stringify({ answerId }), + }); + if (!response.ok) { + throw new Error("Failed to downvote question"); + } + showToast(handleToast, "Downvote Successfully"); + return response.json(); + } catch (error) { + showToast(handleToast, "You have already voted", "error"); + throw new Error("Failed to downvote answer"); + } +} \ No newline at end of file