Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update main branch #91

Merged
merged 5 commits into from
Aug 23, 2024
Merged

Update main branch #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d467dfe
fix: 게시글 수정/삭제 버튼 스타일 수정
ytjdud Aug 22, 2024
136987d
refactor: BottomFixedContainer의 margin을 padding으로 변경
ytjdud Aug 22, 2024
e3670a3
UX 개선: '신청 취소하기' 버튼을 빨간글자로 강조, rounded=false 삭제
ytjdud Aug 22, 2024
33f73bc
refactor: BottomFixedContainer의 bottom을 padding으로 변경하여 배경 콘텐츠 노출 방지
ytjdud Aug 23, 2024
76b811e
Merge pull request #90 from EUM-kmu/85-0821-피드백
ytjdud Aug 23, 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: 1 addition & 1 deletion src/components/common/activity-box.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ const MoreInfoContainer = styled.div`
flex-direction: column;
gap: 20px;
width: 100%;
padding: 24px 22px 45px;
padding: 24px 22px 100px;
`;

const PromiseInfoList = styled.div`
Expand Down
12 changes: 10 additions & 2 deletions src/components/common/bottom-fixed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,20 @@ export const BottomFixed = ({
<BottomFixedContainer
$alignDirection={alignDirection}
style={{
bottom: `calc(${
paddingBottom: `calc(${
currentUrl[1] == "post" ||
(currentUrl[1] == "chat" && !currentUrl[2]) ||
currentUrl[1] == "mypage"
? "4rem"
: "2.2rem"
} + ${!resizeHeight ? 0 : resizeHeight - 20}px)`,
paddingTop: `calc(${
currentUrl[1] == "post" ||
(currentUrl[1] == "chat" && !currentUrl[2]) ||
currentUrl[1] == "mypage"
? "0.5rem" // 네비바(3.5rem)와 BottomFixedContainer(4rem)사이의 간격 만큼 TOP 을 추가함
: "0rem"
} + ${!resizeHeight ? 0 : resizeHeight - 20}px)`,
}}
>
{children}
Expand All @@ -73,11 +80,12 @@ BottomFixed.Button = Button;
const BottomFixedContainer = styled.div<{ $alignDirection: string }>`
display: flex;
position: fixed;
margin: 0 2rem;
padding: 0 2rem;
flex-direction: ${({ $alignDirection }) => $alignDirection};
gap: 11px;
left: 0;
right: 0;
bottom: 0;
background-color: white;
`;

Expand Down
14 changes: 11 additions & 3 deletions src/pages/post/post-detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ export const PostDetailPage = () => {
{data?.userCurrentStatus.writer ? (
data?.marketPostResponse.status === "RECRUITING" ? (
<>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<RowContainer>
<BottomFixed.Button
style={{ backgroundColor: "#e4e8f1", color: "#253659" }}
onClick={() => {
Expand All @@ -202,7 +202,7 @@ export const PostDetailPage = () => {
>
삭제하기
</BottomFixed.Button>
</div>
</RowContainer>
<BottomFixed.Button onClick={() => setRepostModal(true)}>
끌어올리기
</BottomFixed.Button>
Expand Down Expand Up @@ -258,7 +258,7 @@ export const PostDetailPage = () => {
</BottomFixed.Button>
) : (
<BottomFixed.Button
rounded={false}
style={{ backgroundColor: "#e4e8f1", color: "#eb5242" }}
onClick={() => {
setApplyModal(true);
}}
Expand Down Expand Up @@ -397,6 +397,14 @@ export const PostDetailPage = () => {
);
};

const RowContainer = styled.div`
display: flex;
justify-content: space-between;
width: 100%; /* 컨테이너의 너비에 맞춤 */
max-width: calc(480px - 3.2rem); /* 최대 너비를 설정하여 초과 방지 */
margin: auto;
`;

const PaddingWrapper = styled.div<{ $isWriter: boolean }>`
position: relative;
display: flex;
Expand Down