Fix loading of messages

CS3219-AY2425S1 · Nov 13, 2024 · 7e3b006 · 7e3b006
1 parent 798acde
commit 7e3b006
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/peer-prep-fe/src/chat-feature/chat/chat.component.ts b/peer-prep-fe/src/chat-feature/chat/chat.component.ts
@@ -84,6 +84,8 @@ export class ChatComponent implements OnInit, OnDestroy {
 
       this.cdr.detectChanges();
       this.scrollToBottom();
+
+      console.log(sessionStorage)
 
     }
   }
@@ -105,6 +107,7 @@ export class ChatComponent implements OnInit, OnDestroy {
 
   ngOnDestroy(): void {
     if (this.messageSubscription) {
+      this.messageService.clearMessages()
       this.messageSubscription.unsubscribe();
     }
     this.webSocketService.disconnect();
@@ -127,4 +130,5 @@ export class ChatComponent implements OnInit, OnDestroy {
       this.myUsername = JSON.parse(userData).data.username
     }
   }
+
 }
diff --git a/peer-prep-fe/src/services/message.service.ts b/peer-prep-fe/src/services/message.service.ts
@@ -7,12 +7,12 @@ export class MessageService {
   private messages: { userID: string; content: string; username: string  }[] = [];
 
   constructor() {
-    const storedMessages = localStorage.getItem('chatMessages');
+    const storedMessages = sessionStorage.getItem('chatMessages');
     this.messages = storedMessages ? JSON.parse(storedMessages) : [];
   }
   addMessage(message: { userID: string; content: string; username: string}) {
     this.messages.push(message);
-    localStorage.setItem('chatMessages', JSON.stringify(this.messages));
+    sessionStorage.setItem('chatMessages', JSON.stringify(this.messages));
   }
 
   getMessages() {
@@ -21,6 +21,6 @@ export class MessageService {
 
   clearMessages() {
     this.messages = [];
-    localStorage.removeItem('chatMessages');
+    sessionStorage.removeItem('chatMessages');
   }
 }