From 48b64e9aa47a8cc808988ebbfe72c0f06aa9257c Mon Sep 17 00:00:00 2001 From: Jack Papel Date: Sat, 28 Dec 2024 18:05:16 -0800 Subject: [PATCH] Address comments + Fix server connection --- client/src/components/chatMessage.css | 8 -------- .../src/components/gameModeSettings/OutlineSelector.tsx | 5 +++-- client/src/components/useHooks.tsx | 2 +- client/src/menu/settings.css | 1 - client/src/menu/spectator/SpectatorGameScreen.tsx | 2 +- client/src/resources/config.json | 2 +- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/client/src/components/chatMessage.css b/client/src/components/chatMessage.css index 24ad54a00..00e348b1f 100644 --- a/client/src/components/chatMessage.css +++ b/client/src/components/chatMessage.css @@ -101,14 +101,6 @@ .chat-message.warning { background-color: #660000; } -.grave-message { - border: .13rem solid var(--background-border-color); - border-bottom-color: var(--background-border-shadow-color); - border-right-color: var(--background-border-shadow-color); - border-radius: .5rem; - margin: .13rem; - padding: .25rem; -} .kira-guess-results { display: flex; diff --git a/client/src/components/gameModeSettings/OutlineSelector.tsx b/client/src/components/gameModeSettings/OutlineSelector.tsx index a9a71f435..588632232 100644 --- a/client/src/components/gameModeSettings/OutlineSelector.tsx +++ b/client/src/components/gameModeSettings/OutlineSelector.tsx @@ -8,6 +8,7 @@ import { DragAndDrop } from "../DragAndDrop"; import { GameModeContext } from "./GameModesEditor"; import Select, { SelectOptionsSearch } from "../Select"; import StyledText from "../StyledText"; +import { Button } from "../Button"; type RoleOutlineSelectorProps = { roleOutline: RoleOutline, @@ -199,9 +200,9 @@ export function OutlineListSelector(props: { return

{translate("menu.lobby.roleList")}: {roleList.length}

- {!props.disabled && } + }
(a: T, b: T): boolean { const bothAreObjects = a && b && typeof a === "object" && typeof b === "object"; - return Boolean( + return ( bothAreObjects && Object.keys(a).length === Object.keys(b).length && Object.entries(a).every(([k, v]) => deepEqual(v, b[k as keyof T])) diff --git a/client/src/menu/settings.css b/client/src/menu/settings.css index c1c6d97ac..b31a6aa71 100644 --- a/client/src/menu/settings.css +++ b/client/src/menu/settings.css @@ -57,6 +57,5 @@ .settings-menu .menu-list { display: flex; flex-direction: row; - flex-wrap: wrap; justify-content: center; } \ No newline at end of file diff --git a/client/src/menu/spectator/SpectatorGameScreen.tsx b/client/src/menu/spectator/SpectatorGameScreen.tsx index 334c5ce48..6ece70522 100644 --- a/client/src/menu/spectator/SpectatorGameScreen.tsx +++ b/client/src/menu/spectator/SpectatorGameScreen.tsx @@ -41,7 +41,7 @@ export default function SpectatorGameScreen(): ReactElement {
- {mobile && } + {mobile === true && } ); diff --git a/client/src/resources/config.json b/client/src/resources/config.json index 28daaac12..a1da17407 100644 --- a/client/src/resources/config.json +++ b/client/src/resources/config.json @@ -1,3 +1,3 @@ { - "address": "ws://192.168.1.16:8081" + "address": "ws://localhost:8081" } \ No newline at end of file