Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b8acf0c
Design: ClothingInfoItem 줄바꿈 시 단어 단위로 내리기
xxinzzi Dec 3, 2024
21e84cb
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
xxinzzi Dec 3, 2024
557186b
Design: UI 수정
xxinzzi Dec 3, 2024
209a31d
Design: Modal 여백 늘림
xxinzzi Dec 3, 2024
eea84c7
Fix: 충돌 해결
xxinzzi Dec 16, 2024
7b1ed79
Fix: 충돌 해결
xxinzzi Dec 19, 2024
ad82409
Feat: 컬러시스템 구축
xxinzzi Dec 19, 2024
a89ef00
Feat: 폰트 시스템 구축
xxinzzi Dec 19, 2024
8853b5f
Feat: 폰트시스템 삭제 및 컬러시스템 수정
xxinzzi Dec 23, 2024
5f3dede
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
xxinzzi Dec 23, 2024
94d9c06
Feat: text 컬러 수정
xxinzzi Dec 23, 2024
8316196
Fix: 빌드 오류 해결
xxinzzi Dec 23, 2024
1dd6ca8
Refactor: Post & MyPost 병합 후 조건부 렌더링으로 변경
xxinzzi Dec 23, 2024
c09fdc8
Fix: 경로 오류 해결
xxinzzi Dec 23, 2024
146d5a4
Feat: 컬러시스템 적용
xxinzzi Dec 23, 2024
8df0205
Design: BottomSheetMenu css 복구
xxinzzi Dec 28, 2024
de44743
Feat: 체크박스의 label 복구
xxinzzi Dec 28, 2024
546be36
Remove: Login/components 폴더 삭제
xxinzzi Dec 28, 2024
e4b3f2d
Feat: text colors 네이밍 변경 및 white 추가
xxinzzi Dec 28, 2024
3440909
Fix: 충돌 해결
xxinzzi Dec 28, 2024
9577da4
Refactor: import 경로 @/* 삭제
xxinzzi Dec 28, 2024
45fef86
Feat: 기존 폰트 복구 및 color 네이밍 수정
xxinzzi Dec 28, 2024
12fe603
Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react int…
xxinzzi Dec 28, 2024
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: 0 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import AccountCancel from './pages/AccountCancel';
import Verification from './pages/verification';

import Post from './pages/Post';
import MyPost from './pages/MyPost';
import PostUpload from './pages/PostUpload';
import PostImageSelect from './pages/PostImageSelect';
import PostInstaConnect from './pages/PostInstaConnect';
Expand Down Expand Up @@ -43,7 +42,6 @@ const protectedRoutes = [
{ path: '/verification', element: <Verification /> },

{ path: '/post/:postId', element: <Post /> },
{ path: '/my-post/:postId', element: <MyPost /> },
{ path: '/upload', element: <PostUpload /> },
{ path: '/image-select', element: <PostImageSelect /> },
{ path: '/insta-connect', element: <PostInstaConnect /> },
Expand Down
6 changes: 3 additions & 3 deletions src/assets/default/delete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions src/assets/default/edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/default/pin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/BottomButton/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const ButtonWrapper = styled.div`

export const Button = styled.button<{ disabled: boolean }>`
background: ${({ disabled, theme }) =>
disabled ? 'linear-gradient(93deg, #FFC1D6 1.22%, #F8D4D4 99.73%)' : theme.colors.gradient};
disabled ? 'linear-gradient(93deg, #FFC1D6 1.22%, #F8D4D4 99.73%)' : theme.colors.brand.gradient};
border-radius: 0.625rem;
font-size: 1rem;
width: calc(100% - 2.5rem);
Expand Down
11 changes: 8 additions & 3 deletions src/components/ClothingInfoItem/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const ClothingInfoItemContainer = styled.li`
display: flex;
flex-direction: row;
align-items: center;
border: 0.0625rem solid ${({ theme }) => theme.colors.pink2};
border: 0.0625rem solid ${({ theme }) => theme.colors.brand.primaryLight};
border-radius: 0.5rem;
padding: 10px;
min-width: 20.9375rem;
Expand All @@ -25,7 +25,6 @@ export const ClothingInfoLeft = styled.div`

.infoDetail {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 75%;
display: flex;
Expand All @@ -40,7 +39,13 @@ export const ClothingInfoLeft = styled.div`
.model {
margin-right: auto;
color: ${({ theme }) => theme.colors.black};
//overflow-x: hidden;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2; /* 최대 2줄로 제한 */
-webkit-box-orient: vertical;
word-break: keep-all; /* 단어 단위로 줄바꿈 */
overflow-wrap: break-word; /* 단어가 너무 길 경우 다음 줄로 넘김 */
}
`;

Expand Down
4 changes: 2 additions & 2 deletions src/components/Modal/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ export const ModalContainer = styled.div<{ $isCloseButtonVisible: boolean }>`
align-items: center;
justify-content: center;
text-align: center;
gap: 1rem;
gap: 1.5rem;
width: 21.25rem;
max-width: calc(100% - 2.5rem);
max-height: 30%;
padding: 1.25rem;
padding: 2rem 1.5rem 1.5rem 1.5rem;
${({ $isCloseButtonVisible }) => ($isCloseButtonVisible ? 'padding-top: 2.5rem' : '')};
background-color: ${({ theme }) => theme.colors.white};
border-radius: 0.625rem;
Expand Down
2 changes: 1 addition & 1 deletion src/components/PostItem/style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const Pin = styled.img`
display: flex;
position: absolute;
top: 0.75rem;
left: 1.25rem;
left: 0.75rem;
justify-content: center;
align-items: center;
`;
20 changes: 5 additions & 15 deletions src/pages/AccountCancel/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
import { CancelContainer, SubTitle, Text, InfoBox, InfoItem, CheckboxWrapper } from './styles';
import { CancelContainer, SubTitle, Text, InfoBox, InfoItem, CheckboxWrapper, CheckboxInput } from './styles';
import { StyledText } from '../../components/Text/StyledText';
import theme from '../../styles/theme';
import { OODDFrame } from '../../components/Frame/Frame';
Expand Down Expand Up @@ -74,18 +74,13 @@ const AccountCancel: React.FC = () => {
<TopBar text="회원 탈퇴" LeftButtonSrc={back} onClickLeftButton={() => navigate(-1)} />

<SubTitle>
<StyledText as="div" $textTheme={{ style: 'body1-medium', lineHeight: 2 }} color={theme.colors.black}>
<StyledText as="div" $textTheme={{ style: 'headline2-medium', lineHeight: 2 }} color={theme.colors.black}>
OOTD 탈퇴 전 확인하세요!
</StyledText>
</SubTitle>
<Text as="div">
<StyledText as="div" $textTheme={{ style: 'body2-light', lineHeight: 1 }} color={theme.colors.black}>
탈퇴하시면 이용 중인 서비스가 폐쇄되며,
</StyledText>
</Text>
<Text as="div">
<StyledText as="div" $textTheme={{ style: 'body2-light', lineHeight: 1 }} color={theme.colors.black}>
모든 데이터는 복구할 수 없습니다.
<StyledText as="div" $textTheme={{ style: 'caption1-regular', lineHeight: 1 }} color={theme.colors.black}>
{`탈퇴하시면 이용 중인 서비스가 폐쇄되며,\n모든 데이터는 복구할 수 없습니다.`}
</StyledText>
</Text>
<InfoBox>
Expand All @@ -102,12 +97,7 @@ const AccountCancel: React.FC = () => {
</InfoBox>
<CheckboxWrapper as="div">
<label style={{ display: 'flex', alignItems: 'center', cursor: 'pointer' }}>
<input
type="checkbox"
checked={isChecked}
onChange={handleCheckboxChange}
style={{ marginRight: '8px' }} // 텍스트와 체크박스 간격 조절
/>
<CheckboxInput type="checkbox" checked={isChecked} onChange={handleCheckboxChange} />
<StyledText as="span" $textTheme={{ style: 'body4-light', lineHeight: 1 }} color={theme.colors.gray3}>
안내사항을 모두 확인하였으며, 이에 동의합니다.
</StyledText>
Expand Down
33 changes: 27 additions & 6 deletions src/pages/AccountCancel/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export const CancelContainer = styled.div`
margin: 0 auto;
width: 100%;
flex-grow: 1; /* flexbox에서 공간을 채우도록 설정 */
padding: 1.25rem; /* 20px */
display: flex;
flex-direction: column;
`;
Expand All @@ -35,14 +34,14 @@ export const InfoBox = styled.div`
background: #f5f5f5;
padding: 70px; /* 20px */
margin-top: 10px;
border-radius: 10px;
border-radius: 10px;
margin: 10px 20px 1.25rem 20px; /* 10px 위 여백, 20px 좌우 여백, 20px 아래 여백 */
`;

export const InfoItem = styled.p`
font-size: 0.875rem; /* 14px */
margin-bottom: 0.625rem; /* 10px */
padding: 2px 10px;
padding: 2px 10px;
display: flex;
justify-content: center;
align-items: center;
Expand All @@ -53,13 +52,35 @@ export const InfoItem = styled.p`
export const CheckboxWrapper = styled.div`
display: flex;
align-items: center;
margin-bottom: 1.25rem;
padding: 0rem 15px;
margin-bottom: 1.25rem;
padding: 0rem 15px;

input[type='checkbox'] {
margin-right: 0.625rem; /* 10px */
border-radius: 50%;
}
`;

export const CheckboxInput = styled.input`
margin-right: 0.625rem;
cursor: pointer;
appearance: none; /* 기본 스타일 제거 */
width: 1.25rem;
height: 1.25rem;
border: 0.125rem solid #e0e0e0;
border-radius: 0.25rem;
position: relative;
&:checked {
background-color: #ffbbda;
border-color: #ff2389;
}
&:checked::after {
content: '✓';
color: white;
font-size: 0.875rem;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%); /* 정확히 중앙으로 배치 */
}
`;

Expand Down
152 changes: 0 additions & 152 deletions src/pages/MyPost/index.tsx

This file was deleted.

10 changes: 0 additions & 10 deletions src/pages/MyPost/styles.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Comment } from '../../../../apis/post-comment/dto';
import { Comment } from '../../../../../apis/post-comment/dto';

export interface CommentItemProps {
comment: Comment;
Expand Down
Loading
Loading