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

공통 컴포넌트: Confirmation 컴포넌트 수정 #260

Merged
merged 3 commits into from
Mar 8, 2024
Merged

공통 컴포넌트: Confirmation 컴포넌트 수정 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ff26e0
fix: Confirmation 컴포넌트 수정 #259
seoye0ng Mar 8, 2024
04d3518
design: Confirmation 컴포넌트 CSS 수정 #259
seoye0ng Mar 8, 2024
ac92bef
fix: Confirmation 컴포넌트 사용시 props BOTTOM_MARGIN 값 수정 #259
seoye0ng Mar 8, 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/app/(auth)/change-password/complete/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Confirmation from '@shared/confirmation/Confirmation';
import Header from '@shared/header/Header';

const TOP_MARGIN = 16;
const BOTTOM_MARGIN = 66;
const BOTTOM_MARGIN = 32;

function CompleteChangePasswordPage() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/(auth)/find-id/complete/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Confirmation from '@shared/confirmation/Confirmation';
import Header from '@shared/header/Header';

const TOP_MARGIN = 16;
const BOTTOM_MARGIN = 66;
const BOTTOM_MARGIN = 32;

function CompleteFindIdPage() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/(auth)/reset-password/complete/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Confirmation from '@shared/confirmation/Confirmation';
import Header from '@shared/header/Header';

const TOP_MARGIN = 16;
const BOTTOM_MARGIN = 66;
const BOTTOM_MARGIN = 32;

function CompleteChangePasswordPage() {
return (
Expand Down
17 changes: 12 additions & 5 deletions src/components/shared/confirmation/Confirmation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
.confirmationContainer {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 100%;
main {
position: fixed;
z-index: var(--bottomnav-zindex);
box-sizing: border-box;
width: 100%;

.confirmationContainer {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 100%;
}
}
12 changes: 7 additions & 5 deletions src/components/shared/confirmation/Confirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@ function Confirmation({
options, title, description, topMargin, bottomMargin, isHeader = false,
}:ConfirmationProps) {
const router = useRouter();

const mainContainerStyle = {
height: `calc(100vh - ${topMargin + bottomMargin + (isHeader ? 44 : 0)}px)`,
height: isHeader ? 'calc(100% - 44px' : '100%',
paddingTop: topMargin,
paddingBottom: bottomMargin,

};

return (
<main className="mainContainer">
<Spacing size={topMargin} />
<section className="confirmationContainer" style={mainContainerStyle}>
<main className="mainContainer" style={mainContainerStyle}>
<section className="confirmationContainer">
<div className="titleWrapper">
<Text typography="t3" bold color="gray900" display="block" textAlign="start">
{title}
Expand All @@ -47,7 +50,6 @@ function Confirmation({
})}
</Flex>
</section>
<Spacing size={bottomMargin} />
</main>
);
}
Expand Down
Loading