From acd480e3328de397cb92cbec7911a2b6021884ec Mon Sep 17 00:00:00 2001 From: simplonco Date: Sun, 15 Jan 2023 18:43:13 +0100 Subject: [PATCH] chat is on every pages --- .../svelte/api_front/src/App.svelte | 2 ++ .../src/pages/profile/ProfileDisplay.svelte | 4 --- .../api_front/src/pieces/chat/Chat.svelte | 27 ++++++++++++++++--- .../src/pieces/chat/Layout_user.svelte | 3 --- .../src/pieces/chat/Request_rooms.ts | 2 +- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/srcs/requirements/svelte/api_front/src/App.svelte b/srcs/requirements/svelte/api_front/src/App.svelte index 1ed6baff..83e4b4fb 100644 --- a/srcs/requirements/svelte/api_front/src/App.svelte +++ b/srcs/requirements/svelte/api_front/src/App.svelte @@ -1,6 +1,7 @@ + diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte index 59791b1b..efe486b0 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte @@ -4,8 +4,6 @@ import GenerateUserDisplay from '../../pieces/GenerateUserDisplay.svelte'; import { push } from 'svelte-spa-router'; - import Chat from '../../pieces/chat/Chat.svelte'; - let user; onMount( async() => { @@ -17,8 +15,6 @@ - -
{#if user !== undefined} diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte index ad691fc8..49c7697b 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Chat.svelte @@ -2,14 +2,35 @@ import Layouts from './Chat_layouts.svelte'; import { init_socket } from './Socket_chat'; + import { location } from 'svelte-spa-router'; - export let color = "transparent"; - init_socket(); + let color = "transparent"; + + console.log("location:",$location); + if ($location !== '/') + init_socket(); + + function change_color(loc) + { + console.log("change color, location:", loc); + if (loc.startsWith("/game")) + console.log("in change"); + if (loc.startsWith("/spectator")) + console.log("in change"); + if (loc.startsWith("/ranking")) + console.log("in change"); + if (loc.startsWith("/profile")) + console.log("in change"); + } + + $: change_color($location); - +{#if $location !== '/'} + +{/if} diff --git a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_user.svelte b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_user.svelte index 801720ef..8f1eac70 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_user.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/chat/Layout_user.svelte @@ -56,9 +56,6 @@ - {#if back === "room_set"}