diff --git a/src/app.js b/src/app.js
index 7fbd987..ad5f126 100644
--- a/src/app.js
+++ b/src/app.js
@@ -1,9 +1,15 @@
 import express from "express";
+<<<<<<< HEAD
+import user from './routes/userRoutes.js';
+import project from './routes/projectRoutes.js';
+import bodyParser from 'body-parser';
+=======
 import bodyParser from "body-parser";
 import userRoute from "./routes/userRoute.js";
 import cookieParser from "cookie-parser";
 import { tokenAuth } from "./middlewares/authMiddleware.js";
 import projectRoute from "./routes/projectRoute.js";
+>>>>>>> origin
 
 const app = express();
 const port = 3000;
@@ -14,12 +20,21 @@ app.use(bodyParser.urlencoded({ extended: true }));
 app.use(cookieParser());
 app.use("/", userRoute);
 
+<<<<<<< HEAD
+app.use('/user',user);
+app.use('/project', project);
+
+
+app.get("/", (req, res) => {
+  res.send("Response OK");
+=======
 app.get("/", tokenAuth, (req, res) => {
   res.send(`Logged in as: ${req.user.email}`);
+>>>>>>> origin
 });
 
 app.use("/project", projectRoute);
 
 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..f23f84d
--- /dev/null
+++ b/src/controllers/projectControllers.js
@@ -0,0 +1,13 @@
+import { deleteProject, updateProject } from '../models/projectModel.js';
+
+export const updateProject = async (req, res) => {
+  const { projectID, newName } = req.body;
+  res.send(await updateProject(projectID, newName));
+
+};
+
+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
new file mode 100644
index 0000000..ed3d4d0
--- /dev/null
+++ b/src/controllers/userControllers.js
@@ -0,0 +1,52 @@
+import { updateUser } from '../models/userModel';
+
+
+export const loginUserControllers  = (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 registerUserControllers = (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 resetpassUserControllers = 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 updateinfoUserControllers = 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/projectRoute.js b/src/routes/projectRoute.js
index 1c0f038..f469ebf 100644
--- a/src/routes/projectRoute.js
+++ b/src/routes/projectRoute.js
@@ -10,10 +10,12 @@ import { tokenAuth } from "../middlewares/authMiddleware.js";
 
 const route = express.Router();
 
-route.post("/create", tokenAuth, createProject);
-route.post("/update", tokenAuth, updateProject);
-route.post("/delete", tokenAuth, deleteProject);
+route
+  .route("/")
+  .get(tokenAuth, listProjects)
+  .post(tokenAuth, createProject)
+  .put(tokenAuth, updateProject)
+  .delete(tokenAuth, deleteProject);
 route.post("/join", tokenAuth, joinProject);
-route.get("/", tokenAuth, listProjects);
 
 export default route;
diff --git a/src/routes/projectRoutes.js b/src/routes/projectRoutes.js
new file mode 100644
index 0000000..d76b62e
--- /dev/null
+++ 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
new file mode 100644
index 0000000..4983a59
--- /dev/null
+++ b/src/routes/userRoutes.js
@@ -0,0 +1,10 @@
+import express from "express";
+import { loginUserControllers, registerUserControllers, resetpassUserControllers, updateinfoUserControllers } from '../controllers/userControllers.js';
+const routeUser = express.Router();
+
+routeUser.post('/user/login',loginUserControllers);
+routeUser.post('/user/register', registerUserControllers);
+routeUser.post('/user/reset', resetpassUserControllers);
+routeUser.post('/user/update', updateinfoUserControllers);
+
+export default routeUser;
\ No newline at end of file