diff --git a/frontend/.prettierrc.json b/frontend/.prettierrc.json index f079f69..125ba0a 100644 --- a/frontend/.prettierrc.json +++ b/frontend/.prettierrc.json @@ -4,5 +4,7 @@ "trailingComma": "es5", "printWidth": 200, "bracketSpacing": true, - "arrowParens": "always" + "arrowParens": "always", + "plugins": ["prettier-plugin-svelte"], + "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] } diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d291466..5205553 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -25,6 +25,7 @@ "flowbite-svelte": "^0.48.4", "flowbite-svelte-icons": "^2.0.2", "prettier": "3.5.3", + "prettier-plugin-svelte": "^3.3.3", "sass-embedded": "^1.85.1", "svelte": "^5.22.5", "svelte-check": "^4.1.4", @@ -3600,6 +3601,17 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, + "node_modules/prettier-plugin-svelte": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.3.3.tgz", + "integrity": "sha512-yViK9zqQ+H2qZD1w/bH7W8i+bVfKrD8GIFjkFe4Thl6kCT9SlAsXVNmt3jCvQOCsnOhcvYgsoVlRV/Eu6x5nNw==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "prettier": "^3.0.0", + "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0" + } + }, "node_modules/prompts": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", diff --git a/frontend/package.json b/frontend/package.json index 2bbb81f..e7282f9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,6 +18,7 @@ "flowbite-svelte": "^0.48.4", "flowbite-svelte-icons": "^2.0.2", "prettier": "3.5.3", + "prettier-plugin-svelte": "^3.3.3", "sass-embedded": "^1.85.1", "svelte": "^5.22.5", "svelte-check": "^4.1.4", diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 11e3722..026de37 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -1,13 +1,13 @@ diff --git a/frontend/src/components/ConnectRoom.svelte b/frontend/src/components/ConnectRoom.svelte index ad908ed..34935e5 100644 --- a/frontend/src/components/ConnectRoom.svelte +++ b/frontend/src/components/ConnectRoom.svelte @@ -1,12 +1,6 @@ - +
- +

{$_("lobby.confirm_leave_message")}

- - + +
- +
- +
- +
- +

{$_("lobby.confirm_kick_player_message", { - values: { player_name: sessionStore.getUser(kick_player)?.Username || 'Name not found' }, + values: { player_name: sessionStore.getUser(kick_player)?.Username || "Name not found" }, })}

- + + {/if}
- {$_("game_status.game_status")} + {$_("game_status.game_status")} {$_(`game_status.${GameState[$sessionStore.gameState].toLowerCase()}`)} - +
@@ -196,61 +129,52 @@ {/if} - + {#if sessionStore.getState().gameState === GameState.Lobby} -
- - - -
- - - {#if sessionStore.getPlayerPermissions().isHost} - + +
+ - {/if} -
- + + {#if sessionStore.getPlayerPermissions().isHost} + + {/if} +
+ {/if} @@ -263,10 +187,7 @@ >
- {$_("lobby.start_game")} - + {$_("lobby.start_game")}
@@ -276,10 +197,7 @@ {#if players.length > 5} - + {/if} @@ -297,25 +215,17 @@ {player.Username} {#if sessionStore.isCurrentPlayer(player.PlayerId)} - {$_("lobby.you")} + {$_("lobby.you")} {/if} {#if sessionStore.getPlayerPermissions(player.PlayerId).isHost} - {$_("lobby.host")} + {$_("lobby.host")} {/if} {#if player.IsConnected} - {$_(`player_status.connected`)} + {$_(`player_status.connected`)} {:else} - {$_(`player_status.disconnected`)} + {$_(`player_status.disconnected`)} {/if} @@ -348,9 +258,7 @@ > - {$_("lobby.rename_player")} + {$_("lobby.rename_player")} {/if} diff --git a/frontend/src/components/RenamePlayer.svelte b/frontend/src/components/RenamePlayer.svelte index 34b8ae0..8b711f2 100644 --- a/frontend/src/components/RenamePlayer.svelte +++ b/frontend/src/components/RenamePlayer.svelte @@ -32,7 +32,7 @@ debounceTimer = setTimeout(() => { sessionStore.renamePlayer(playerId, newName); isLoading = false; - unfocusInput() + unfocusInput(); }, 1800); } @@ -57,29 +57,25 @@ role="button" tabindex="0" on:click={focusInput} - on:keydown={(event) => { if (event.key === 'Enter' || event.key === ' ') focusInput(); }}> + on:keydown={(event) => { + if (event.key === "Enter" || event.key === " ") focusInput(); + }} +>
{#if playerId == sessionStore.getUserId()} - {$_("lobby.rename_yourself")} + {$_("lobby.rename_yourself")} {:else} - {$_("lobby.rename_player")} + {$_("lobby.rename_player")} {/if}
- +
{#if isLoading} -
- -
-{/if} +
+ +
+ {/if} diff --git a/frontend/src/components/StatsContainer.svelte b/frontend/src/components/StatsContainer.svelte index 6c77798..28ebb65 100644 --- a/frontend/src/components/StatsContainer.svelte +++ b/frontend/src/components/StatsContainer.svelte @@ -7,15 +7,15 @@ online_player_count: null, current_game_rooms: null, games_played: null, - } + }; async function getStats() { try { const res = await fetch("/api/stats"); const resJson = await res.json(); - stats.online_player_count = resJson?.OnlinePlayerCount - stats.current_game_rooms = resJson?.RunningGames - stats.games_played = resJson?.TotalGamesPlayed + stats.online_player_count = resJson?.OnlinePlayerCount; + stats.current_game_rooms = resJson?.RunningGames; + stats.games_played = resJson?.TotalGamesPlayed; } catch {} } @@ -25,11 +25,11 @@ getStats(); // Request stats update every 10s getStateInterval = setInterval(getStats, 10 * 60 * 1000); - }) + }); onDestroy(() => { clearInterval(getStateInterval); - }) + });
@@ -41,4 +41,4 @@ {$_("landing_page.stats_container.current_game_rooms", { values: { count: stats.current_game_rooms ?? "..." } })} {$_("landing_page.stats_container.games_played", { values: { count: stats.games_played ?? "..." } })}
- \ No newline at end of file + diff --git a/frontend/src/routes/Leave.svelte b/frontend/src/routes/Leave.svelte index 5cde5b3..72a5483 100644 --- a/frontend/src/routes/Leave.svelte +++ b/frontend/src/routes/Leave.svelte @@ -6,18 +6,13 @@ import { sessionStore } from "../stores/sessionStore"; onMount(async () => { - await sessionStore.leaveRoom() - }) + await sessionStore.leaveRoom(); + });
- - + +

{$_("leave.leaving_game")}
diff --git a/frontend/src/routes/[...404].svelte b/frontend/src/routes/[...404].svelte index 85ee76b..c970b3f 100644 --- a/frontend/src/routes/[...404].svelte +++ b/frontend/src/routes/[...404].svelte @@ -2,12 +2,11 @@ import { Button, Card } from "flowbite-svelte"; import { MoveLeft } from "lucide-svelte"; import { _ } from "svelte-i18n"; - import { url } from '@roxi/routify' + import { url } from "@roxi/routify"; function goBack() { window.history.pushState({}, "", "/"); } -
@@ -20,8 +19,8 @@ {$_("imprint.go_back")} - +

{$_("404.404_page_not_found")}

-

{$_("404.page_not_found", { values: { page: $url('$leaf') }})}

+

{$_("404.page_not_found", { values: { page: $url("$leaf") } })}
diff --git a/frontend/src/routes/_module.svelte b/frontend/src/routes/_module.svelte index d3256ed..1f27cd9 100644 --- a/frontend/src/routes/_module.svelte +++ b/frontend/src/routes/_module.svelte @@ -20,11 +20,7 @@
-