Merge pull request #90 from 0adiy/main

Refactor: added iteration in questions view and separated the questions content, also modified the post logic for the form

app.js

@@ -2,6 +2,7 @@ const express = require("express")
 const bodyParser = require("body-parser")
 const axios = require("axios")
 const sgMail = require("@sendgrid/mail")
+const questionsJSON = require("./questions")
 const ExpressError=require("./utils/ExpressError.js")
 
 require("dotenv").config()
@@ -34,15 +35,25 @@ app.get("/about",(req,res)=>{
 app.post("/question",(req,res)=>{
     const reciever = req.body.reciever_email
     reciever_email.push(reciever)
-    res.render("questions")
+    res.render("questions", {questions: questionsJSON})
 })
 
 app.post("/result",async (req,res)=>{
-  let p = (parseFloat(req.body.avalue)+parseFloat(req.body.bvalue)+parseFloat(req.body.cvalue)+parseFloat(req.body.dvalue))/2
-  let e = (parseFloat(req.body.evalue)+parseFloat(req.body.fvalue)+parseFloat(req.body.gvalue)+parseFloat(req.body.hvalue))/2
-  let r = (parseFloat(req.body.ivalue)+parseFloat(req.body.jvalue)+parseFloat(req.body.kvalue)+parseFloat(req.body.lvalue))/2
-  let m = (parseFloat(req.body.mvalue)+parseFloat(req.body.nvalue)+parseFloat(req.body.ovalue)+parseFloat(req.body.pvalue))/2
-  let a = (parseFloat(req.body.qvalue)+parseFloat(req.body.rvalue)+parseFloat(req.body.svalue)+parseFloat(req.body.tvalue))/2
+	const {
+		value0, value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15, value16, value17, value18, value19
+	} = req.body
+	let p = [ value0,  value1,  value2,  value3].map(n => parseFloat(n)).reduce((a, b) => a + b, 0) / 2
+	let e = [ value4,  value5,  value6,  value7].map(n => parseFloat(n)).reduce((a, b) => a + b, 0) / 2
+	let r = [ value8,  value9, value10, value11].map(n => parseFloat(n)).reduce((a, b) => a + b, 0) / 2
+	let m = [value12, value13, value14, value15].map(n => parseFloat(n)).reduce((a, b) => a + b, 0) / 2
+	let a = [value16, value17, value18, value19].map(n => parseFloat(n)).reduce((a, b) => a + b, 0) / 2
+
+	console.log(p, e, r, m, a);
+  // let p = (parseFloat(req.body.avalue)+parseFloat(req.body.bvalue)+parseFloat(req.body.cvalue)+parseFloat(req.body.dvalue))/2
+  // let e = (parseFloat(req.body.evalue)+parseFloat(req.body.fvalue)+parseFloat(req.body.gvalue)+parseFloat(req.body.hvalue))/2
+  // let r = (parseFloat(req.body.ivalue)+parseFloat(req.body.jvalue)+parseFloat(req.body.kvalue)+parseFloat(req.body.lvalue))/2
+  // let m = (parseFloat(req.body.mvalue)+parseFloat(req.body.nvalue)+parseFloat(req.body.ovalue)+parseFloat(req.body.pvalue))/2
+  // let a = (parseFloat(req.body.qvalue)+parseFloat(req.body.rvalue)+parseFloat(req.body.svalue)+parseFloat(req.body.tvalue))/2
 
 // console.log(req.body.username)
   if(p<e && p<r && p<m && p<a ){

questions.js

@@ -0,0 +1,150 @@
+const questions = [
+  {
+    question: "How often do you find yourself happy?",
+    options: [
+      { value: 5, text: "Frequently" },
+      { value: 0, text: "Rarely" },
+    ],
+  },
+  {
+    question: "Do you often experience feelings of excitement and enthusiasm?",
+    options: [
+      { value: 5, text: "Frequently" },
+      { value: 0, text: "Rarely" },
+    ],
+  },
+  {
+    question:
+      "How frequently do you feel grateful for the good things in your life?",
+    options: [
+      { value: 5, text: "Frequently" },
+      { value: 0, text: "Rarely" },
+    ],
+  },
+  {
+    question: "Do you feel jealous at some times?",
+    options: [
+      { value: 0, text: "Affermative" },
+      { value: 5, text: "Negative" },
+    ],
+  },
+  {
+    question:
+      "Do you actively seek out new challenges to keep yourself engaged?",
+    options: [
+      { value: 5, text: "Frequently" },
+      { value: 0, text: "Rarely" },
+    ],
+  },
+  {
+    question:
+      "How often do you lose track of time, when you're doing activities you enjoy?",
+    options: [
+      { value: 5, text: "Frequently" },
+      { value: 0, text: "Rarely" },
+    ],
+  },
+  {
+    question: "How often do you get completely absorbed in what you're doing?",
+    options: [
+      { value: 5, text: "Frequently" },
+      { value: 0, text: "Rarely" },
+    ],
+  },
+  {
+    question: "Can you dance without fear in public?",
+    options: [
+      { value: 5, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+  {
+    question:
+      "Do you feel like you have a support system of friends and family?",
+    options: [
+      { value: 5, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+  {
+    question:
+      "How often do you spend quality time with people who uplift and inspire you?",
+    options: [
+      { value: 5, text: "Frequently" },
+      { value: 0, text: "Rarely" },
+    ],
+  },
+  {
+    question:
+      "Do you feel comfortable sharing your thoughts and feelings with others?",
+    options: [
+      { value: 5, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+  {
+    question: "Do you feel you need a partner?",
+    options: [
+      { value: 0, text: "Affermative" },
+      { value: 5, text: "Negative" },
+    ],
+  },
+  {
+    question: "Do you feel a sense of purpose and direction in your life?",
+    options: [
+      { value: 6, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+  {
+    question:
+      "Do you feel that your life has a deeper meaning beyond just day-to-day activities?",
+    options: [
+      { value: 5, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+  {
+    question: "Do you spend negative time on socials?",
+    options: [
+      { value: 0, text: "Affermative" },
+      { value: 5, text: "Rarely" },
+    ],
+  },
+  {
+    question: "Do you like going to college/school/office?",
+    options: [
+      { value: 5, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+  {
+    question: "Have you achieved any major goals?",
+    options: [
+      { value: 5, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+  {
+    question: "Do you think your Parents are proud of you?",
+    options: [
+      { value: 5, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+  {
+    question: "Do you think people respect you?",
+    options: [
+      { value: 5, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+  {
+    question: "Do you think you have done good in your life so far?",
+    options: [
+      { value: 5, text: "Affermative" },
+      { value: 0, text: "Negative" },
+    ],
+  },
+];
+module.exports = questions;