updated

backend/controller/applicantController.js

@@ -3,7 +3,7 @@ const { checkExistingJobApplication, insertJobApplication } = require('../utils/
 const { sendEmail } = require('../utils/sendEmail');
 
 const submitJobApplication = async (req, res) => {
-    const { name, email, phone, experience, role, linkedin } = req.body;
+    const { name, email, phone, experience, role, linkedin, consent } = req.body;
     const resume = req.file;
 
     console.log('Received job application:', req.body);
@@ -35,7 +35,7 @@ const submitJobApplication = async (req, res) => {
     const filename = resume.originalname;
 
     // Insert application into the database
-    await insertJobApplication(name, email, phone, experience, role, linkedin, resume.buffer, filename);
+    await insertJobApplication(name, email, phone, experience, role, linkedin, resume.buffer, filename, consent);
     console.log('Job Application added to DB successfully');
 
     try{

backend/controller/contactController.js

@@ -9,7 +9,7 @@ const { useVapi} = require("../config");
 const assistant_url = 'https://api.vapi.ai/call';
 
 const submitContactForm = async (req, res) => {
-    const { name, email, phone, subject, message } = req.body;
+    const { name, email, phone, subject, message, consent } = req.body;
     console.log('Received contact form submission:', req.body);
 
     if (!name || !email || !phone || !subject || !message) {
@@ -24,7 +24,7 @@ const submitContactForm = async (req, res) => {
         return res.status(400).send({ error: 'Your contact request with the same subject is in queue' });
     }
 
-    await insertContactRequest(name, email, phone, subject, message);
+    await insertContactRequest(name, email, phone, subject, message, consent);
     console.log('Contact request added successfully');
 
     try{

backend/controller/demoRequestController.js

@@ -12,7 +12,7 @@ const { useVapi} = require("../config");
 const assistant_url = 'https://api.vapi.ai/call';
 
 const demoRequest = async (req, res) => {
-    const { name, email, company, product, demoDate, selectedSlot, phone, additionalComments, timezone } = req.body;
+    const { name, email, company, product, demoDate, selectedSlot, phone, additionalComments, timezone, consent } = req.body;
     console.log('Received demo request:', req.body);
 
     // Basic validation on the server side
@@ -61,7 +61,7 @@ const demoRequest = async (req, res) => {
     console.log('Converted time range to Asia/Kolkata:', formattedRange);
 
     // 2. Insert the new demo request into the database
-    await insertDemoRequest(name, email, company, product, convertedDemoDate, formattedRange, phone, additionalComments);
+    await insertDemoRequest(name, email, company, product, convertedDemoDate, formattedRange, phone, additionalComments, consent);
     console.log('Demo request added successfully');
 
     const [ eventData, icsContent ] = await createGoogleCalendarEvent(name, email, demoDate, selectedSlot, product, timezone);

backend/utils/contactRequestDB.js

@@ -8,9 +8,9 @@ async function checkExistingContactRequest(name, email, subject) {
 }
 
 // Insert contact request
-async function insertContactRequest(name, email, phone, subject, message) {
-    const insertQuery = `INSERT INTO contact_requests (date, time, name, email, phone, subject, message) VALUES (DATE("now"), TIME("now"), ?, ?, ?, ?, ?);`;
-    await runQuery(insertQuery, [name, email, phone, subject, message]);
+async function insertContactRequest(name, email, phone, subject, message, consent) {
+    const insertQuery = `INSERT INTO contact_requests (date, time, name, email, phone, subject, message, consent) VALUES (DATE("now"), TIME("now"), ?, ?, ?, ?, ?, ?);`;
+    await runQuery(insertQuery, [name, email, phone, subject, message, consent]);
 }
 
 module.exports = { checkExistingContactRequest, insertContactRequest };

backend/utils/demoRequestDB.js

@@ -11,12 +11,12 @@ async function checkExistingDemoRequest(name, email, product, demoDate, phone) {
 }
 
 // Insert demo request
-async function insertDemoRequest(name, email, company, product, demoDate, slot, phone, message) {
+async function insertDemoRequest(name, email, company, product, demoDate, slot, phone, message, consent) {
     const insertQuery = `
-        INSERT INTO demo_requests (date, time, name, email, company, product, demo_date, slot, phone, comments) 
-        VALUES (DATE("now"), TIME("now"), ?, ?, ?, ?, ?, ?, ?, ?);
+        INSERT INTO demo_requests (date, time, name, email, company, product, demo_date, slot, phone, comments, consent) 
+        VALUES (DATE("now"), TIME("now"), ?, ?, ?, ?, ?, ?, ?, ?, ?);
     `;
-    await runQuery(insertQuery, [name, email, company, product, demoDate, slot, phone, message]);
+    await runQuery(insertQuery, [name, email, company, product, demoDate, slot, phone, message, consent]);
 }
 
 module.exports = { checkExistingDemoRequest, insertDemoRequest };

backend/utils/jobRequestDB.js

@@ -9,9 +9,9 @@ async function checkExistingJobApplication(name, email, role) {
 }
 
 // Insert job application
-async function insertJobApplication(name, email, phone, experience, role, linkedin, resume, filename) {
-    const insertQuery = `INSERT INTO applicants (date, time, name, email, phone, experience, role, linkedin, resume, filename) VALUES (DATE("now"), TIME("now"), ?, ?, ?, ?, ?, ?, ?, ?);`;
-    await runQuery(insertQuery, [name, email, phone, experience, role, linkedin, resume, filename]);
+async function insertJobApplication(name, email, phone, experience, role, linkedin, resume, filename, consent) {
+    const insertQuery = `INSERT INTO applicants (date, time, name, email, phone, experience, role, linkedin, resume, filename, consent) VALUES (DATE("now"), TIME("now"), ?, ?, ?, ?, ?, ?, ?, ?, ?);`;
+    await runQuery(insertQuery, [name, email, phone, experience, role, linkedin, resume, filename, consent]);
 }
 
 module.exports = { checkExistingJobApplication, insertJobApplication };

backend/utils/setupDB.js

@@ -24,7 +24,8 @@ async function initializeDatabase() {
                 experience TEXT,
                 linkedin TEXT,
                 resume BLOB,
-                filename TEXT NOT NULL
+                filename TEXT NOT NULL,
+                consent INTEGER NOT NULL
             )`,
             demo_requests: `CREATE TABLE IF NOT EXISTS demo_requests (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -37,7 +38,8 @@ async function initializeDatabase() {
                 demo_date TEXT,
                 slot TEXT,
                 phone TEXT,
-                comments TEXT
+                comments TEXT,
+                consent INTEGER NOT NULL
             )`,
             contact_requests: `CREATE TABLE IF NOT EXISTS contact_requests (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -47,7 +49,8 @@ async function initializeDatabase() {
                 email TEXT NOT NULL,
                 phone TEXT,
                 subject TEXT,
-                message TEXT
+                message TEXT,
+                consent INTEGER NOT NULL
             )`,
             purchases: `CREATE TABLE IF NOT EXISTS purchases (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,

frontend/src/sections/contact/Forms.jsx

@@ -231,8 +231,8 @@ const ContactForm = ({ formType, demoProduct }) => {
 
     let formData =
       formType === 'general'
-        ? { name, email, phone, subject, message }
-        : { name, email, phone, company, product, demoDate, selectedSlot, additionalComments, timezone };
+        ? { name, email, phone, subject, message, consent }
+        : { name, email, phone, company, product, demoDate, selectedSlot, additionalComments, timezone, consent };
 
     // Validate required fields
     // if(formType === 'general' && (!name || !email || !phone || !subject || !message) ){
@@ -429,7 +429,10 @@ const ContactForm = ({ formType, demoProduct }) => {
             />
             <label htmlFor="gdpr-consent">
               I consent to the processing of my submitted data in accordance with the{' '}
-              <a href="/privacy-policy" target="_blank" rel="noopener noreferrer"><i style={{color:"#3f7ad3"}}>Privacy Policy</i></a>.
+              <a href="/privacy-policy" target="_blank" rel="noopener noreferrer">
+                <i style={{ color: "#3f7ad3" }}>Privacy Policy</i>
+              </a>.{' '}
+              <span style={{ color: "red", marginLeft: "5px" }}>*</span>
             </label>
           </ConsentWrapper>
 
@@ -537,7 +540,10 @@ const ContactForm = ({ formType, demoProduct }) => {
             />
             <label htmlFor="gdpr-consent">
               I consent to the processing of my submitted data in accordance with the{' '}
-              <a href="/privacy-policy" target="_blank" rel="noopener noreferrer"><i style={{color:"#3f7ad3"}}>Privacy Policy</i></a>.
+              <a href="/privacy-policy" target="_blank" rel="noopener noreferrer">
+                <i style={{ color: "#3f7ad3" }}>Privacy Policy</i>
+              </a>.{' '}
+              <span style={{ color: "red", marginLeft: "5px" }}>*</span>
             </label>
           </ConsentWrapper>
 

frontend/src/sections/jobs/JobPageSection.jsx

@@ -309,6 +309,7 @@ const JobPageSection = ({ job }) => {
       formData.append('phone', phone);
       formData.append('experience', experience);
       formData.append('linkedin', linkedin);
+      formData.append('consent', consent);
       formData.append('role', role); // Add role to the form data
       formData.append('resume', document.getElementById('fileInput').files[0]);
 
@@ -613,7 +614,7 @@ const JobPageSection = ({ job }) => {
                     </IntlTelInputWrapper>
                     {errors.phone && <span style={{ color: '#de493e', fontSize: '0.875rem' }}>{errors.phone}</span>}
 
-                  <label style={{ display: "flex" }}>Experience </label>{" "}
+                  <label style={{ display: "flex" }}>Experience <div style={{ color: "red", marginLeft: "10px" }}>*</div> </label>{" "}
                   {/*<div style={{color:'red', marginLeft:"10px"}}>*</div> */}
                   <Textarea
                     value={experience}
@@ -713,16 +714,11 @@ const JobPageSection = ({ job }) => {
                       required
                     />
                     <label htmlFor="gdpr-consent">
-                      I consent to the processing of my submitted data in
-                      accordance with the{" "}
-                      <a
-                        href="/privacy-policy"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                      >
+                      I consent to the processing of my submitted data in accordance with the{' '}
+                      <a href="/privacy-policy" target="_blank" rel="noopener noreferrer">
                         <i style={{ color: "#3f7ad3" }}>Privacy Policy</i>
-                      </a>
-                      .
+                      </a>.{' '}
+                      <span style={{ color: "red", marginLeft: "5px" }}>*</span>
                     </label>
                   </ConsentWrapper>
                   <SubmitButton type="submit" data-testid="submit-btn">