moahmedwafy commited on
Commit
4feafca
·
1 Parent(s): 3c870f5

refactor: small refactors

Browse files
Files changed (3) hide show
  1. src/configs/database.ts +3 -8
  2. src/index.route.ts +7 -12
  3. src/index.ts +2 -2
src/configs/database.ts CHANGED
@@ -2,12 +2,7 @@ import mongoose from "mongoose";
2
  import { config } from "./config";
3
 
4
  export const connectDatabase = async () => {
5
- return mongoose
6
- .connect(config.db.uri)
7
- .then(() => {
8
- console.log(`Connected to MongoDB database successfully!`);
9
- })
10
- .catch((err) => {
11
- console.error("MongoDB Error: ", err);
12
- });
13
  };
 
2
  import { config } from "./config";
3
 
4
  export const connectDatabase = async () => {
5
+ return mongoose.connect(config.db.uri).then(() => {
6
+ console.log(`Connected to MongoDB database successfully!`);
7
+ });
 
 
 
 
 
8
  };
src/index.route.ts CHANGED
@@ -1,30 +1,25 @@
1
  import express from "express";
2
 
3
- const app = express.Router();
4
-
5
  import { userRoutes } from "./modules/user/index.route";
6
  import { adminRoutes } from "./modules/console/index.route";
7
 
8
- // set prefix for all routes
9
- const v1Router = express.Router();
10
 
11
- v1Router.use("/user", userRoutes);
12
- v1Router.use("/admin", adminRoutes);
13
 
14
- v1Router.get("/", (_req: any, res: any) => {
15
  res
16
  .status(200)
17
  .json({ success: true, message: "Welcome Message", code: 200 });
18
  });
19
 
20
- v1Router.get("/health", (_req: any, res: any) => {
21
  res.status(200).json({ success: true, message: "Server is up!", code: 200 });
22
  });
23
 
24
- v1Router.all("*", (_req: any, res: any) => {
25
  res.status(404).json({ success: false, message: "Invalid URL!", code: 404 });
26
  });
27
 
28
- app.use("/api/v1", v1Router);
29
-
30
- export { app as routes };
 
1
  import express from "express";
2
 
 
 
3
  import { userRoutes } from "./modules/user/index.route";
4
  import { adminRoutes } from "./modules/console/index.route";
5
 
6
+ const mainRouter = express.Router();
 
7
 
8
+ mainRouter.use("/user", userRoutes);
9
+ mainRouter.use("/admin", adminRoutes);
10
 
11
+ mainRouter.get("/", (_req: any, res: any) => {
12
  res
13
  .status(200)
14
  .json({ success: true, message: "Welcome Message", code: 200 });
15
  });
16
 
17
+ mainRouter.get("/health", (_req: any, res: any) => {
18
  res.status(200).json({ success: true, message: "Server is up!", code: 200 });
19
  });
20
 
21
+ mainRouter.all("*", (_req: any, res: any) => {
22
  res.status(404).json({ success: false, message: "Invalid URL!", code: 404 });
23
  });
24
 
25
+ export { mainRouter };
 
 
src/index.ts CHANGED
@@ -1,8 +1,8 @@
1
  import express from "express";
2
  import cors from "cors";
3
- import { routes } from "./index.route";
4
  import { connectDatabase } from "./configs/database";
5
  import { config } from "./configs/config";
 
6
 
7
  const main = async () => {
8
  // set up database connection
@@ -17,7 +17,7 @@ const main = async () => {
17
  app.use(express.json());
18
 
19
  // set up routes
20
- app.use(routes);
21
 
22
  // start server
23
  app.listen(config.port, () => {
 
1
  import express from "express";
2
  import cors from "cors";
 
3
  import { connectDatabase } from "./configs/database";
4
  import { config } from "./configs/config";
5
+ import { mainRouter } from "./index.route";
6
 
7
  const main = async () => {
8
  // set up database connection
 
17
  app.use(express.json());
18
 
19
  // set up routes
20
+ app.use(mainRouter);
21
 
22
  // start server
23
  app.listen(config.port, () => {