From cd03048cb3ad8e96d1fc0dafe8240f354cfff1de Mon Sep 17 00:00:00 2001 From: NigeParis Date: Sun, 11 Jan 2026 13:04:52 +0100 Subject: [PATCH] Chat Overlay on global site done - needs to have chat hide still --- frontend/src/auth.ts | 1 + frontend/src/chat/chat.ts | 7 +++- .../src/chat/chatHelperFunctions/connected.ts | 39 ++++++++++--------- .../src/chat/chatHelperFunctions/quitChat.ts | 20 +++++----- frontend/src/pages/root/root.html | 2 +- 5 files changed, 38 insertions(+), 31 deletions(-) diff --git a/frontend/src/auth.ts b/frontend/src/auth.ts index dd13abd..b65b8ac 100644 --- a/frontend/src/auth.ts +++ b/frontend/src/auth.ts @@ -4,6 +4,7 @@ import cookie from "js-cookie"; import { ensureWindowState } from "@app/utils"; import { navigateTo } from "./routing"; + cookie.remove("pkce"); const headerProfile = document.querySelector("#header-profile")!; diff --git a/frontend/src/chat/chat.ts b/frontend/src/chat/chat.ts index d6ab56d..f3d6bda 100644 --- a/frontend/src/chat/chat.ts +++ b/frontend/src/chat/chat.ts @@ -393,7 +393,7 @@ clearText?.addEventListener("click", () => { }); bquit?.addEventListener("click", () => { - showInfo('Nigel close the chat overlay please') + quitChat(socket); }); // Enter key to send message @@ -418,3 +418,8 @@ chatButton!.addEventListener("click", () => { } }); +document.addEventListener('click', () => { + if (socket) { + connected(socket); + } +}); \ No newline at end of file diff --git a/frontend/src/chat/chatHelperFunctions/connected.ts b/frontend/src/chat/chatHelperFunctions/connected.ts index ed03d6a..e96ec5b 100644 --- a/frontend/src/chat/chatHelperFunctions/connected.ts +++ b/frontend/src/chat/chatHelperFunctions/connected.ts @@ -6,27 +6,28 @@ import { updateUser } from "@app/auth"; /** * function displays who is logged in the chat in the ping-Bubbies window * @param socket - */ +*/ export async function connected(socket: Socket): Promise { - + + const buddies = document.getElementById('div-buddies') as HTMLDivElement; setTimeout(async () => { try { - const buddies = document.getElementById('div-buddies') as HTMLDivElement; - const loggedIn = isLoggedIn(); - if (!loggedIn) throw('Not Logged in'); - let oldUser = localStorage.getItem("oldName") ?? ""; - if (loggedIn?.name === undefined) {return ;}; - oldUser = loggedIn.name ?? ""; - let user = await updateUser(); - localStorage.setItem("oldName", oldUser); - buddies.textContent = ""; - socket.emit('list', { - oldUser: oldUser, - user: user?.name, - }); - } catch (e) { - showError('Failed to login: Unknown error'); - } - }, 16); + let oldUser = localStorage.getItem("oldName") ?? ""; + let user = await updateUser(); + const loggedIn = isLoggedIn(); + if (!loggedIn) throw('Not Logged in'); + if (loggedIn?.name === undefined) {return ;}; + oldUser = loggedIn.name ?? ""; + localStorage.setItem("oldName", oldUser); + socket.emit('list', { + oldUser: oldUser, + user: user?.name, + }); + socket.connect(); + } catch (e) { + buddies.textContent = ""; + socket.disconnect(); + } + }, 16); }; \ No newline at end of file diff --git a/frontend/src/chat/chatHelperFunctions/quitChat.ts b/frontend/src/chat/chatHelperFunctions/quitChat.ts index 76d26a7..d5ed5f7 100644 --- a/frontend/src/chat/chatHelperFunctions/quitChat.ts +++ b/frontend/src/chat/chatHelperFunctions/quitChat.ts @@ -8,22 +8,22 @@ import { setTitle } from "@app/routing"; /** * function to quit the chat - leaves the ping-Buddies list * @param socket - */ +*/ export function quitChat (socket: Socket) { - + const chatBox = document.getElementById("chatBox")!; + const overlay = document.querySelector('#overlay')!; + try { - const systemWindow = document.getElementById('system-box') as HTMLDivElement; - const chatWindow = document.getElementById("t-chatbox") as HTMLDivElement; - if (socket) { - logout(socket); - setTitle('Chat Page'); - connected(socket); + if (chatBox.classList.contains('hidden')) { + // chatBox.classList.toggle('hidden'); + // overlay.classList.add('opacity-60'); } else { - getSocket(); + chatBox.classList.toggle('hidden'); + overlay.classList.remove('opacity-60'); } } catch (e) { showError('Failed to Quit Chat: Unknown error'); } - + }; \ No newline at end of file diff --git a/frontend/src/pages/root/root.html b/frontend/src/pages/root/root.html index 7d16696..ca57281 100644 --- a/frontend/src/pages/root/root.html +++ b/frontend/src/pages/root/root.html @@ -1,4 +1,4 @@ -
+