Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 2 additions & 8 deletions client/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
import styled from "styled-components";
import "./App.css";
import { GameClientContextProvider } from "./contexts/GameClientContext";
import { GameEngineContextProvider } from "./contexts/GameEngineContext";
import { GameScreenSelector } from "./GameScreenSelector";

const SettingsIcon = styled.div`
position: absolute;
top: 10px;
right: 10px;
`;
import { SettingsButtonAndPopup } from "./menus/SettingsButtonAndPopup";

function App() {
return (
<div className="App">
<GameEngineContextProvider>
<GameClientContextProvider>
<>
<SettingsIcon>⚙️</SettingsIcon>
<SettingsButtonAndPopup />
<GameScreenSelector />
</>
</GameClientContextProvider>
Expand Down
19 changes: 18 additions & 1 deletion client/src/contexts/GameClientContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ export const GameClientContext = React.createContext<{
playerTurnTimeoutRef: React.MutableRefObject<any>;
gameMode: GameMode | null;
setGameMode: React.Dispatch<React.SetStateAction<GameMode | null>>;
settings: {
showPossibleMoves: boolean;
};
setSettings: React.Dispatch<
React.SetStateAction<{ showPossibleMoves: boolean }>
>;
}>({} as any);

export const GameClientContextProvider = ({
Expand All @@ -56,6 +62,7 @@ export const GameClientContextProvider = ({
const [promotionMenuPosition, setPromotionMenuPosition] =
useState<Position | null>(null); // stores null or promoting position
const [gameMode, setGameMode] = useState<GameMode | null>(null);
const [settings, setSettings] = useState({ showPossibleMoves: true });

const {
availableMovesForPlayer,
Expand All @@ -72,6 +79,12 @@ export const GameClientContextProvider = ({
setPlayerSelection(player);
}, []);

useEffect(() => {
if (!settings.showPossibleMoves) {
setAvailableMoves([]);
}
}, [settings.showPossibleMoves]);

useEffect(() => {
if (
playerSelection !== null &&
Expand Down Expand Up @@ -121,7 +134,9 @@ export const GameClientContextProvider = ({
mapIndexToChessFile(selectedPiece.fileIndex) &&
move.from.rank === mapRankIndexToRank(selectedPiece.tileIndex),
);
setAvailableMoves(availableSelectedPieceMoves);
setAvailableMoves(
settings.showPossibleMoves ? availableSelectedPieceMoves : [],
);
}, [selectedPiece, availableMovesForPlayer]);

return (
Expand All @@ -138,6 +153,8 @@ export const GameClientContextProvider = ({
playerTurnTimeoutRef,
gameMode,
setGameMode,
settings,
setSettings,
}}
>
{children}
Expand Down
101 changes: 101 additions & 0 deletions client/src/menus/SettingsButtonAndPopup.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import React, { useState } from "react";
import styled from "styled-components";
import { GameClientContext } from "../contexts/GameClientContext";

const SettingsIcon = styled.div`
position: absolute;
top: 10px;
right: 10px;
cursor: pointer;
`;

const PopupOverlay = styled.div`
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
background: rgba(0, 0, 0, 0.8);
z-index: 1000;
display: flex;
align-items: center;
justify-content: center;
`;

const PopupContent = styled.div`
background: rgb(40, 40, 40);
color: white;
padding: 1rem 1.5rem;
border-radius: 12px;
box-shadow: 0 2px 16px rgba(0, 0, 0, 0.15);
min-width: 220px;
`;

const SettingsPopupContainer = styled.div`
background: rgb(40, 40, 40);
color: white;
padding: 1rem 1.5rem;
border-radius: 12px;
min-width: 320px;
`;

const SettingsLabel = styled.label`
display: flex;
align-items: center;
gap: 8px;
font-size: 1.1rem;
margin-top: 1rem;
`;

const CloseButton = styled.button`
margin-top: 24px;
float: right;
padding: 0.5rem 1.5rem;
border-radius: 6px;
border: 1px solid #222;
background: #2d8cff;
color: #fff;
font-weight: 600;
cursor: pointer;
`;

export function SettingsButtonAndPopup() {
const [showSettings, setShowSettings] = useState(false);
return (
<>
<SettingsIcon onClick={() => setShowSettings(true)}>
⚙️
</SettingsIcon>
{showSettings && (
<PopupOverlay onClick={() => setShowSettings(false)}>
<PopupContent onClick={(e) => e.stopPropagation()}>
<SettingsPopup onClose={() => setShowSettings(false)} />
</PopupContent>
</PopupOverlay>
)}
</>
);
}

function SettingsPopup({ onClose }: { onClose: () => void }) {
const { settings, setSettings } = React.useContext(GameClientContext);
return (
<SettingsPopupContainer>
<h2>Settings</h2>
<SettingsLabel>
<input
type="checkbox"
checked={settings.showPossibleMoves}
onChange={(e) =>
setSettings((s) => ({
...s,
showPossibleMoves: e.target.checked,
}))
}
/>
Show possible moves
</SettingsLabel>
<CloseButton onClick={onClose}>Close</CloseButton>
</SettingsPopupContainer>
);
}
1 change: 0 additions & 1 deletion server/src/user/jwt-auth.guard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
UnauthorizedException,
} from "@nestjs/common";
import { JwtService } from "@nestjs/jwt";
import { Request } from "express";

@Injectable()
export class JwtAuthGuard implements CanActivate {
Expand Down