From a630af953eceaaec2cee456d6ae53af38e195c46 Mon Sep 17 00:00:00 2001 From: iamrahimi Date: Mon, 20 Jan 2025 15:29:30 -0800 Subject: [PATCH] error fix for API, project eplorer --- src/app.js | 2 +- src/controllers/projectController.js | 3 ++- src/routes/authRouter.js | 4 ++-- src/routes/mainRouter.js | 10 ++++++++-- src/routes/projectRouter.js | 9 ++++----- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/app.js b/src/app.js index 3387246..73f6ba3 100644 --- a/src/app.js +++ b/src/app.js @@ -25,7 +25,7 @@ const authenticateToken = require('./middlewares/authMiddleware'); app.use('/api/v1', authRouter); app.use('/api/v1', userRouter); -app.use('/api/v1', authenticateToken, mainRouter); +app.use('/api/v1', mainRouter); app.use('/api/v1', authenticateToken, projectRouter); diff --git a/src/controllers/projectController.js b/src/controllers/projectController.js index aa798e5..67d8dba 100644 --- a/src/controllers/projectController.js +++ b/src/controllers/projectController.js @@ -254,6 +254,7 @@ const projectController = { parseInt(user_id, 10), parseInt(project_id, 10) ); + return res.status(200).json(result); }else { return res.status(405).json({ success: false, @@ -262,7 +263,7 @@ const projectController = { } - return res.status(200).json(result); + } catch (error) { return res.status(500).json({ success: false, diff --git a/src/routes/authRouter.js b/src/routes/authRouter.js index 30a065b..84a8ece 100644 --- a/src/routes/authRouter.js +++ b/src/routes/authRouter.js @@ -1,6 +1,7 @@ const express = require('express'); const { loginUser } = require('../services/authService'); -const { forgotPassword, resetPassword, changePassword } = require('../controllers/authController'); +const { forgotPassword, resetPassword } = require('../controllers/authController'); + const router = express.Router(); @@ -40,7 +41,6 @@ router.post('/logout', async (req, res) => { }); router.post('/forgot-password', forgotPassword); -router.get('/change-password/:token', changePassword); router.post('/reset-password/:token', resetPassword); module.exports = router; \ No newline at end of file diff --git a/src/routes/mainRouter.js b/src/routes/mainRouter.js index 68b7bf8..81b0d2e 100644 --- a/src/routes/mainRouter.js +++ b/src/routes/mainRouter.js @@ -1,7 +1,13 @@ const express = require('express'); const router = express.Router(); -const mainController = require('../controllers/mainController.js'); +const projectController = require('../controllers/projectController'); -router.get('/', mainController.get); + +router.get('/projects', projectController.getAllProjects); // Endpoint to get all projects +router.get('/projects/:id', projectController.getProjectById); // Endpoint to get a specific project by ID +router.get('/dashboard', projectController.dashboard); // endpoint for getting total project, comments and users. +router.get('/projects/:id', projectController.getProjectById); // Endpoint to get a specific project by ID +router.get('/comments/:project_id', projectController.getCommentsByProjectId); // Endpoint to get all comments for a specific project +router.get('/likes/:project_id', projectController.getLikesByProjectId); //Endpoint for get all likes for a specific project module.exports = router; \ No newline at end of file diff --git a/src/routes/projectRouter.js b/src/routes/projectRouter.js index a4db068..eb10a3b 100644 --- a/src/routes/projectRouter.js +++ b/src/routes/projectRouter.js @@ -2,17 +2,16 @@ const express = require('express'); const router = express.Router(); const projectController = require('../controllers/projectController'); -router.get('/dashboard', projectController.dashboard); // endpoint for getting total project, comments and users. -router.get('/projects', projectController.getAllProjects); // Endpoint to get all projects -router.get('/projects/:id', projectController.getProjectById); // Endpoint to get a specific project by ID + + + router.post('/addproject', projectController.addProject); // Endpoint to add a new project router.put('/updateproject/:project_id', projectController.updateProject); // Endpoint to update a project router.get('/userprojects/', projectController.getProjectsByUser); // Endpoint to get all projects by a specific user router.post('/addcomment/:project_id', projectController.addComment); // Endpoint to add a comment to a project -router.get('/comments/:project_id', projectController.getCommentsByProjectId); // Endpoint to get all comments for a specific project router.delete("/deleteproject/:project_id", projectController.deleteProject); // Endpoint to delete a project router.post('/addlike/:project_id', projectController.addLike); // Endpoint to add a like to a project router.delete('/removelike/:project_id', projectController.removeLike); // Endpoint to delete a like from the project -router.get('/likes/:project_id', projectController.getLikesByProjectId); //Endpoint for get all likes for a specific project + module.exports = router; \ No newline at end of file