Skip to content

Commit 78e7654

Browse files
gudusolgudusol
committed
Merge branch 'main' into pre-production
2 parents 8041ebb + bdad76c commit 78e7654

File tree

14 files changed

+55
-55
lines changed

14 files changed

+55
-55
lines changed

‎apps/service/src/app/problem/solve/[publishId]/[problemId]/child-problem/[childProblemId]/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ const Page = () => {
147147
return (
148148
<>
149149
<ProgressHeader progress={(childProblemNumber / (childProblemLength + 1)) * 100} />
150-
<main className='flex flex-col px-[2rem] py-[8rem] md:flex-row md:gap-[4rem]'>
150+
<main className='flex flex-col px-[2rem] py-[8rem]'>
151151
<div className='w-full'>
152152
<div className='flex items-center justify-between'>
153153
<h1 className='font-bold-18 text-main'>
@@ -184,7 +184,7 @@ const Page = () => {
184184
<div className='w-full'>
185185
<form onSubmit={handleSubmit(handleSubmitAnswer)}>
186186
<h3 className='font-bold-16 text-black'>정답 선택</h3>
187-
<div className='mt-[1.2rem] flex flex-col gap-[2rem] lg:flex-row'>
187+
<div className='mt-[1.2rem] flex flex-col gap-[2rem]'>
188188
<AnswerInput
189189
answerType={answerType}
190190
selectedAnswer={isSolved && answer ? answer : selectedAnswer}

‎apps/service/src/app/problem/solve/[publishId]/[problemId]/main-problem/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ const Page = () => {
118118
return (
119119
<>
120120
<ProgressHeader progress={100} />
121-
<main className='flex flex-col px-[2rem] py-[8rem] md:flex-row md:gap-[4rem]'>
121+
<main className='flex flex-col px-[2rem] py-[8rem]'>
122122
<div className='w-full'>
123123
<div className='flex items-center justify-between'>
124124
<div className='flex items-center gap-[1.2rem]'>
@@ -177,7 +177,7 @@ const Page = () => {
177177
<div className='mt-[2.8rem] w-full'>
178178
<form onSubmit={handleSubmit(handleSubmitAnswer)}>
179179
<h3 className='font-bold-16 text-black'>정답 선택</h3>
180-
<div className='mt-[1.2rem] flex flex-col gap-[2rem] lg:flex-row'>
180+
<div className='mt-[1.2rem] flex flex-col gap-[2rem] md:flex-row'>
181181
<AnswerInput
182182
answerType={answerType}
183183
selectedAnswer={isSolved && answer ? answer : selectedAnswer}

‎apps/service/src/app/report/[publishId]/[problemId]/analysis/page.tsx‎

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -48,48 +48,46 @@ const Page = () => {
4848
return (
4949
<>
5050
<ProgressHeader progress={33} />
51-
<main className='flex min-h-[100dvh] flex-col justify-between px-[2rem] py-[8rem]'>
52-
<div>
53-
<header className='flex items-center justify-between'>
54-
<h1 className='font-bold-18 text-main my-[0.8rem]'>메인 문제 {problemNumber}번</h1>
55-
<div className='flex items-center gap-[0.8rem]'>
56-
<span className='font-medium-16 text-black'>정답</span>
57-
<span className='font-medium-16 text-main'>
58-
{answer}
59-
{answerType === 'MULTIPLE_CHOICE' && '번'}
60-
</span>
61-
</div>
62-
</header>
63-
<div className='mt-[2.4rem] flex flex-col gap-[1.6rem]'>
64-
<TabMenu
65-
leftMenu='분석'
66-
rightMenu='손해설'
67-
selectedTab={selectedTab}
68-
onTabChange={handleClickTab}
69-
/>
70-
<ImageContainer className={`${selectedTab === '분석' ? 'block' : 'hidden'}`}>
71-
<Image
72-
src={mainAnalysisImageUrl ?? ''}
73-
alt='analysis'
74-
className={`w-full object-contain`}
75-
width={700}
76-
height={200}
77-
priority
78-
/>
79-
</ImageContainer>
80-
<ImageContainer className={`${selectedTab === '손해설' ? 'block' : 'hidden'}`}>
81-
<Image
82-
src={mainHandwritingExplanationImageUrl ?? ''}
83-
alt='handWriting'
84-
className={`w-full object-contain`}
85-
width={700}
86-
height={200}
87-
priority
88-
/>
89-
</ImageContainer>
51+
<main className='min-h-[100dvh] justify-between px-[2rem] pt-[8rem] pb-[18rem]'>
52+
<header className='flex items-center justify-between'>
53+
<h1 className='font-bold-18 text-main my-[0.8rem]'>메인 문제 {problemNumber}번</h1>
54+
<div className='flex items-center gap-[0.8rem]'>
55+
<span className='font-medium-16 text-black'>정답</span>
56+
<span className='font-medium-16 text-main'>
57+
{answer}
58+
{answerType === 'MULTIPLE_CHOICE' && '번'}
59+
</span>
9060
</div>
61+
</header>
62+
<div className='mt-[2.4rem] flex flex-col gap-[1.6rem]'>
63+
<TabMenu
64+
leftMenu='분석'
65+
rightMenu='손해설'
66+
selectedTab={selectedTab}
67+
onTabChange={handleClickTab}
68+
/>
69+
<ImageContainer className={`${selectedTab === '분석' ? 'block' : 'hidden'}`}>
70+
<Image
71+
src={mainAnalysisImageUrl ?? ''}
72+
alt='analysis'
73+
className={`w-full object-contain`}
74+
width={700}
75+
height={200}
76+
priority
77+
/>
78+
</ImageContainer>
79+
<ImageContainer className={`${selectedTab === '손해설' ? 'block' : 'hidden'}`}>
80+
<Image
81+
src={mainHandwritingExplanationImageUrl ?? ''}
82+
alt='handWriting'
83+
className={`w-full object-contain`}
84+
width={700}
85+
height={200}
86+
priority
87+
/>
88+
</ImageContainer>
9189
</div>
92-
<div>
90+
<div className='bg-background fixed right-0 bottom-[6.2rem] left-0 mx-auto h-[11.8rem] max-w-[768px] p-[2rem]'>
9391
<button
9492
type='button'
9593
className='border-sub1 flex w-full items-center justify-between rounded-[1.6rem] border bg-white px-[2rem] py-[1.6rem]'

‎apps/service/src/app/report/[publishId]/[problemId]/prescription/detail/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const Page = () => {
3737
<Header title='진단 및 처방' iconType='back' />
3838
<main className='px-[2rem] py-[8rem]'>
3939
<h1 className='font-bold-18 text-main my-[0.8rem]'>{title}</h1>
40-
<div className='mt-[1.6rem] flex flex-col gap-[1.6rem] md:flex-row'>
40+
<div className='mt-[1.6rem] flex flex-col gap-[1.6rem]'>
4141
<ImageContainer className='w-full'>
4242
<Image
4343
src={problemImageUrl ?? ''}

‎apps/service/src/app/report/[publishId]/[problemId]/reading-tip/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const Page = () => {
1717
<Header title='문제를 읽어내려갈 때' iconType='back' />
1818
<main className='px-[2rem] py-[8rem]'>
1919
<h1 className='font-bold-18 text-main my-[0.8rem]'>메인 문제 {problemNumber}번</h1>
20-
<div className='mt-[1.6rem] flex flex-col gap-[3.2rem] md:flex-row md:gap-[1.6rem]'>
20+
<div className='mt-[1.6rem] flex flex-col gap-[3.2rem]'>
2121
<div className='flex w-full flex-col gap-[1.2rem]'>
2222
<h2 className='font-bold-16 text-main my-[0.8rem]'>문제 분석</h2>
2323
<ImageContainer>

‎apps/service/src/components/common/Header.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const Header = ({ title, iconType = 'home' }: HeaderProps) => {
1919
};
2020

2121
return (
22-
<header className='bg-background fixed inset-0 z-40 flex h-[6rem] items-center justify-between px-[2rem]'>
22+
<header className='bg-background fixed inset-0 z-40 mx-auto flex h-[6rem] max-w-[768px] items-center justify-between px-[2rem]'>
2323
<div className='flex w-1/6 cursor-pointer items-center'>
2424
{iconType === 'home' && <IcHome width={24} height={24} onClick={handleClickHome} />}
2525
{iconType === 'back' && <IcLeft width={24} height={24} onClick={() => router.back()} />}

‎apps/service/src/components/common/Modals/PortalModal.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const PortalModal = ({ isOpen, onClose, children = null }: PortalModalProps) =>
3030
<div className='fixed inset-0 z-50 flex items-center justify-center' onClick={onClose}>
3131
<div className='h-full w-full bg-black opacity-50' />
3232
<div
33-
className='absolute top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] transform overflow-auto rounded-[16px] bg-white shadow-lg'
33+
className='absolute top-[50%] left-[50%] max-w-[768px] translate-x-[-50%] translate-y-[-50%] transform overflow-auto rounded-[16px] bg-white shadow-lg'
3434
onClick={(e) => e.stopPropagation()}>
3535
{children}
3636
</div>

‎apps/service/src/components/common/Modals/RouteModal.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const RouteModal = ({ children }: RouteModalProps) => {
1414
onClick={() => router.back()}>
1515
<div className='h-full w-full bg-black opacity-50' />
1616
<div
17-
className='absolute top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] transform overflow-auto rounded-[16px] bg-white shadow-lg'
17+
className='absolute top-[50%] left-[50%] max-w-[768px] translate-x-[-50%] translate-y-[-50%] transform overflow-auto rounded-[16px] bg-white shadow-lg'
1818
onClick={(e) => e.stopPropagation()}>
1919
{children}
2020
</div>

‎apps/service/src/components/common/NavigationFooter.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const NavigationFooter = ({
1414
onClickNext,
1515
}: NavigationFooterProps) => {
1616
return (
17-
<div className='bg-background fixed right-0 bottom-0 left-0 flex h-[6.2rem] items-center justify-between px-[2rem]'>
17+
<div className='bg-background fixed right-0 bottom-0 left-0 mx-auto flex h-[6.2rem] max-w-[768px] items-center justify-between px-[2rem]'>
1818
<div>
1919
{prevLabel && onClickPrev && (
2020
<NavigationButton variant='prev' label={prevLabel} onClick={onClickPrev} />

‎apps/service/src/components/common/ProgressHeader.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const ProgressHeader = ({ progress }: ProgressHeaderProps) => {
2121
};
2222

2323
return (
24-
<header className='bg-background fixed inset-0 z-40 h-fit'>
24+
<header className='bg-background fixed inset-0 z-40 mx-auto h-fit max-w-[768px]'>
2525
<div className='flex h-[6rem] items-center px-[2rem]'>
2626
<IcList width={24} height={24} onClick={handleClickProblemList} />
2727
</div>

0 commit comments

Comments
 (0)