diff --git a/site/interface/site/liveChat/showActualGameMessage.js b/site/interface/site/liveChat/showActualGameMessage.js index 475b633..be4c6d3 100644 --- a/site/interface/site/liveChat/showActualGameMessage.js +++ b/site/interface/site/liveChat/showActualGameMessage.js @@ -6,7 +6,7 @@ /* By: edbernar { - divMessageListChatHome.innerHTML += ` -
-

${element.content}

-

${element.date}

-
- `; + newDiv = document.createElement("div"); + contentNode = document.createTextNode(element.content); + dateNode = document.createTextNode(element.date); + newDiv.classList.add(element.from == me ? "meMessage" : "opponentMessage"); + tmp = document.createElement("p"); + tmp.classList.add("content"); + tmp.appendChild(contentNode); + newDiv.appendChild(tmp); + tmp = document.createElement("p"); + tmp.classList.add("time"); + tmp.appendChild(dateNode); + newDiv.appendChild(tmp); + divMessageListChatHome.appendChild(newDiv); }); divMessageListChatHome.scrollTop = divMessageListChatHome.scrollHeight; divMessageListChatHome.innerHTML += ` diff --git a/site/interface/site/liveChat/showPrivateChat.js b/site/interface/site/liveChat/showPrivateChat.js index b4217cb..d174e8f 100644 --- a/site/interface/site/liveChat/showPrivateChat.js +++ b/site/interface/site/liveChat/showPrivateChat.js @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* showPrivateChat.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ +/* By: edbernar ${user.name} + h2Username.appendChild(h2UsernameNode); + divButtonTypeChatHome.appendChild(h2Username); + divButtonTypeChatHome .innerHTML += `

Return

`; h2Button[0].style.cursor = "default"; @@ -71,16 +74,29 @@ async function changeButton(user) async function displayAllMessage(divMessageListChatHome) { + let newDiv = null; + let contentNode = null; + let dateNode = null; + let tmp = null; + divMessageListChatHome.style.height = "230px"; divMessageListChatHome.style.paddingBottom = "20px"; divMessageListChatHome.innerHTML = ''; messageList.forEach(element => { - divMessageListChatHome.innerHTML += ` -
-

${element.content}

-

${element.date}

-
- `; + newDiv = document.createElement("div"); + contentNode = document.createTextNode(element.content); + dateNode = document.createTextNode(element.date); + console.log(element.from, userMeInfo.id); + newDiv.classList.add(element.from === userMeInfo.id ? "meMessage" : "opponentMessage"); + tmp = document.createElement("p"); + tmp.classList.add("content"); + tmp.appendChild(contentNode); + newDiv.appendChild(tmp); + tmp = document.createElement("p"); + tmp.classList.add("time"); + tmp.appendChild(dateNode); + newDiv.appendChild(tmp); + divMessageListChatHome.appendChild(newDiv); }); divMessageListChatHome.scrollTop = divMessageListChatHome.scrollHeight; } diff --git a/site/interface/site/notification/main.js b/site/interface/site/notification/main.js index 102f517..9e54739 100644 --- a/site/interface/site/notification/main.js +++ b/site/interface/site/notification/main.js @@ -3,25 +3,25 @@ /* ::: :::::::: */ /* main.js :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: edbernar +#+ +:+ +#+ */ +/* By: edbernar { + divHeader.parentNode.style.animation = "slideOut 0.21s"; + setTimeout(() => { + divHeader.parentNode.remove(); + }, 199); + }); if (img) divHeader.appendChild(icon); divHeader.appendChild(h1Title); @@ -52,20 +58,21 @@ function createHeader(title, img) function createContent(message) { - const divContent = document.createElement("div"); - const pMessage = document.createElement("p"); - const limit = 100; + const divContent = document.createElement("div"); + const pMessage = document.createElement("p"); + const pMessageNode = document.createTextNode(message); + const limit = 100; divContent.classList.add("content"); pMessage.style.textAlign = "center"; if (message.length > limit) message = message.substring(0, limit) + "..."; - pMessage.innerHTML = message; + pMessage.appendChild(pMessageNode); divContent.appendChild(pMessage); return (divContent); } -function createLoadBar(timer) +function createLoadBar(newNotification, timer) { const divLoadBar = document.createElement("div"); const progress = document.createElement("div"); @@ -79,6 +86,10 @@ function createLoadBar(timer) progress.style.height = '5px'; progress.style.width = '0px'; progress.style.backgroundColor = 'black'; + newNotification.addEventListener("mouseover", () => { + clearInterval(interval); + progress.style.width = "100%"; + }); interval = setInterval(() => { progress.style.width = (intervalTimer * i) * 100 / timer + "%"; i++; @@ -86,19 +97,21 @@ function createLoadBar(timer) setTimeout(() => { clearInterval(interval); }, timer); - return (divLoadBar); + newNotification.appendChild(divLoadBar); + return (interval); } function createFooter(action, actionText) { const newButton = document.createElement("div"); + const textNode = document.createTextNode(actionText); if (action == null) return (null); newButton.style.cursor = "pointer"; if (actionText.length > 20) actionText = actionText.substring(0, 20) + "..."; - newButton.innerHTML = actionText; + newButton.appendChild(textNode); newButton.setAttribute("onclick", action); newButton.classList.add("footer"); if (typeof(action) !== "function") @@ -114,8 +127,10 @@ function newNotification(title, message, img, action, timer, actionText) const header = createHeader(title, img); const content = createContent(message); const footer = createFooter(action, actionText); - const loadBar = createLoadBar(timer); + let intervalLoadBar = null; + let timeoutInTimout = null; + console.log("New notification: " + message); newNotification.classList.add("notification"); newNotification.style.width = "100%"; newNotification.appendChild(header); @@ -123,13 +138,18 @@ function newNotification(title, message, img, action, timer, actionText) newNotification.appendChild(content); if (footer) newNotification.appendChild(footer); - newNotification.appendChild(loadBar); - setTimeout(() => { - setTimeout(() => { + intervalLoadBar = createLoadBar(newNotification, timer); + const timeout = setTimeout(() => { + timeoutInTimout = setTimeout(() => { divNotification.removeChild(newNotification); }, 199); newNotification.style.animation = "slideOut 0.21s"; }, timer); + newNotification.addEventListener("mouseover", () => { + clearTimeout(timeout); + clearTimeout(timeoutInTimout); + clearInterval(intervalLoadBar); + }); } class notification @@ -146,7 +166,6 @@ class notification new(title, message, img=null, action=null, actionText="Confirm") { - console.log("New notification: " + message); newNotification(title, message, img, action, this.timer, actionText); } } diff --git a/site/interface/site/websocket.js b/site/interface/site/websocket.js index 1530af1..7a315bd 100644 --- a/site/interface/site/websocket.js +++ b/site/interface/site/websocket.js @@ -6,7 +6,7 @@ /* By: edbernar { }; socket.onmessage = (event) => { - let response; + let response; try { response = JSON.parse(event.data); @@ -51,8 +51,7 @@ socket.onmessage = (event) => { { try { functionResponse[typeResponse.indexOf(response.type)](response.content); - } - catch { + } catch { console.warn(response); } } diff --git a/websocket-server/Class/__pycache__/User.cpython-310.pyc b/websocket-server/Class/__pycache__/User.cpython-310.pyc deleted file mode 100644 index 3d2c99d..0000000 Binary files a/websocket-server/Class/__pycache__/User.cpython-310.pyc and /dev/null differ diff --git a/websocket-server/typeRequets/__pycache__/getPrivateListMessage.cpython-310.pyc b/websocket-server/typeRequets/__pycache__/getPrivateListMessage.cpython-310.pyc deleted file mode 100644 index b018eec..0000000 Binary files a/websocket-server/typeRequets/__pycache__/getPrivateListMessage.cpython-310.pyc and /dev/null differ diff --git a/websocket-server/typeRequets/__pycache__/getPrivateListUser.cpython-310.pyc b/websocket-server/typeRequets/__pycache__/getPrivateListUser.cpython-310.pyc deleted file mode 100644 index d176516..0000000 Binary files a/websocket-server/typeRequets/__pycache__/getPrivateListUser.cpython-310.pyc and /dev/null differ diff --git a/websocket-server/typeRequets/__pycache__/login.cpython-310.pyc b/websocket-server/typeRequets/__pycache__/login.cpython-310.pyc deleted file mode 100644 index 479b869..0000000 Binary files a/websocket-server/typeRequets/__pycache__/login.cpython-310.pyc and /dev/null differ diff --git a/websocket-server/typeRequets/__pycache__/sendPrivateMessage.cpython-310.pyc b/websocket-server/typeRequets/__pycache__/sendPrivateMessage.cpython-310.pyc deleted file mode 100644 index c696138..0000000 Binary files a/websocket-server/typeRequets/__pycache__/sendPrivateMessage.cpython-310.pyc and /dev/null differ diff --git a/websocket-server/typeRequets/getPrivateListMessage.py b/websocket-server/typeRequets/getPrivateListMessage.py index cee83fa..90ffbcc 100644 --- a/websocket-server/typeRequets/getPrivateListMessage.py +++ b/websocket-server/typeRequets/getPrivateListMessage.py @@ -6,7 +6,7 @@ # By: edbernar