merge conflicts

ChangePlusPlusVandy · Dec 3, 2024 · 00820e0 · 00820e0
1 parent eba9eed
commit 00820e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -22,6 +22,7 @@
     "mongodb": "^6.9.0",
     "mongoose": "^8.4.1",
     "path": "^0.12.7",
+    "sendgrid": "^5.2.3",
     "ts-node-dev": "^2.0.0",
     "uuid": "^10.0.0"
   },

diff --git a/api/src/routes/user.ts b/api/src/routes/user.ts
@@ -3,6 +3,7 @@ import mongoose from "mongoose";
 import dbConnect from "../config/db";
 import sgMail from "@sendgrid/mail";
 import User from "../model/User";
+// import { validateAccessToken } from "../controllers/auth0-middleware";
 
 const router = express.Router();
 

diff --git a/api/src/server.ts b/api/src/server.ts
@@ -21,8 +21,7 @@ app.use("/workshop", routes.workshop);
 
 connectDB();
 
-app.use("/api", router); // connect routes (prefix as api), what is the lin 7 logic for?: import * as routes from "./routes/index"
+app.use("/user", routes.user);
+app.use("/api", router);
 
-app.listen(process.env.PORT || 8000, () =>
-  console.log(`Server running on port ${process.env.PORT || 8000}`),
-);
+app.listen(process.env.PORT || 8000, () => console.log("Server running..."));