router seems to work

aahmadyar123 · Aug 26, 2023 · af3c205 · af3c205
1 parent bdebc17
commit af3c205
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/backend/backend.js b/backend/backend.js
@@ -12,10 +12,10 @@ const dotenv = require("dotenv");
 dotenv.config();
 
 //import routes
-const authRoutes = require("./routes/authRoutes")
-const userRoutes = require("./routes/authRoutes")
-const ingredientRoutes = require("./routes/authRoutes")
-const recipeRoutes = require("./routes/authRoutes")
+const authRoutes = require("./routes/authRoutes");
+const userRoutes = require("./routes/userRoutes");
+const ingredientRoutes = require("./routes/ingredientRoutes");
+const recipeRoutes = require("./routes/recipeRoutes");
 
 // Spoonacular API methods
 const recipeAPI = require("./recipeAPI.js");
@@ -54,7 +54,7 @@ const port = 8000;
 
 app.use(cors());
 app.use(express.json());
-//app.use(cookieParser());
+app.use(cookieParser());
 
 // auth middleware for protected routes
 app.use("/recipes", authenticateToken);

diff --git a/backend/routes/authRoutes.js b/backend/routes/authRoutes.js
@@ -4,6 +4,7 @@ const router = express.Router();
 //DB models
 const userServices = require("../controllers/user-services");
 
+const jwt = require("jsonwebtoken");
 
 function generateAccessToken(id) {
   /*
@@ -23,7 +24,6 @@ function generateAccessToken(id) {
 //    the database
 router.post("/login", async (req, res) => {
   const user = req.body;
-    console.log(user);
   try {
     const result = await userServices.login(user.email, user.password);
 

diff --git a/backend/routes/ingredientRoutes.js b/backend/routes/ingredientRoutes.js
@@ -48,4 +48,4 @@ router.put("/", async (req, res) => {
 });
 
 
-modules.exports = router;
+module.exports = router;
diff --git a/backend/routes/recipeRoutes.js b/backend/routes/recipeRoutes.js
@@ -1,6 +1,8 @@
 const express = require("express");
 const router = express.Router();
 
+router.use(express.json())
+
 //DB models
 const userServices = require("../controllers/user-services");
 const recipeServices = require("../controllers/recipe-services");

diff --git a/backend/routes/userRoutes.js b/backend/routes/userRoutes.js
@@ -4,6 +4,7 @@ const router = express.Router();
 
 //DB models
 const userServices = require("../controllers/user-services");
+const { model } = require("mongoose");
 
 
 // --------------------------------------------------
@@ -75,3 +76,5 @@ router.post("/:id/recipes", async (req, res) => {
     res.status(500).send("Internal Server Error.");
   }
 });
+
+module.exports = router;
diff --git a/react-frontend/src/components/context/AuthProvider.js b/react-frontend/src/components/context/AuthProvider.js
@@ -15,7 +15,7 @@ export const AuthProvider = ({ children }) => {
   const navigate = useNavigate();
 
   const handleRegister = async (user) => {
-    const response = await axios.post(process.env.REACT_APP_BACKEND_URL, user);
+    const response = await axios.post(`${process.env.REACT_APP_BACKEND_URL}/register`, user);
     const token = response.data['token']
     setToken(token);
 
@@ -47,7 +47,7 @@ export const AuthProvider = ({ children }) => {
     console.log("In Login");
 
     try{
-      const response = await axios.post(process.env.REACT_APP_BACKEND_URL, user);
+      const response = await axios.post(`${process.env.REACT_APP_BACKEND_URL}/login`, user);
       if (response.status === 201){
           const token = response.data['token'];
           setToken(token);