Merge pull request #22 from CS3219-AY2425S1/feat/link-fe-to-question-service

Author: Kurtyjlee

.gitignore

@@ -0,0 +1,36 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts

.husky/pre-commit

@@ -0,0 +1 @@
+pnpm pre-commit

docker-compose.yml

@@ -1,16 +1,38 @@
-version: "3"
 services:
   frontend:
+    image: asia-southeast1-docker.pkg.dev/cs3219-g11-peerprep/cs3219-g11-repo/peerprep-fe:latest
     build:
       context: ./peerprep-fe
       dockerfile: Dockerfile
+    # volumes:
+    #   - ./peerprep-fe:/app  # Mount src directory for hot reloading
+    #   - /app/node_modules  # Prevent overwriting node_modules
+    #   - /app/.next
     ports:
       - "3000:3000"
     environment:
       - NODE_ENV=production
-
-  # Add other microservices here
-  # backend:
-  #   ...
-  # database:
-  #   ...
+    networks:
+      - peerprep-network
+    env_file:
+      - ./peerprep-fe/.env.production
+  question-service:
+    image: asia-southeast1-docker.pkg.dev/cs3219-g11-peerprep/cs3219-g11-repo/question-svc:latest
+    build:
+      context: ./question-service
+      dockerfile: Dockerfile
+    volumes:
+      - ./question-service:/app  # Mount src directory for hot reloading
+      - ./question-service/node_modules:/app/node_modules
+    ports:
+      - "4001:4001"
+    environment:
+      - NODE_ENV=production
+      - PORT=4001
+    networks:
+      - peerprep-network
+    env_file:
+      - ./question-service/.env.dev
+networks:
+  peerprep-network:
+    driver: bridge

package.json

@@ -0,0 +1,13 @@
+{
+	"scripts": {
+		"pre-commit": "npm run --workspaces pre-commit",
+		"prepare": "husky"
+	},
+	"devDependencies": {
+		"husky": "^9.1.6"
+	},
+	"workspaces": [
+		"question-service",
+		"peerprep-fe"
+	]
+}

peerprep-fe/.gitignore

@@ -27,6 +27,7 @@ yarn-error.log*
 
 # local env files
 .env*.local
+.env.*
 
 # vercel
 .vercel

peerprep-fe/.prettierrc

@@ -0,0 +1,7 @@
+{
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "printWidth": 80,
+  "plugins": ["prettier-plugin-tailwindcss"]
+}

peerprep-fe/next.config.mjs

@@ -1,6 +1,6 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  output: "standalone",
+  output: "standalone"
 };
 
 export default nextConfig;

peerprep-fe/package.json

@@ -6,14 +6,17 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start -p 3000 -H 0.0.0.0",
-    "lint": "next lint"
+    "lint": "next lint",
+    "format": "prettier --write \"src/**/*.tsx\" \"src/**/*.ts\" \"./tailwind.config.ts\"",
+    "pre-commit": "pnpm format && git add -u"
   },
   "dependencies": {
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-popover": "^1.1.1",
     "@radix-ui/react-select": "^2.1.1",
     "@radix-ui/react-slot": "^1.1.0",
+    "axios": "^1.7.7",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "1.0.0",
@@ -32,6 +35,8 @@
     "eslint": "^8",
     "eslint-config-next": "14.2.12",
     "postcss": "^8",
+    "prettier": "^3.3.3",
+    "prettier-plugin-tailwindcss": "^0.6.8",
     "tailwindcss": "^3.4.1",
     "typescript": "^5"
   }