From 442faaa159d2f7c60d3663b8dc31d750ad1e3f1c Mon Sep 17 00:00:00 2001 From: adjsky Date: Wed, 15 May 2024 03:28:12 +0300 Subject: [PATCH] random default avatar --- apps/client/src/lib/atoms/game.ts | 6 ++- apps/client/src/screens/entry.tsx | 1 + e2e/fixtures/entry.ts | 2 + e2e/fixtures/game.ts | 2 + e2e/fixtures/waiting.ts | 6 ++- e2e/suites/screens/entry.spec.ts | 11 ----- ...\202\320\260\321\200-1-chromium-linux.png" | Bin 45580 -> 0 bytes ...\202\320\260\321\200-2-chromium-linux.png" | Bin 42317 -> 0 bytes ...\202\320\260\321\200-3-chromium-linux.png" | Bin 42955 -> 0 bytes ...\270\321\206\320\260-1-chromium-linux.png" | Bin 42270 -> 42317 bytes e2e/suites/screens/waiting.spec.ts | 1 + e2e/utility/add-player.ts | 2 + e2e/utility/use-avatar.ts | 42 ++++++++++++++++++ 13 files changed, 60 insertions(+), 13 deletions(-) delete mode 100644 "e2e/suites/screens/entry.spec.ts-snapshots/\320\220\320\262\320\260\321\202\320\260\321\200-1-chromium-linux.png" delete mode 100644 "e2e/suites/screens/entry.spec.ts-snapshots/\320\220\320\262\320\260\321\202\320\260\321\200-2-chromium-linux.png" delete mode 100644 "e2e/suites/screens/entry.spec.ts-snapshots/\320\220\320\262\320\260\321\202\320\260\321\200-3-chromium-linux.png" create mode 100644 e2e/utility/use-avatar.ts diff --git a/apps/client/src/lib/atoms/game.ts b/apps/client/src/lib/atoms/game.ts index 1f2a424c..1e77233e 100644 --- a/apps/client/src/lib/atoms/game.ts +++ b/apps/client/src/lib/atoms/game.ts @@ -2,6 +2,7 @@ import { atom } from "jotai" import { atomWithSafeStorage } from "@/core/atom-with-safe-storage" +import { AVAILABLE_AVATARS } from "../data/constants" import getRandomInt from "../functions/get-random-int" import type { Player } from "@evil-cards/server/src/ws/send" @@ -12,5 +13,8 @@ export const nicknameAtom = atomWithSafeStorage( "nickname", `Игрок${getRandomInt(1000, 9999)}` ) -export const avatarAtom = atomWithSafeStorage("avatar", 1) +export const avatarAtom = atomWithSafeStorage( + "avatar", + getRandomInt(1, AVAILABLE_AVATARS) +) export const soundsAtom = atomWithSafeStorage("sounds", true) diff --git a/apps/client/src/screens/entry.tsx b/apps/client/src/screens/entry.tsx index 7f1451c7..3ad4d423 100644 --- a/apps/client/src/screens/entry.tsx +++ b/apps/client/src/screens/entry.tsx @@ -93,6 +93,7 @@ const UserCard: React.FC = () => { backgroundSize: "cover" }} data-testid="avatar" + data-test-avatar-id={avatarId} />