Merge pull request #217 from FinalDoubleTen/dev

Env: 여정페이지 2차배포
WePlanPlans · Jan 21, 2024 · 3c5f516 · 3c5f516
2 parents 72a9064 + d530e38
commit 3c5f516
Show file tree

Hide file tree

Showing 92 changed files with 2,738 additions and 651 deletions.
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "@radix-ui/react-radio-group": "^1.1.3",
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-tabs": "^1.0.4",
+    "@radix-ui/react-toast": "^1.1.5",
     "@radix-ui/react-toggle-group": "^1.0.4",
     "@stomp/stompjs": "^7.0.0",
     "@svgr/rollup": "^8.1.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/@types/service.ts b/src/@types/service.ts
@@ -2,7 +2,7 @@ export type subInfoRes = {
   status: number;
   message: string;
   data: {
-    tripId: number;
+    tripId: string;
     startDate: string;
     endDate: string;
     numberOfPeople: number;
@@ -16,7 +16,7 @@ export type subItemRes = {
   status: number;
   message: string;
   data: {
-    tripId: number;
+    tripId: string;
     visitDate: string;
     transportation: 'CAR' | 'PUBLIC_TRANSPORTATION';
     tripItems: {
@@ -52,7 +52,7 @@ export type subPathRes = {
   status: number;
   message: string;
   data: {
-    tripId: number;
+    tripId: string;
     visitDate: string;
     transportation: 'CAR' | 'PUBLIC_TRANSPORTATION';
     paths: {
@@ -77,16 +77,12 @@ export type subMemberRes = {
   status: number;
   message: string;
   data: {
-    tripId: number;
-    connectedMembers: {
-      memberId: number;
-      name: string;
-      thumbnailUrl: string;
-    }[];
+    tripId: string;
     tripMembers: {
       memberId: number;
       name: string;
       thumbnailUrl: string;
+      connected: boolean;
     }[];
     numberOfPeople: number;
   } | null;
@@ -95,7 +91,7 @@ export type subBudgetRes = {
   status: number;
   message: string;
   data: {
-    tripId: number;
+    tripId: string;
     budget: number;
     calculatedPrice: number;
   } | null;
@@ -107,6 +103,7 @@ export type SocketContextType = {
   tripPath: subPathRes | null;
   tripMember: subMemberRes | null;
   tripBudget: subBudgetRes | null;
+  tripId: string;
   callBackPub: (callback: () => void) => void;
 };
 

diff --git a/src/@types/socket.types.ts b/src/@types/socket.types.ts
@@ -2,7 +2,7 @@ type subInfoMessage = (message: {
   status: number;
   message: string;
   data: {
-    tripId: number;
+    tripId: string;
     startDate: string;
     endDate: string;
     numberOfPeople: number;
@@ -16,7 +16,7 @@ type subItemMessage = (response: {
   status: number;
   message: string;
   data: {
-    tripId: number;
+    tripId: string;
     visitDate: string;
     transportation: 'CAR' | 'PUBLIC_TRANSPORTATION';
     tripItems: {
@@ -36,7 +36,7 @@ type subPathMessage = (response: {
   status: number;
   message: string;
   data: {
-    tripId: number;
+    tripId: string;
     visitDate: string;
     transportation: 'CAR' | 'PUBLIC_TRANSPORTATION';
     paths: {
@@ -61,16 +61,12 @@ type subMemberMessage = (response: {
   status: number;
   message: string;
   data: {
-    tripId: number;
-    connectedMembers: {
-      memberId: number;
-      name: string;
-      thumbnailUrl: string;
-    }[];
+    tripId: string;
     tripMembers: {
       memberId: number;
       name: string;
       thumbnailUrl: string;
+      connected: boolean;
     }[];
     numberOfPeople: number;
   };
@@ -80,7 +76,7 @@ type subBudgetMessage = (response: {
   status: number;
   message: string;
   data: {
-    tripId: number;
+    tripId: string;
     budget: number;
     calculatedPrice: number;
   };
@@ -102,9 +98,9 @@ interface pubAddTripItem {
 }
 
 interface pubUpdatePrice {
-  tripId: number;
+  tripId: string;
   visitDate: string;
-  price: number;
+  price: string;
 }
 
 interface pubUpdateTripItem {
@@ -132,7 +128,7 @@ interface pubDeleteItem {
 }
 
 interface pubMember {
-  memberId: number;
+  token: string;
 }
 
 interface pubGetPathAndItems {

diff --git a/src/@types/tours.types.ts b/src/@types/tours.types.ts
@@ -37,3 +37,18 @@ export interface TourType {
   longitude?: string;
   latitude?: string;
 }
+
+export interface LikedListType {
+  tripLikedItemId: number;
+  tourItemId: number;
+  contentTypeId: number;
+  title: string;
+  ratingAverage: number;
+  reviewCount: number;
+  smallThumbnailUrl: string;
+  tourAddress: string;
+  prefer: boolean;
+  notPrefer: boolean;
+  preferTotalCount: number;
+  notPreferTotalCount: number;
+}
diff --git a/src/@types/trips.types.ts b/src/@types/trips.types.ts
@@ -3,12 +3,12 @@ interface TripRequest {
   numberOfPeople: number;
   startDate: string | null;
   endDate: string | null;
-  area: string | null;
-  subarea: string | null;
+  area?: string | null;
+  subarea?: string | null;
 }
 
 interface MyTripType {
-  tripId: number;
+  tripId: string;
   tripName: string;
   startDate: string;
   endDate: string;
@@ -18,3 +18,35 @@ interface MyTripType {
   area: string;
   subArea: string;
 }
+
+interface ourTripType {
+  tripLikedItemId: number;
+  tourItemId: number;
+  contentTypeId: number;
+  ratingAverage: number;
+  reviewCount: number;
+  smallThumbnailUrl: string;
+  tourAddress: string;
+  prefer: boolean;
+  notPrefer: boolean;
+  preferTotalCount: number;
+  notPreferTotalCount: number;
+  title: string;
+}
+
+interface ThumbsProps {
+  tripId: string;
+  tourId: number;
+  prefer: boolean;
+  notPrefer: boolean;
+}
+
+interface AuthorityType {
+  status: number;
+  message: string;
+  data: {
+    memberId: number;
+    tripAuthority: string;
+    tripId: string;
+  };
+}
diff --git a/src/api/socket.ts b/src/api/socket.ts
@@ -84,7 +84,7 @@ export const pubAddTripItem = (
 // 여행 아이템 예상 가격 업데이트 이벤트 발생시
 export const pubUpdatePrice = (
   pubUpdatePrice: pubUpdatePrice,
-  tripItemId: string,
+  tripItemId: number,
 ) => {
   socketClient.publish({
     destination: `/pub/tripItems/${tripItemId}/updatePrice`,
@@ -101,18 +101,15 @@ export const pubUpdateTripItem = (
     destination: `/pub/trips/${tripId}/updateTripItemOrder`,
     body: JSON.stringify(pubUpdateTripItem),
   });
-
-  console.log(pubUpdateTripItem);
-  console.log('펍실행');
 };
 
 // 여행 날짜별 교통 수단 변경 이벤트 발생시 (01/16 업데이트)
 export const pubUpdateTransportation = (
   pubUpdateTransportation: pubUpdateTransportation,
-  trips: string,
+  tripId: string,
 ) => {
   socketClient.publish({
-    destination: `/pub/trips/${trips}/updateTransportation`,
+    destination: `/pub/trips/${tripId}/updateTransportation`,
     body: JSON.stringify(pubUpdateTransportation),
   });
 };
@@ -137,7 +134,6 @@ export const pubDeleteItem = (
     destination: `/pub/tripItems/${tripItemId}/deleteItem`,
     body: JSON.stringify(pubDeleteItem),
   });
-  console.log(pubDeleteItem);
 };
 
 // 멤버 여정 페이지로 입장 이벤트 발생시
@@ -157,10 +153,9 @@ export const pubDisconnectMember = (pubMember: pubMember, tripId: string) => {
 };
 
 // 여정 편집 페이지 입장 이벤트 발생시(모든 sub 다받음)
-export const pubEnterMember = (pubMember: pubMember, tripId: string) => {
+export const pubEnterMember = (tripId: string) => {
   socketClient.publish({
     destination: `/pub/trips/${tripId}/enterMember`,
-    body: JSON.stringify(pubMember),
   });
 };