refactor folders

server/src/routes.ts

-import * as express from "express";
-import authLoginController from "./authLogin";
-
-
-const router = express.Router();
-
-
-
-router.post("/api/login/", authLoginController);
-export default router;
-
-// // Vehicle Type
-// router.get("/api/vehicleType/:id", async (req, res) => {
-//   const id = Number(req.params.id);
-//   const result = await VehicleTypeService.getById(id);
-//   return res.status(200).send(result);
-// });
-// router.post("/api/vehicleType/", async (req, res) => {
-//   const payload = req.body;
-//   const result = await VehicleTypeService.create(payload);
-//   return res.status(200).send(result);
-// });
-// router.put("/api/vehicleType/:id", async (req, res) => {
-//   const id = Number(req.params.id);
-//   const payload = req.body;
-//   const result = await VehicleTypeService.update(id, payload);
-//   return res.status(201).send(result);
-// });
-// router.delete("/api/vehicleType/:id", async (req, res) => {
-//   const id = Number(req.params.id);
-//   const result = await VehicleTypeService.deleteById(id);
-//   return res.status(204).send({
-//     success: result,
-//   });
-// });
-// router.get("/api/vehicleType/", async (req, res) => {
-//   const results = await VehicleTypeService.getAll();
-//   return res.status(200).send(results);
-// });
-
-// // USER
-// router.get("/api/user/:id", async (req, res) => {
-//   const id = Number(req.params.id);
-//   const result = await UserService.getById(id);
-//   return res.status(200).send(result);
-// });
-// router.post("/api/user/", async (req, res) => {
-//   const payload = req.body;
-//   const result = await UserService.create(payload);
-//   return res.status(200).send(result);
-// });
-// router.put("/api/user/:id", async (req, res) => {
-//   const id = Number(req.params.id);
-//   const payload = req.body;
-//   const result = await UserService.update(id, payload);
-//   return res.status(201).send(result);
-// });
-// router.delete("/api/user/:id", async (req, res) => {
-//   const id = Number(req.params.id);
-//   const result = await UserService.deleteById(id);
-//   return res.status(204).send({
-//     success: result,
-//   });
-// });
-// router.get("/api/user/", async (req, res) => {
-//   const results = await UserService.getAll();
-//   return res.status(200).send(results);
-// });
-
-// // Other TODO
-// /*
-// router.get('/api/login', (req, res) => {
-//     console.log(req.body)
-//     res.json({'success': true, data: []});
-// });
-//  */
-// router.post("/api/logEntry", (req, res) => {
-//   console.log(req.body);
-//   res.json({ success: true });
-// });
-

server/src/authLogin.ts → server/src/routes/auth.controllers.ts

 import bcrypt from "bcrypt";
-import jwt from "jsonwebtoken";
-import Worker from "./db/models/Worker";
 import { Request, Response } from "express";
+import jwt from "jsonwebtoken";
+import Worker from "../db/models/Worker";
 
 const authLoginController = async (req: Request, res: Response) => {
   try {
@@ -21,7 +21,7 @@ const authLoginController = async (req: Request, res: Response) => {
 
     //if not found -> email incorrect or worker not found
     if (getPasswordIfWorkerExists.length === 0) {
-      return res.status(401).send("wrong email or email not found!");
+      return res.status(401).json({ success: false, error: "invalidEmail" });
     }
 
     //otherwise: if worker found
@@ -44,20 +44,19 @@ const authLoginController = async (req: Request, res: Response) => {
       //create payload
       const payload = {
         email: tokenPayload[0].email,
-        password: tokenPayload[0].password,
         role: tokenPayload[0].role,
       };
 
       //create and send token: -------------------------------
       const secret = process.env.JWT_SECRET;
       const token = jwt.sign(payload, secret);
-      return res.status(200).send({ token });
+      return res.status(200).json({ success: true, token });
     } else {
-      return res.status(401).send("invalid password!");
+      return res.status(401).json({ success: false, error: "invalidPassword" });
     }
   } catch (error) {
     console.error("server error: ", error.message);
-    return res.status(500).send("server error!");
+    return res.status(500).json({ success: false, error: "serverError" });
   }
 };
 export default authLoginController;

server/src/routes/auth.routes.ts

+import * as express from "express";
+import { body } from "express-validator";
+import handleValidationResult from "../middleware/handleValidationErrors";
+import authLoginController from "./auth.controllers";
+
+const authRouter = express.Router();
+
+authRouter.post(
+  "/api/login/",
+  body("email").isEmail().normalizeEmail(),
+  body("password").not().isEmpty(),
+  handleValidationResult,
+  authLoginController
+);
+export default authRouter;

server/src/server.ts

 import "dotenv/config";
 import express from "express";
+import initializeDatabase from "./db";
+import createInitialWorkerIfNotExists from "./db/createInitialWorker";
 import showAllDBs from "./db/DB_Information/showAllDBs";
 import showTables from "./db/DB_Information/showDBTables";
 import showTableContent from "./db/DB_Information/showTableContent";
-import initializeDatabase from "./db";
-// import apiRouter from "./routes";
-import sendMail from "./mail";
-import router from "./routes";
-import createInitialWorkerIfNotExists from "./db/createInitialWorker";
+import authRouter from "./routes/auth.routes";
 
 let init = async () => {
   //DB
@@ -19,7 +17,7 @@ let init = async () => {
   const port = process.env.PORT || 4000;
   app.listen(port, () => console.log(`Server listening on port: ${port}\n`));
   app.get("/", (req, res) => res.send("hello in server"));
-  app.use("/", router);
+  app.use("/", authRouter);
   //DB-information section
   await showAllDBs(sequelize);
   await showTables(sequelize);