Merge pull request #262 from FinalDoubleTen/FE-94--feat/Trips/DragAnd…

…Drop feat: 커서공유 테스트
WePlanPlans · Jan 24, 2024 · 9279e04 · 9279e04
2 parents 871fa7d + c5b93a4
commit 9279e04
Show file tree

Hide file tree

Showing 70 changed files with 1,139 additions and 1,776 deletions.
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "react-beautiful-dnd": "^13.1.1",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.49.2",
+    "react-icons": "^5.0.1",
     "react-infinite-scroller": "^1.2.6",
     "react-kakao-maps-sdk": "^1.1.24",
     "react-modal": "^3.16.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/mockServiceWorker.js b/public/mockServiceWorker.js
diff --git a/src/@types/member.types.ts b/src/@types/member.types.ts
@@ -18,7 +18,7 @@ interface MemberInfo {
   // | 'TEENAGER'
   // | 'TWENTIES'
   // | 'THIRTIES'
-  // | 'FOURTIES'
+  // | 'FORTIES'
   // | 'ABOVE_FIFTIES'
   // | 'DEFATULT'
   genderType: string | null;