Skip to content

Commit 5bb3a65

Browse files
committed
Merge branch 'dev' of https://github.com/MBTips/FE-MBTips into feature/profile-component
2 parents 35c157f + fd6270f commit 5bb3a65

27 files changed

+373
-15
lines changed

public/icon/close.svg

Lines changed: 1 addition & 0 deletions
Loading

public/icon/lightbulb.svg

Lines changed: 10 additions & 0 deletions
Loading

public/icon/plus.svg

Lines changed: 4 additions & 0 deletions
Loading

public/icon/plus_button.svg

Lines changed: 0 additions & 5 deletions
This file was deleted.

public/icon/starbubble.svg

Lines changed: 4 additions & 0 deletions
Loading

public/icon/submit_action.svg

Lines changed: 5 additions & 0 deletions
Loading

public/icon/submit_disabled.svg

Lines changed: 5 additions & 0 deletions
Loading

public/icon/thermometer.svg

Lines changed: 9 additions & 0 deletions
Loading

src/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function App() {
2-
return;
2+
return <></>;
33
}
44

5-
export default App;
5+
export default App;

src/components/Alert.tsx

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import AlertButton from "@/components/button/AlertButton";
2+
3+
const Alert = () => {
4+
return (
5+
<>
6+
<div className="flex flex-col justify-center items-center bg-white rounded-2xl w-[294px] h-[200px]">
7+
<h3 className="font-bold text-2xl">채팅방 나가기</h3>
8+
<p className="mt-[9px] font-medium text-xl">
9+
<span>대화가 저장되지 않아요.</span>
10+
<span className="flex justify-center">정말 나갈까요?</span>
11+
</p>
12+
<div className="flex gap-3.5 mt-[19px]">
13+
<AlertButton>취소</AlertButton>
14+
<AlertButton>확인</AlertButton>
15+
</div>
16+
</div>
17+
</>
18+
);
19+
};
20+
21+
export default Alert;

0 commit comments

Comments
 (0)