Resolve merge conflict

Author: SelwynAng

.env.sample

@@ -0,0 +1,18 @@
+## Common variables
+COMPOSE_PATH_SEPARATOR=:
+# Replace string between '...compose.' and '.yml' with 'dev' or 'prod'
+COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
+
+## Frontend variables
+FRONTEND_PORT=3000
+
+## Question service variables
+QUESTION_SVC_PORT=
+QUESTION_SVC_DB_URI=
+
+## User service variables
+USER_SVC_PORT=
+USER_SVC_DB_URI=
+JWT_SECRET=
+EMAIL_ADDRESS=
+EMAIL_PASSWORD=

.gitignore

@@ -0,0 +1 @@
+.env

docker-compose.dev.yml

@@ -0,0 +1,20 @@
+# Base file is docker-compose.yml
+services:
+  frontend:
+    build:
+      target: dev
+    volumes:
+      - ./frontend/app:/app/app
+      - ./frontend/components:/app/components
+
+  question-service:
+    environment:
+      - BUILD_ENV=dev
+    volumes:
+      - ./question-service/app:/app/app
+  
+  user-service:
+    build:
+      target: dev
+    volumes:
+      - ./user-service/app:/app/app

docker-compose.prod.yml

@@ -0,0 +1,13 @@
+# Base file is docker-compose.yml
+services:
+  frontend:
+    build:
+      target: prod
+
+  question-service:
+    environment:
+      - BUILD_ENV=prod
+  
+  user-service:
+    build:
+      target: prod

docker-compose.yml

@@ -0,0 +1,30 @@
+services:
+  frontend:
+    build:
+      context: ./frontend
+    ports:
+      - $FRONTEND_PORT:$FRONTEND_PORT
+    depends_on:
+      - question-service
+      - user-service
+
+  question-service:
+    build:
+      context: ./question-service
+    ports:
+      - $QUESTION_SVC_PORT:$QUESTION_SVC_PORT
+    environment:
+      - PORT=$QUESTION_SVC_PORT
+      - DB_URI=$QUESTION_SVC_DB_URI
+  
+  user-service:
+    build:
+      context: ./user-service
+    ports:
+      - $USER_SVC_PORT:$USER_SVC_PORT
+    environment:
+      - PORT=$USER_SVC_PORT
+      - DB_URI=$USER_SVC_DB_URI
+      - JWT_SECRET=$JWT_SECRET
+      - EMAIL_ADDRESS=$EMAIL_ADDRESS
+      - EMAIL_PASSWORD=$EMAIL_PASSWORD

frontend/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+.next

frontend/Dockerfile

@@ -0,0 +1,20 @@
+# Base stage
+FROM node:20-alpine AS base
+WORKDIR /app
+COPY package.json .
+COPY yarn.lock .
+RUN yarn install --frozen-lockfile
+
+# Production build stage
+FROM base AS build
+COPY . .
+RUN yarn build
+
+# Development stage
+FROM base AS dev
+COPY . .
+CMD ["yarn", "dev"]
+
+# Production runtime stage
+FROM build AS prod
+CMD ["yarn", "start"]

frontend/app/app/layout.tsx

@@ -1,9 +1,13 @@
+"use client";
+
 import type { Metadata } from "next";
 import localFont from "next/font/local";
 import "./globals.css";
 import { ThemeProvider } from "@/components/theme-provider";
 import { Toaster } from "@/components/ui/toaster";
 import AuthProvider from "@/app/auth/auth-context";
+import AuthPageWrapper from "@/components/auth/auth-page-wrapper";
+import { Navbar } from "@/components/navbar";
 
 const geistSans = localFont({
   src: "./fonts/GeistVF.woff",
@@ -37,7 +41,12 @@ export default function RootLayout({
           enableSystem
           disableTransitionOnChange
         >
-          <AuthProvider>{children}</AuthProvider>
+          <AuthProvider>
+            <AuthPageWrapper>
+              <Navbar />
+              {children}
+            </AuthPageWrapper>
+          </AuthProvider>
           <Toaster />
         </ThemeProvider>
       </body>

frontend/app/layout.tsx

@@ -1,3 +1,5 @@
+"use client";
+
 import { useAuth } from "@/app/auth/auth-context";
 import { usePathname } from "next/navigation";