diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py index 99d40ff..881502b 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py +++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py @@ -6,7 +6,7 @@ # By: edbernar { await showPrivateChat(userList[i]); }); } + document.getElementById('newConversation').addEventListener('mouseup', () => { + divMessageListChatHome.innerText = 'Loading...'; + sendRequest("get_all_list_user", {}); + waitForallListUser().then((listUser) => { + divMessageListChatHome.innerText = ''; + listUser.forEach(element => { + let user = document.createElement("div"); + user.classList.add("user"); + user.innerHTML = ` +
+ +
+

+ ` + user.querySelector("img").src = element.pfp; + user.querySelector("h3").innerText = element.name; + divMessageListChatHome.appendChild(user); + }) + }) + }); } export { showListUser }; \ No newline at end of file diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeAllListUser.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeAllListUser.js new file mode 100644 index 0000000..b7a23b4 --- /dev/null +++ b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeAllListUser.js @@ -0,0 +1,39 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* typeAllListUser.js :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: edbernar { + + if (allListUserAvailable) + resolve(); + else + allListUserResolve = resolve; + }); +} + +function typePrivateListMessage(list) { + allListUser = list; + allListUserAvailable = true; + if (allListUserResolve) + { + allListUserResolve(allListUser); + allListUserResolve = null; + allListUserAvailable = false; + } +} + +export { waitForallListUser, typePrivateListMessage, allListUser }; \ No newline at end of file diff --git a/docker-compose/requirements/nginx/static/javascript/websocket.js b/docker-compose/requirements/nginx/static/javascript/websocket.js index 3e3b052..6a3c3b9 100644 --- a/docker-compose/requirements/nginx/static/javascript/websocket.js +++ b/docker-compose/requirements/nginx/static/javascript/websocket.js @@ -6,7 +6,7 @@ /* By: edbernar { - let token = getCookie("token"); - status = 1; console.log('Connected'); }; @@ -92,21 +76,10 @@ function sendRequest(type, content) { coc = JSON.stringify(content); else coc = content; - if (getCookie("token")) - { - socket.send(JSON.stringify({ - type: type, - token: getCookie("token"), - content: content - })); - } - else - { - socket.send(JSON.stringify({ - type: type, - content: content - })); - } + socket.send(JSON.stringify({ + type: type, + content: content + })); } export { socket, sendRequest }; \ No newline at end of file