Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions backend/controllers/userController.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const User = require('../models/user');
const AlumniProfile = require('../models/alumni-profile');
const { Op } = require('sequelize');
const bcrypt = require('bcryptjs');
const { generateAuthToken } = require('../middleware/authMiddleware');
Expand Down Expand Up @@ -114,6 +115,54 @@ class UserController {
}
}

// Search Alumni Profiles
async searchProfiles(req, res) {
try {
const { name, graduationYear, company } = req.query;
console.log(req.query);
// Build the where clause based on search parameters
const whereClause = {};

if (name) {
whereClause[Op.or] = [
{ firstName: { [Op.iLike]: `%${name}%` } },
{ lastName: { [Op.iLike]: `%${name}%` } }
];
}

if (graduationYear) {
whereClause.graduationYear = graduationYear;
}

if (company) {
whereClause.company = { [Op.iLike]: `%${company}%` };
}

// Find alumni profiles that match the criteria
const alumni = await AlumniProfile.findAll({
where: whereClause,
order: [['lastName', 'ASC'], ['firstName', 'ASC']],
attributes: [
'id', 'firstName', 'lastName', 'graduationYear',
'degreeProgram', 'major', 'company', 'jobTitle', 'privacySettings','email','phone'
]
});

// Only return public profiles unless user has admin role
const filteredAlumni = req.user?.role === 'admin'
? alumni
: alumni.filter(profile => profile.privacySettings === 'public');

res.json({
alumni: filteredAlumni,
total: filteredAlumni.length
});
} catch (error) {
console.error('Error searching alumni profiles:', error);
res.status(500).json({ error: error.message });
}
}

// Change user password
async changePassword(req, res) {
try {
Expand Down
2 changes: 2 additions & 0 deletions backend/routes/userRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ router.patch('/change-password', authenticateUser, userController.changePassword
// Deactivate user account (PATCH for clarity)
router.patch('/deactivate-account', authenticateUser, userController.deactivateAccount);

router.get('/search', userController.searchProfiles);
// List all users (Admin only)
router.get('/', authenticateUser, authorizeRoles('admin'), userController.listUsers);


module.exports = router;
6 changes: 5 additions & 1 deletion frontend/src/app/alumni/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ const AlumniDashboard = () => {
router.push("/jobs/create");
}

const editJob = (jobId) =>{
router.push(`/jobs/edit/${jobId}`);
}

// Use actual data if available, otherwise use fallback
const displayUser = user ;
const displayEvents = userEvents;
Expand Down Expand Up @@ -396,7 +400,7 @@ const AlumniDashboard = () => {
{displayJobs
.filter(job => job.poster.id === displayUser.userId)
.map(job => (
<div key={job.id} className="border-b border-gray-100 pb-3 last:border-0 last:pb-0">
<div onClick={()=>editJob(job.id)} key={job.id} className="border-b border-gray-100 pb-3 last:border-0 last:pb-0">
<h4 className="font-medium text-gray-800">{job.jobTitle}</h4>
<p className="text-md text-gray-600">{job.companyName} • {job.location}</p>
<div className="flex justify-between items-center mt-1">
Expand Down
Loading