Skip to content

make ui of top, down bar and timer more attractive #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

make ui of top, down bar and timer more attractive #325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions apps/frontend/src/screens/Game.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ export const Game = () => {

const getTimer = (timeConsumed: number) => {
const timeLeftMs = GAME_TIME_MS - timeConsumed;
if (timeLeftMs <= 0) {
return <div className="text-white">Time's up!</div>;
}
const minutes = Math.floor(timeLeftMs / (1000 * 60));
const remainingSeconds = Math.floor((timeLeftMs % (1000 * 60)) / 1000);

Expand All @@ -237,30 +240,29 @@ export const Game = () => {
gameResult={result}
></GameEndModal>
)}
{started && (
<div className="justify-center flex pt-4 text-white">
{(user.id === gameMetadata?.blackPlayer?.id ? 'b' : 'w') ===
chess.turn()
? 'Your turn'
: "Opponent's turn"}
</div>
)}
<div className="justify-center flex">
<div className="pt-2 w-full">
<div className="flex flex-wrap justify-around content-around w-full">
<div className="text-white">
<div className="flex justify-center">
<div>
<div className="mb-4">
<div className="mb-2">
{started && (
<div className="flex justify-between">
<div className="flex justify-between items-center h-10 font-semibold">
<UserAvatar
name={
user.id === gameMetadata?.whitePlayer?.id
? gameMetadata?.blackPlayer?.name
: gameMetadata?.whitePlayer?.name ?? ''
}
/>
<div className="justify-center flex text-white">
{(user.id === gameMetadata?.blackPlayer?.id ? 'b' : 'w') ===
chess.turn()
? 'Your turn'
: "Opponent's turn"}
</div>

{getTimer(
user.id === gameMetadata?.whitePlayer?.id
? player2TimeConsumed
Expand All @@ -287,7 +289,7 @@ export const Game = () => {
</div>
</div>
{started && (
<div className="mt-4 flex justify-between">
<div className="mt- flex justify-between items-center mt-2 h-10 font-semibold">
<UserAvatar
name={
user.id === gameMetadata?.blackPlayer?.id
Expand Down Expand Up @@ -336,4 +338,4 @@ export const Game = () => {
</div>
</div>
);
};
};