fixed problems

server/src/index.ts

@@ -18,7 +18,7 @@ import Mailgun from "mailgun.js";
 import { messagesCollection } from "./utilities/firebaseInit";
 import { calculateDistanceInMeters } from "./actions/calculateDistance";
 import { scheduleCron } from "./actions/deleter";
-import userAndAuthRouter from "./routes";
+import mainRouter from "./routes";
 
 const { createServer } = require("http");
 const { Server } = require("socket.io");
@@ -157,44 +157,18 @@ app.get("/", (req, res) => {
   res.send("Echologator API");
 });
 
-app.use(userAndAuthRouter);
 
+app.use(mainRouter);
 
 
-
-
-
-
-
-
-
-// Error handling
-app.get("*", (req, res) => {
-  res.json("404: Path could not be found! COULD NOT {GET}");
-  res.status(404);
-});
-
-app.post("*", (req, res) => {
-  res.json("404: Path could not be found! COULD NOT {POST}");
-  res.status(404);
-});
-
-app.put("*", (req, res) => {
-  res.json("404: Path could not be found! COULD NOT {PUT}");
-  res.status(404);
-});
-
-app.delete("*", (req, res) => {
-  res.json("404: Path could not be found! COULD NOT {DELETE}");
-  res.status(404);
-});
-
 app.listen(express_port, () => {
   return console.log(
     `[EXP] Listening for requests at http://localhost:${express_port}.`
   );
 });
 
+
+
 //Remove the comments if you want to use the deleter !!!!!!
 //scheduleCron(); // Begin searching and collecting Garbage (old messages)
 

server/src/routes/error/error.ts

@@ -0,0 +1,27 @@
+import { Router } from "express";
+
+const errorRouter = Router();
+
+
+// Error handling
+errorRouter.get("*", (req, res) => {
+    res.json("404: Path could not be found! COULD NOT {GET}");
+    res.status(404);
+});
+
+errorRouter.post("*", (req, res) => {
+    res.json("404: Path could not be found! COULD NOT {POST}");
+    res.status(404);
+});
+
+errorRouter.put("*", (req, res) => {
+    res.json("404: Path could not be found! COULD NOT {PUT}");
+    res.status(404);
+});
+
+errorRouter.delete("*", (req, res) => {
+res.json("404: Path could not be found! COULD NOT {DELETE}");
+    res.status(404);
+});
+
+export default errorRouter;

server/src/routes/index.ts

@@ -1,10 +1,12 @@
 import { Router } from "express";
 import authRouter from "./auth";
 import userRouter from "./user";
+import errorRouter from "./error/error";
 
-const userAndAuthRouter = Router();
+const mainRouter = Router();
 
-userAndAuthRouter.use(authRouter);
-userAndAuthRouter.use(userRouter);
+mainRouter.use(authRouter);
+mainRouter.use(userRouter);
+mainRouter.use(errorRouter);
 
-export default userAndAuthRouter;
+export default mainRouter;

server/src/routes/user/index.ts

@@ -1,15 +1,15 @@
 import { Router } from "express";
 import createUserRoute from "./create";
 import deleteUserRoute from "./delete";
-import getNearbyUserRoute from "./getNearby";
 import updateUserRoute from "./update";
+import nearbyUserRoute from "./getNearby";
 
 const userRouter = Router();
 
 
 userRouter.use(createUserRoute);
 userRouter.use(deleteUserRoute);
-userRouter.use(getNearbyUserRoute);
+userRouter.use(nearbyUserRoute);
 userRouter.use(updateUserRoute);
 
 

server/src/routes/user/getNearby.ts → server/src/routes/user/nearby.ts

@@ -1,9 +1,9 @@
 import { Router } from "express";
 import { findNearbyUsers, getConnectedUser } from "../../actions/getConnectedUsers";
 
-const getNearbyUserRoute = Router();
+const nearbyUserRoute = Router();
 
-getNearbyUserRoute.get("/users", async (req, res) => {
+nearbyUserRoute.get("/users", async (req, res) => {
     let query = "";
     try {
       if (req.query.lat && req.query.lon && req.query.radius) {
@@ -38,4 +38,4 @@ getNearbyUserRoute.get("/users", async (req, res) => {
     }
 });
 
-export default getNearbyUserRoute;
+export default nearbyUserRoute;