nested routes

CoffeeCollab · Mar 11, 2024 · 9c436ff · 9c436ff
1 parent 43c30e6
commit 9c436ff
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 66 deletions.
diff --git a/public/jsForPages/shiftTracker.js b/public/jsForPages/shiftTracker.js
@@ -166,7 +166,7 @@ document.addEventListener("DOMContentLoaded", function () {
 document.getElementById("timeInBtn").addEventListener("click", async () => {
   try {
       // Make an AJAX request to the server to trigger the time-in action
-      const response = await fetch("/time-in", {
+      const response = await fetch("/record/time-in", {
           method: "POST",
           headers: {
               "Content-Type": "application/json",
@@ -201,7 +201,7 @@ document.getElementById("timeInBtn").addEventListener("click", async () => {
 document.getElementById("timeOutBtn").addEventListener("click", async () => {
   try {
       // Make an AJAX request to the server to trigger the time-in action
-      const response = await fetch("/time-out", {
+      const response = await fetch("/record/time-out", {
           method: "POST",
           headers: {
               "Content-Type": "application/json",
@@ -232,7 +232,7 @@ document.getElementById("timeOutBtn").addEventListener("click", async () => {
 
 document.getElementById("break").addEventListener("click", async () => {
   try {
-    const response = await fetch("/break-in", {
+    const response = await fetch("/record/break-in", {
       method: "POST",
       headers: {
         "Content-type": "application/json",
@@ -261,7 +261,7 @@ document.getElementById("break").addEventListener("click", async () => {
 
 document.getElementById("break").addEventListener("click", async () => {
   try {
-    const response = await fetch("/break-in", {
+    const response = await fetch("/record/break-in", {
       method: "POST",
       headers: {
         "Content-type": "application/json",

diff --git a/routes/root.js b/routes/root.js
@@ -2,6 +2,7 @@ import express from "express";
 import path from "path";
 import bodyParser from "body-parser";
 import bcrypt from 'bcrypt';
+import timeRouter from "./timeRoutes.js";
 import { client, authenticateUser } from "../modules/database.js";
 import { deleteUserById, addNewUser, timeIn, timeOut, checkLastShift, breakIn, breakOut} from "../modules/data-service.js";
 import { createUser, getUserByEmail, getUserByName, getUserBySin } from "../modules/data-service-auth.js";
@@ -13,67 +14,6 @@ const currentDir = process.cwd();
 
 router.use(bodyParser.urlencoded({ extended: true}));
 
-router.post("/time-in", authenticateUser, async (req, res) => {
-    // const userId = req.body.userId;
-    const userId = req.session.user.id
-
-    const lastShift = await checkLastShift(client, userId)
-    if (lastShift.workedHours === undefined) {
-        return res.status(400).json({ message: "Previous shift time-out hasn't been recorded" });
-    }
-
-    try {
-        await timeIn(client, userId);
-        res.status(200).json({ message: "Time-in recorded successfully" });
-    } catch (error) {
-        console.log(error);
-        res.status(500).json({ message: "Internal Server Error" });
-    }
-});
-
-
-router.post("/break-in", authenticateUser, async (req, res) => {
-    const userId = req.session.user.id;
-
-    // const shiftCheck = await checkLastShift(client, userId);
-    const lastShift = await checkLastShift(client, userId);
-    if(lastShift.timeInNum != undefined && lastShift.workedHours != undefined){
-        return res.status(400).json({ message: "You haven't started a shift yet." });
-    }
-
-    try{
-        await breakIn(client, userId);
-        res.status(200).json({message: "Break-in recorded successfully"});
-    } catch (error) {
-        console.log(error);
-        res.status(500).json({ message: "Internal Server Error" });
-    }
-
-})
-
-
-
-router.post("/time-out", authenticateUser, async (req, res) => {
-    const userId = req.session.user.id;
-
-    const lastShift = await checkLastShift(client, userId)
-    console.log(lastShift)
-    if (lastShift.timeInNum === undefined) {
-        return res.status(400).json({ message: "You haven't started a shift yet." });
-    }
-    else if(lastShift.breakInNum != undefined && lastShift.breakOutNum === undefined){
-        return res.status(400).json({ message: "You didn't finish your break. Time-out anyway?" });
-    }
-
-    try {
-        await timeOut(client, userId);
-        res.status(200).json({message: "Time-out recorded successfully"})
-    } catch (e) {
-        console.error(e);
-        res.status(500).json({message: "Internal Server Error"})
-    }
-});
-
 // Route to handle creating a new user
 router.post("/create-user", async (req, res) => {
 
@@ -167,6 +107,6 @@ router.get('/create-user', (req, res) => {
     res.sendFile(path.resolve(currentDir, 'views', 'registrationTest.html'))
 })
 
-
+router.use("/record", timeRouter);
 
 export default router;
diff --git a/routes/timeRoutes.js b/routes/timeRoutes.js
@@ -0,0 +1,72 @@
+import express from "express";
+import bodyParser from "body-parser";
+import { client, authenticateUser } from "../modules/database.js";
+import { timeIn, timeOut, checkLastShift, breakIn, breakOut } from "../modules/data-service.js";
+
+
+const timeRouter = express.Router();
+
+timeRouter.use(bodyParser.urlencoded({ extended: true}));
+
+timeRouter.post("/time-in", authenticateUser, async (req, res) => {
+    // const userId = req.body.userId;
+    const userId = req.session.user.id
+
+    const lastShift = await checkLastShift(client, userId)
+    if (lastShift.workedHours === undefined) {
+        return res.status(400).json({ message: "Previous shift time-out hasn't been recorded" });
+    }
+
+    try {
+        await timeIn(client, userId);
+        res.status(200).json({ message: "Time-in recorded successfully" });
+    } catch (error) {
+        console.log(error);
+        res.status(500).json({ message: "Internal Server Error" });
+    }
+});
+
+
+timeRouter.post("/break-in", authenticateUser, async (req, res) => {
+    const userId = req.session.user.id;
+
+    // const shiftCheck = await checkLastShift(client, userId);
+    const lastShift = await checkLastShift(client, userId);
+    if(lastShift.timeInNum != undefined && lastShift.workedHours != undefined){
+        return res.status(400).json({ message: "You haven't started a shift yet." });
+    }
+
+    try{
+        await breakIn(client, userId);
+        res.status(200).json({message: "Break-in recorded successfully"});
+    } catch (error) {
+        console.log(error);
+        res.status(500).json({ message: "Internal Server Error" });
+    }
+
+})
+
+
+
+timeRouter.post("/time-out", authenticateUser, async (req, res) => {
+    const userId = req.session.user.id;
+
+    const lastShift = await checkLastShift(client, userId)
+    console.log(lastShift)
+    if (lastShift.timeInNum === undefined) {
+        return res.status(400).json({ message: "You haven't started a shift yet." });
+    }
+    else if(lastShift.breakInNum != undefined && lastShift.breakOutNum === undefined){
+        return res.status(400).json({ message: "You didn't finish your break. Time-out anyway?" });
+    }
+
+    try {
+        await timeOut(client, userId);
+        res.status(200).json({message: "Time-out recorded successfully"})
+    } catch (e) {
+        console.error(e);
+        res.status(500).json({message: "Internal Server Error"})
+    }
+});
+
+export default timeRouter;