From 9bd73cd0da8772db0ebf82ed7e6130adf0b6e5bf Mon Sep 17 00:00:00 2001 From: "codeshwar-preview[bot]" <160849357+codeshwar-preview[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:28:09 +0000 Subject: [PATCH] Update files in jobs-72 --- public/js/interactivity.js | 3 +-- routes/authRoutes.js | 11 ++++------- routes/jobRoutes.js | 5 ++--- views/jobListing.ejs | 8 ++++---- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/public/js/interactivity.js b/public/js/interactivity.js index dc75b3e..9db1390 100644 --- a/public/js/interactivity.js +++ b/public/js/interactivity.js @@ -1,4 +1,3 @@ -document.addEventListener('DOMContentLoaded', function() { document.getElementById('loginForm').addEventListener('submit', function(e) { e.preventDefault(); const username = document.getElementById('username').value; @@ -83,7 +82,7 @@ function handleLogin(username, password) { .then((response) => response.json()) .then((data) => { if (data.message === 'Login successful') { - window.location.href = '/profile'; + window.location.href = '/jobs'; } else { alert(data.message); } diff --git a/routes/authRoutes.js b/routes/authRoutes.js index 394fdf5..258b496 100644 --- a/routes/authRoutes.js +++ b/routes/authRoutes.js @@ -1,7 +1,7 @@ -const express = require('express'); const router = express.Router(); const User = require('../models/User'); const { requireAuth, alreadyLoggedIn } = require('./middleware/authMiddleware'); +const sessionManagement = require('./utils/sessionManagement'); const validateUserInput = (username, password, email = '') => { const isValidEmail = email => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email); @@ -35,7 +35,7 @@ router.post('/register', async (req, res) => { const user = new User({ username, password, email, domainOfInterest, linkedinUrl, currentCompany, currentLevel }); await user.save(); req.session.userId = user._id; - res.redirect('/login'); // Modified line: Redirecting user to login page after successful registration + res.redirect('/login'); } catch (error) { res.status(500).json({ message: 'Error registering user', error: error.message }); } @@ -62,8 +62,7 @@ router.post('/login', async (req, res) => { domainOfInterest: user.domainOfInterest }; req.session.userId = user._id; - res.json({ message: 'Login successful', user: userInfo }); - + res.redirect('/jobs'); } catch (error) { res.status(500).json({ message: 'Error logging in', error: error.message }); } @@ -75,7 +74,6 @@ router.get('/logout', requireAuth, (req, res) => { return res.status(500).json({ message: 'Error logging out', error: err }); } res.clearCookie('connect.sid'); - // Modified line: Redirecting user to index page after successful logout res.redirect('/'); }); }); @@ -101,5 +99,4 @@ router.get('/profile', requireAuth, async (req, res) => { } }); - -module.exports = router; +module.exports = router; \ No newline at end of file diff --git a/routes/jobRoutes.js b/routes/jobRoutes.js index 3987d5a..3d37c55 100644 --- a/routes/jobRoutes.js +++ b/routes/jobRoutes.js @@ -1,7 +1,6 @@ -const express = require('express'); const router = express.Router(); const Job = require('../models/Job'); -const { requireAuth, alreadyLoggedIn} = require('./middleware/authMiddleware'); +const { requireAuth, alreadyLoggedIn } = require('./middleware/authMiddleware'); router.get('/jobpost', (req, res) => { res.render('jobpost.ejs'); @@ -29,4 +28,4 @@ router.get('/jobs', async (req, res) => { } }); -module.exports = router; +module.exports = router; \ No newline at end of file diff --git a/views/jobListing.ejs b/views/jobListing.ejs index 0349452..c8d1f91 100644 --- a/views/jobListing.ejs +++ b/views/jobListing.ejs @@ -1,4 +1,3 @@ -
@@ -9,7 +8,7 @@ width: 80%; margin: 20px auto; font-family: Arial, sans-serif; - text-align: center; /* Center align the content */ + text-align: center; } .job-listing { background-color: #f9f9f9; @@ -29,7 +28,7 @@ padding: 5px 10px; margin: 5px 0; border-radius: 4px; - background-color: #007bff; /* Modified color */ + background-color: #007bff; color: white; text-decoration: none; font-size: 12px; @@ -65,4 +64,5 @@No job listings available at the moment.
<% } %> - \ No newline at end of file + +