Merge branch 'main' of https://gitlab.reutlingen-university.de/hobelsbe/cloud_computing

index.js

@@ -75,6 +75,10 @@ async function addUserToActiveUsers(response, socket) {
 
 async function deleteUserFromActiveUsers(response, socket) {
   
+  return new Promise(resolve => {
+    activeUsers.delete(socket.id);
+
+  
   return new Promise(resolve => {
     activeUsers.delete(socket.id);
     var userArr = Array.from(activeUsers.values());
@@ -112,6 +116,8 @@ io.on('connection', (socket) => {
     var receiver = response.receiver;
     var sender = response.name;
 
+    activeUsers.
+
     io.emit(receiver, {
       private_msg: private_msg,
       receiver: receiver,

views/index.html

@@ -37,10 +37,15 @@
       <input id="input" autocomplete="off" /><button>Send</button>
     </form>
     <form id="form_private" action="">
-      <input id="input_private" autocomplete="off" />
+      <input id="input_private" autocomplete="off" placeholder="Private Message"/>
       <input id="input_private_reciever" autocomplete="off" placeholder="Receiver"/>
       <button>Send private Message</button>
     </form>
+    <form id="form_multiple_receiver" action="">
+      <input id="input_multiple_receiver" autocomplete="off" placeholder="Private Message"/>
+      <input id="input_multiple_receiver" autocomplete="off" placeholder="Receiver"/>
+      <button>Send group message</button>
+    </form>
     <input id="file" type="file"/>
     <script src="/socket.io/socket.io.js"></script>
     <script>
@@ -78,16 +83,21 @@
         }
       })
 
+      //Receive private Messages
       socket.on(username, function(response){
-        console.log("Private Message: ", response.private_msg," From: ", response.sender);
-/* 
+        var private_msg =  response.private_msg;
+        var sender = response.sender;
+        var private_msg = response.private_msg;
+        console.log("New private Message: ", response.private_msg," From: ", response.sender);
+
         var item = document.createElement('li');
-        var nameMsg = name + ": " + msg + "   --" + dateTime;
+        var nameMsg = "new private Message from: " + sender + ": " + private_msg;
         item.textContent = nameMsg;
 
         messages.appendChild(item);
-        window.scrollTo(0, document.body.scrollHeight); */
-      }) 
+        window.scrollTo(0, document.body.scrollHeight);
+
+      });
 
       //Event Listener to trigger emit function. Sends 'chat message' event and Message to Server
       form.addEventListener('submit', function(e) {