refactor(server): moved the server files outside the src to improve static files

server/README.md

@@ -1,8 +0,0 @@
-```
-npm install
-npm run dev
-```
-
-```
-open http://localhost:3000
-```

server/index.ts

@@ -4,8 +4,8 @@ import {serveStatic} from "@hono/node-server/serve-static";
 import {logger} from "hono/logger";
 import {cors} from "hono/cors";
 
-import {db} from "../../database/dbclient.js";
+import {db} from "../database/dbclient.js";
-import {modules} from "../../database/schema/modules.js";
+import {modules} from "../database/schema/modules.js";
 
 // custom routes
 import scalar from "./services/general/route/scalar.js";
@@ -44,7 +44,7 @@ const routes = [
     system,
 ] as const;
 
-routes.forEach((route) => {
+const appRoutes = routes.forEach((route) => {
     app.route("/api/", route);
 });
 
@@ -57,8 +57,8 @@ app.all("/ocme/*", async (c) => {
 });
 
 // front end static files
-app.get("*", serveStatic({root: "../frontend/dist"}));
+app.use("/*", serveStatic({root: "./frontend/dist"}));
-app.get("*", serveStatic({path: "../frontend/dist/index.html"}));
+app.use("*", serveStatic({path: "./frontend/dist/index.html"}));
 
 serve(
     {
@@ -69,3 +69,5 @@ serve(
         console.log(`Server is running on http://localhost:${info.port}`);
     }
 );
+
+export type AppRoutes = typeof appRoutes;

server/package.json

@@ -1,31 +0,0 @@
-{
-    "name": "server",
-    "type": "module",
-    "scripts": {
-        "dev": "dotenvx run -f ../.env -- tsx watch src/index.ts",
-        "build": "rimraf dist && tsc --build",
-        "start": "dotenvx run node dist/server/src/index.js"
-    },
-    "dependencies": {
-        "@hono/node-server": "^1.13.8",
-        "@dotenvx/dotenvx": "^1.35.0",
-        "@hono/zod-openapi": "^0.18.4",
-        "@scalar/hono-api-reference": "^0.5.175",
-        "@types/jsonwebtoken": "^9.0.8",
-        "axios": "^1.7.9",
-        "bcrypt": "^5.1.1",
-        "compression": "^1.8.0",
-        "cookie": "^1.0.2",
-        "date-fns": "^4.1.0",
-        "dotenv": "^16.4.7",
-        "drizzle-orm": "^0.39.3",
-        "drizzle-zod": "^0.7.0",
-        "jsonwebtoken": "^9.0.2",
-        "pg": "^8.13.3",
-        "postgres": "^3.4.5",
-        "zod": "^3.24.2"
-    },
-    "devDependencies": {
-        "typescript": "~5.7.3"
-    }
-}

server/services/auth/authService.ts

@@ -3,10 +3,16 @@ import {OpenAPIHono} from "@hono/zod-openapi";
 import login from "./routes/login.js";
 import register from "./routes/register.js";
 import session from "./routes/session.js";
+import getAccess from "./routes/getUserRoles.js";
+import {authMiddleware} from "./middleware/authMiddleware.js";
 
 const app = new OpenAPIHono();
 app.route("auth/login", login);
 app.route("auth/register", register);
 app.route("auth/session", session);
 
+// required to login
+app.use("auth/getuseraccess", authMiddleware);
+app.route("/auth/getuseraccess", getAccess);
+
 export default app;

server/services/auth/controllers/getUserAccess.ts

@@ -4,8 +4,8 @@ in the login route we attach it to user under roles.
 */
 
 import {eq} from "drizzle-orm";
-import {db} from "../../../../../database/dbclient.js";
+import {db} from "../../../../database/dbclient.js";
-import {userRoles} from "../../../../../database/schema/userRoles.js";
+import {userRoles} from "../../../../database/schema/userRoles.js";
 
 export const roleCheck = async (user_id: any) => {
     // get the user roles by the user_id

server/services/auth/controllers/login.ts

@@ -1,6 +1,6 @@
 import jwt from "jsonwebtoken";
-import {db} from "../../../../../database/dbclient.js";
+import {db} from "../../../../database/dbclient.js";
-import {users} from "../../../../../database/schema/users.js";
+import {users} from "../../../../database/schema/users.js";
 import {eq, sql} from "drizzle-orm";
 import {checkPassword} from "../utils/checkPassword.js";
 import {roleCheck} from "./getUserAccess.js";

server/services/auth/middleware/authMiddleware.ts

@@ -1,5 +1,7 @@
 import {type MiddlewareHandler} from "hono";
-import {sign, verify} from "jsonwebtoken";
+import jwt from "jsonwebtoken";
+
+const {sign, verify} = jwt;
 
 export const authMiddleware: MiddlewareHandler = async (c, next) => {
     const authHeader = c.req.header("Authorization");

server/services/auth/routes/getUserRoles.ts

@@ -0,0 +1,31 @@
+import {z, createRoute, OpenAPIHono} from "@hono/zod-openapi";
+import {apiHit} from "../../../globalUtils/apiHits.js";
+
+const app = new OpenAPIHono();
+
+const responseSchema = z.object({
+    message: z.string().optional().openapi({example: "User Created"}),
+});
+
+app.openapi(
+    createRoute({
+        tags: ["Auth"],
+        summary: "Returns the useraccess table",
+        method: "get",
+        path: "/",
+
+        responses: {
+            200: {
+                content: {"application/json": {schema: responseSchema}},
+                description: "Retrieve the user",
+            },
+        },
+    }),
+    async (c) => {
+        // apit hit
+        apiHit(c, {endpoint: "api/auth/register"});
+        return c.json({message: "UserRoles coming over"});
+    }
+);
+
+export default app;

server/services/auth/routes/register.ts

@@ -1,6 +1,6 @@
 import {z, createRoute, OpenAPIHono} from "@hono/zod-openapi";
-import {db} from "../../../../../database/dbclient.js";
+import {db} from "../../../../database/dbclient.js";
-import {users} from "../../../../../database/schema/users.js";
+import {users} from "../../../../database/schema/users.js";
 import {apiHit} from "../../../globalUtils/apiHits.js";
 import {createPassword} from "../utils/createPassword.js";
 import {eq} from "drizzle-orm";

server/services/server/route/modules.ts

@@ -1,6 +1,6 @@
 import {z, createRoute, OpenAPIHono} from "@hono/zod-openapi";
-import {modules} from "../../../../../database/schema/modules.js";
+import {modules} from "../../../../database/schema/modules.js";
-import {db} from "../../../../../database/dbclient.js";
+import {db} from "../../../../database/dbclient.js";
 import {eq} from "drizzle-orm";
 
 // Define the request body schema

server/tsconfig.json

@@ -1,16 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "ESNext",
-        "module": "NodeNext",
-        "moduleResolution": "nodenext",
-        "strict": true,
-        "verbatimModuleSyntax": true,
-        "skipLibCheck": true,
-        "types": ["node"],
-        "jsx": "react-jsx",
-        "jsxImportSource": "hono/jsx",
-        "outDir": "./dist",
-        "removeComments": true
-    },
-    "exclude": ["node_modules"]
-}