Merge branch 'main' into new

consumerWebsite/routes/render.js

@@ -77,10 +77,4 @@ router.get('/contact', function(req, res, next) {
   res.render('contact'); 
 });
 
-//404  page
-router.get('*', function(req, res, next) {
-    res.render('404'); 
-});
-
-
 module.exports = router;

consumerWebsite/routes/user.js

@@ -1,41 +1,60 @@
-const { getUser, addUser } = require("../functions/apiDatabase.js");
+const { addUser, loginUser } = require("../functions/apiDatabase.js");
 
 const express = require("express");
 const router = express.Router();
 
-//get all users
-router.get("/", async (req, res, next) => {
-	try {
-		const location = await getUser();
-		res.status(200).json(location);
-	} catch (error) {
-		console.error(error);
-		next(error);
-	}
-});
-
-
 // /user/register
 router.post("/register", async (req, res, next) => {
 	try {
-		console.log("this is " , req.body);
-		await addUser(req.body);
-		res.status(200).json({ register: true });
+		let Res = await addUser(req.body);
+		if (Res == false) {
+			let error = new Error("UserRegFailed");
+			error.message = "The user failed to be craated";
+			error.status = 400;
+			return next(error);
+		}
+    else{
+      return res.json({
+        message: "User created successfully",
+      });
+    }
 	} catch (error) {
 		console.error(error);
 		next(error);
 	}
 });
 
-
 //login
+router.post("/login", async (req, res, next) => {
+	try {
+		let Res = await loginUser(req.body);
+		if (Res == false) {
+      let error = new Error("User Login Failed");
+			error.status = 400;
+			return next(error);
+		}
+    else{
+      //pass res back to form to be set in local storage
+      console.log(Res);
+      return res.json({
+        message: "User login successfully",
+        token: Res.token,
+        userId: Res.userid,
+        username: Res.username,
+      }); 
+
+    }
+	} catch (error) {
+		console.error(error);
+		next(error);
+	}
+});
 //update
 //delete
 //getbyid
 
 module.exports = router;
 
-
 /*
 
 curl localhost/api/v0/user/register -H "Content-Type: application/json" -X POST -d '{"username": 
@@ -78,4 +97,4 @@ router.get('/:uid', async function(req, res, next){
 module.exports = router;
 
 
-*/
+*/