Skip to content

Commit c4a229b

Browse files
authored
Merge branch 'dev' into feature/ChatTips-컴포넌트-개발
2 parents 6845fbd + 4f48252 commit c4a229b

21 files changed

+198
-22
lines changed

public/icon/close.svg

Lines changed: 1 addition & 0 deletions
Loading

public/icon/mbtipslogo.svg

Lines changed: 9 additions & 0 deletions
Loading

public/icon/people.svg

Lines changed: 4 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/submit_action.svg

Lines changed: 5 additions & 0 deletions
Loading

public/icon/submit_disabled.svg

Lines changed: 5 additions & 0 deletions
Loading

src/App.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1-
import TipsMenu from "./components/TipsMenu";
2-
31
function App() {
4-
return (
5-
<div>
6-
<TipsMenu mode="topic" />
7-
<TipsMenu mode="conversation" />
8-
<TipsMenu mode="temporature" />
9-
</div>
10-
);
2+
return <></>;
113
}
124

135
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;

src/components/ChatAction.tsx

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { ChangeEvent, useState } from "react";
2+
import ToggleChatTipsButton from "@/components/button/ToggleChatTipsButton";
3+
import MessageInput from "@/components/input/MessageInput";
4+
5+
const ChatAction = () => {
6+
const [isOpen, setIsOpen] = useState(false);
7+
const [value, setValue] = useState("");
8+
9+
const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
10+
setValue(e.target.value);
11+
};
12+
13+
return (
14+
<div className="flex justify-around items-center bg-white px-5 py-3.5 border-[1px] border-gray-100 w-full h-[68px]">
15+
<ToggleChatTipsButton isOpen={isOpen} setIsOpen={setIsOpen} />
16+
<MessageInput value={value} onChange={handleChange} />
17+
<img
18+
className="ml-4"
19+
src={value ? "/icon/submit_action.svg" : "/icon/submit_disabled.svg"}
20+
alt="메시지 제출"
21+
width={40}
22+
height={40}
23+
/>
24+
</div>
25+
);
26+
};
27+
28+
export default ChatAction;

0 commit comments

Comments
 (0)