Merge branch 'dev' into 89-feat-add-realtime-notification-with-fcm

package.json

@@ -19,17 +19,21 @@
     "dotenv": "^16.3.1",
     "firebase": "^9.23.0",
     "framer-motion": "^10.16.16",
+    "immutability-helper": "^3.1.1",
     "jwt-decode": "^4.0.0",
     "react": "^18.2.0",
     "react-cookie": "^7.0.1",
     "react-datepicker": "^4.25.0",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.49.2",
     "react-icons": "^4.12.0",
     "react-kakao-maps-sdk": "^1.1.24",
     "react-mobile-datepicker": "^4.0.2",
     "react-router-dom": "^6.21.1",
     "recoil": "^0.7.7",
+    "recoil-persist": "^5.1.0",
     "swiper": "^11.0.5"
   },
   "devDependencies": {

src/App.tsx

@@ -1,6 +1,8 @@
 import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
 import {Suspense} from 'react';
 import {CookiesProvider} from 'react-cookie';
+import {DndProvider} from 'react-dnd';
+import {HTML5Backend} from 'react-dnd-html5-backend';
 import {BrowserRouter} from 'react-router-dom';
 import './firebase/messaging-init-in-sw';
 
@@ -15,9 +17,11 @@ function App() {
     <Suspense fallback='서스펜스 로딩입니다, 추후에 폴백UI를 추가하거나 아니면 지우겠습니다~~'>
       <QueryClientProvider client={queryClient}>
         <CookiesProvider>
-          <BrowserRouter>
-            <MainRouter />
-          </BrowserRouter>
+          <DndProvider backend={HTML5Backend}>
+            <BrowserRouter>
+              <MainRouter />
+            </BrowserRouter>
+          </DndProvider>
         </CookiesProvider>
       </QueryClientProvider>
     </Suspense>

src/api/vote.ts

@@ -19,7 +19,7 @@ export const getVoteInfo = async (voteId: number): Promise<VoteInfo> => {
 
 //보트 리스트
 export const getVoteListInfo = async (spaceId: number): Promise<VoteListInfo[]> => {
-  const response = await axios.get(`/api/votes/${spaceId}`);
+  const response = await axios.get(`/api/votes`, {params: {spaceId, voteStatusOption: 'ALL'}});
   return response.data;
 };
 
@@ -28,7 +28,7 @@ export const getVoteListInfo = async (spaceId: number): Promise<VoteListInfo[]>
 /* ----------------------------------- P O S T ---------------------------------- */
 
 //vote 추가
-export const PostNewVote = async ({spaceId, title}: PostVoteTitleProps) => {
+export const postNewVote = async ({spaceId, title}: PostVoteTitleProps) => {
   try {
     const response = await axios.post('/api/votes', {spaceId, title});
     console.log('axios 포스트 성공', response);