Skip to content

Commit

Permalink
Merge pull request #346 from TripInfoWeb/dev_refactoring
Browse files Browse the repository at this point in the history
Refactor: 모임 페이지네이션에서 본명 대신 닉네임 표시
  • Loading branch information
HyunJinNo authored Sep 21, 2024
2 parents 8f5262d + 3aac644 commit 9f22b42
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/components/common/GatheringItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const GatheringItem = ({ data }: IGatheringItem) => {
{data.title}
</p>
<p className="overflow-hidden text-ellipsis whitespace-nowrap text-sm font-medium text-gray1">
{data.userName}
{data.nickname}
</p>
</div>
{/* 마감일 포함 영역 */}
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/GatheringItemHome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const GatheringItemHome = ({ data }: IGatheringItemHome) => {
{data.title}
</p>
<p className="overflow-hidden text-ellipsis whitespace-nowrap text-sm font-medium text-gray1">
{data.userName}
{data.nickname}
</p>
</div>
<div className="flex flex-col gap-5">
Expand Down
19 changes: 10 additions & 9 deletions src/types/GatheringDto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export interface TopGatheringResponseDto {
title: string;
}


// types.ts

type UserPostingResponse = {
Expand All @@ -40,7 +39,10 @@ export type PlaceResponse = {
};

type ZoneCategoryResponse = {
parentZoneCategory: { parentZoneCategory: null | ZoneCategoryResponse; name: string } | null;
parentZoneCategory: {
parentZoneCategory: null | ZoneCategoryResponse;
name: string;
} | null;
name: string;
};

Expand All @@ -53,7 +55,7 @@ export type GatheringRecommend = {
isBookMark: boolean;
likeCount: number;
gatheringCategoryName: string;
userName: string;
nickname: string;
scheduleStartDate: string;
scheduleEndDate: string;
deadline: string;
Expand All @@ -74,8 +76,8 @@ export interface gatheringApplicantsResponsesDto {
nickname: string;
age: number;
sex: string;
},
gatheringStatus: 'WAIT' | 'CONSENT' | 'REFUSE'
};
gatheringStatus: "WAIT" | "CONSENT" | "REFUSE";
}

export interface GatheringDetailResponseDto {
Expand Down Expand Up @@ -104,8 +106,7 @@ export interface GatheringDetailResponseDto {
gatheringStatus: string;
openChattingUrl: string;
userImage: string;
};

}

// 모임 리스트 조회

Expand All @@ -118,7 +119,7 @@ export interface Gathering {
isBookMark: boolean;
likeCount: number;
gatheringCategoryName: string;
userName: string;
nickname: string;
scheduleStartDate: string; // ISO 8601 format
scheduleEndDate: string; // ISO 8601 format
deadline: string; // ISO 8601 format
Expand Down Expand Up @@ -160,4 +161,4 @@ export interface GatheringsResponse {
numberOfElements: number;
pageable: Pageable;
empty: boolean;
}
}

0 comments on commit 9f22b42

Please sign in to comment.