Merge branch 'main' into VOl-71/after-user-authentication-post-a-new-…

…user-if-they-dont-already-exist
UoaWDCC · May 21, 2024 · 3a889a3 · 3a889a3
2 parents b8c19b3 + 49bc7f3
commit 3a889a3
Show file tree

Hide file tree

Showing 76 changed files with 7,556 additions and 2,931 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,10 @@
 {
   "dependencies": {
-    "firebase": "^10.11.0"
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.3.0",
+    "firebase": "^10.11.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-router-dom": "^6.23.0"
   }
 }
diff --git a/web/Dockerfile.production b/web/Dockerfile.production
@@ -44,6 +44,8 @@ COPY --from=build /app/dist /usr/share/nginx/html
 COPY --link _redirects /usr/share/nginx/html/_redirects
 COPY nginx.conf /etc/nginx/nginx.conf
 
+# Serve the public folder
+COPY --link public /usr/share/nginx/html/public
 
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 80