From c8793ede881a8152245199c6182d51556c9b7d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= Date: Thu, 26 Dec 2024 23:25:46 +0900 Subject: [PATCH 1/8] =?UTF-8?q?Refact:=20=EA=B3=B5=ED=86=B5=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=A6=AC=ED=8C=A9=ED=86=A0?= =?UTF-8?q?=EB=A7=81=20(=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95,=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=EB=AA=85=EB=AA=85=20=EA=B7=9C=EC=B9=99=20?= =?UTF-8?q?=EC=A0=90=EA=B2=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PostItem/dto.ts | 2 +- src/components/PostItem/index.tsx | 38 ++++++-------- src/components/PostItem/style.tsx | 6 +-- src/components/TopBar/dto.ts | 12 ++--- src/components/TopBar/index.tsx | 69 ++++++++++++------------- src/components/TopBar/styles.tsx | 8 +-- src/components/UserProfile/dto.ts | 5 ++ src/components/UserProfile/index.tsx | 25 ++++----- src/components/UserProfile/style.tsx | 8 +-- src/pages/AccountCancel/index.tsx | 60 +++++++++++---------- src/pages/AccountEdit/index.tsx | 2 +- src/pages/AccountSetting/index.tsx | 12 ++--- src/pages/Chats/ChatRoom/index.tsx | 4 +- src/pages/PostImageSelect/index.tsx | 2 +- src/pages/PostInstaFeedSelect/index.tsx | 4 +- src/pages/PostUpload/index.tsx | 2 +- src/pages/Profile/index.tsx | 18 ++----- src/pages/ProfileEdit/index.tsx | 6 +-- src/pages/TermsAgreement/index.tsx | 2 +- src/pages/verification/index.tsx | 2 +- 20 files changed, 135 insertions(+), 152 deletions(-) create mode 100644 src/components/UserProfile/dto.ts diff --git a/src/components/PostItem/dto.ts b/src/components/PostItem/dto.ts index 23cd3a3c..e46a6b04 100644 --- a/src/components/PostItem/dto.ts +++ b/src/components/PostItem/dto.ts @@ -1,4 +1,4 @@ -import { UserPostSummary } from '../../apis/post/dto'; +import { UserPostSummary } from '@/apis/post/dto'; export interface Post extends UserPostSummary {} diff --git a/src/components/PostItem/index.tsx b/src/components/PostItem/index.tsx index 4a4596b0..1c093936 100644 --- a/src/components/PostItem/index.tsx +++ b/src/components/PostItem/index.tsx @@ -1,46 +1,40 @@ import React from 'react'; import { useNavigate } from 'react-router-dom'; -import theme from '../../styles/theme'; -import { - PostItemContainer, - PostImageContainer, - PostImage, - LikesCountStyledText, - Icon, - LikesOverlay, - PinSvg, -} from './style'; -import HeartSvg from '../../assets/default/like.svg'; -import MessageSvg from '../../assets/default/message.svg'; -import PinIcon from '../../assets/default/pin.svg'; -import { PostItemProps } from './dto'; + +import theme from '@/styles/theme'; +import PinIcon from '@/assets/default/pin.svg'; +import Heart from '@components/Icons/Heart'; +import Message from '@components/Icons/Message'; + +import { PostItemLayout, PostImageContainer, PostImage, LikesCountStyledText, LikesOverlay, Pin } from './style'; +import type { PostItemProps } from './dto'; const PostItem: React.FC = ({ post, isMyPost = true }) => { const navigate = useNavigate(); - const imageUrl = post.imageUrl; + const PostImageUrl = post.imageUrl; - const handleClick = () => { + const handlePostClick = () => { const path = isMyPost ? `/my-post/${post.id}` : `/post/${post.id}`; navigate(path); }; return ( - + - - {post.isRepresentative && } + + {post.isRepresentative && } - + {post.postLikesCount} - + {post.postCommentsCount} - + ); }; diff --git a/src/components/PostItem/style.tsx b/src/components/PostItem/style.tsx index 83c253f1..655f234a 100644 --- a/src/components/PostItem/style.tsx +++ b/src/components/PostItem/style.tsx @@ -1,7 +1,7 @@ import styled from 'styled-components'; -import { StyledText } from '../Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; -export const PostItemContainer = styled.article` +export const PostItemLayout = styled.article` flex: 1 1 calc(50% - 0.5rem); /* 기본적으로 두 개씩 배치되도록 설정 */ width: 100%; max-width: 67.5rem; /* 최대 너비 설정 */ @@ -59,7 +59,7 @@ export const LikesCountStyledText = styled(StyledText)` margin: 0 8px 0.5rem 4px; `; -export const PinSvg = styled.img` +export const Pin = styled.img` display: flex; position: absolute; top: 0.75rem; diff --git a/src/components/TopBar/dto.ts b/src/components/TopBar/dto.ts index 1f7579f0..c3d47e7e 100644 --- a/src/components/TopBar/dto.ts +++ b/src/components/TopBar/dto.ts @@ -1,12 +1,12 @@ export interface TopBarProps { - text?: string; // 텍스트, optional prop - RightButtonSrc?: string; // KebabMenuButton src의 Optional prop - LeftButtonSrc?: string; // BackButton src의 Optional prop - onLeftClick?: () => void; // BackButton src의 Optional prop - onRightClick?: () => void; // KebabMenuButton src의 Optional prop + text?: string; + RightButtonSrc?: string; + LeftButtonSrc?: string; + onLeftButtonClick?: () => void; + onRightButtonClick?: () => void; $withBorder?: boolean; } -export interface TopbarLayoutProps { +export interface TopBarLayoutProps { $withBorder?: boolean; } diff --git a/src/components/TopBar/index.tsx b/src/components/TopBar/index.tsx index 11d57864..37213536 100644 --- a/src/components/TopBar/index.tsx +++ b/src/components/TopBar/index.tsx @@ -1,48 +1,47 @@ -import theme from '../../styles/theme'; -import { TopbarLayout, StyledTextLayout, LeftButton, RightButton } from './styles'; +import React from 'react'; import { useNavigate } from 'react-router-dom'; -import { TopBarProps } from './dto'; +import theme from '@/styles/theme'; +import type { TopBarProps } from './dto'; +import { TopBarLayout, StyledTextWrapper, LeftButton, RightButton } from './styles'; const TopBar: React.FC = ({ text = '', RightButtonSrc, LeftButtonSrc, - onLeftClick, - onRightClick, + onLeftButtonClick, + onRightButtonClick, $withBorder = false, }) => { - const nav = useNavigate(); + const navigate = useNavigate(); return ( - <> - - { - if (onLeftClick) { - onLeftClick(); - } else { - nav(-1); - } - }} - > - 뒤로가기 - - - {text} - - { - if (onRightClick) { - onRightClick(); - } - }} - > - 메뉴 - - - + + { + if (onLeftButtonClick) { + onLeftButtonClick(); + } else { + navigate(-1); + } + }} + > + 뒤로가기 + + + {text} + + { + if (onRightButtonClick) { + onRightButtonClick(); + } + }} + > + 메뉴 + + ); }; diff --git a/src/components/TopBar/styles.tsx b/src/components/TopBar/styles.tsx index a5317833..3d06de80 100644 --- a/src/components/TopBar/styles.tsx +++ b/src/components/TopBar/styles.tsx @@ -1,8 +1,8 @@ import styled from 'styled-components'; -import { TopbarLayoutProps } from './dto'; -import { StyledText } from '../Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; +import type { TopBarLayoutProps } from './dto'; -export const TopbarLayout = styled.header` +export const TopBarLayout = styled.header` display: flex; position: sticky; top: 0; /* 부모 요소의 상단에 붙도록 설정 */ @@ -18,7 +18,7 @@ export const TopbarLayout = styled.header` `} `; -export const StyledTextLayout = styled(StyledText)` +export const StyledTextWrapper = styled(StyledText)` flex-direction: column; align-items: center; `; diff --git a/src/components/UserProfile/dto.ts b/src/components/UserProfile/dto.ts new file mode 100644 index 00000000..d8a1140e --- /dev/null +++ b/src/components/UserProfile/dto.ts @@ -0,0 +1,5 @@ +export interface UserProfileProps { + userImg?: string; // string | undefined + bio?: string; + nickname: string; +} diff --git a/src/components/UserProfile/index.tsx b/src/components/UserProfile/index.tsx index 04df42f0..bbb33f81 100644 --- a/src/components/UserProfile/index.tsx +++ b/src/components/UserProfile/index.tsx @@ -1,26 +1,21 @@ import React from 'react'; -import { StyledText } from '../Text/StyledText'; -import theme from '../../styles/theme'; -import { UserProfileContainer, UserImg, UserDetails, BioStyledText } from './style'; - -interface UserProfileProps { - userImg?: string; // string | undefined - bio?: string; - nickname: string; -} +import theme from '@/styles/theme'; +import { StyledText } from '@components/Text/StyledText'; +import type { UserProfileProps } from './dto'; +import { UserProfileLayout, UserImg, UserDetailsContainer, StyledBio } from './style'; const UserProfile: React.FC = React.memo(({ userImg, bio = '', nickname }) => { const truncatedBio = bio ? (bio.length > 50 ? bio.substring(0, 50) + '...' : bio) : ''; return ( - + - + {nickname} - + {truncatedBio} - - - + + + ); }); diff --git a/src/components/UserProfile/style.tsx b/src/components/UserProfile/style.tsx index 709717e0..275dbb28 100644 --- a/src/components/UserProfile/style.tsx +++ b/src/components/UserProfile/style.tsx @@ -1,7 +1,7 @@ import styled from 'styled-components'; -import { StyledText } from '../Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; -export const UserProfileContainer = styled.section` +export const UserProfileLayout = styled.section` display: flex; flex-direction: row; `; @@ -12,7 +12,7 @@ export const UserImg = styled.img` border-radius: 50%; `; -export const UserDetails = styled.section` +export const UserDetailsContainer = styled.section` display: flex; flex-direction: column; justify-content: center; @@ -21,7 +21,7 @@ export const UserDetails = styled.section` margin-left: 1rem; `; -export const BioStyledText = styled(StyledText)` +export const StyledBio = styled(StyledText)` display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; diff --git a/src/pages/AccountCancel/index.tsx b/src/pages/AccountCancel/index.tsx index 3877683d..23aae579 100644 --- a/src/pages/AccountCancel/index.tsx +++ b/src/pages/AccountCancel/index.tsx @@ -10,11 +10,11 @@ import back from '../../assets/arrow/left.svg'; import BottomButton from '../../components/BottomButton'; import { patchUserWithdrawApi } from '../../apis/user'; -import Modal from '../../components/Modal'; +import Modal from '../../components/Modal'; const AccountCancel: React.FC = () => { const [isChecked, setIsChecked] = useState(false); - const [modalContent, setModalContent] = useState(null); + const [modalContent, setModalContent] = useState(null); const [isModalVisible, setIsModalVisible] = useState(false); const navigate = useNavigate(); @@ -55,8 +55,8 @@ const AccountCancel: React.FC = () => { localStorage.clear(); setTimeout(() => { - navigate('/login'); - }, 2000); + navigate('/login'); + }, 2000); } else { setModalContent(response.code || '알 수 없는 오류가 발생했습니다.'); setIsModalVisible(true); @@ -71,7 +71,7 @@ const AccountCancel: React.FC = () => { return ( - navigate(-1)} /> + navigate(-1)} /> @@ -90,28 +90,27 @@ const AccountCancel: React.FC = () => { - - 지금까지 OODD를 이용해주셔서 감사합니다! - - + + 지금까지 OODD를 이용해주셔서 감사합니다! + @@ -125,14 +124,13 @@ const AccountCancel: React.FC = () => { {isModalVisible && ( - -)} - + + )} ); }; diff --git a/src/pages/AccountEdit/index.tsx b/src/pages/AccountEdit/index.tsx index 598bf59d..6409749e 100644 --- a/src/pages/AccountEdit/index.tsx +++ b/src/pages/AccountEdit/index.tsx @@ -37,7 +37,7 @@ const AccountEdit: React.FC = () => { return ( - navigate(-1)} /> + navigate(-1)} />
diff --git a/src/pages/AccountSetting/index.tsx b/src/pages/AccountSetting/index.tsx index aee54ca6..c11aead7 100644 --- a/src/pages/AccountSetting/index.tsx +++ b/src/pages/AccountSetting/index.tsx @@ -11,9 +11,9 @@ import back from '../../assets/arrow/left.svg'; import imageBasic from '../../assets/default/defaultProfile.svg'; import Profile_s from './../../assets/default/my-page.svg'; import leave from '../../assets/default/leave.svg'; -import { getUserInfoApi } from '../../apis/user'; -import { UserInfoData } from '../../apis/user/dto'; -import Loading from '../../components/Loading'; +import { getUserInfoApi } from '../../apis/user'; +import { UserInfoData } from '../../apis/user/dto'; +import Loading from '../../components/Loading'; const AccountSetting: React.FC = () => { const navigate = useNavigate(); @@ -67,13 +67,13 @@ const AccountSetting: React.FC = () => { }; if (isLoading) { - return ; + return ; } return ( - navigate(-1)} /> + navigate(-1)} /> @@ -89,7 +89,7 @@ const AccountSetting: React.FC = () => { diff --git a/src/pages/Chats/ChatRoom/index.tsx b/src/pages/Chats/ChatRoom/index.tsx index f7125cff..2d635805 100644 --- a/src/pages/Chats/ChatRoom/index.tsx +++ b/src/pages/Chats/ChatRoom/index.tsx @@ -234,10 +234,10 @@ const ChatRoom: React.FC = () => { text={opponentInfo?.nickname || '알수없음'} LeftButtonSrc={Back} RightButtonSrc={KebabMenu} - onLeftClick={() => { + onLeftButtonClick={() => { nav(-1); }} - onRightClick={() => { + onRightButtonClick={() => { setIsMenuBottomSheetOpen(true); }} $withBorder={true} diff --git a/src/pages/PostImageSelect/index.tsx b/src/pages/PostImageSelect/index.tsx index adba904c..157e0f2e 100644 --- a/src/pages/PostImageSelect/index.tsx +++ b/src/pages/PostImageSelect/index.tsx @@ -142,7 +142,7 @@ const PostImageSelect: React.FC = () => { {images.length === 0 ? ( diff --git a/src/pages/PostInstaFeedSelect/index.tsx b/src/pages/PostInstaFeedSelect/index.tsx index 5cc26e76..8ce5aa6b 100644 --- a/src/pages/PostInstaFeedSelect/index.tsx +++ b/src/pages/PostInstaFeedSelect/index.tsx @@ -71,14 +71,14 @@ const PostInstaFeedSelect: React.FC = () => { // 페이지 종료 함수 const handleClose = () => { - navigate(`/profile/${userId}`); + navigate(`/profile/${userId}`); }; return ( {isSuccessModalOpen && } {isFailModalOpen && } - {' '} + {' '} {posts.map((post, index) => ( handlePostSelect(post)}> diff --git a/src/pages/PostUpload/index.tsx b/src/pages/PostUpload/index.tsx index 35ab0469..5866a3ad 100644 --- a/src/pages/PostUpload/index.tsx +++ b/src/pages/PostUpload/index.tsx @@ -308,7 +308,7 @@ const PostUpload: React.FC = () => { return ( - + { navigate(-1)} - onRightClick={() => setIsOptionsBottomSheetOpen(true)} // OptionsBottomSheet 열기 + onLeftButtonClick={() => navigate(-1)} + onRightButtonClick={() => setIsOptionsBottomSheetOpen(true)} // OptionsBottomSheet 열기 /> )} @@ -121,11 +121,7 @@ const Profile: React.FC = () => { /> - {isMyPage ? ( - - ) : ( - - )} + {isMyPage ? : } @@ -135,16 +131,12 @@ const Profile: React.FC = () => { {isMyPage && ( 코멘트 - - {posts.reduce((sum, post) => sum + (post.postCommentsCount || 0), 0)} - + {posts.reduce((sum, post) => sum + (post.postCommentsCount || 0), 0)} )} 좋아요 - - {posts.reduce((sum, post) => sum + (post.postLikesCount || 0), 0)} - + {posts.reduce((sum, post) => sum + (post.postLikesCount || 0), 0)} diff --git a/src/pages/ProfileEdit/index.tsx b/src/pages/ProfileEdit/index.tsx index f40830c7..8074baf2 100644 --- a/src/pages/ProfileEdit/index.tsx +++ b/src/pages/ProfileEdit/index.tsx @@ -10,7 +10,7 @@ import { CameraIcon, UserInfo, Username, - EmailInput + EmailInput, } from './styles'; import { StyledText } from '../../components/Text/StyledText'; import theme from '../../styles/theme'; @@ -127,7 +127,7 @@ const ProfileEdit: React.FC = () => { profilePictureUrl: profilePictureUrl || '', bio: bio || '', }; - + const response = await patchUserInfoApi(payload, storedUserId); if (response.isSuccess) { @@ -157,7 +157,7 @@ const ProfileEdit: React.FC = () => { return ( - navigate(-1)} /> + navigate(-1)} /> {isModalVisible && ( { return ( - + diff --git a/src/pages/verification/index.tsx b/src/pages/verification/index.tsx index 6891d6f2..17fbe917 100644 --- a/src/pages/verification/index.tsx +++ b/src/pages/verification/index.tsx @@ -104,7 +104,7 @@ const Verification: React.FC = () => { return ( - navigate(-1)} /> + navigate(-1)} /> From 50ff956c5871fba2ec8c90163b4ad9f3b40967ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= <jim400934@gmail.com> Date: Thu, 26 Dec 2024 23:31:04 +0900 Subject: [PATCH 2/8] =?UTF-8?q?Chore:=20import=20=EC=88=9C=EC=84=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PostItem/index.tsx | 2 +- src/components/TopBar/index.tsx | 2 ++ src/components/UserProfile/index.tsx | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/PostItem/index.tsx b/src/components/PostItem/index.tsx index 1c093936..7311bcff 100644 --- a/src/components/PostItem/index.tsx +++ b/src/components/PostItem/index.tsx @@ -6,8 +6,8 @@ import PinIcon from '@/assets/default/pin.svg'; import Heart from '@components/Icons/Heart'; import Message from '@components/Icons/Message'; -import { PostItemLayout, PostImageContainer, PostImage, LikesCountStyledText, LikesOverlay, Pin } from './style'; import type { PostItemProps } from './dto'; +import { PostItemLayout, PostImageContainer, PostImage, LikesCountStyledText, LikesOverlay, Pin } from './style'; const PostItem: React.FC<PostItemProps> = ({ post, isMyPost = true }) => { const navigate = useNavigate(); diff --git a/src/components/TopBar/index.tsx b/src/components/TopBar/index.tsx index 37213536..f214872b 100644 --- a/src/components/TopBar/index.tsx +++ b/src/components/TopBar/index.tsx @@ -1,6 +1,8 @@ import React from 'react'; import { useNavigate } from 'react-router-dom'; + import theme from '@/styles/theme'; + import type { TopBarProps } from './dto'; import { TopBarLayout, StyledTextWrapper, LeftButton, RightButton } from './styles'; diff --git a/src/components/UserProfile/index.tsx b/src/components/UserProfile/index.tsx index bbb33f81..031bbf48 100644 --- a/src/components/UserProfile/index.tsx +++ b/src/components/UserProfile/index.tsx @@ -1,6 +1,8 @@ import React from 'react'; + import theme from '@/styles/theme'; import { StyledText } from '@components/Text/StyledText'; + import type { UserProfileProps } from './dto'; import { UserProfileLayout, UserImg, UserDetailsContainer, StyledBio } from './style'; From a0b2e9dea9536e74776d77f100e3da9545851b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= <jim400934@gmail.com> Date: Fri, 27 Dec 2024 10:40:37 +0900 Subject: [PATCH 3/8] =?UTF-8?q?Refact:=20=EC=BD=94=EB=A9=98=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=94=ED=83=95=EC=9C=BC=EB=A1=9C=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=9E=AC=EC=88=98=EC=A0=95,=20=EB=B3=80=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PostItem/dto.ts | 2 +- src/components/PostItem/index.tsx | 16 ++++++++-------- src/components/TopBar/dto.ts | 4 ++-- src/components/TopBar/index.tsx | 14 +++++++------- src/components/UserProfile/index.tsx | 2 +- src/pages/AccountCancel/index.tsx | 2 +- src/pages/AccountEdit/index.tsx | 2 +- src/pages/AccountSetting/index.tsx | 2 +- src/pages/Chats/ChatRoom/index.tsx | 4 ++-- src/pages/Login/SocialLoginButton/index.tsx | 2 +- src/pages/Login/index.tsx | 6 +++--- src/pages/PostImageSelect/index.tsx | 2 +- src/pages/PostInstaFeedSelect/index.tsx | 2 +- src/pages/PostUpload/index.tsx | 2 +- src/pages/Profile/index.tsx | 4 ++-- src/pages/ProfileEdit/index.tsx | 2 +- src/pages/SignUp/index.tsx | 2 +- src/pages/TermsAgreement/index.tsx | 6 +++--- src/pages/verification/index.tsx | 2 +- 19 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/components/PostItem/dto.ts b/src/components/PostItem/dto.ts index e46a6b04..2db2ca24 100644 --- a/src/components/PostItem/dto.ts +++ b/src/components/PostItem/dto.ts @@ -1,4 +1,4 @@ -import { UserPostSummary } from '@/apis/post/dto'; +import { UserPostSummary } from '@apis/post/dto'; export interface Post extends UserPostSummary {} diff --git a/src/components/PostItem/index.tsx b/src/components/PostItem/index.tsx index 7311bcff..4beb8355 100644 --- a/src/components/PostItem/index.tsx +++ b/src/components/PostItem/index.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { useNavigate } from 'react-router-dom'; -import theme from '@/styles/theme'; -import PinIcon from '@/assets/default/pin.svg'; -import Heart from '@components/Icons/Heart'; +import theme from '@styles/theme'; +import PinIcon from '@assets/default/pin.svg'; +import Like from '@components/Icons/Like'; import Message from '@components/Icons/Message'; import type { PostItemProps } from './dto'; @@ -11,20 +11,20 @@ import { PostItemLayout, PostImageContainer, PostImage, LikesCountStyledText, Li const PostItem: React.FC<PostItemProps> = ({ post, isMyPost = true }) => { const navigate = useNavigate(); - const PostImageUrl = post.imageUrl; + const postImageUrl = post.imageUrl; - const handlePostClick = () => { + const handlePostItemClick = () => { const path = isMyPost ? `/my-post/${post.id}` : `/post/${post.id}`; navigate(path); }; return ( - <PostItemLayout onClick={handlePostClick}> + <PostItemLayout onClick={handlePostItemClick}> <PostImageContainer> - <PostImage src={PostImageUrl} alt={`post-${post.id}`} /> + <PostImage src={postImageUrl} alt={`post-${post.id}`} /> {post.isRepresentative && <Pin src={PinIcon} />} <LikesOverlay> - <Heart /> + <Like /> <LikesCountStyledText $textTheme={{ style: 'caption1-regular' }} color={theme.colors.gray3}> {post.postLikesCount} </LikesCountStyledText> diff --git a/src/components/TopBar/dto.ts b/src/components/TopBar/dto.ts index c3d47e7e..84ff4939 100644 --- a/src/components/TopBar/dto.ts +++ b/src/components/TopBar/dto.ts @@ -2,8 +2,8 @@ export interface TopBarProps { text?: string; RightButtonSrc?: string; LeftButtonSrc?: string; - onLeftButtonClick?: () => void; - onRightButtonClick?: () => void; + onClickLeftButton?: () => void; + onClickRightButton?: () => void; $withBorder?: boolean; } diff --git a/src/components/TopBar/index.tsx b/src/components/TopBar/index.tsx index f214872b..2b18fe08 100644 --- a/src/components/TopBar/index.tsx +++ b/src/components/TopBar/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useNavigate } from 'react-router-dom'; -import theme from '@/styles/theme'; +import theme from '@styles/theme'; import type { TopBarProps } from './dto'; import { TopBarLayout, StyledTextWrapper, LeftButton, RightButton } from './styles'; @@ -10,8 +10,8 @@ const TopBar: React.FC<TopBarProps> = ({ text = '', RightButtonSrc, LeftButtonSrc, - onLeftButtonClick, - onRightButtonClick, + onClickLeftButton, + onClickRightButton, $withBorder = false, }) => { const navigate = useNavigate(); @@ -21,8 +21,8 @@ const TopBar: React.FC<TopBarProps> = ({ <LeftButton src={LeftButtonSrc} onClick={() => { - if (onLeftButtonClick) { - onLeftButtonClick(); + if (onClickLeftButton) { + onClickLeftButton(); } else { navigate(-1); } @@ -36,8 +36,8 @@ const TopBar: React.FC<TopBarProps> = ({ <RightButton src={RightButtonSrc} onClick={() => { - if (onRightButtonClick) { - onRightButtonClick(); + if (onClickRightButton) { + onClickRightButton(); } }} > diff --git a/src/components/UserProfile/index.tsx b/src/components/UserProfile/index.tsx index 031bbf48..3db8059a 100644 --- a/src/components/UserProfile/index.tsx +++ b/src/components/UserProfile/index.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import theme from '@/styles/theme'; +import theme from '@styles/theme'; import { StyledText } from '@components/Text/StyledText'; import type { UserProfileProps } from './dto'; diff --git a/src/pages/AccountCancel/index.tsx b/src/pages/AccountCancel/index.tsx index 23aae579..44ace24c 100644 --- a/src/pages/AccountCancel/index.tsx +++ b/src/pages/AccountCancel/index.tsx @@ -71,7 +71,7 @@ const AccountCancel: React.FC = () => { return ( <OODDFrame> <CancelContainer> - <TopBar text="회원 탈퇴" LeftButtonSrc={back} onLeftButtonClick={() => navigate(-1)} /> + <TopBar text="회원 탈퇴" LeftButtonSrc={back} onClickLeftButton={() => navigate(-1)} /> <SubTitle> <StyledText as="div" $textTheme={{ style: 'body1-medium', lineHeight: 2 }} color={theme.colors.black}> diff --git a/src/pages/AccountEdit/index.tsx b/src/pages/AccountEdit/index.tsx index 6409749e..f78907b7 100644 --- a/src/pages/AccountEdit/index.tsx +++ b/src/pages/AccountEdit/index.tsx @@ -37,7 +37,7 @@ const AccountEdit: React.FC = () => { return ( <OODDFrame> <ProfileEditContainer> - <TopBar text="회원 정보 수정" LeftButtonSrc={back} onLeftButtonClick={() => navigate(-1)} /> + <TopBar text="회원 정보 수정" LeftButtonSrc={back} onClickLeftButton={() => navigate(-1)} /> <Section> <SectionTitle> diff --git a/src/pages/AccountSetting/index.tsx b/src/pages/AccountSetting/index.tsx index c11aead7..7da01656 100644 --- a/src/pages/AccountSetting/index.tsx +++ b/src/pages/AccountSetting/index.tsx @@ -73,7 +73,7 @@ const AccountSetting: React.FC = () => { return ( <OODDFrame> <ProfileEditContainer> - <TopBar text="계정 관리" LeftButtonSrc={back} onLeftButtonClick={() => navigate(-1)} /> + <TopBar text="계정 관리" LeftButtonSrc={back} onClickLeftButton={() => navigate(-1)} /> <ProfilePicWrapper> <ProfilePic> diff --git a/src/pages/Chats/ChatRoom/index.tsx b/src/pages/Chats/ChatRoom/index.tsx index 2d635805..f3e11f69 100644 --- a/src/pages/Chats/ChatRoom/index.tsx +++ b/src/pages/Chats/ChatRoom/index.tsx @@ -234,10 +234,10 @@ const ChatRoom: React.FC = () => { text={opponentInfo?.nickname || '알수없음'} LeftButtonSrc={Back} RightButtonSrc={KebabMenu} - onLeftButtonClick={() => { + onClickLeftButton={() => { nav(-1); }} - onRightButtonClick={() => { + onClickRightButton={() => { setIsMenuBottomSheetOpen(true); }} $withBorder={true} diff --git a/src/pages/Login/SocialLoginButton/index.tsx b/src/pages/Login/SocialLoginButton/index.tsx index d14330ed..b448688e 100644 --- a/src/pages/Login/SocialLoginButton/index.tsx +++ b/src/pages/Login/SocialLoginButton/index.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import theme from '@/styles/theme'; +import theme from '@styles/theme'; import type { SocialLoginProps } from './dto'; diff --git a/src/pages/Login/index.tsx b/src/pages/Login/index.tsx index 5e5292fd..60979ecb 100644 --- a/src/pages/Login/index.tsx +++ b/src/pages/Login/index.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { OODDFrame } from '@/components/Frame/Frame'; -import theme from '@/styles/theme'; +import theme from '@styles/theme'; -import kakaoLogo from '@/assets/default/snsIcon/kakao.svg'; -import naverLogo from '@/assets/default/snsIcon/naver.svg'; +import kakaoLogo from '@assets/default/snsIcon/kakao.svg'; +import naverLogo from '@assets/default/snsIcon/naver.svg'; import SocialLoginButton from './SocialLoginButton/index'; diff --git a/src/pages/PostImageSelect/index.tsx b/src/pages/PostImageSelect/index.tsx index 157e0f2e..74ed26c8 100644 --- a/src/pages/PostImageSelect/index.tsx +++ b/src/pages/PostImageSelect/index.tsx @@ -142,7 +142,7 @@ const PostImageSelect: React.FC<ImageSelectModalProps> = () => { <TopBar text="OOTD 업로드" LeftButtonSrc={images.length === 0 ? X : Left} - onLeftButtonClick={images.length === 0 ? handleClose : handlePrev} + onClickLeftButton={images.length === 0 ? handleClose : handlePrev} /> <Content> {images.length === 0 ? ( diff --git a/src/pages/PostInstaFeedSelect/index.tsx b/src/pages/PostInstaFeedSelect/index.tsx index 8ce5aa6b..732b99ae 100644 --- a/src/pages/PostInstaFeedSelect/index.tsx +++ b/src/pages/PostInstaFeedSelect/index.tsx @@ -78,7 +78,7 @@ const PostInstaFeedSelect: React.FC<InstaFeedSelectModalProps> = () => { <OODDFrame> {isSuccessModalOpen && <Modal {...connectSuccessModalProps} />} {isFailModalOpen && <Modal {...connectFailModalProps} />} - <TopBar text="가져올 OOTD 선택" LeftButtonSrc={X} onLeftButtonClick={handleClose} />{' '} + <TopBar text="가져올 OOTD 선택" LeftButtonSrc={X} onClickLeftButton={handleClose} />{' '} <Content> {posts.map((post, index) => ( <PostContainer key={index} onClick={() => handlePostSelect(post)}> diff --git a/src/pages/PostUpload/index.tsx b/src/pages/PostUpload/index.tsx index 5866a3ad..fff08fcb 100644 --- a/src/pages/PostUpload/index.tsx +++ b/src/pages/PostUpload/index.tsx @@ -308,7 +308,7 @@ const PostUpload: React.FC<PostUploadModalProps> = () => { return ( <OODDFrame> <UploadContainer> - <TopBar text="OOTD 업로드" LeftButtonSrc={Left} onLeftButtonClick={handlePrev} /> + <TopBar text="OOTD 업로드" LeftButtonSrc={Left} onClickLeftButton={handlePrev} /> <Content> <ImageSwiper images={selectedImages} /> <StyledInput diff --git a/src/pages/Profile/index.tsx b/src/pages/Profile/index.tsx index 55cecf2d..eba79c1b 100644 --- a/src/pages/Profile/index.tsx +++ b/src/pages/Profile/index.tsx @@ -108,8 +108,8 @@ const Profile: React.FC = () => { <TopBar RightButtonSrc={MoreSvg} LeftButtonSrc={BackSvg} - onLeftButtonClick={() => navigate(-1)} - onRightButtonClick={() => setIsOptionsBottomSheetOpen(true)} // OptionsBottomSheet 열기 + onClickLeftButton={() => navigate(-1)} + onClickRightButton={() => setIsOptionsBottomSheetOpen(true)} // OptionsBottomSheet 열기 /> )} diff --git a/src/pages/ProfileEdit/index.tsx b/src/pages/ProfileEdit/index.tsx index 8074baf2..c3608fe5 100644 --- a/src/pages/ProfileEdit/index.tsx +++ b/src/pages/ProfileEdit/index.tsx @@ -157,7 +157,7 @@ const ProfileEdit: React.FC = () => { return ( <OODDFrame> <ProfileEditContainer> - <TopBar text="회원정보 수정" LeftButtonSrc={back} onLeftButtonClick={() => navigate(-1)} /> + <TopBar text="회원정보 수정" LeftButtonSrc={back} onClickLeftButton={() => navigate(-1)} /> {isModalVisible && ( <Modal content={modalContent || ''} diff --git a/src/pages/SignUp/index.tsx b/src/pages/SignUp/index.tsx index 78a82256..6eb3f8b4 100644 --- a/src/pages/SignUp/index.tsx +++ b/src/pages/SignUp/index.tsx @@ -5,7 +5,7 @@ import { patchUserInfoApi } from '@/apis/user'; import type { PatchUserInfoRequest } from '@/apis/user/dto'; import { handleError } from '@/apis/util/handleError'; -import OODDlogo from '@/assets/default/oodd.svg'; +import OODDlogo from '@assets/default/oodd.svg'; import { OODDFrame } from '@/components/Frame/Frame'; import { StyledText } from '@/components/Text/StyledText'; diff --git a/src/pages/TermsAgreement/index.tsx b/src/pages/TermsAgreement/index.tsx index ebca680d..9bc67ffc 100644 --- a/src/pages/TermsAgreement/index.tsx +++ b/src/pages/TermsAgreement/index.tsx @@ -4,8 +4,8 @@ import { useNavigate } from 'react-router-dom'; import { postTermsAgreementApi } from '@/apis/user'; import { handleError } from '@/apis/util/handleError'; -import Back from '@/assets/arrow/left.svg'; -import OODDlogo from '@/assets/default/oodd.svg'; +import Back from '@assets/arrow/left.svg'; +import OODDlogo from '@assets/default/oodd.svg'; import { OODDFrame } from '@/components/Frame/Frame'; import { StyledText } from '@/components/Text/StyledText'; @@ -84,7 +84,7 @@ const TermsAgreement: React.FC = () => { return ( <OODDFrame> - <TopBar LeftButtonSrc={Back} onLeftButtonClick={navigateToLogin} /> + <TopBar LeftButtonSrc={Back} onClickLeftButton={navigateToLogin} /> <TermsAgreementLayout> <LogoWrapper> <LogoImg src={OODDlogo} /> diff --git a/src/pages/verification/index.tsx b/src/pages/verification/index.tsx index 17fbe917..fcb2d5f3 100644 --- a/src/pages/verification/index.tsx +++ b/src/pages/verification/index.tsx @@ -104,7 +104,7 @@ const Verification: React.FC = () => { return ( <OODDFrame> <VerificationWrapper> - <TopBar text="본인인증" LeftButtonSrc={back} onLeftButtonClick={() => navigate(-1)} /> + <TopBar text="본인인증" LeftButtonSrc={back} onClickLeftButton={() => navigate(-1)} /> <Container> <Title> From a36ee0cdc67af37f6a8be65e5704dac69ed48ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= <jim400934@gmail.com> Date: Fri, 27 Dec 2024 11:08:14 +0900 Subject: [PATCH 4/8] =?UTF-8?q?Refact:=20=EA=B2=BD=EB=A1=9C=20=EC=9E=AC?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PostItem/dto.ts | 2 +- src/components/PostItem/index.tsx | 4 ++-- src/components/PostItem/style.tsx | 2 +- src/components/TopBar/styles.tsx | 2 +- src/components/UserProfile/index.tsx | 2 +- src/components/UserProfile/style.tsx | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/PostItem/dto.ts b/src/components/PostItem/dto.ts index 2db2ca24..e46a6b04 100644 --- a/src/components/PostItem/dto.ts +++ b/src/components/PostItem/dto.ts @@ -1,4 +1,4 @@ -import { UserPostSummary } from '@apis/post/dto'; +import { UserPostSummary } from '@/apis/post/dto'; export interface Post extends UserPostSummary {} diff --git a/src/components/PostItem/index.tsx b/src/components/PostItem/index.tsx index 4beb8355..60eea185 100644 --- a/src/components/PostItem/index.tsx +++ b/src/components/PostItem/index.tsx @@ -3,8 +3,8 @@ import { useNavigate } from 'react-router-dom'; import theme from '@styles/theme'; import PinIcon from '@assets/default/pin.svg'; -import Like from '@components/Icons/Like'; -import Message from '@components/Icons/Message'; +import Like from '@/components/Icons/Like'; +import Message from '@/components/Icons/Message'; import type { PostItemProps } from './dto'; import { PostItemLayout, PostImageContainer, PostImage, LikesCountStyledText, LikesOverlay, Pin } from './style'; diff --git a/src/components/PostItem/style.tsx b/src/components/PostItem/style.tsx index 655f234a..0190f41d 100644 --- a/src/components/PostItem/style.tsx +++ b/src/components/PostItem/style.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@components/Text/StyledText'; +import { StyledText } from '@/components/Text/StyledText'; export const PostItemLayout = styled.article` flex: 1 1 calc(50% - 0.5rem); /* 기본적으로 두 개씩 배치되도록 설정 */ diff --git a/src/components/TopBar/styles.tsx b/src/components/TopBar/styles.tsx index 3d06de80..12f55445 100644 --- a/src/components/TopBar/styles.tsx +++ b/src/components/TopBar/styles.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@components/Text/StyledText'; +import { StyledText } from '@/components/Text/StyledText'; import type { TopBarLayoutProps } from './dto'; export const TopBarLayout = styled.header<TopBarLayoutProps>` diff --git a/src/components/UserProfile/index.tsx b/src/components/UserProfile/index.tsx index 3db8059a..83168ea8 100644 --- a/src/components/UserProfile/index.tsx +++ b/src/components/UserProfile/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import theme from '@styles/theme'; -import { StyledText } from '@components/Text/StyledText'; +import { StyledText } from '@/components/Text/StyledText'; import type { UserProfileProps } from './dto'; import { UserProfileLayout, UserImg, UserDetailsContainer, StyledBio } from './style'; diff --git a/src/components/UserProfile/style.tsx b/src/components/UserProfile/style.tsx index 275dbb28..901cdd3c 100644 --- a/src/components/UserProfile/style.tsx +++ b/src/components/UserProfile/style.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@components/Text/StyledText'; +import { StyledText } from '@/components/Text/StyledText'; export const UserProfileLayout = styled.section` display: flex; From 3635db4f7141421de6b5e8337168cca3f53f68a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= <jim400934@gmail.com> Date: Fri, 27 Dec 2024 11:12:04 +0900 Subject: [PATCH 5/8] =?UTF-8?q?Chore:=20=EC=9D=B4=EC=9A=A9=EC=95=BD?= =?UTF-8?q?=EA=B4=80=EB=8F=99=EC=9D=98=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EB=9D=BC=EC=9A=B0=ED=8C=85=20=EA=B2=BD=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 140061b0..96beb78e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -57,9 +57,10 @@ const protectedRoutes = [ // 인증이 필요 없는 페이지 배열 const publicRoutes = [ { path: '/login', element: <Login /> }, - { path: '/signup', element: <SignUp /> }, { path: '/login/complete', element: <LoginComplete /> }, - { path: '/terms-agreement', element: <TermsAgreement /> }, + + { path: '/signup', element: <SignUp /> }, + { path: '/signup/terms-agreement', element: <TermsAgreement /> }, ]; const App: React.FC = () => { From 09c2a23321af55f4ff4715686e10a2c27e700b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= <jim400934@gmail.com> Date: Fri, 27 Dec 2024 11:23:22 +0900 Subject: [PATCH 6/8] =?UTF-8?q?Refact:=20=EA=B2=BD=EB=A1=9C=20=EC=9E=AC?= =?UTF-8?q?=EC=9E=AC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PostItem/dto.ts | 2 +- src/components/PostItem/index.tsx | 4 ++-- src/components/PostItem/style.tsx | 2 +- src/components/TopBar/styles.tsx | 2 +- src/components/UserProfile/index.tsx | 2 +- src/components/UserProfile/style.tsx | 2 +- src/pages/Home/HomeTopBar/index.tsx | 2 +- src/pages/Home/OOTD/Feed/dto.ts | 2 +- src/pages/Home/OOTD/Feed/index.tsx | 4 ++-- src/pages/Login/LoginComplete/index.tsx | 10 +++++----- src/pages/Login/SocialLoginButton/style.tsx | 2 +- src/pages/Login/index.tsx | 2 +- src/pages/Login/styles.tsx | 2 +- src/pages/SignUp/index.tsx | 14 +++++++------- src/pages/SignUp/style.tsx | 2 +- src/pages/TermsAgreement/index.tsx | 14 +++++++------- src/pages/TermsAgreement/styles.tsx | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/components/PostItem/dto.ts b/src/components/PostItem/dto.ts index e46a6b04..2db2ca24 100644 --- a/src/components/PostItem/dto.ts +++ b/src/components/PostItem/dto.ts @@ -1,4 +1,4 @@ -import { UserPostSummary } from '@/apis/post/dto'; +import { UserPostSummary } from '@apis/post/dto'; export interface Post extends UserPostSummary {} diff --git a/src/components/PostItem/index.tsx b/src/components/PostItem/index.tsx index 60eea185..4beb8355 100644 --- a/src/components/PostItem/index.tsx +++ b/src/components/PostItem/index.tsx @@ -3,8 +3,8 @@ import { useNavigate } from 'react-router-dom'; import theme from '@styles/theme'; import PinIcon from '@assets/default/pin.svg'; -import Like from '@/components/Icons/Like'; -import Message from '@/components/Icons/Message'; +import Like from '@components/Icons/Like'; +import Message from '@components/Icons/Message'; import type { PostItemProps } from './dto'; import { PostItemLayout, PostImageContainer, PostImage, LikesCountStyledText, LikesOverlay, Pin } from './style'; diff --git a/src/components/PostItem/style.tsx b/src/components/PostItem/style.tsx index 0190f41d..655f234a 100644 --- a/src/components/PostItem/style.tsx +++ b/src/components/PostItem/style.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@/components/Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; export const PostItemLayout = styled.article` flex: 1 1 calc(50% - 0.5rem); /* 기본적으로 두 개씩 배치되도록 설정 */ diff --git a/src/components/TopBar/styles.tsx b/src/components/TopBar/styles.tsx index 12f55445..3d06de80 100644 --- a/src/components/TopBar/styles.tsx +++ b/src/components/TopBar/styles.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@/components/Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; import type { TopBarLayoutProps } from './dto'; export const TopBarLayout = styled.header<TopBarLayoutProps>` diff --git a/src/components/UserProfile/index.tsx b/src/components/UserProfile/index.tsx index 83168ea8..3db8059a 100644 --- a/src/components/UserProfile/index.tsx +++ b/src/components/UserProfile/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import theme from '@styles/theme'; -import { StyledText } from '@/components/Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; import type { UserProfileProps } from './dto'; import { UserProfileLayout, UserImg, UserDetailsContainer, StyledBio } from './style'; diff --git a/src/components/UserProfile/style.tsx b/src/components/UserProfile/style.tsx index 901cdd3c..275dbb28 100644 --- a/src/components/UserProfile/style.tsx +++ b/src/components/UserProfile/style.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@/components/Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; export const UserProfileLayout = styled.section` display: flex; diff --git a/src/pages/Home/HomeTopBar/index.tsx b/src/pages/Home/HomeTopBar/index.tsx index def7acee..59bae2c5 100644 --- a/src/pages/Home/HomeTopBar/index.tsx +++ b/src/pages/Home/HomeTopBar/index.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Button, ButtonContainer, HomeLogo, HomeTopBarContainer } from './styles'; import logo from '@assets/default/oodd.svg'; -import Alarm from '@/components/Icons/Alarm'; +import Alarm from '@components/Icons/Alarm'; // Home 페이지의 상단 바입니다. 로고와 알림이 있습니다. // TODO: 버튼 클릭 이벤트 처리 필요 diff --git a/src/pages/Home/OOTD/Feed/dto.ts b/src/pages/Home/OOTD/Feed/dto.ts index f58b891d..b89b9f6a 100644 --- a/src/pages/Home/OOTD/Feed/dto.ts +++ b/src/pages/Home/OOTD/Feed/dto.ts @@ -1,4 +1,4 @@ -import { PostSummary } from '@/apis/post/dto'; +import { PostSummary } from '@apis/post/dto'; export interface FeedProps { feed: PostSummary; diff --git a/src/pages/Home/OOTD/Feed/index.tsx b/src/pages/Home/OOTD/Feed/index.tsx index 9a3251b4..4d6be4ed 100644 --- a/src/pages/Home/OOTD/Feed/index.tsx +++ b/src/pages/Home/OOTD/Feed/index.tsx @@ -24,8 +24,8 @@ import xBtn from '@assets/default/reject.svg'; import { useNavigate } from 'react-router-dom'; import defaultProfile from '@assets/default/defaultProfile.svg'; import dayjs from 'dayjs'; -import Heart from '@/components/Icons/Heart'; -import Message from '@/components/Icons/Message'; +import Heart from '@components/Icons/Heart'; +import Message from '@components/Icons/Message'; import { OptionsBottomSheetProps } from '@components/BottomSheet/OptionsBottomSheet/dto'; import OptionsBottomSheet from '@components/BottomSheet/OptionsBottomSheet'; import CommentBottomSheet from '@components/CommentBottomSheet'; diff --git a/src/pages/Login/LoginComplete/index.tsx b/src/pages/Login/LoginComplete/index.tsx index 5e59b4fe..f7132bed 100644 --- a/src/pages/Login/LoginComplete/index.tsx +++ b/src/pages/Login/LoginComplete/index.tsx @@ -1,12 +1,12 @@ import React, { useEffect, useState } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; -import { getUserInfoByJwtApi } from '@/apis/auth'; -import { handleError } from '@/apis/util/handleError'; -import { postTermsAgreementApi } from '@/apis/user'; +import { getUserInfoByJwtApi } from '@apis/auth'; +import { handleError } from '@apis/util/handleError'; +import { postTermsAgreementApi } from '@apis/user'; -import Loading from '@/components/Loading'; -import Modal from '@/components/Modal'; +import Loading from '@components/Loading'; +import Modal from '@components/Modal'; const LoginComplete: React.FC = () => { const [isModalOpen, setIsModalOpen] = useState(false); diff --git a/src/pages/Login/SocialLoginButton/style.tsx b/src/pages/Login/SocialLoginButton/style.tsx index 51d18de8..044dff37 100644 --- a/src/pages/Login/SocialLoginButton/style.tsx +++ b/src/pages/Login/SocialLoginButton/style.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@/components/Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; export const SocialLoginContainer = styled.button<{ $bgColor: string; $border?: boolean }>` display: flex; diff --git a/src/pages/Login/index.tsx b/src/pages/Login/index.tsx index 60979ecb..fa3ce121 100644 --- a/src/pages/Login/index.tsx +++ b/src/pages/Login/index.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { OODDFrame } from '@/components/Frame/Frame'; +import { OODDFrame } from '@components/Frame/Frame'; import theme from '@styles/theme'; import kakaoLogo from '@assets/default/snsIcon/kakao.svg'; diff --git a/src/pages/Login/styles.tsx b/src/pages/Login/styles.tsx index de9838c7..5acd57a9 100644 --- a/src/pages/Login/styles.tsx +++ b/src/pages/Login/styles.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@/components/Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; export const LoginContainer = styled.main` display: flex; diff --git a/src/pages/SignUp/index.tsx b/src/pages/SignUp/index.tsx index 6eb3f8b4..2df51cbf 100644 --- a/src/pages/SignUp/index.tsx +++ b/src/pages/SignUp/index.tsx @@ -1,16 +1,16 @@ import React, { useState } from 'react'; import { useNavigate } from 'react-router-dom'; -import { patchUserInfoApi } from '@/apis/user'; -import type { PatchUserInfoRequest } from '@/apis/user/dto'; -import { handleError } from '@/apis/util/handleError'; +import { patchUserInfoApi } from '@apis/user'; +import type { PatchUserInfoRequest } from '@apis/user/dto'; +import { handleError } from '@apis/util/handleError'; import OODDlogo from '@assets/default/oodd.svg'; -import { OODDFrame } from '@/components/Frame/Frame'; -import { StyledText } from '@/components/Text/StyledText'; -import BottomButton from '@/components/BottomButton'; -import Modal from '@/components/Modal'; +import { OODDFrame } from '@components/Frame/Frame'; +import { StyledText } from '@components/Text/StyledText'; +import BottomButton from '@components/BottomButton'; +import Modal from '@components/Modal'; import { getCurrentUserId } from '@utils/getCurrentUserId'; diff --git a/src/pages/SignUp/style.tsx b/src/pages/SignUp/style.tsx index 2fc3ec1e..ce60e0be 100644 --- a/src/pages/SignUp/style.tsx +++ b/src/pages/SignUp/style.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@/components/Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; export const SignUpLayout = styled.main` display: flex; diff --git a/src/pages/TermsAgreement/index.tsx b/src/pages/TermsAgreement/index.tsx index 9bc67ffc..f27ed463 100644 --- a/src/pages/TermsAgreement/index.tsx +++ b/src/pages/TermsAgreement/index.tsx @@ -1,17 +1,17 @@ import React, { useState } from 'react'; import { useNavigate } from 'react-router-dom'; -import { postTermsAgreementApi } from '@/apis/user'; -import { handleError } from '@/apis/util/handleError'; +import { postTermsAgreementApi } from '@apis/user'; +import { handleError } from '@apis/util/handleError'; import Back from '@assets/arrow/left.svg'; import OODDlogo from '@assets/default/oodd.svg'; -import { OODDFrame } from '@/components/Frame/Frame'; -import { StyledText } from '@/components/Text/StyledText'; -import BottomButton from '@/components/BottomButton'; -import TopBar from '@/components/TopBar'; -import Modal from '@/components/Modal'; +import { OODDFrame } from '@components/Frame/Frame'; +import { StyledText } from '@components/Text/StyledText'; +import BottomButton from '@components/BottomButton'; +import TopBar from '@components/TopBar'; +import Modal from '@components/Modal'; import { getCurrentUserId } from '@utils/getCurrentUserId'; diff --git a/src/pages/TermsAgreement/styles.tsx b/src/pages/TermsAgreement/styles.tsx index 6bc7ee34..c12d1725 100644 --- a/src/pages/TermsAgreement/styles.tsx +++ b/src/pages/TermsAgreement/styles.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { StyledText } from '@/components/Text/StyledText'; +import { StyledText } from '@components/Text/StyledText'; export const TermsAgreementLayout = styled.main` display: flex; From 2948ed9613426ad2def57d93fe27437c541403cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= <jim400934@gmail.com> Date: Fri, 27 Dec 2024 13:16:27 +0900 Subject: [PATCH 7/8] =?UTF-8?q?Chore:=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/TermsAgreement/index.tsx | 2 +- tsconfig.app.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/TermsAgreement/index.tsx b/src/pages/TermsAgreement/index.tsx index f27ed463..0c650bd0 100644 --- a/src/pages/TermsAgreement/index.tsx +++ b/src/pages/TermsAgreement/index.tsx @@ -15,7 +15,7 @@ import Modal from '@components/Modal'; import { getCurrentUserId } from '@utils/getCurrentUserId'; -import { LogoWrapper, LogoImg } from '@/pages/SignUp/style'; +import { LogoWrapper, LogoImg } from '@pages/SignUp/style'; import { TermsAgreementLayout, StyledTitle, CheckboxList, CheckboxItem, CheckboxInput, Divider } from './styles'; diff --git a/tsconfig.app.json b/tsconfig.app.json index 26cbc668..e3847893 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -33,7 +33,7 @@ "@assets/*": ["assets/*"], "@config/*": ["config/*"], "@context/*": ["context/*"], - "@page/*": ["page/*"], + "@pages/*": ["pages/*"], "@recoil/*": ["recoil/*"], "@utils/*": ["utils/*"], }, From 9512d1389869c1dba4c09978f1241a358dc813a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A7=80=EB=AF=BC=EC=9E=AC?= <jim400934@gmail.com> Date: Fri, 27 Dec 2024 13:58:01 +0900 Subject: [PATCH 8/8] =?UTF-8?q?Fix:=20=EB=B9=8C=EB=93=9C=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.ts b/vite.config.ts index d8972fc6..cd1583e5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -20,7 +20,7 @@ export default defineConfig({ '@assets': path.resolve(__dirname, 'src/assets'), '@config': path.resolve(__dirname, 'src/config'), '@context': path.resolve(__dirname, 'src/context'), - '@page': path.resolve(__dirname, 'src/page'), + '@pages': path.resolve(__dirname, 'src/pages'), '@recoil': path.resolve(__dirname, 'src/recoil'), '@utils': path.resolve(__dirname, 'src/utils'), },