Implemented notes on roompage

gramcracker40 · May 1, 2023 · aeafc31 · aeafc31
1 parent 87b8c6e
commit aeafc31
Show file tree

Hide file tree

Showing 6 changed files with 292 additions and 277 deletions.
diff --git a/UserInterface/js/chart.js b/UserInterface/js/chart.js
@@ -126,7 +126,7 @@ function updateChart(dates, data, key) {
     },
     options: {
       animation: false,
-      aspectRatio: 1,
+      aspectRatio: 1.5,
       scales: {
         y: {
           beginAtZero: false,

diff --git a/UserInterface/js/login.js b/UserInterface/js/login.js
@@ -19,6 +19,10 @@ async function validateUser() {
   const jwt = await proxy.login(user);
   if (jwt) {
     invalidLoginText.style.visibility = 'hidden';
+
+    const jwtStr = JSON.stringify(jwt);
+    sessionStorage.setItem('jwt', jwtStr);
+
     sessionStorage.setItem('access_token', jwt['access_token']);
     sessionStorage.setItem('refresh_token', jwt['refresh_token']);
     window.location.assign('/home');

diff --git a/UserInterface/js/roomMessages.js b/UserInterface/js/roomMessages.js
@@ -18,7 +18,6 @@ function createUserList() {
 }
 
 createUserList();
-// console.log(usernames);
 
 function resetChatbox() {
   while(chatbox_body.firstChild) {
@@ -27,7 +26,7 @@ function resetChatbox() {
 }
 
 async function renderMessages() {
-  const messages = proxy.getAllMessagesByRoom(roomID);
+  const messages = await proxy.getAllMessagesByRoom(roomID);
   console.log(messages);
   resetChatbox();
 
@@ -66,8 +65,13 @@ renderMessages();
 async function sendMessage() {
   const messageBox = document.getElementById('message-input-box');
   const message = messageBox.value;
-  console.log(message);
 
   // Get user ID from access_token
-  Utils.
+  const jwt = Utils.getJwt();
+  const userID = jwt['user_id'];
+
+  await proxy.createRoomMessage(roomID, userID, message);
+  renderMessages();
+
+  messageBox.value = '';
 }
diff --git a/UserInterface/js/utilities.js b/UserInterface/js/utilities.js
@@ -11,7 +11,7 @@ export function getUserObj() {
   return user;
 }
 
-export function parseJwt (token) {
+export function parseJwt(token) {
   var base64Url = token.split('.')[1];
   var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
   var jsonPayload = decodeURIComponent(window.atob(base64).split('').map(function(c) {
@@ -21,6 +21,8 @@ export function parseJwt (token) {
   return JSON.parse(jsonPayload);
 }
 
-// export function getJwt(obj) {
-//   return JSON.parse(obj)["access_token"];
-// }
+export function getJwt() {
+  const jwtStr = sessionStorage.getItem('jwt');
+  const jwt = JSON.parse(jwtStr);
+  return jwt;
+}