Organize files

Author: scinorandex

src/api.ts

@@ -2,9 +2,9 @@ import express from "express";
 import morgan from "morgan";
 import { errorHandler } from "./api/errorHandler";
 import { plainRouter } from "./api/plainRouter";
-import { router } from "./api/router";
+import { regularRouter } from "./api/regularRouter";
 import { userAgentMiddleware } from "./api/userAgent";
-import { lines } from "./utils/getResponses";
+import { lines } from "./utils/libs/getResponses";
 
 const port = parseInt(process.env.PORT!) || 7070;
 
@@ -19,7 +19,7 @@ app.use(userAgentMiddleware);
 app.use(["/quiet/basic", "/quiet/cmd", "/quiet/plain"], plainRouter);
 app.use(["/basic", "/cmd", "/plain"], plainRouter);
 
-app.use(["/quiet", "/"], router);
+app.use(["/quiet", "/"], regularRouter);
 app.use("/", errorHandler);
 
 // Not found handler

src/api/plainRouter.ts

@@ -5,8 +5,8 @@ import {
     informationPerCountryPlain,
     historyPerCountryPlain,
     globalHistoryPlain,
-} from "../utils/plainHandlers";
-import { isQuiet } from "./router";
+} from "../utils/routes/plain/plainHandlers";
+import { isQuiet } from "./regularRouter";
 
 /**
  * The plainRouter handles all the plain routes such as /basic, /cmd, and /plain

src/api/router.ts src/api/regularRouter.tssrc/api/router.ts renamed to src/api/regularRouter.ts

@@ -4,7 +4,7 @@ import {
     globalInformation,
     historyPerCountry,
     informationPerCountry,
-} from "../utils/handlers";
+} from "../utils/routes/regular/regularHandlers";
 import handleAsync from "./handleAsync";
 
 /**
@@ -16,13 +16,12 @@ export const isQuiet: (req: Request) => boolean = (req) =>
     req.baseUrl.startsWith("/quiet");
 
 /**
- * The rootRouter handles all the processing of the requests *after* passing through
+ * The regularRouter handles all the processing of the requests *after* passing through
  * all middlewares except not found and error handling middleware
  */
-export const router = Router({ mergeParams: true });
+export const regularRouter = Router({ mergeParams: true });
 
-// rootRouter.get("/history/:country/:type", historyPerCountryAndType);
-router.get(
+regularRouter.get(
     "/history/:mode?",
     handleAsync(async (req, res, next) => {
         // get mode from params
@@ -37,7 +36,7 @@ router.get(
     })
 );
 
-router.get(
+regularRouter.get(
     "/history/:country/:mode?",
     handleAsync(async (req, res, next) => {
         const country = req.params.country;
@@ -53,15 +52,15 @@ router.get(
     })
 );
 
-router.get(
+regularRouter.get(
     "/:country",
     handleAsync(async (req, res, _next) => {
         const country = req.params.country;
         res.send(await informationPerCountry(country, isQuiet(req)));
     })
 );
 
-router.get(
+regularRouter.get(
     "/",
     handleAsync(async (req, res, _next) => {
         res.send(await globalInformation(isQuiet(req)));

src/api/userAgent.ts

@@ -1,5 +1,5 @@
 import { Request, Response, NextFunction } from "express";
-import { lines } from "../utils/getResponses";
+import { lines } from "../utils/libs/getResponses";
 
 // Type of middleware and handler
 export type Handler = (

src/cli.ts

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 import argv from "minimist";
-import { lines, welcomeMessage } from "./utils/getResponses";
+import { lines, welcomeMessage } from "./utils/libs/getResponses";
 import {
     globalHistory,
     globalInformation,
     historyPerCountry,
     informationPerCountry,
-} from "./utils/handlers";
+} from "./utils/routes/regular/regularHandlers";
 import {
     globalHistoryPlain,
     globalInformationPlain,
     historyPerCountryPlain,
     informationPerCountryPlain,
-} from "./utils/plainHandlers";
+} from "./utils/routes/plain/plainHandlers";
 
 const args = argv(process.argv.slice(2));
 let { history, mode, help, quiet, plain } = args;

src/utils/generateAsciichart.ts src/utils/libs/generateAsciichart.tssrc/utils/generateAsciichart.ts renamed to src/utils/libs/generateAsciichart.ts

@@ -1,4 +1,4 @@
-const { version } = require("../../package.json");
+const { version } = require("../../../package.json");
 
 // This file is a centralized location to get responses to the user
 // Such as the BMC link, the twitter link, github repo page etc.