Merge pull request #80 from CS3219-AY2425S1/feat/17-api-gateway

Author: simbayippy

.github/workflows/deploy.yml

@@ -28,10 +28,7 @@ jobs:
         run: "gcloud info"
 
       - name: "Trigger Cloud Build"
-        env:
-          NEXT_PUBLIC_QUESTION_SERVICE_URL: ${{ secrets.NEXT_PUBLIC_QUESTION_SERVICE_URL }}
-          NEXT_PUBLIC_AUTH_SERVICE_URL: ${{ secrets.NEXT_PUBLIC_AUTH_SERVICE_URL }}
-          AUTH_SERVICE_URL: ${{ secrets.AUTH_SERVICE_URL }}
-          QUESTION_SERVICE_URL: ${{ secrets.QUESTION_SERVICE_URL }}
+        env: # have to use env here as cant use secrets in kubernetes for nextJS
+          NEXT_PUBLIC_API_GATEWAY_URL: ${{ secrets.NEXT_PUBLIC_API_GATEWAY_URL }}
         run: |
-          gcloud builds submit --config cloudbuild.yaml --substitutions _NEXT_PUBLIC_QUESTION_SERVICE_URL="$NEXT_PUBLIC_QUESTION_SERVICE_URL",_NEXT_PUBLIC_AUTH_SERVICE_URL="$NEXT_PUBLIC_AUTH_SERVICE_URL",_AUTH_SERVICE_URL="$AUTH_SERVICE_URL",_QUESTION_SERVICE_URL="$QUESTION_SERVICE_URL"
+          gcloud builds submit --config cloudbuild.yaml --substitutions _NEXT_PUBLIC_API_GATEWAY_URL="$NEXT_PUBLIC_API_GATEWAY_URL"

.gitignore

@@ -1,22 +1,25 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-.yarn/install-state.gz
-.vscode
+# Dependencies
+node_modules/
 
-# testing
-/coverage
+# Build output
+dist/
+build/
 
-# next.js
-/.next/
-/out/
+# Logs
+*.log
 
-# production
-/build
+# Environment variables
+.env
 
+# IDE files
+.vscode/
+.idea/
+
+# OS files
+.DS_Store
+Thumbs.db
 # pnpm stores
 */.pnpm-store
 

api-gateway/.gitignore

@@ -0,0 +1,6 @@
+/node_modules
+.env
+.env.*
+/dist
+combined.log
+error.log

api-gateway/.prettierrc

@@ -0,0 +1,6 @@
+{
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 80
+}

api-gateway/Dockerfile

@@ -0,0 +1,38 @@
+# Base stage for both dev and prod
+FROM node:18-alpine AS base
+
+# Install pnpm globally
+RUN npm install -g pnpm
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy package.json and pnpm-lock.yaml
+COPY package.json ./
+COPY pnpm-lock.yaml ./
+
+RUN pnpm install
+
+# Development stage
+FROM base AS development
+
+COPY src ./src
+COPY tsconfig.json ./
+
+# Note: Don't expose ports here, Compose will handle that for us
+
+CMD ["pnpm", "dev"]
+
+
+# Production stage
+FROM base AS production
+ENV NODE_ENV=production
+ENV PORT=8001
+
+COPY src ./src
+COPY tsconfig.json ./
+COPY .env.production ./
+
+EXPOSE ${PORT}
+
+CMD ["pnpm", "start"]

api-gateway/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "api-gateway",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "dev": "nodemon --exec ts-node src/app.ts",
+    "start": "tsc && node dist/app.js",
+    "build": "tsc",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "pre-commit": "pnpm format && git add -u"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@stomp/stompjs": "^7.0.0",
+    "cors": "^2.8.5",
+    "dotenv": "^16.4.5",
+    "express": "^4.21.1",
+    "http-proxy-middleware": "^3.0.3",
+    "jsonwebtoken": "^9.0.2",
+    "winston": "^3.15.0",
+    "ws": "^8.13.0"
+  },
+  "devDependencies": {
+    "@types/cors": "^2.8.17",
+    "@types/express": "^5.0.0",
+    "@types/jsonwebtoken": "^9.0.7",
+    "@types/node": "^22.7.7",
+    "@types/ws": "^8.5.12",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "nodemon": "^3.1.7",
+    "prettier": "^3.3.3",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.6.3"
+  }
+}