From 66d5f1bebfe4c877606a26329f08258ac117e61b Mon Sep 17 00:00:00 2001 From: Reem-Kamal-Ghoniem Date: Wed, 7 Feb 2024 00:11:15 +0200 Subject: [PATCH 1/3] delete, update project --- src/app.js | 15 ++++---- src/controllers/projectControllers.js | 13 +++++++ src/controllers/user.js | 26 -------------- src/controllers/userControllers.js | 52 +++++++++++++++++++++++++++ src/routes/projectRoutes.js | 0 src/routes/user.js | 8 ----- src/routes/userRoutes.js | 11 ++++++ 7 files changed, 83 insertions(+), 42 deletions(-) create mode 100644 src/controllers/projectControllers.js delete mode 100644 src/controllers/user.js create mode 100644 src/controllers/userControllers.js create mode 100644 src/routes/projectRoutes.js delete mode 100644 src/routes/user.js create mode 100644 src/routes/userRoutes.js diff --git a/src/app.js b/src/app.js index 591ca25..3b1776c 100644 --- a/src/app.js +++ b/src/app.js @@ -1,9 +1,7 @@ import express from "express"; -import login from './routes/login.js'; -const bodyParser = require('body-parser'); -const register = require('./routes/user.js'); - - +import user from './routes/userRoutes.js'; +import project from './routes/projectRoutes.js'; +import bodyParser from 'body-parser'; const app = express(); const port = 3000; @@ -12,8 +10,9 @@ app.use(express.json()); app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: true })); -app.use('/',login); -app.use('/', register); +app.use('/user',user); +app.use('/project', project); + app.get("/", (req, res) => { res.send("Response OK"); @@ -21,4 +20,4 @@ app.get("/", (req, res) => { app.listen(port, () => { console.log(`Server is running on port ${port}`); -}); +}); \ No newline at end of file diff --git a/src/controllers/projectControllers.js b/src/controllers/projectControllers.js new file mode 100644 index 0000000..46dae7b --- /dev/null +++ b/src/controllers/projectControllers.js @@ -0,0 +1,13 @@ +import { deleteProject, updateProject } from '../models/projectModel.js'; + +export const updateProjectControllers= async (req, res) => { + const {projectID, newName} = req.body; + res.send(await updateProject(projectID, newName)); + + }; + + export const deleteProjectControllers= async (req, res) => { + const {projectID} = req.body; + await deleteProject(projectID); + res.send('project deleted'); + }; \ No newline at end of file diff --git a/src/controllers/user.js b/src/controllers/user.js deleted file mode 100644 index 0c48a54..0000000 --- a/src/controllers/user.js +++ /dev/null @@ -1,26 +0,0 @@ -export const loginController = (req,res) => { - const ref_email = "1234@gmail.com" - const ref_pass = "1234"; - let {email, pass } = req.body; - if (email === ref_email && pass == ref_pass) - { - res.send('true\n'); - } - else{ - res.send('entre valid email and password\n') - } -} - - -const users = []; -export const registerController = (req, res) => { - const { email, username, password } = req.body; - - if (users.find((user) => user.email === email)) { - res.send('Email is already registered.'); - } - - users.push({ email, username, password }); - - res.status(201).send('User registered successfully.'); -}; \ No newline at end of file diff --git a/src/controllers/userControllers.js b/src/controllers/userControllers.js new file mode 100644 index 0000000..4f36905 --- /dev/null +++ b/src/controllers/userControllers.js @@ -0,0 +1,52 @@ +import { updateUser } from '../models/userModel'; + + +export const loginUser = (req,res) => { + const ref_email = "1234@gmail.com" + const ref_pass = "1234"; + let {email, pass } = req.body; + if (email === ref_email && pass == ref_pass) + { + res.send('true\n'); + } + else{ + res.send('entre valid email and password\n') + } +} + + +const users = []; +export const registerUser = (req, res) => { + const { email, username, password } = req.body; + + if (users.find((user) => user.email === email)) { + res.send('Email is already registered.'); + } + + users.push({ email, username, password }); + + res.status(201).send('User registered successfully.'); +}; + +export const resetpassUser = async (req, res) => { + const {email, newPassword} = req.body; + const newUser = await updateUser(email, {password: newPassword}) + if (newUser) { + res.send('password updated'); + } + else { + res.send('user not existed, please regestir'); + }; +}; + + +export const updateinfoUser= async (req, res) => { + const {email, newName} = req.body; + const newUser = await updateUser(email, {name: newName}) + if (newUser) { + res.send('name updated'); + } + else { + res.send('user not existed, please regestir'); + }; +}; diff --git a/src/routes/projectRoutes.js b/src/routes/projectRoutes.js new file mode 100644 index 0000000..e69de29 diff --git a/src/routes/user.js b/src/routes/user.js deleted file mode 100644 index e00f96e..0000000 --- a/src/routes/user.js +++ /dev/null @@ -1,8 +0,0 @@ -import express from "express"; -import { loginController, registerController } from '../controllers/user.js'; -const route = express.Router(); - -route.post('/login',loginController); -route.post('/register', registerController); - -export default route; \ No newline at end of file diff --git a/src/routes/userRoutes.js b/src/routes/userRoutes.js new file mode 100644 index 0000000..970419d --- /dev/null +++ b/src/routes/userRoutes.js @@ -0,0 +1,11 @@ +import express from "express"; +import { loginController, registerController} from '../controllers/user.js'; +// , resetpassController, updateinfoController +const route = express.Router(); + +route.post('/login',loginController); +route.post('/register', registerController); +// route.post('/user/reset', resetpassController); +// route.post('/user/update', updateinfoController); + +export default route; \ No newline at end of file From 2fa5be2af321973bf355aa8541af8442e47450b4 Mon Sep 17 00:00:00 2001 From: Reem-Kamal-Ghoniem Date: Sun, 11 Feb 2024 04:47:29 +0200 Subject: [PATCH 2/3] changing function name --- src/controllers/projectControllers.js | 18 +++++++++--------- src/controllers/userControllers.js | 8 ++++---- src/routes/projectRoutes.js | 8 ++++++++ src/routes/userRoutes.js | 15 +++++++-------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/controllers/projectControllers.js b/src/controllers/projectControllers.js index 46dae7b..f23f84d 100644 --- a/src/controllers/projectControllers.js +++ b/src/controllers/projectControllers.js @@ -1,13 +1,13 @@ import { deleteProject, updateProject } from '../models/projectModel.js'; -export const updateProjectControllers= async (req, res) => { - const {projectID, newName} = req.body; - res.send(await updateProject(projectID, newName)); +export const updateProject = async (req, res) => { + const { projectID, newName } = req.body; + res.send(await updateProject(projectID, newName)); - }; +}; - export const deleteProjectControllers= async (req, res) => { - const {projectID} = req.body; - await deleteProject(projectID); - res.send('project deleted'); - }; \ No newline at end of file +export const deleteProject = async (req, res) => { + const { projectID } = req.body; + await deleteProject(projectID); + res.send('project deleted'); +}; \ No newline at end of file diff --git a/src/controllers/userControllers.js b/src/controllers/userControllers.js index 4f36905..ed3d4d0 100644 --- a/src/controllers/userControllers.js +++ b/src/controllers/userControllers.js @@ -1,7 +1,7 @@ import { updateUser } from '../models/userModel'; -export const loginUser = (req,res) => { +export const loginUserControllers = (req,res) => { const ref_email = "1234@gmail.com" const ref_pass = "1234"; let {email, pass } = req.body; @@ -16,7 +16,7 @@ export const loginUser = (req,res) => { const users = []; -export const registerUser = (req, res) => { +export const registerUserControllers = (req, res) => { const { email, username, password } = req.body; if (users.find((user) => user.email === email)) { @@ -28,7 +28,7 @@ export const registerUser = (req, res) => { res.status(201).send('User registered successfully.'); }; -export const resetpassUser = async (req, res) => { +export const resetpassUserControllers = async (req, res) => { const {email, newPassword} = req.body; const newUser = await updateUser(email, {password: newPassword}) if (newUser) { @@ -40,7 +40,7 @@ export const resetpassUser = async (req, res) => { }; -export const updateinfoUser= async (req, res) => { +export const updateinfoUserControllers = async (req, res) => { const {email, newName} = req.body; const newUser = await updateUser(email, {name: newName}) if (newUser) { diff --git a/src/routes/projectRoutes.js b/src/routes/projectRoutes.js index e69de29..d76b62e 100644 --- a/src/routes/projectRoutes.js +++ b/src/routes/projectRoutes.js @@ -0,0 +1,8 @@ +import express from "express"; +import {deleteProjectControllers, updateProjectControllers } from '../controllers/projectControllers.js'; +const routeProject = express.Router(); + +routeProject.post ('/project/delete', deleteProjectControllers); +routeProject.post ('/project/update', updateProjectControllers); + +export default routeProject; diff --git a/src/routes/userRoutes.js b/src/routes/userRoutes.js index 970419d..4983a59 100644 --- a/src/routes/userRoutes.js +++ b/src/routes/userRoutes.js @@ -1,11 +1,10 @@ import express from "express"; -import { loginController, registerController} from '../controllers/user.js'; -// , resetpassController, updateinfoController -const route = express.Router(); +import { loginUserControllers, registerUserControllers, resetpassUserControllers, updateinfoUserControllers } from '../controllers/userControllers.js'; +const routeUser = express.Router(); -route.post('/login',loginController); -route.post('/register', registerController); -// route.post('/user/reset', resetpassController); -// route.post('/user/update', updateinfoController); +routeUser.post('/user/login',loginUserControllers); +routeUser.post('/user/register', registerUserControllers); +routeUser.post('/user/reset', resetpassUserControllers); +routeUser.post('/user/update', updateinfoUserControllers); -export default route; \ No newline at end of file +export default routeUser; \ No newline at end of file From 007bbb70fe8177fd8f115f81e11355327ff58bcd Mon Sep 17 00:00:00 2001 From: Salma-Mahmoudd Date: Sat, 17 Feb 2024 02:25:26 +0200 Subject: [PATCH 3/3] Edit project route --- src/routes/projectRoute.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/routes/projectRoute.js diff --git a/src/routes/projectRoute.js b/src/routes/projectRoute.js new file mode 100644 index 0000000..f469ebf --- /dev/null +++ b/src/routes/projectRoute.js @@ -0,0 +1,21 @@ +import express from "express"; +import { + createProject, + updateProject, + deleteProject, + joinProject, + listProjects, +} from "../controllers/projectController.js"; +import { tokenAuth } from "../middlewares/authMiddleware.js"; + +const route = express.Router(); + +route + .route("/") + .get(tokenAuth, listProjects) + .post(tokenAuth, createProject) + .put(tokenAuth, updateProject) + .delete(tokenAuth, deleteProject); +route.post("/join", tokenAuth, joinProject); + +export default route;