Merge branch 'develop' into feature/collaborative-editing

Author: charlenetcy

.github/workflows/codecov.yml

@@ -26,6 +26,7 @@ jobs:
         run: npx jest --coverage
 
       - name: Upload results to Codecov
+        if: always()
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -34,3 +34,6 @@ npm-debug.logcoverage/
 coverage/
 
 .vscode/
+
+# Database files
+/user-service/db

README.md

@@ -1,4 +1,4 @@
-[![codecov](https://codecov.io/gh/CS3219-AY2526Sem1/cs3219-ay2526s1-project-g03/graph/badge.svg?token=H8J2691IYM)](https://codecov.io/gh/CS3219-AY2526Sem1/cs3219-ay2526s1-project-g03)
+[![codecov](https://codecov.io/github/cs3219-ay2526sem1/cs3219-ay2526s1-project-g03/branch/develop/graph/badge.svg?token=H8J2691IYM)](https://codecov.io/github/cs3219-ay2526sem1/cs3219-ay2526s1-project-g03)
 
 [![Review Assignment Due Date](https://classroom.github.com/assets/deadline-readme-button-22041afd0340ce965d47ae6ef1cefeee28c7c493a6346c4f15d667ab976d596c.svg)](https://classroom.github.com/a/QUdQy4ix)
 

docker-compose.yml

@@ -1,5 +1,31 @@
 services:
   # --- DATABASES ---
+  user-db-mongodb:
+    image: mongo
+    container_name: user-db-mongodb
+    restart: unless-stopped
+    env_file:
+      - .env
+    volumes:
+      - ./user-service/db:/data/db
+    networks:
+      - app-network
+  
+  # For development purposes
+  user-db-mongo-express:
+    image: mongo-express
+    container_name: user-db-mongo-express
+    restart: unless-stopped  
+    ports:
+      - 8084:8081
+    env_file:
+      - .env
+    networks:
+      - app-network
+    depends_on:
+      - user-db-mongodb
+    
+
   question-db-pg:
     image: postgres:14-alpine
     container_name: question-db-pg
@@ -60,6 +86,9 @@ services:
       - /app/node_modules
     networks:
       - app-network
+    depends_on:
+      - user-db-mongodb
+    command: sh -c "npm run seed:admin || true && npm run dev" # for production change to npm start
 
   # Question service
   question-service:

frontend/.gitignore

@@ -23,4 +23,6 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+.vite
 .env

frontend/src/App.tsx

@@ -1,20 +1,53 @@
-import {Route, Routes} from 'react-router-dom';
+import {Route, Routes, useNavigate} from 'react-router-dom';
 import Home from './pages/home';
 import Register from './pages/register';
+import Login from './pages/login';
 import Input from './collaboration/pages/Input';
 import {CollabPage} from './collaboration/pages/CollabPage';
 import { Toaster } from 'react-hot-toast';
+import VerifyEmail from './pages/verifyEmail';
+import Profile from './pages/profile';
+import AuthContainer from './components/authContainer';
+import {setNavigate} from './lib/navigation';
+import ForgotPassword from './pages/forgotPassword';
+import ResetPassword from './pages/resetPassword';
+import UserProfile from './pages/userProfile';
+import ProfileSettings from './pages/profileSettings';
+import CompleteProfile from './pages/completeProfile';
+import AdminManagement from './pages/adminManagement';
+import AdminContainer from './components/adminContainer';
 
 function App() {
+  const navigate = useNavigate();
+  setNavigate(navigate); // Allows use of navigate within Axios.
   return (
     <>
       <Toaster />
 
       <Routes>
-        <Route path="/" element={<Home />} />
+        <Route path="/home" element={<Home />} />
         <Route path="/register" element={<Register />} />
-        <Route path="room" element={<Input />} />
-        <Route path="room/:roomId" element={<CollabPage />} />
+        <Route path="/complete-profile" element={<CompleteProfile />} />
+        <Route path="/email/verify/:code" element={<VerifyEmail />} />
+        <Route path="/login" element={<Login />} />
+        <Route path="/password/forgot" element={<ForgotPassword />} />
+        <Route path="/password/reset" element={<ResetPassword />} />
+        // Authorized users only (defined as having verfieid email).
+        <Route path="/" element={<AuthContainer />}>
+          <Route index element={<Profile />} />
+          <Route path="profile/" element={<UserProfile />} />
+          <Route path="profile/settings" element={<ProfileSettings />} />
+          <Route path="room" element={<Input />} />
+          <Route path="room/:roomId" element={<CollabPage />} />
+          <Route
+            path="admin/manage"
+            element={
+              <AdminContainer>
+                <AdminManagement />
+              </AdminContainer>
+            }
+          />
+        </Route>
       </Routes>
     </>
   );