Merge branch 'main' into feature/65-update-map-page

Team-pingping · Nov 23, 2024 · 652981b · 652981b
2 parents f4e2e99 + 46e9385
commit 652981b
Show file tree

Hide file tree

Showing 55 changed files with 2,447 additions and 1,032 deletions.
diff --git a/fe/package-lock.json b/fe/package-lock.json
diff --git a/fe/package.json b/fe/package.json
@@ -15,6 +15,7 @@
     "@react-spring/web": "^9.7.5",
     "@use-gesture/react": "^10.3.1",
     "axios": "^1.7.7",
+    "classnames": "^2.5.1",
     "dotenv": "^16.4.5",
     "express": "^4.21.0",
     "lodash.debounce": "^4.0.8",
@@ -23,6 +24,7 @@
     "next-auth": "^4.24.8",
     "react": "^18",
     "react-dom": "^18",
+    "react-swipeable": "^7.0.2",
     "tailwind-scrollbar-hide": "^1.1.7",
     "uuid": "^10.0.0",
     "winston": "^3.14.2",

diff --git a/fe/public/gif/popup.gif b/fe/public/gif/popup.gif
diff --git a/fe/public/images/ArrowBack.svg b/fe/public/images/ArrowBack.svg
diff --git a/fe/public/images/Check.svg b/fe/public/images/Check.svg
diff --git a/fe/public/images/Search.svg b/fe/public/images/Search.svg
diff --git a/fe/public/images/graytooltip.svg b/fe/public/images/graytooltip.svg
diff --git a/fe/public/images/tooltip.svg b/fe/public/images/tooltip.svg
diff --git a/fe/public/images/whitedelete.svg b/fe/public/images/whitedelete.svg
diff --git a/fe/public/svg/LocationPin.svg b/fe/public/svg/LocationPin.svg
diff --git a/fe/public/svg/bluecheck.svg b/fe/public/svg/bluecheck.svg
diff --git a/fe/public/svg/delete.svg b/fe/public/svg/delete.svg
diff --git a/fe/public/svg/graycancel.svg b/fe/public/svg/graycancel.svg
diff --git a/fe/public/svg/graycheck.svg b/fe/public/svg/graycheck.svg
diff --git a/fe/public/svg/infomation.svg b/fe/public/svg/infomation.svg
diff --git a/fe/public/svg/information.svg b/fe/public/svg/information.svg
diff --git a/fe/public/svg/linkAdd.svg b/fe/public/svg/linkAdd.svg
diff --git a/fe/public/svg/loding1.svg b/fe/public/svg/loding1.svg
diff --git a/fe/public/svg/loding2.svg b/fe/public/svg/loding2.svg