diff --git a/backend/server.js b/backend/server.js index f052289..ab27881 100644 --- a/backend/server.js +++ b/backend/server.js @@ -182,6 +182,7 @@ const createSocketIOServer = (server, rooms) => { socket.emit("game-update", room.data); const player = { + id: socket.id, socket, name: formatName(name), selectedCard: null, diff --git a/src/app.scss b/src/app.scss index f78eb5d..a181aca 100644 --- a/src/app.scss +++ b/src/app.scss @@ -14,8 +14,11 @@ --primary-800: #a1440b; --primary-900: #823a0c; --primary-950: #461b04; + background-color: var(--primary-50); } + + *, *::after, *::before { diff --git a/src/lib/components/Textarea.svelte b/src/lib/components/Textarea.svelte index 39abe3b..1d0d0db 100644 --- a/src/lib/components/Textarea.svelte +++ b/src/lib/components/Textarea.svelte @@ -42,6 +42,7 @@ &:disabled { cursor: not-allowed; filter: grayscale(0.8); + border-color: var(--primary-500); } } diff --git a/src/routes/create/+page.svelte b/src/routes/create/+page.svelte index 4cebfb5..aca3b9e 100644 --- a/src/routes/create/+page.svelte +++ b/src/routes/create/+page.svelte @@ -548,7 +548,7 @@ flex-direction: column; align-items: center; justify-content: center; - min-height: 100vh; + min-height: 100dvh; text-align: center; scale: 0; animation: scale 0.5s forwards 0.2s; diff --git a/src/routes/join/+page.svelte b/src/routes/join/+page.svelte index 0bddf7c..91da167 100644 --- a/src/routes/join/+page.svelte +++ b/src/routes/join/+page.svelte @@ -90,7 +90,7 @@ flex-direction: column; align-items: center; justify-content: center; - height: 100vh; + height: 100dvh; text-align: center; scale: 0; animation: scale 0.5s forwards 0.2s; diff --git a/src/routes/manager/[id]/+page.svelte b/src/routes/manager/[id]/+page.svelte index b6d4be6..9020902 100644 --- a/src/routes/manager/[id]/+page.svelte +++ b/src/routes/manager/[id]/+page.svelte @@ -7,8 +7,8 @@ import type { Socket } from 'socket.io-client'; import { onDestroy, onMount } from 'svelte'; import { toast } from 'svelte-sonner'; - import { backOut } from 'svelte/easing'; - import { fade, fly, scale } from 'svelte/transition'; + import { backOut, bounceInOut, cubicInOut, elasticInOut } from 'svelte/easing'; + import { fade, fly, scale, slide } from 'svelte/transition'; import ioClient from 'socket.io-client'; import Confetti from 'svelte-confetti'; import { _ } from 'svelte-i18n'; @@ -136,8 +136,8 @@ position: fixed; top: -50px; left: 0; - height: 100vh; - width: 100vw; + height: 100dvh; + width: 100dvw; display: flex; justify-content: center; overflow: hidden; @@ -149,8 +149,8 @@ delay={[500, 2000]} infinite duration={5000} - amount={200} - fallDistance="100vh" + amount={100} + fallDistance="100dvh" /> {/if} @@ -198,7 +198,10 @@ {#if resultsItem} -
{users.length} player{users.length > 1 ? 's' : ''}
{/if} - {#each users as user} + {#each users as user (user.id)}