Format files and fix http response

.eslintrc.json

@@ -1,3 +1,6 @@
 {
-    "extends": ["next/core-web-vitals", "next/typescript"]
+    "extends": [
+        "next/core-web-vitals",
+        "next/typescript"
+    ]
 }

server/auth/actions.ts

@@ -5,39 +5,33 @@ import { and, eq } from 'drizzle-orm';
 import createHttpError from 'http-errors';
 import HttpCode from '@server/types/HttpCode';
 
-export const ActionsEnum = {
+export enum ActionsEnum {
-
+    createOrg = "createOrg",
-    createOrg: 1,
+    deleteOrg = "deleteOrg",
-    deleteOrg: 2,
+    getOrg = "getOrg",
-    getOrg: 3,
+    listOrgs = "listOrgs",
-    listOrgs: 4,
+    updateOrg = "updateOrg",
-    updateOrg: 5,
+    createSite = "createSite",
-    
+    deleteSite = "deleteSite",
-    createSite: 6,
+    getSite = "getSite",
-    deleteSite: 7,
+    listSites = "listSites",
-    getSite: 8,
+    updateSite = "updateSite",
-    listSites: 9,
+    createResource = "createResource",
-    updateSite: 10,
+    deleteResource = "deleteResource",
-
+    getResource = "getResource",
-    createResource: 11,
+    listResources = "listResources",
-    deleteResource: 12,
+    updateResource = "updateResource",
-    getResource: 13,
+    createTarget = "createTarget",
-    listResources: 14,
+    deleteTarget = "deleteTarget",
-    updateResource: 15,
+    getTarget = "getTarget",
-
+    listTargets = "listTargets",
-    createTarget: 16,
+    updateTarget = "updateTarget",
-    deleteTarget: 17,
+    getUser = "getUser",
-    getTarget: 18,
+    deleteUser = "deleteUser",
-    listTargets: 19,
+    listUsers = "listUsers"
-    updateTarget: 20,
-
-    getUser: 21,
-    deleteUser: 22,
-    listUsers: 23
-
 }
 
-export async function checkUserActionPermission(actionId: number, req: Request): Promise<boolean> {
+export async function checkUserActionPermission(actionId: string, req: Request): Promise<boolean> {
     const userId = req.user?.id;
 
     if (!userId) {

server/db/schema.ts

@@ -130,7 +130,7 @@ export const passwordResetTokens = sqliteTable("passwordResetTokens", {
 });
 
 export const actions = sqliteTable("actions", {
-    actionId: integer("actionId").primaryKey({ autoIncrement: true }),
+    actionId: text("actionId").primaryKey(),
     name: text("name").notNull(),
     description: text("description"),
 });
@@ -146,7 +146,7 @@ export const roleActions = sqliteTable("roleActions", {
     roleId: integer("roleId")
         .notNull()
         .references(() => roles.roleId, { onDelete: "cascade" }),
-    actionId: integer("actionId")
+    actionId: text("actionId")
         .notNull()
         .references(() => actions.actionId, { onDelete: "cascade" }),
     orgId: integer("orgId")
@@ -158,7 +158,7 @@ export const userActions = sqliteTable("userActions", {
     userId: text("userId")
         .notNull()
         .references(() => users.id, { onDelete: "cascade" }),
-    actionId: integer("actionId")
+    actionId: text("actionId")
         .notNull()
         .references(() => actions.actionId, { onDelete: "cascade" }),
     orgId: integer("orgId")

server/routers/auth/getUserOrgs.ts

@@ -15,12 +15,12 @@ export async function getUserOrgs(req: Request, res: Response, next: NextFunctio
     try {
         const userOrganizations = await db.select({
             orgId: userOrgs.orgId,
-      role: userOrgs.role,
+            roleId: userOrgs.roleId,
         })
             .from(userOrgs)
             .where(eq(userOrgs.userId, userId));
 
-    req.userOrgs = userOrganizations.map(org => org.orgId);
+        req.userOrgIds = userOrganizations.map(org => org.orgId);
         // req.userOrgRoleIds = userOrganizations.reduce((acc, org) => {
         //   acc[org.orgId] = org.role;
         //   return acc;

server/routers/gerbil/getConfig.ts

@@ -3,6 +3,8 @@ import { DrizzleError, eq } from 'drizzle-orm';
 import { sites, resources, targets, exitNodes } from '@server/db/schema';
 import db from '@server/db';
 import logger from '@server/logger';
+import HttpCode from '@server/types/HttpCode';
+import createHttpError from 'http-errors';
 
 export const getConfig = async (req: Request, res: Response, next: NextFunction): Promise<void> => {
     try {
@@ -55,11 +57,7 @@ export const getConfig = async (req: Request, res: Response, next: NextFunction)
         res.json(config);
     } catch (error) {
         logger.error('Error querying database:', error);
-        if (error instanceof DrizzleError) {
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
-            res.status(500).json({ error: 'Database query error', message: error.message });
-        } else {
-            next(error);
-        }
     }
 };
 

server/routers/gerbil/receiveBandwidth.ts

@@ -3,6 +3,9 @@ import { DrizzleError, eq } from 'drizzle-orm';
 import { sites, resources, targets, exitNodes } from '@server/db/schema';
 import db from '@server/db';
 import logger from '@server/logger';
+import createHttpError from 'http-errors';
+import HttpCode from '@server/types/HttpCode';
+import response from "@server/utils/response";
 
 interface PeerBandwidth {
     publicKey: string;
@@ -10,7 +13,7 @@ interface PeerBandwidth {
     bytesOut: number;
 }
 
-export const receiveBandwidth = async (req: Request, res: Response, next: NextFunction): Promise<void> => {
+export const receiveBandwidth = async (req: Request, res: Response, next: NextFunction): Promise<any> => {
     try {
         const bandwidthData: PeerBandwidth[] = req.body;
 
@@ -43,10 +46,16 @@ export const receiveBandwidth = async (req: Request, res: Response, next: NextFu
 
         }
 
-    res.status(200).json({ message: 'Bandwidth data updated successfully' });
+        return response(res, {
+            data: {},
+            success: true,
+            error: false,
+            message: "Organization retrieved successfully",
+            status: HttpCode.OK,
+        });
     } catch (error) {
         logger.error('Error updating bandwidth data:', error);
-    res.status(500).json({ error: 'Internal server error' });
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 };
 

server/routers/org/createOrg.ts

@@ -6,6 +6,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const createOrgSchema = z.object({
     name: z.string().min(1).max(255),
@@ -49,16 +50,15 @@ export async function createOrg(req: Request, res: Response, next: NextFunction)
             domain,
         }).returning();
 
-    return res.status(HttpCode.CREATED).send(
+        return response(res, {
-      response(res, {
             data: newOrg[0],
             success: true,
             error: false,
             message: "Organization created successfully",
             status: HttpCode.CREATED,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/org/deleteOrg.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const deleteOrgSchema = z.object({
     orgId: z.string().transform(Number).pipe(z.number().int().positive())
@@ -45,16 +46,15 @@ export async function deleteOrg(req: Request, res: Response, next: NextFunction)
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: null,
             success: true,
             error: false,
             message: "Organization deleted successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/org/getOrg.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const getOrgSchema = z.object({
     orgId: z.string().transform(Number).pipe(z.number().int().positive())
@@ -46,16 +47,15 @@ export async function getOrg(req: Request, res: Response, next: NextFunction): P
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: org[0],
             success: true,
             error: false,
             message: "Organization retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/org/listOrgs.ts

@@ -7,6 +7,7 @@ import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { sql, inArray } from 'drizzle-orm';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const listOrgsSchema = z.object({
     limit: z.string().optional().transform(Number).pipe(z.number().int().positive().default(10)),
@@ -72,8 +73,7 @@ export async function listOrgs(req: Request, res: Response, next: NextFunction):
         //   userRole: req.userOrgRoleIds[org.orgId],
         // }));
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: {
                 organizations,
                 pagination: {
@@ -86,9 +86,9 @@ export async function listOrgs(req: Request, res: Response, next: NextFunction):
             error: false,
             message: "Organizations retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/org/updateOrg.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const updateOrgParamsSchema = z.object({
     orgId: z.string().transform(Number).pipe(z.number().int().positive())
@@ -65,16 +66,15 @@ export async function updateOrg(req: Request, res: Response, next: NextFunction)
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: updatedOrg[0],
             success: true,
             error: false,
             message: "Organization updated successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/resource/createResource.ts

@@ -6,6 +6,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const createResourceParamsSchema = z.object({
     siteId: z.number().int().positive(),
@@ -64,16 +65,15 @@ export async function createResource(req: Request, res: Response, next: NextFunc
             subdomain,
         }).returning();
 
-    return res.status(HttpCode.CREATED).send(
         response(res, {
             data: newResource[0],
             success: true,
             error: false,
             message: "Resource created successfully",
             status: HttpCode.CREATED,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/resource/deleteResource.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 // Define Zod schema for request parameters validation
 const deleteResourceSchema = z.object({
@@ -48,16 +49,15 @@ export async function deleteResource(req: Request, res: Response, next: NextFunc
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: null,
             success: true,
             error: false,
             message: "Resource deleted successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/resource/getResource.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 // Define Zod schema for request parameters validation
 const getResourceSchema = z.object({
@@ -49,16 +50,15 @@ export async function getResource(req: Request, res: Response, next: NextFunctio
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: resource[0],
             success: true,
             error: false,
             message: "Resource retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/resource/listResources.ts

@@ -7,6 +7,7 @@ import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { sql, eq, and, or, inArray } from 'drizzle-orm';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const listResourcesParamsSchema = z.object({
     siteId: z.coerce.number().int().positive().optional(),
@@ -92,8 +93,7 @@ export async function listResources(req: RequestWithOrgAndRole, res: Response, n
         const totalCountResult = await countQuery;
         const totalCount = totalCountResult[0].count;
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: {
                 resources: resourcesList,
                 pagination: {
@@ -106,9 +106,9 @@ export async function listResources(req: RequestWithOrgAndRole, res: Response, n
             error: false,
             message: "Resources retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/resource/updateResource.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 // Define Zod schema for request parameters validation
 const updateResourceParamsSchema = z.object({
@@ -69,16 +70,15 @@ export async function updateResource(req: Request, res: Response, next: NextFunc
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: updatedResource[0],
             success: true,
             error: false,
             message: "Resource updated successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/site/createSite.ts

@@ -7,6 +7,7 @@ import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import fetch from 'node-fetch';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const API_BASE_URL = "http://localhost:3000";
 
@@ -65,17 +66,16 @@ export async function createSite(req: Request, res: Response, next: NextFunction
             subnet,
         }).returning();
 
-    return res.status(HttpCode.CREATED).send(
+        return response(res, {
-      response(res, {
             data: newSite[0],
             success: true,
             error: false,
             message: "Site created successfully",
             status: HttpCode.CREATED,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }
 
@@ -95,10 +95,9 @@ async function addPeer(peer: string) {
         }
 
         const data: any = await response.json();
-    console.log('Peer added successfully:', data.status);
+        logger.info('Peer added successfully:', data.status);
         return data;
     } catch (error: any) {
-    console.error('Error adding peer:', error.message);
         throw error;
     }
 }

server/routers/site/deleteSite.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 
 const API_BASE_URL = "http://localhost:3000";
@@ -51,17 +52,16 @@ export async function deleteSite(req: Request, res: Response, next: NextFunction
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: null,
             success: true,
             error: false,
             message: "Site deleted successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }
 

server/routers/site/getSite.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 // Define Zod schema for request parameters validation
 const getSiteSchema = z.object({
@@ -49,16 +50,15 @@ export async function getSite(req: Request, res: Response, next: NextFunction):
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: site[0],
             success: true,
             error: false,
             message: "Site retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/site/listSites.ts

@@ -7,6 +7,7 @@ import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { sql, eq, and, or, inArray } from 'drizzle-orm';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const listSitesParamsSchema = z.object({
     orgId: z.string().optional().transform(Number).pipe(z.number().int().positive()),
@@ -85,8 +86,7 @@ export async function listSites(req: Request, res: Response, next: NextFunction)
         const totalCountResult = await countQuery;
         const totalCount = totalCountResult[0].count;
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: {
                 sites: sitesList,
                 pagination: {
@@ -99,9 +99,9 @@ export async function listSites(req: Request, res: Response, next: NextFunction)
             error: false,
             message: "Sites retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/site/updateSite.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 // Define Zod schema for request parameters validation
 const updateSiteParamsSchema = z.object({
@@ -74,16 +75,15 @@ export async function updateSite(req: Request, res: Response, next: NextFunction
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: updatedSite[0],
             success: true,
             error: false,
             message: "Site updated successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/target/createTarget.ts

@@ -6,6 +6,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const createTargetParamsSchema = z.object({
     resourceId: z.string().uuid(),
@@ -56,16 +57,15 @@ export async function createTarget(req: Request, res: Response, next: NextFuncti
             ...targetData
         }).returning();
 
-    return res.status(HttpCode.CREATED).send(
+        return response(res, {
-      response(res, {
             data: newTarget[0],
             success: true,
             error: false,
             message: "Target created successfully",
             status: HttpCode.CREATED,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/target/deleteTarget.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const deleteTargetSchema = z.object({
     targetId: z.string().transform(Number).pipe(z.number().int().positive())
@@ -45,16 +46,15 @@ export async function deleteTarget(req: Request, res: Response, next: NextFuncti
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: null,
             success: true,
             error: false,
             message: "Target deleted successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/target/getTarget.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const getTargetSchema = z.object({
     targetId: z.string().transform(Number).pipe(z.number().int().positive())
@@ -46,16 +47,15 @@ export async function getTarget(req: Request, res: Response, next: NextFunction)
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: target[0],
             success: true,
             error: false,
             message: "Target retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/target/listTargets.ts

@@ -7,6 +7,7 @@ import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { sql, eq } from 'drizzle-orm';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const listTargetsParamsSchema = z.object({
     resourceId: z.string().optional()
@@ -86,10 +87,9 @@ export async function listTargets(req: Request, res: Response, next: NextFunctio
             error: false,
             message: "Targets retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
     } catch (error) {
-    console.log(error);
+        logger.error(error);
-    
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
-    return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "sadfdf"));
     }
 }

server/routers/target/updateTarget.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const updateTargetParamsSchema = z.object({
     targetId: z.string().transform(Number).pipe(z.number().int().positive())
@@ -67,16 +68,15 @@ export async function updateTarget(req: Request, res: Response, next: NextFuncti
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: updatedTarget[0],
             success: true,
             error: false,
             message: "Target updated successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/user/deleteUser.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const deleteUserSchema = z.object({
     userId: z.string().uuid()
@@ -45,16 +46,15 @@ export async function deleteUser(req: Request, res: Response, next: NextFunction
             );
         }
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: null,
             success: true,
             error: false,
             message: "User deleted successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/user/getUser.ts

@@ -7,6 +7,7 @@ import response from "@server/utils/response";
 import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const getUserSchema = z.object({
     userId: z.string().uuid()
@@ -49,16 +50,15 @@ export async function getUser(req: Request, res: Response, next: NextFunction):
         // Remove passwordHash from the response
         const { passwordHash: _, ...userWithoutPassword } = user[0];
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: userWithoutPassword,
             success: true,
             error: false,
             message: "User retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

server/routers/user/listUsers.ts

@@ -7,6 +7,7 @@ import HttpCode from '@server/types/HttpCode';
 import createHttpError from 'http-errors';
 import { sql } from 'drizzle-orm';
 import { ActionsEnum, checkUserActionPermission } from '@server/auth/actions';
+import logger from '@server/logger';
 
 const listUsersSchema = z.object({
     limit: z.string().optional().transform(Number).pipe(z.number().int().positive().default(10)),
@@ -46,8 +47,7 @@ export async function listUsers(req: Request, res: Response, next: NextFunction)
         // Remove passwordHash from each user object
         const usersWithoutPassword = usersList.map(({ passwordHash, ...userWithoutPassword }) => userWithoutPassword);
 
-    return res.status(HttpCode.OK).send(
+        return response(res, {
-      response(res, {
             data: {
                 users: usersWithoutPassword,
                 pagination: {
@@ -60,9 +60,9 @@ export async function listUsers(req: Request, res: Response, next: NextFunction)
             error: false,
             message: "Users retrieved successfully",
             status: HttpCode.OK,
-      })
+        });
-    );
     } catch (error) {
-    next(error);
+        logger.error(error);
+        return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
     }
 }

src/app/globals.css

@@ -1,6 +1,7 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
 @layer base {
     :root {
         --background: 37 100% 100%;
@@ -24,6 +25,7 @@
         --ring: 37 8% 51%;
         --radius: 0rem;
     }
+
     .dark {
         --background: 37 50% 10%;
         --foreground: 37 5% 100%;
@@ -47,10 +49,12 @@
         --radius: 0rem;
     }
 }
+
 @layer base {
     * {
         @apply border-border;
     }
+
     body {
         @apply bg-background text-foreground;
     }

tsconfig.json

@@ -1,6 +1,10 @@
 {
     "compilerOptions": {
-        "lib": ["dom", "dom.iterable", "esnext"],
+        "lib": [
+            "dom",
+            "dom.iterable",
+            "esnext"
+        ],
         "allowJs": true,
         "skipLibCheck": true,
         "strict": true,
@@ -14,9 +18,15 @@
         "incremental": true,
         "baseUrl": "src",
         "paths": {
-            "@server/*": ["../server/*"],
+            "@server/*": [
-            "@app/*": ["*"],
+                "../server/*"
-            "@/*": ["./*"]
+            ],
+            "@app/*": [
+                "*"
+            ],
+            "@/*": [
+                "./*"
+            ]
         },
         "plugins": [
             {
@@ -24,6 +34,13 @@
             }
         ]
     },
-    "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+    "include": [
-    "exclude": ["node_modules"]
+        "next-env.d.ts",
+        "**/*.ts",
+        "**/*.tsx",
+        ".next/types/**/*.ts"
+    ],
+    "exclude": [
+        "node_modules"
+    ]
 }