Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/apis/chatting/dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export interface chatRoomMessagesData {
fromUser: FromUserDto;
toUser: ToUserDto;
createdAt: string;
toUserReadAt: any;
toUserReadAt: Date;
}

export interface FromUserDto {
Expand Down
2 changes: 1 addition & 1 deletion src/apis/post-comment/dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface Content {
content: string;
}

interface CreateCommentData extends Content {}
type CreateCommentData = Content;

export interface Comment {
id: number;
Expand Down
6 changes: 3 additions & 3 deletions src/apis/post-comment/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { EmptySuccessResponse } from '../core/dto';
import { newRequest } from '@apis/core';

import { CreateCommentRequest, CreateCommentResponse, GetCommentListResponse } from './dto';
import type { EmptySuccessResponse } from '@apis/core/dto';

import { newRequest } from '../core';
import type { CreateCommentRequest, CreateCommentResponse, GetCommentListResponse } from './dto';

// 게시글 댓글 생성 API
export const createCommentApi = (postId: number, data: CreateCommentRequest) =>
Expand Down
4 changes: 2 additions & 2 deletions src/apis/post-like/dto.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BaseSuccessResponse } from '../core/dto';
import { PaginationMeta } from '../util/dto';
import type { BaseSuccessResponse } from '@apis/core/dto';
import type { PaginationMeta } from '@apis/util/dto';

// 좋아요 누르기/취소
export type TogglePostLikeStatusResponse = BaseSuccessResponse<TogglePostLikeStatusData>;
Expand Down
4 changes: 2 additions & 2 deletions src/apis/post-like/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TogglePostLikeStatusResponse, GetPostLikeListResponse } from './dto';
import { newRequest } from '@apis/core';

import { newRequest } from '../core';
import type { TogglePostLikeStatusResponse, GetPostLikeListResponse } from './dto';

// 게시글 좋아요 누르기/취소
export const togglePostLikeStatusApi = (postId: number) =>
Expand Down
2 changes: 1 addition & 1 deletion src/apis/post-report/dto.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseSuccessResponse } from '../core/dto';
import type { BaseSuccessResponse } from '@apis/core/dto';

interface BaseReport {
id: number; // 신고 ID
Expand Down
4 changes: 2 additions & 2 deletions src/apis/post-report/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { SendPostReportRequest, SendPostReportResponse } from './dto';
import { newRequest } from '@apis/core';

import { newRequest } from '../core';
import type { SendPostReportRequest, SendPostReportResponse } from './dto';

// 게시글 신고 API
export const sendPostReportApi = (data: SendPostReportRequest) =>
Expand Down
6 changes: 3 additions & 3 deletions src/apis/post/dto.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BaseSuccessResponse } from '../core/dto';
import { PaginationMeta } from '../util/dto';
import type { BaseSuccessResponse } from '@apis/core/dto';
import type { PaginationMeta } from '@apis/util/dto';

// 게시글 생성
//request
Expand Down Expand Up @@ -28,7 +28,7 @@ export interface PostBase {
postClothings?: PostClothing[] | null;
isRepresentative: boolean;
}
export interface CreatePostData extends PostBase {}
export type CreatePostData = PostBase;
export interface PostSummary {
id: number;
content: string;
Expand Down
8 changes: 4 additions & 4 deletions src/apis/post/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { EmptySuccessResponse } from '../core/dto';
import { newRequest } from '@apis/core';

import {
import type { EmptySuccessResponse } from '@apis/core/dto';

import type {
CreatePostRequest,
CreatePostResponse,
GetPostListResponse,
Expand All @@ -10,8 +12,6 @@ import {
ModifyPostResponse,
} from './dto';

import { newRequest } from '../core';

// 게시글 생성
export const createPostApi = (data: CreatePostRequest) => newRequest.post<CreatePostResponse>('/post', data);

Expand Down
2 changes: 1 addition & 1 deletion src/components/BottomButton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const BottomButton: React.FC<BottomButtonProps> = ({ content, onClick, disabled
return (
<ButtonWrapper>
<Button onClick={onClick} disabled={disabled}>
<StyledText $textTheme={{ style: 'body1-regular', lineHeight: 2 }}>{content}</StyledText>
<StyledText $textTheme={{ style: 'body1-regular' }}>{content}</StyledText>
</Button>
</ButtonWrapper>
);
Expand Down
4 changes: 2 additions & 2 deletions src/components/ClothingInfoItem/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ const ClothingInfoItem: React.FC<ClothingInfoItemProps> = ({ clothingObj, onDele
<img src={clothingObj.imageUrl} alt="ClothingImg" />
</ClothingImage>
<div className="infoDetail">
<StyledText className="brand" $textTheme={{ style: 'body2-bold', lineHeight: 2 }}>
<StyledText className="brand" $textTheme={{ style: 'body2-bold' }}>
{clothingObj.brandName}
</StyledText>
<ClothingModel className="model" $textTheme={{ style: 'body4-light', lineHeight: 1 }}>
<ClothingModel className="model" $textTheme={{ style: 'body4-light' }}>
{clothingObj.modelName}
</ClothingModel>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ClothingInfoItem/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const ClothingInfoLeft = styled.div`

.model {
margin-right: auto;
color: ${({ theme }) => theme.colors.black};
color: ${({ theme }) => theme.colors.text.primary};
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
Expand Down
6 changes: 3 additions & 3 deletions src/components/ConfirmationModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
>
<ConfirmationModalLayout>
<ContentBox>
<StyledText $textTheme={{ style: 'body2-regular' }} color={theme.colors.black}>
<StyledText $textTheme={{ style: 'body2-regular' }} color={theme.colors.text.primary}>
{content}
</StyledText>
</ContentBox>
Expand All @@ -36,14 +36,14 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
onCloseModal();
}}
>
<StyledText $textTheme={{ style: 'body2-regular' }} color={theme.colors.black}>
<StyledText $textTheme={{ style: 'body2-regular' }} color={theme.colors.text.primary}>
취소
</StyledText>
</Button>
</>
)}
<Button onClick={confirm.action}>
<StyledText $textTheme={{ style: 'body2-regular', lineHeight: 1.5 }} color={'#F00'}>
<StyledText $textTheme={{ style: 'body2-regular' }} color={'#F00'}>
{confirm.text}
</StyledText>
</Button>
Expand Down
1 change: 0 additions & 1 deletion src/components/Text/dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ interface FontStylesByPlatform {
export interface StyledTextProps {
$textTheme: {
style: FontStyleKey | FontStylesByPlatform;
lineHeight?: number;
};
color?: string;
children: unknown;
Expand Down
3 changes: 1 addition & 2 deletions src/components/TopBar/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import theme from '@styles/theme';

import { StyledText } from '@components/Text/StyledText';

import type { TopBarLayoutProps } from './dto';
export const TopBarLayout = styled.header<TopBarLayoutProps>`
export const TopBarLayout = styled.header<{ $withBorder: boolean }>`
display: flex;
position: sticky;
top: 0; /* 부모 요소의 상단에 붙도록 설정 */
Expand Down
Loading
Loading