Skip to content

Commit 28944e3

Browse files
resolve: merge conflicts between fix-vigy-login and main branches
- Resolved merge conflicts in app.js by combining both branches' routes - Added missing subscribe route from main branch - Added body-parser and validator dependencies - Updated package-lock.json with new dependencies - Created routes/subscribe.js with email validation - Preserved all vigy functionality from fix-vigy-login branch
1 parent cdbfeec commit 28944e3

File tree

4 files changed

+3627
-21
lines changed

4 files changed

+3627
-21
lines changed

backend/app.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ app.use(cors());
1919
app.use(express.json());
2020
=======
2121
const vigyRoutes = require("./routes/vigyRoutes");
22+
const subscribeRoute = require("./routes/subscribe");
2223

2324
const app = express();
2425

@@ -69,6 +70,7 @@ app.get("/", (req, res) => {
6970
});
7071

7172
// Route setup
73+
app.use("/api/subscribe", subscribeRoute); // POST /api/subscribe
7274
app.use("/auth", authRoutes);
7375
app.use("/api", routes);
7476
app.use("/api", passwordResetRoutes);

0 commit comments

Comments
 (0)