merge: merge with master

unstructuredstudio · Mar 5, 2024 · 8c79aa1 · 8c79aa1
2 parents 1a622f7 + e1c4774
commit 8c79aa1
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 274 deletions.
diff --git a/zubhub_frontend/zubhub/package.json b/zubhub_frontend/zubhub/package.json
@@ -18,6 +18,7 @@
     "axios": "^1.5.1",
     "caniuse-lite": "^1.0.30001543",
     "classnames": "^2.2.6",
+    "clsx": "^2.1.0",
     "compressorjs": "^1.0.7",
     "dayjs": "^1.11.10",
     "formik": "^2.2.5",
@@ -30,6 +31,7 @@
     "lodash": "^4.17.21",
     "nanoid": "^3.3.1",
     "pdfmake": "^0.2.7",
+    "prop-types": "^15.0.0",
     "quill": "^1.3.7",
     "react": "^17.0.0",
     "react-confetti": "^6.1.0",