Skip to content

Commit db8d53b

Browse files
junjeeongjunjeeong
committed
chore: merge conflict 해결
1 parent 993269f commit db8d53b

File tree

7 files changed

+55
-58
lines changed

7 files changed

+55
-58
lines changed

‎src/components/modal/TermsAndPrivacyModal.tsx‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,34 @@ const TermsAndPrivacyModal = ({
77
closeModal
88
}: {
99
mode: "terms" | "privacy";
10-
closeModal: ()=>void;
10+
closeModal: () => void;
1111
}) => {
1212
const title = mode === "terms" ? "이용약관" : "개인정보처리방침";
13-
const description =
14-
mode === "terms"
15-
? TERMS
16-
: PRIVACY;
13+
const description = mode === "terms" ? TERMS : PRIVACY;
1714

18-
const handleOuterClick = () => {
19-
closeModal()
20-
}
15+
const handleOuterClick = () => {
16+
closeModal();
17+
};
2118

22-
const handleInnerClick = (e:MouseEvent) => {
23-
e.stopPropagation();
24-
}
19+
const handleInnerClick = (e: MouseEvent) => {
20+
e.stopPropagation();
21+
};
2522

2623
return (
27-
<div className="inset-0 fixed flex items-center justify-center z-50 bg-black/50" onClick={handleOuterClick}>
28-
<div className="relative rounded-lg flex flex-col items-center w-[360px] h-[476px] bg-white px-[45px] py-[25px] overflow-scroll " onClick={handleInnerClick}>
29-
<h1 className="font-bold text-2xl ">{title}</h1>
30-
<p className="mt-[30px] whitespace-pre-wrap">{description}</p>
31-
<button
32-
onClick={closeModal}
33-
className="absolute top-6 right-4"
24+
<div
25+
className="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
26+
onClick={handleOuterClick}
27+
>
28+
<div
29+
className="relative flex h-[476px] w-[360px] flex-col items-center overflow-scroll rounded-lg bg-white px-[45px] py-[25px] "
30+
onClick={handleInnerClick}
3431
>
35-
<img src="/icon/close.svg" alt="닫기 버튼" width={22} height={22} />
36-
</button>
37-
</div>
32+
<h1 className="text-2xl font-bold ">{title}</h1>
33+
<p className="mt-[30px] whitespace-pre-wrap">{description}</p>
34+
<button onClick={closeModal} className="absolute top-6 right-4">
35+
<img src="/icon/close.svg" alt="닫기 버튼" width={22} height={22} />
36+
</button>
37+
</div>
3838
</div>
3939
);
4040
};

‎src/pages/Chat.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const Chat = () => {
143143
<meta property="twitter:description" content={`${mbti}와의 대화창`} />
144144
</Helmet>
145145

146-
<div className="flex h-screen w-[360px] flex-col bg-white md:w-[375px] lg:w-[500px]">
146+
<div className="flex h-screen w-full flex-col bg-white lg:w-[500px]">
147147
<Header title={chatTitle} showShareIcon={false} />
148148

149149
<div className="flex-1 space-y-4 overflow-y-auto px-[20px] pt-6">

‎src/pages/Content.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const Content = () => {
6868
/>
6969
</Helmet>
7070

71-
<div className="flex w-[360px] flex-col bg-white md:w-[375px] lg:w-[500px]">
71+
<div className="flex w-full flex-col bg-white lg:w-[500px]">
7272
<Header title="콘텐츠" />
7373

7474
<div className="flex flex-col gap-[36px] px-5 py-5">

‎src/pages/Home.tsx‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,35 @@ const Home = () => {
4141
<meta property="twitter:description" content="홈" />
4242
</Helmet>
4343

44-
<div className="flex w-[360px] flex-col bg-white md:w-[375px] lg:w-[500px]">
45-
<Header />
46-
<main>
47-
<section aria-label="콘텐츠 배너">
48-
<Banner />
49-
</section>
50-
<section className="mt-5 w-full" aria-label="빠른 대화">
51-
<div className="w-full px-[20px] py-[13px]">
52-
<SubTitle mode="빠른대화" />
53-
</div>
54-
<div className="px-5 py-3">
55-
<ChatStartButton mode={"go-fast"} />
56-
</div>
57-
</section>
58-
<section aria-label="친구 목록">
59-
<div className="w-full px-[20px] py-[21px]">
60-
<SubTitle mode="친구목록" />
61-
</div>
62-
<div className="flex justify-center pb-[127px]">
63-
{isLoggedIn && virtualFreindList.length > 0 ? (
64-
<ProfileContainer
65-
list={virtualFreindList}
66-
setVirtualFriendList={setVirtualFriendList}
67-
/>
68-
) : (
69-
<StrokeBanner />
70-
)}
71-
</div>
72-
</section>
73-
</main>
74-
</div>
44+
<Header />
45+
<main>
46+
<section aria-label="콘텐츠 배너">
47+
<Banner />
48+
</section>
49+
<section className="mt-5 w-full" aria-label="빠른 대화">
50+
<div className="w-full px-[20px] py-[13px]">
51+
<SubTitle mode="빠른대화" />
52+
</div>
53+
<div className="flex justify-center px-5 py-3">
54+
<ChatStartButton mode={"go-fast"} />
55+
</div>
56+
</section>
57+
<section aria-label="친구 목록">
58+
<div className="w-full px-[20px] py-[21px]">
59+
<SubTitle mode="친구목록" />
60+
</div>
61+
<div className="flex justify-center pb-[127px]">
62+
{isLoggedIn && virtualFreindList.length > 0 ? (
63+
<ProfileContainer
64+
list={virtualFreindList}
65+
setVirtualFriendList={setVirtualFriendList}
66+
/>
67+
) : (
68+
<StrokeBanner />
69+
)}
70+
</div>
71+
</section>
72+
</main>
7573
</>
7674
);
7775
};

‎src/pages/MbtiTestQuestions.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const MbtiTestQuestions = () => {
4545
/>
4646
</Helmet>
4747

48-
<div className="flex flex-col sm:w-[360px] md:w-[375px] lg:w-[500px]">
48+
<div className="flex w-full flex-col lg:w-[500px]">
4949
<Header title="상대방 MBTI 유추 테스트" />
5050
<main className="flex h-full flex-col items-center justify-center bg-white whitespace-pre-wrap ">
5151
<span className="text-lg font-medium text-gray-500">

‎src/pages/MbtiTestResult.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import RestartButton from "@/components/button/RestartButton";
66
import ChatStartButton from "@/components/button/ChatStartButton";
77
import useLayoutSize from "@/hooks/useLayoutSize";
88
import Header from "@/components/header/Header";
9-
import { useParams } from "react-router-dom";
109

1110
const MbtiTestResult = () => {
1211
const { mbti } = useParams();
@@ -46,7 +45,7 @@ const MbtiTestResult = () => {
4645
/>
4746
</Helmet>
4847

49-
<div className="flex h-[1008px] flex-col sm:w-[360px] md:w-[375px] lg:w-[500px]">
48+
<div className="flex h-[1008px] w-full flex-col lg:w-[500px]">
5049
<Header title="결과" showShareIcon={false} />
5150
<main className="flex h-screen w-full flex-grow flex-col items-center bg-white px-5 py-5">
5251
<img

‎src/pages/SelectInfo.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ const SelectInfo = () => {
250250
/>
251251
</Helmet>
252252

253-
<div className="flex w-[360px] flex-col bg-white md:w-[375px] lg:w-[500px]">
253+
<div className="flex w-full flex-col bg-white lg:w-[500px]">
254254
<Header title={headerTitle} showShareIcon={false} />
255255

256256
<div className="mx-auto w-[320px]">

0 commit comments

Comments
 (0)