.gitignore

@@ -1,4 +1,3 @@
 node_modules
 logs
-.env
+.env
-public/builds

public/css/dashboard.css

@@ -871,6 +871,7 @@ tr[data-vaid]:hover {
 
 .project-name {
     font-weight: 600;
+    color: #1f2937;
     font-size: 0.9rem;
 }
 
@@ -962,6 +963,7 @@ tr[data-vaid]:hover {
     }
 }
 
+/* Modal Styles */
 .modal-overlay {
     display: none;
     position: fixed;
@@ -971,332 +973,125 @@ tr[data-vaid]:hover {
     height: 100%;
     background: rgba(0, 0, 0, 0.5);
     z-index: 1000;
-    backdrop-filter: blur(5px);
+    justify-content: center;
-}
-
-.modal-content {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    background: white;
-    border-radius: 12px;
-    box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
-    width: 90%;
-    max-width: 800px;
-    max-height: 80vh;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-}
-
-.modal-header {
-    padding: 20px 24px;
-    border-bottom: 1px solid #e5e7eb;
-    background: #f8fafc;
-    display: flex;
-    justify-content: between;
     align-items: center;
 }
 
+.modal-content {
+    background: white;
+    border-radius: 8px;
+    padding: 20px;
+    max-width: 500px;
+    width: 90%;
+    max-height: 80vh;
+    overflow-y: auto;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+}
+
+.modal-header {
+    display: flex;
+    justify-content: between;
+    align-items: center;
+    margin-bottom: 15px;
+    border-bottom: 1px solid #e5e7eb;
+    padding-bottom: 10px;
+}
+
 .modal-title {
-    font-size: 1.5rem;
+    font-size: 1.25rem;
     font-weight: 600;
-    color: #1f2937;
     margin: 0;
 }
 
-.modal-close {
+.close-modal {
     background: none;
     border: none;
     font-size: 1.5rem;
     cursor: pointer;
     color: #6b7280;
-    padding: 4px;
-    border-radius: 4px;
-    transition: all 0.2s;
 }
 
-.modal-close:hover {
+.close-modal:hover {
     color: #374151;
-    background: #e5e7eb;
 }
 
-.modal-body {
+.va-list {
-    padding: 24px;
-    overflow-y: auto;
-    flex-grow: 1;
-}
-
-.project-info-section {
-    margin-bottom: 24px;
-    padding: 16px;
-    background: #f8fafc;
-    border-radius: 8px;
-    border-left: 4px solid #3b82f6;
-}
-
-.project-info-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-    gap: 16px;
-    margin-bottom: 16px;
-}
-
-.project-info-item {
     display: flex;
     flex-direction: column;
+    gap: 10px;
 }
 
-.project-info-label {
+.va-item {
-    font-size: 0.875rem;
-    color: #6b7280;
-    margin-bottom: 4px;
-}
-
-.project-info-value {
-    font-size: 1rem;
-    font-weight: 500;
-    color: #1f2937;
-}
-
-.va-section-title {
-    font-size: 1.25rem;
-    font-weight: 600;
-    color: #1f2937;
-    margin-bottom: 16px;
     display: flex;
+    justify-content: space-between;
     align-items: center;
-    gap: 8px;
+    padding: 10px;
-}
+    border: 1px solid #e5e7eb;
-
+    border-radius: 6px;
-.va-count-badge {
-    background: #3b82f6;
-    color: white;
-    padding: 2px 8px;
-    border-radius: 12px;
-    font-size: 0.75rem;
-    font-weight: 500;
-}
-
-.va-table {
-    width: 100%;
-    border-collapse: collapse;
-    background: white;
-    border-radius: 8px;
-    overflow: hidden;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-
-.va-table th {
-    background: #f8fafc;
-    padding: 12px 16px;
-    text-align: left;
-    font-weight: 600;
-    color: #374151;
-    border-bottom: 1px solid #e5e7eb;
-    font-size: 0.875rem;
-}
-
-.va-table td {
-    padding: 16px;
-    border-bottom: 1px solid #f3f4f6;
-}
-
-.va-table tr:last-child td {
-    border-bottom: none;
-}
-
-.va-table tr:hover {
     background: #f9fafb;
 }
 
-.va-name {
+.va-info-modal {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-}
-
-.va-avatar {
-    width: 40px;
-    height: 40px;
-    border-radius: 50%;
-    background: #3b82f6;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: white;
-    font-weight: 600;
-    font-size: 0.875rem;
-    text-transform: uppercase;
-}
-
-.va-details {
     display: flex;
     flex-direction: column;
 }
 
-.va-fullname {
+.va-name-modal {
-    font-weight: 500;
+    font-weight: 600;
-    color: #1f2937;
+    color: #374151;
-    text-transform: capitalize;
 }
 
-.va-email {
+.va-email-modal {
     font-size: 0.875rem;
     color: #6b7280;
 }
 
-.status-badge {
+.va-status {
-    display: inline-flex;
+    padding: 4px 8px;
-    align-items: center;
+    border-radius: 12px;
-    gap: 6px;
+    font-size: 0.75rem;
-    padding: 6px 12px;
+    font-weight: 600;
-    border-radius: 20px;
-    font-size: 0.875rem;
-    font-weight: 500;
 }
 
-.status-badge.active {
+.status-active {
     background: #dcfce7;
     color: #166534;
 }
 
-.status-badge.inactive {
+.status-inactive {
     background: #f3f4f6;
     color: #6b7280;
 }
 
-.status-dot {
+/* Project row hover effect */
-    width: 8px;
+.project-row {
-    height: 8px;
+    cursor: pointer;
-    border-radius: 50%;
+    transition: background-color 0.2s ease;
 }
 
-.status-dot.active {
+.project-row:hover {
-    background: #16a34a;
+    background-color: #f8fafc;
 }
 
-.status-dot.inactive {
+/* Logout button styles */
-    background: #9ca3af;
+.logout-button {
+    background: none;
+    border: none;
+    color: #ef4444;
+    cursor: pointer;
+    padding: 10px;
+    border-radius: 6px;
+    transition: background-color 0.2s ease;
+    text-align: left;
+    width: 100%;
 }
 
-.activity-status {
+.logout-button:hover {
-    display: flex;
+    background-color: #fef2f2;
-    align-items: center;
-    gap: 8px;
 }
 
-.activity-dot {
+.logout-container {
-    width: 8px;
+    margin-top: auto;
-    height: 8px;
+    padding: 20px;
-    border-radius: 50%;
+    border-top: 1px solid #e5e7eb;
-    animation: pulse 2s infinite;
-}
-
-.activity-dot.active {
-    background: #16a34a;
-}
-
-.activity-dot.inactive {
-    background: #9ca3af;
-}
-
-@keyframes pulse {
-    0% { opacity: 1; }
-    50% { opacity: 0.5; }
-    100% { opacity: 1; }
-}
-
-.no-vas-message {
-    text-align: center;
-    padding: 40px 20px;
-    color: #6b7280;
-}
-
-.no-vas-message i {
-    font-size: 3rem;
-    margin-bottom: 16px;
-    color: #d1d5db;
-}
-
-/* Responsive Design */
-@media (max-width: 768px) {
-    .modal-content {
-        width: 95%;
-        max-height: 90vh;
-    }
-
-    .modal-body {
-        padding: 16px;
-    }
-
-    .project-info-grid {
-        grid-template-columns: 1fr;
-    }
-
-    .va-table {
-        font-size: 0.875rem;
-    }
-
-    .va-table th,
-    .va-table td {
-        padding: 12px 8px;
-    }
-}
-
-/* Dark theme support */
-[data-theme="dark"] .modal-content {
-    background: #1f2937;
-    color: #f9fafb;
-}
-
-[data-theme="dark"] .modal-header {
-    background: #374151;
-    border-bottom-color: #4b5563;
-}
-
-[data-theme="dark"] .modal-title {
-    color: #f9fafb;
-}
-
-[data-theme="dark"] .project-info-section {
-    background: #374151;
-    border-left-color: #60a5fa;
-}
-
-[data-theme="dark"] .project-info-value {
-    color: #f9fafb;
-}
-
-[data-theme="dark"] .va-section-title {
-    color: #f9fafb;
-}
-
-[data-theme="dark"] .va-table {
-    background: #374151;
-}
-
-[data-theme="dark"] .va-table th {
-    background: #4b5563;
-    color: #f9fafb;
-    border-bottom-color: #6b7280;
-}
-
-[data-theme="dark"] .va-table td {
-    border-bottom-color: #4b5563;
-    color: #f9fafb;
-}
-
-[data-theme="dark"] .va-table tr:hover {
-    background: #4b5563;
-}
-
-[data-theme="dark"] .va-fullname {
-    color: #f9fafb;
-}
-
-[data-theme="dark"] .status-badge.inactive {
-    background: #4b5563;
-    color: #d1d5db;
 }

public/js/va-register.js

@@ -346,14 +346,6 @@
                 const email = document.getElementById('email').value;
                 const password = document.getElementById('password').value;
                 const confirmPassword = document.getElementById('confirmPassword').value;
-
-                if(!email && !password) {
-                    showError('', 'email', step);
-                    showError('', 'password', step);
-                    showError('Please enter a valid email address and password', 'confirmPassword', step);
-                    isValid = false;
-                    return isValid;
-                }
                 
                 // Email validation
                 if (!validateEmail(email)) {

src/controllers/client/dashboard/clientDashboardProjects.controller.js

@@ -15,7 +15,7 @@ function formatHoursToReadable(hours) {
     }
 }
 
-// Getting client dashboard data - projects with assigned VA details
+// Getting client dashboard data - all VAs and projects
 async function client_dashboard_projects(req, res) {
     try {
         const accessToken = req.headers.token;        
@@ -31,137 +31,71 @@ async function client_dashboard_projects(req, res) {
         }
 
         const clientEmail = decoded.email;
-        
-        // STEP 1: Get client ID from token
         const clientUser = await ClientModel.findOne({ "userDetails.email": clientEmail });
         if (!clientUser) {
             return res.status(404).json({ success: false, message: "Client not found" });
         }
 
-        const clientId = clientUser._id;
+        // Get all VA IDs and Project IDs assigned to this client
+        const clientVaIds = clientUser.vaIds || [];
+        const clientProjectIds = clientUser.projectIds || [];
 
-        // STEP 2: Find all projects of this client
+        // Get all VAs assigned to this client (with required fields only)
+        const allAssignedVAs = await VAModel.find({ 
+            _id: { $in: clientVaIds }
+        })
+            .select('userDetails.firstName userDetails.lastName userDetails.email')
+            .lean()
+            .exec();
+
+        // Get All Projects of client with required fields
         const clientProjects = await ProjectModel.find({ 
-            clientId: clientId 
+            _id: { $in: clientProjectIds }
         })
             .select('name hourlyRate vaAssigned dedicatedHours status')
             .lean()
             .exec();
 
-        // Get all VA IDs from all projects for activity check
+        allAssignedVAs.forEach(async (va) => {
-        const allProjectVaIds = [];
+            const vaLogs = await LoggedModel.find({
-        clientProjects.forEach(project => {
+                vaId: va._id,
-            if (project.vaAssigned && project.vaAssigned.length > 0) {
+                vaEmail: va.email
-                allProjectVaIds.push(...project.vaAssigned);
+            })
-            }
-        });
-
-        // STEP 3: Get all VAs assigned to these projects
-        const allAssignedVAs = await VAModel.find({ 
-            _id: { $in: allProjectVaIds } 
         })
-            .select('userDetails.firstName userDetails.lastName userDetails.email status')
-            .lean()
-            .exec();
 
-        // Create a map for quick VA lookup
+        // Format VAs with only required fields
-        const vaMap = allAssignedVAs.reduce((acc, va) => {
+        const vasFormatted = allAssignedVAs.map((va) => ({
-            acc[va._id.toString()] = va;
+            id: va._id,
-            return acc;
+            firstName: va.userDetails?.firstName || '',
-        }, {});
+            lastName: va.userDetails?.lastName || '',
-
+            email: va.userDetails?.email || '',
-        // STEP 4: Check VA activity per project
+            status: va.status || ''
-        const currentTime = new Date();
-        
-        // Format projects with assigned VA details
-        const projectsFormatted = await Promise.all(clientProjects.map(async (project) => {
-            const assignedVAIds = project.vaAssigned || [];
-            
-            // Get VA details and check activity for each assigned VA
-            const assignedVADetails = await Promise.all(assignedVAIds.map(async (vaId) => {
-                const va = vaMap[vaId.toString()];
-                if (!va) return null;
-
-                // Check if this VA is currently active on THIS specific project
-                const latestLog = await LoggedModel.findOne({
-                    vaId: vaId,
-                    projectId: project._id,
-                    loggedType: "LOGIN"
-                }).sort({ time: -1 }).lean();
-
-                let isActive = false;
-                if (latestLog) {
-                    const loginTime = new Date(latestLog.time);
-                    const hoursSinceLastActivity = (currentTime - loginTime) / (1000 * 60 * 60);
-                    if (hoursSinceLastActivity <= 24) {
-                        isActive = true;
-                    }
-                }
-
-                return {
-                    id: va._id,
-                    firstName: va.userDetails?.firstName || '',
-                    lastName: va.userDetails?.lastName || '',
-                    email: va.userDetails?.email || '',
-                    status: va.status || '',
-                    isActive: isActive
-                };
-            }));
-
-            // Filter out null entries and count active VAs
-            const validVADetails = assignedVADetails.filter(Boolean);
-            const activeVAsCount = validVADetails.filter(va => va.isActive).length;
-
-            return {
-                id: project._id,
-                name: project.name,
-                hourlyRate: project.hourlyRate,
-                vaAssigned: validVADetails.length,
-                activeVAs: activeVAsCount,
-                dedicatedHours: formatHoursToReadable(project.dedicatedHours) || "0h",
-                status: project.status || '',
-                assignedVADetails: validVADetails
-            };
         }));
 
-        // Calculate summary counts
+        // Format projects with only required fields
-        const totalProjects = projectsFormatted.length;
+        const projectsFormatted = clientProjects.map((project) => ({
-        
+            id: project._id,
-        // Count total unique VAs across all projects
+            name: project.name,
-        const allVAsAcrossProjects = new Set();
+            hourlyRate: project.hourlyRate,
-        projectsFormatted.forEach(project => {
+            vaAssigned: project.vaAssigned.length || 0,
-            project.assignedVADetails.forEach(va => {
+            dedicatedHours: formatHoursToReadable(project.dedicatedHours) || 0,
-                allVAsAcrossProjects.add(va.id);
+            status: project.status || ''
-            });
+        }));
-        });
-        
-        // Count total active VAs (across all projects)
-        const totalActiveVAs = new Set();
-        projectsFormatted.forEach(project => {
-            project.assignedVADetails.forEach(va => {
-                if (va.isActive) {
-                    totalActiveVAs.add(va.id);
-                }
-            });
-        });
-
-        const projectsWithActiveVAs = projectsFormatted.filter(project => project.activeVAs > 0).length;
 
         return res.status(200).json({ 
             success: true, 
             data: {
+                vas: vasFormatted,
                 projects: projectsFormatted
             },
             counts: {
-                totalProjects: totalProjects,
+                totalVAs: vasFormatted.length,
-                totalVAs: allVAsAcrossProjects.size,
+                totalProjects: projectsFormatted.length
-                activeVAs: totalActiveVAs.size,
-                projectsWithActiveVAs: projectsWithActiveVAs
             }
         });
 
     } catch (error) {
-        console.error("Client dashboard projects error:", error);
+        console.error("Client dashboard error:", error);
         return res.status(500).json({ 
             success: false, 
             message: "Internal Server Error",

src/controllers/passwordReset.controllers.js

@@ -1,17 +1,17 @@
 import PasswordResetRepository from "../repository/passwordReset.repository.js";
 import PasswordResetService from "../services/passwordReset.service.js";
-// import EmailService from "../services/email.service.js";
+import EmailService from "../services/email.service.js";
 import logger from "../config/logger.js";
 
 const passwordResetService = new PasswordResetService(
     new PasswordResetRepository(),
-    // new EmailService({
+    new EmailService({
-    //     host: process.env.SMTP_HOST,
+        host: process.env.SMTP_HOST,
-    //     port: process.env.SMTP_PORT,
+        port: process.env.SMTP_PORT,
-    //     user: process.env.SMTP_USER,
+        user: process.env.SMTP_USER,
-    //     pass: process.env.SMTP_PASS,
+        pass: process.env.SMTP_PASS,
-    //     from: process.env.EMAIL_FROM,
+        from: process.env.EMAIL_FROM,
-    // })
+    })
 );
 
 // VA: Request password reset

src/controllers/va/vaProjects/vaProjectLog.controller.js

@@ -189,47 +189,47 @@ async function va_project_log_callback(req, res) {
 
         const createdLog = await LoggedModel.create({ loggedType: type, vaId, vaEmail, projectId })
 // console.log(createdLog)
-        try {
+        // try {
-            const salesforceUrl = `${process.env.SF_DOCTRACKER_API_URL}services/apexrest/docva/api/va-project-log`;
+        //     const salesforceUrl = `${process.env.SF_DOCTRACKER_API_URL}services/apexrest/docva/api/va-project-log`;
-            const sfData = {
+        //     const sfData = {
-                    "_id": createdLog._id,
+        //             "_id": createdLog._id,
-                    "loggedType": type,
+        //             "loggedType": type,
-                    "vaId":  vaId,
+        //             "vaId":  vaId,
-                    "vaEmail": vaEmail,
+        //             "vaEmail": vaEmail,
-                    "projectId": projectId,
+        //             "projectId": projectId,
-                    "time":  createdLog.time,
+        //             "time":  createdLog.time,
-                }
+        //         }
 
-            const response = await fetch(salesforceUrl, {
+        //     const response = await fetch(salesforceUrl, {
-                method: 'POST',
+        //         method: 'POST',
-                headers: {
+        //         headers: {
-                    'Content-Type': 'application/json',
+        //             'Content-Type': 'application/json',
-                    // Add any required headers for Salesforce authentication
+        //             // Add any required headers for Salesforce authentication
-                    // 'Authorization': 'Bearer ' + process.env.SF_ACCESS_TOKEN
+        //             // 'Authorization': 'Bearer ' + process.env.SF_ACCESS_TOKEN
-                },
+        //         },
-                body: JSON.stringify(sfData)
+        //         body: JSON.stringify(sfData)
-            });
+        //     });
             
-            if (!response.ok) {
+        //     if (!response.ok) {
-                const errorText = await response.text();
+        //         const errorText = await response.text();
-                throw new Error(`Salesforce API responded with status ${response.status}: ${errorText}`);
+        //         throw new Error(`Salesforce API responded with status ${response.status}: ${errorText}`);
-            }
+        //     }
 
-            const result = await response.json();
+        //     const result = await response.json();
-            // console.log("✅ Successfully synced VA data to Salesforce:", result);
+        //     // console.log("✅ Successfully synced VA data to Salesforce:", result);
             
-            res.status(201).json({ success: true, message: `${type} Successfully`, logId: createdLog._id, SyncSalesforce: result });
+        //     res.status(201).json({ success: true, message: `${type} Successfully`, logId: createdLog._id, SyncSalesforce: result });
-        } catch (error) {
+        // } catch (error) {
-            console.error("Failed to sync with Salesforce:", error.message);
+        //     console.error("Failed to sync with Salesforce:", error.message);
-            console.log(error)
+        //     console.log(error)
             
-            // Create a custom error to distinguish Salesforce errors
+        //     // Create a custom error to distinguish Salesforce errors
-            const salesforceError = new Error(`Salesforce sync failed: ${error.message}`);
+        //     const salesforceError = new Error(`Salesforce sync failed: ${error.message}`);
-            salesforceError.isSalesforceError = true;
+        //     salesforceError.isSalesforceError = true;
-            throw salesforceError;
+        //     throw salesforceError;
-        }
+        // }
 
-        // return res.status(201).send({ success: true, message: `${type} Successfully`, logId: createdLog._id });
+        return res.status(201).send({ success: true, message: `${type} Successfully`, logId: createdLog._id });
 
     } catch (error) {
         return res.status(500).send("Internal Server Error");

src/helper/updateEntityRelationships.js

@@ -234,7 +234,7 @@ async function removeEntityRelationships(data) {
                     }}
                 );
             }
-            
+
             // Remove projectId from VAs
             if (vaId && Array.isArray(vaId)) {
                 // await VAModel.updateMany(

src/server.js

@@ -26,6 +26,19 @@ const app = express();
 const server = new createServer(app);
 const io = new Server(server);
 
+app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
+	console.log("⚠️ Certificate error:", url);
+
+	// Allow for ngrok only
+	if (url.includes("ngrok")) {
+		event.preventDefault();
+		callback(true);   // approve the certificate
+	} else {
+		callback(false);  // reject others
+	}
+});
+
+
 app.on('certificate-error', (event, webContents, url, error, certificate, callback) => {
 	console.log("⚠️ Certificate error:", url);
 
@@ -77,11 +90,10 @@ app.get('/varegister/:sf_token?', (req, res) => {
 	const { sf_token } = req.params;
 
 	try {
-		// const decoded = jwt.verify(sf_token, process.env.JWT_SECRET_SF_TOKEN);
+		const decoded = jwt.verify(sf_token, process.env.JWT_SECRET_SF_TOKEN);
 
 		if (decoded) {
-			const email = decoded.email;
+			res.render('va_register', { title: "VA Registration" });
-			res.render('va_register', { title: "VA Registration", email });
 		} else {
 			res.render('not_found', { title: "VA Registration" });
 		}
@@ -102,8 +114,7 @@ app.get('/clientregister/:sf_token?', (req, res) => {
 		const decoded = jwt.verify(sf_token, process.env.JWT_SECRET_SF_TOKEN);
 
 		if (decoded) {
-			const email = decoded.email;
+			res.render('va_client_register', { title: "Client Registration" });
-			res.render('va_client_register', { title: "Client Registration", email });
 		} else {
 			res.render('not_found', { title: "Client Registration" });
 		}

src/services/passwordReset.service.js

@@ -2,26 +2,25 @@ import jwt from "jsonwebtoken";
 import bcrypt from "bcrypt";
 import { VAModel, ClientModel } from "../models/vaModel.js";
 import logger from "../config/logger.js";
-import axios from "axios";
 
 class PasswordResetService {
-  constructor(passwordResetRepository) {
+  constructor(passwordResetRepository, emailService) {
     this.passwordResetRepository = passwordResetRepository;
-    // this.emailService = emailService;
+    this.emailService = emailService;
   }
 
   async requestPasswordReset(email, userType) {
     try {
       // Determine which model to use
       const userModel = userType === 'va' ? VAModel : ClientModel;
-
+      
       // Check if user exists
       const user = await userModel.findOne({ "userDetails.email": email.toLowerCase() });
       if (!user) {
         logger.info(`Password reset requested for non-existent ${userType}: ${email}`);
-        return {
+        return { 
-          success: false,
+          success: false, 
-          message: "Email not recognized. Please sign up to continue."
+          message: "Email not recognized. Please sign up to continue." 
         };
       }
 
@@ -30,7 +29,7 @@ class PasswordResetService {
 
       // Generate JWT token
       const token = jwt.sign(
-        {
+        { 
           email: email.toLowerCase(),
           userType: userType,
           type: 'password_reset'
@@ -61,9 +60,9 @@ class PasswordResetService {
       await this.sendResetEmail(email, resetLink, userType);
 
       logger.info(`Password reset token created for ${userType}: ${email}`);
-      return {
+      return { 
-        success: true,
+        success: true, 
-        message: "If the email exists, a reset link has been sent"
+        message: "If the email exists, a reset link has been sent" 
       };
 
     } catch (error) {
@@ -93,10 +92,10 @@ class PasswordResetService {
         return { valid: false, message: "Invalid or expired token" };
       }
 
-      return {
+      return { 
-        valid: true,
+        valid: true, 
         email: decoded.email,
-        userType: decoded.userType
+        userType: decoded.userType 
       };
 
     } catch (error) {
@@ -130,7 +129,7 @@ class PasswordResetService {
       const userModel = userType === 'va' ? VAModel : ClientModel;
 
       // Check if user exists and has matching token
-      const user = await userModel.findOne({
+      const user = await userModel.findOne({ 
         "userDetails.email": decoded.email,
         passwordResetToken: token
       });
@@ -151,12 +150,12 @@ class PasswordResetService {
       await resetRecord.save();
 
       // Send confirmation email
-      // await this.sendPasswordChangedEmail(decoded.email, userType);
+      await this.sendPasswordChangedEmail(decoded.email, userType);
 
       logger.info(`Password successfully reset for ${userType}: ${decoded.email}`);
-      return {
+      return { 
-        success: true,
+        success: true, 
-        message: "Password has been reset successfully"
+        message: "Password has been reset successfully" 
       };
 
     } catch (error) {
@@ -167,15 +166,16 @@ class PasswordResetService {
 
   async sendResetEmail(email, resetLink, userType) {
     try {
-      const userTypeText = userType === 'va' ? 'VA' : 'CLIENT';
+      const userTypeText = userType === 'va' ? 'Virtual Assistant' : 'Client';
+      
+      const emailData = {
+        to: email,
+        subject: `${userTypeText} - Password Reset Request`,
+        html: this.generateResetEmailTemplate(resetLink, userTypeText),
+      };
 
-      await axios.post(`${process.env.SF_DOCTRACKER_API_URL}services/apexrest/docva/api/forgot-password`, {
+      await this.emailService.sendEmail(emailData);
-        data: {
+      logger.info(`Password reset email sent to ${userType}: ${email}`);
-          email: email,
-          url: resetLink,
-          userType: userTypeText
-        }
-      });
 
     } catch (error) {
       logger.error(`PasswordReset Service - sendResetEmail error for ${userType}: ${error.message}`);
@@ -186,7 +186,7 @@ class PasswordResetService {
   async sendPasswordChangedEmail(email, userType) {
     try {
       const userTypeText = userType === 'va' ? 'Virtual Assistant' : 'Client';
-
+      
       const emailData = {
         to: email,
         subject: `${userTypeText} - Password Changed Successfully`,

views/client/dashboard-dashboard.ejs

@@ -272,6 +272,7 @@
             <tr>
                 <td>
                     <div class="status-indicator">
+                        <div class="status-dot ${statusClass}"></div>
                         <span class="status-text ${statusClass}">${statusText}</span>
                     </div>
                 </td>
@@ -328,14 +329,14 @@
                     vaEmptyState.style.display = 'none';
                     
                     // Add event listeners to view links
-                    // document.querySelectorAll('.view-link').forEach(link => {
+                    document.querySelectorAll('.view-link').forEach(link => {
-                    //     link.addEventListener('click', function(e) {
+                        link.addEventListener('click', function(e) {
-                    //         e.preventDefault();
+                            e.preventDefault();
-                    //         const vaId = this.getAttribute('data-va-id');
+                            const vaId = this.getAttribute('data-va-id');
-                    //         // You can update this link as needed
+                            // You can update this link as needed
-                    //         window.location.href = `/client/virtual-assistants/${vaId}`;
+                            window.location.href = `/client/virtual-assistants/${vaId}`;
-                    //     });
+                        });
-                    // });
+                    });
                 } else {
                     vaTableBody.innerHTML = '';
                     vaTableBody.style.display = 'none';

views/client/dashboard-projects.ejs

@@ -132,45 +132,10 @@
                             </div>
                         </div>
                     </div>
+                    
                 </div>
             </main>
         </div>
-        <div id="projectModal" class="modal-overlay">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h2 class="modal-title" id="modalProjectName">Project Details</h2>
-                </div>
-                <div class="modal-body">                    
-                    <div class="va-details-section">
-                        <h3 class="va-section-title">
-                            <i class="fas fa-users"></i>
-                            Virtual Assistants
-                            <span class="va-count-badge" id="vaCountBadge">0</span>
-                        </h3>
-                        
-                        <div class="va-table-container">
-                            <table class="va-table">
-                                <thead>
-                                    <tr>
-                                        <th>Virtual Assistant</th>
-                                        <th>Status</th>
-                                        <th>Activity</th>
-                                    </tr>
-                                </thead>
-                                <tbody id="modalVATableBody">
-                                    <!-- VA details will be loaded here -->
-                                </tbody>
-                            </table>
-                            <div id="modalNoVAs" class="no-vas-message" style="display: none;">
-                                <i class="fas fa-user-friends"></i>
-                                <h4>No Virtual Assistants</h4>
-                                <p>No VAs are currently assigned to this project.</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
     </div>
 <script>
     // Theme management
@@ -237,107 +202,16 @@
         }
     }
 
-   // Modal management
+   function createProjectTableRow(project, allVAs) {
-    const projectModal = document.getElementById('projectModal');
-    const modalClose = document.getElementById('modalClose');
-    const modalProjectName = document.getElementById('modalProjectName');
-    const modalVATableBody = document.getElementById('modalVATableBody');
-    const modalNoVAs = document.getElementById('modalNoVAs');
-    const vaCountBadge = document.getElementById('vaCountBadge');
-
-    function openProjectModal(project) {
-        // Set project name
-        modalProjectName.textContent = project.name || 'Unnamed Project';
-        
-        // Set project info
-        const hourlyRate = project.hourlyRate ? `$${project.hourlyRate}/hr` : 'Not set';
-        const dedicatedHours = project.dedicatedHours || 'Not set';
-        const statusText = project.status === 'ACTIVE' ? 'Active' : 'Inactive';
-        const statusClass = project.status === 'ACTIVE' ? 'active' : 'inactive';
-        
-        // Set VA details
-        const assignedVAs = project.assignedVADetails || [];
-        vaCountBadge.textContent = assignedVAs.length;
-        
-        if (assignedVAs.length > 0) {
-            modalVATableBody.innerHTML = assignedVAs.map(va => createVATableRow(va)).join('');
-            modalVATableBody.style.display = '';
-            modalNoVAs.style.display = 'none';
-        } else {
-            modalVATableBody.innerHTML = '';
-            modalVATableBody.style.display = 'none';
-            modalNoVAs.style.display = 'block';
-        }
-        
-        // Show modal
-        projectModal.style.display = 'block';
-        document.body.style.overflow = 'hidden';
-    }
-
-    function createVATableRow(va) {
-        const statusClass = va.status === 'FULLTIME' ? 'active' : 'inactive';
-        const statusText = va.status === 'FULLTIME' ? 'Full Time' : 
-                            va.status === 'PARTTIME' ? 'Part Time' : 'Inactive';
-        
-        const activityClass = va.isActive ? 'active' : 'inactive';
-        const activityText = va.isActive ? 'Currently Active' : 'Not Active';
-        
-        // Get initials for avatar
-        const initials = (va.firstName?.charAt(0) || '') + (va.lastName?.charAt(0) || '') || 'VA';
-        
-        return `
-            <tr>
-                <td>
-                    <div class="va-name">
-                        <div class="va-avatar">${initials}</div>
-                        <div class="va-details">
-                            <span class="va-fullname">${va.firstName} ${va.lastName}</span>
-                            <span class="va-email">${va.email}</span>
-                        </div>
-                    </div>
-                </td>
-                <td>
-                    <div class=" ${statusClass}">
-                        ${statusText}
-                    </div>
-                </td>
-                <td>
-                    <div class="activity-status">
-                        <div class="activity-dot ${activityClass}"></div>
-                        <span>${activityText}</span>
-                    </div>
-                </td>
-            </tr>
-        `;
-    }
-
-    function closeProjectModal() {
-        projectModal.style.display = 'none';
-        document.body.style.overflow = 'auto';
-    }
-
-    // Close modal when clicking outside
-    projectModal.addEventListener('click', (e) => {
-        if (e.target === projectModal) {
-            closeProjectModal();
-        }
-    });
-
-    // Close modal with escape key
-    document.addEventListener('keydown', (e) => {
-        if (e.key === 'Escape' && projectModal.style.display === 'block') {
-            closeProjectModal();
-        }
-    });
-
-    function createProjectTableRow(project) {
         const statusClass = project.status === 'ACTIVE' ? 'active' : 'inactive';
         const statusText = project.status === 'ACTIVE' ? 'Active' : 'Inactive';
         const hourlyRate = project.hourlyRate ? `$${project.hourlyRate}/hr` : '-';
         const dedicatedHours = project.dedicatedHours ? `${project.dedicatedHours}` : '-';
+        console.log(project)
+        console.log(allVAs)
         
         return `
-            <tr class="project-row" data-project-id="${project.id}">
+            <tr class="project-row" data-project-id="${project.id}" data-project-name="${project.name}">
                 <td>
                     <div class="project-info">
                         <div class="project-name">${project.name || 'Unnamed Project'}</div>
@@ -353,15 +227,41 @@
                     <span class="dedicated-hours">${dedicatedHours}</span>
                 </td>
                 <td>
-                    <div class="status-badge ${statusClass}">
+                    <div class="">
                         <div class="status-dot ${statusClass}"></div>
-                        <span class="status-text">${statusText}</span>
+                        <span class="status-text ${statusClass}">${statusText}</span>
                     </div>
                 </td>
             </tr>
         `;
     }
+
+    // Create VA table row HTML
+    // function createVATableRow(va) {
+    //     const statusClass = va.status === 'active' ? 'active' : 'inactive';
+    //     const statusText = va.status === 'active' ? 'Active' : 'Inactive';
+    //     const fullName = `${va.firstName || ''} ${va.lastName || ''}`.trim() || 'Unknown';
         
+    //     return `
+    //         <tr>
+    //             <td>
+    //                 <div class="va-info">
+    //                     <div class="va-name">${fullName}</div>
+    //                 </div>
+    //             </td>
+    //             <td>
+    //                 <span class="va-email">${va.email || 'N/A'}</span>
+    //             </td>
+    //             <td>
+    //                 <div class="status-indicator">
+    //                     <div class="status-dot ${statusClass}"></div>
+    //                     <span class="status-text ${statusClass}">${statusText}</span>
+    //                 </div>
+    //             </td>
+    //         </tr>
+    //     `;
+    // }
+    
     // Load dashboard data
     async function loadDashboardData() {
         try {
@@ -369,6 +269,7 @@
             if (!response) return;
             
             const result = await response.json();
+            
             if (result.success) {
                 const data = result.data;
                 const counts = result.counts;
@@ -380,17 +281,20 @@
                 const projectsTableBody = document.getElementById('projectsTableBody');
                 const projectsEmptyState = document.getElementById('projectsEmptyState');
                 const projects = data.projects || [];
+                const vas = data.vas || [];
                 
                 if (projects.length > 0) {
-                    projectsTableBody.innerHTML = projects.map(project => createProjectTableRow(project)).join('');
+                    projectsTableBody.innerHTML = projects.map(project => createProjectTableRow(project, vas)).join('');
                     projectsTableBody.style.display = '';
                     projectsEmptyState.style.display = 'none';
                     
                     // Add click event listeners to project rows
-                    document.querySelectorAll('.project-row').forEach((row, index) => {
+                    document.querySelectorAll('.project-row').forEach(row => {
                         row.addEventListener('click', function() {
-                            const project = projects[index];
+                            const projectId = this.getAttribute('data-project-id');
-                            openProjectModal(project);                            
+                            const projectName = this.getAttribute('data-project-name');
+                            console.log(projectName)
+                            
                         });
                     });
                 } else {

views/client/dashboard-virtual-assistants.ejs

@@ -272,6 +272,7 @@
             <tr>
                 <td>
                     <div class="status-indicator">
+                        <div class="status-dot ${statusClass}"></div>
                         <span class="status-text ${statusClass}">${statusText}</span>
                     </div>
                 </td>
@@ -326,6 +327,16 @@
                     vaTableBody.innerHTML = allVAs.map(va => createVATableRow(va)).join('');
                     vaTableBody.style.display = '';
                     vaEmptyState.style.display = 'none';
+                    
+                    // Add event listeners to view links
+                    document.querySelectorAll('.view-link').forEach(link => {
+                        link.addEventListener('click', function(e) {
+                            e.preventDefault();
+                            const vaId = this.getAttribute('data-va-id');
+                            // You can update this link as needed
+                            window.location.href = `/client/virtual-assistants/${vaId}`;
+                        });
+                    });
                 } else {
                     vaTableBody.innerHTML = '';
                     vaTableBody.style.display = 'none';

views/client_login.ejs

@@ -213,7 +213,7 @@
 <body>
 
     <div class="logo">
-        <img id="logo-img" src="/public/images/logo-white-vertical.svg" alt="DocVA Logo" />
+        <img src="/public/images/logo-white-vertical.svg" alt="DocVA Logo" />
     </div>
 
     <div class="login-card">
@@ -224,7 +224,7 @@
             <input type="password" name="password" placeholder="Enter your password *" required />
             <a href="/client/forgot-password" class="forgot">Forgot password?</a>
 
-            <button type="submit" class="btn btn-primary">Log in using password</button>
+            <button type="submit" class="btn btn-primary">🔒 Log in using password</button>
 
             <!-- <div class="divider">OR</div>
 
@@ -236,10 +236,6 @@
         const root = document.documentElement;
 
         function setTheme(theme) {
-            document.getElementById("logo-img").src =
-                theme === "dark"
-                    ? "/public/images/logo-white-vertical.svg"
-                    : "/public/images/logo-colored-vertical.svg";
             root.setAttribute("data-theme", theme);
         }
 
@@ -280,7 +276,7 @@
                 if (!res.ok) {
                     throw new Error(data.message || "Login failed");
                 }
-
+                
                 if (data.success) {
                     // 🟢 Save token
                     localStorage.setItem("knoptpq", data.accessToken);

views/download_tracker.ejs

@@ -139,7 +139,7 @@
     <script>
         const osButtons = document.querySelectorAll(".os-btn");
         const downloadBtn = document.getElementById("downloadBtn");
-        const version = "<%= version || '1.1.1' %>";
+        const version = "<%= version || '3.2.1' %>";
 
         let selectedOS = "windows";
 
@@ -171,13 +171,7 @@
 
         // -------- Download --------
         downloadBtn.addEventListener("click", () => {
-
+            window.location.href = `/download-file?os=${selectedOS}`;
-            const link = document.createElement("a");
-            link.href = `/public/builds/build-1.1.1.1/windows/VA Tracker-Setup-1.1.1.exe`;
-            link.setAttribute("download", "");
-            link.click()
-
-            // window.location.href = ``;
         });
     </script>
 

views/va_client_register.ejs

@@ -107,7 +107,7 @@
                         </div>
                         <div class="form-group">
                             <div class="input-container">
-                                <input type="email" id="email" class="input-field" placeholder=" "  value="<%= email %>" readonly disabled required>
+                                <input type="email" id="email" class="input-field" placeholder=" " required>
                                 <label for="email" class="input-label">Email *</label>
                             </div>
                         </div>

views/va_register.ejs

@@ -174,7 +174,7 @@
                     <form id="account-form">
                         <div class="form-group">
                             <div class="input-container">
-                                <input type="email" id="email" class="input-field" placeholder=" "  value="<%= email %>" readonly disabled required>
+                                <input type="email" id="email" class="input-field" placeholder=" " required autocomplete="username">
                                 <label for="email" class="input-label">Email Address *</label>
                             </div>
                         </div>
@@ -184,6 +184,10 @@
                                 <input type="password" id="password" class="input-field" placeholder=" " required autocomplete="new-password">
                                 <label for="password" class="input-label">Create Password *</label>
                             </div>
+                            <div class="password-actions">
+                                <button type="button" class="password-toggle" onclick="togglePasswordVisibility()">Show Password</button>
+                                <button type="button" class="password-generate" onclick="generatePassword()">Generate Strong Password</button>
+                            </div>
                         </div>
                         
                         <div class="form-group">
@@ -192,10 +196,6 @@
                                 <label for="confirmPassword" class="input-label">Confirm Password *</label>
                             </div>
                             <div class="invalid-feedback" id="password-match-error" style="display: none; color: #dc3545; font-size: 12px; margin-top: 5px;">Passwords do not match</div>
-                            <div class="password-actions">
-                                <button type="button" class="password-toggle" onclick="togglePasswordVisibility()">Show Password</button>
-                                <button type="button" class="password-generate" onclick="generatePassword()">Generate Strong Password</button>
-                            </div>
                         </div>
                         
                         <div class="form-actions">
@@ -263,7 +263,7 @@
                             <div class="form-group">
                                 <div class="input-container">
                                     <select id="country" class="select-field" required onchange="handleChangeSelect(this)">
-                                        <option value="" disabled selected></option>
+                                        <option value=""></option>
                                     </select>
                                     <label for="country" class="input-label">Country *</label>
                                 </div>
@@ -273,7 +273,7 @@
                         <div class="form-group">
                             <div class="input-container">
                                 <select id="state" class="select-field" required onchange="handleChangeSelect(this)">
-                                    <!-- <option value=""></option> -->
+                                    <option value=""></option>
                                 </select>
                                 <label for="state" class="input-label">State / Region *</label>
                                 <div class="location-loading" id="state-loading">Loading states...</div>