Merge branch 'master' of https://github.com/cornell-dti/carriage-web …

…into nd433/RepeatingRide
cornell-dti · Nov 1, 2024 · 03e617d · 03e617d
2 parents f5bb52b + 11b5e40
commit 03e617d
Show file tree

Hide file tree

Showing 8 changed files with 992 additions and 83 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -4,6 +4,10 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
+    "@emotion/react": "^11.13.3",
+    "@emotion/styled": "^11.13.0",
+    "@mui/icons-material": "^6.1.5",
+    "@mui/material": "^6.1.5",
     "@react-aria/utils": "^3.25.2",
     "@react-oauth/google": "^0.12.1",
     "@types/crypto-js": "^4.2.2",