Skip to content

Commit e990b68

Browse files
authored
Merge pull request #49 from CS3219-AY2425S1/improve-chat-interface
reinstate chat messages
2 parents ea9fc30 + e5d64ce commit e990b68

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

Frontend/src/App.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
color: #61dafb;
2929
}
3030

31+
.scrollable-accordion-body {
32+
max-height: 300px; /* Set the maximum height */
33+
overflow-y: auto; /* Enable vertical scrolling */
34+
}
35+
3136
@keyframes App-logo-spin {
3237
from {
3338
transform: rotate(0deg);

Frontend/src/components/collab/Chat.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const Chat = ({ currentUser, messages, sendMessage }) => {
1818
<Accordion.Header>
1919
Chat
2020
</Accordion.Header>
21-
<Accordion.Body>
21+
<Accordion.Body className="scrollable-accordion-body">
2222
<ListGroup>
2323
{messages.map((msg, idx) => (
2424
<ListGroupItem

Frontend/src/components/collab/CollaborationSpace.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ const CollaborationSpace = () => {
114114
setLoading(false);
115115
break;
116116
case 'newMessage':
117-
console.log("adding message", data.message)
117+
console.log("adding message", data.message);
118+
setMessages((prevMessages) => [...prevMessages, data.message]);
118119
break;
119120
case 'languageChange':
120121
addNotif(`User ${data.user} has changed the language to ${data.language}`);

0 commit comments

Comments
 (0)