tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Site

Browse Source 
- change style button chat (absolute -> fixed)
    - Add script for chat
This commit is contained in:
Kum1ta
2024-08-25 18:22:49 +02:00
parent 26f3e33d4f
commit b1aefa3540
5 changed files with 50 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker-compose/requirements/nginx/static/javascript/homePage/main.js
View File

@ -6,13 +6,13 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/25 00:02:19 by edbernar #+# #+# */
/* Updated: 2024/08/25 15:29:51 by edbernar ### ########.fr */
/* Updated: 2024/08/25 18:18:09 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
import { Home3D } from "/static/javascript/home3D/home3D.js"
import { Login } from "/static/javascript/login/main.js";
// import { liveChat } from "/static/javascript/liveChat/main.js";
import { LiveChat } from "/static/javascript/liveChat/main.js";
class HomePage
{
@ -20,6 +20,7 @@ class HomePage
{
Home3D.create();
Login.create();
LiveChat.create();
window.addEventListener('scroll', scrool);
}
@ -27,7 +28,8 @@ class HomePage
{
Home3D.dispose();
Login.dispose();
window.addEventListener('scroll', scrool);
LiveChat.dispose();
window.removeEventListener('scroll', scrool);
}
};

48
docker-compose/requirements/nginx/static/javascript/liveChat/main.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/04 19:19:10 by edbernar #+# #+# */
/* Updated: 2024/08/24 23:22:20 by edbernar ### ########.fr */
/* Updated: 2024/08/25 18:17:13 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,6 +20,32 @@ import { showListUser } from "/static/javascript/liveChat/showUserList.js";
- game message when game will be implemented
*/
let chatButton = null;
let topChatHomeCross = null;
class LiveChat
{
static create()
{
const chatDiv = document.getElementById("chatDiv");
chatButton = document.getElementById("chatButton");
topChatHomeCross = document.getElementById("topChatCross");
chatButton.addEventListener("click", showChatMenu);
topChatHomeCross.addEventListener("click", hideChatMenu);
}
static dispose()
{
chatButton.removeEventListener("click", showChatMenu);
topChatHomeCross.removeEventListener("click", hideChatMenu);
chatButton = null;
topChatHomeCross = null;
}
}
function addDefaultButton()
{
const newDiv = document.createElement("div");
@ -60,22 +86,18 @@ function removeButtonIfExist()
}
}
function liveChat()
async function showChatMenu()
{
const chatButton = document.getElementById("chatButton");
const chatDiv = document.getElementById("chatDiv");
const topChatHomeCross = document.getElementById("topChatCross");
chatButton.addEventListener("click", async () => {
chatDiv.style.display = "flex";
removeButtonIfExist();
addDefaultButton();
await showListUser();
});
topChatHomeCross.addEventListener("click", () => {
chatDiv.style.display = "none";
infoPanel.isOpen = false;
});
}
export { liveChat };
function hideChatMenu()
{
chatDiv.style.display = "none";
infoPanel.isOpen = false;
}
export { LiveChat };

3
docker-compose/requirements/nginx/static/javascript/typeResponse/typeLogin.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/02 00:39:53 by edbernar #+# #+# */
/* Updated: 2024/08/25 17:09:22 by edbernar ### ########.fr */
/* Updated: 2024/08/25 18:09:04 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
@ -35,7 +35,6 @@ function typeLogin(content)
console.log("Welcome " + content.username + "\nYou're id is " + content.id);
userMeInfo.username = content.username;
userMeInfo.id = content.id;
console.warn("L'ID a été ajouté manuellement dans le serv: " + userMeInfo.id);
}
loginAvailable = true;
if (loginResolve)

3
docker-compose/requirements/nginx/static/javascript/websocket.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/31 22:17:24 by edbernar #+# #+# */
/* Updated: 2024/08/25 17:17:57 by edbernar ### ########.fr */
/* Updated: 2024/08/25 18:09:25 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
@ -67,7 +67,6 @@ socket.onmessage = (event) => {
}
else
{
console.log(response);
try {
functionResponse[typeResponse.indexOf(response.type)](response.content);
} catch {

8
docker-compose/requirements/nginx/static/style/homePage/liveChat.css
View File

@ -3,16 +3,16 @@
/* ::: :::::::: */
/* liveChat.css :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: marvin <marvin@student.42.fr> +#+ +:+ +#+ */
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/30 13:53:39 by edbernar #+# #+# */
/* Updated: 2024/08/10 16:47:10 by marvin ### ########.fr */
/* Updated: 2024/08/25 18:20:50 by edbernar ### ########.fr */
/* */
/* ************************************************************************** */
#chatButton {
position: absolute;
position: fixed;
bottom: 10px;
left: 30px;
background-color: white;
@ -36,7 +36,7 @@
width: 350px;
height: 400px;
background-color: #131313;
position: absolute;
position: fixed;
left: 20px;
bottom: 0px;
z-index: 999;