ref
This commit is contained in:
parent
1e48626808
commit
9cd37080d4
2 changed files with 9 additions and 10 deletions
|
|
@ -7,6 +7,7 @@ import Home from './pages/Home';
|
||||||
import CreateRoom from './pages/CreateRoom';
|
import CreateRoom from './pages/CreateRoom';
|
||||||
import JoinRoom from './pages/JoinRoom';
|
import JoinRoom from './pages/JoinRoom';
|
||||||
import RoomPage from './pages/RoomPage';
|
import RoomPage from './pages/RoomPage';
|
||||||
|
import GamePage from './pages/GamePage';
|
||||||
import LocalGame from './pages/LocalGame';
|
import LocalGame from './pages/LocalGame';
|
||||||
import './App.css';
|
import './App.css';
|
||||||
|
|
||||||
|
|
@ -22,6 +23,7 @@ function App() {
|
||||||
<Route path="/create-room" element={<CreateRoom />} />
|
<Route path="/create-room" element={<CreateRoom />} />
|
||||||
<Route path="/join-room" element={<JoinRoom />} />
|
<Route path="/join-room" element={<JoinRoom />} />
|
||||||
<Route path="/room/:roomCode" element={<RoomPage />} />
|
<Route path="/room/:roomCode" element={<RoomPage />} />
|
||||||
|
<Route path="/game/:roomCode" element={<GamePage />} />
|
||||||
<Route path="/local-game" element={<LocalGame />} />
|
<Route path="/local-game" element={<LocalGame />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</>
|
</>
|
||||||
|
|
|
||||||
|
|
@ -100,10 +100,6 @@ const RoomPage = () => {
|
||||||
}, [room]);
|
}, [room]);
|
||||||
|
|
||||||
const handleStartGame = () => {
|
const handleStartGame = () => {
|
||||||
if (!room.questionPackId) {
|
|
||||||
alert('Выберите пак вопросов перед началом игры');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
startGame();
|
startGame();
|
||||||
navigate(`/game/${roomCode}`);
|
navigate(`/game/${roomCode}`);
|
||||||
};
|
};
|
||||||
|
|
@ -181,21 +177,22 @@ const RoomPage = () => {
|
||||||
<strong>{room.questionPack.name}</strong> (
|
<strong>{room.questionPack.name}</strong> (
|
||||||
{room.questionPack.questionCount || 0} вопросов)
|
{room.questionPack.questionCount || 0} вопросов)
|
||||||
</p>
|
</p>
|
||||||
{isHost && room.status === 'WAITING' && (
|
{isHost && (
|
||||||
<p className="pack-hint">
|
<p className="pack-hint">
|
||||||
Можете изменить пак вопросов перед началом игры
|
Можете изменить пак вопросов в любой момент
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="pack-info">
|
<div className="pack-info">
|
||||||
<p className="pack-warning">
|
<p className="pack-hint">
|
||||||
Пак вопросов не выбран. Выберите пак для начала игры.
|
Пак вопросов не выбран. Вы можете начать игру без пака и
|
||||||
|
добавить его позже.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{isHost && room.status === 'WAITING' && (
|
{isHost && (
|
||||||
<div className="pack-selector">
|
<div className="pack-selector">
|
||||||
<select
|
<select
|
||||||
value={selectedPackId}
|
value={selectedPackId}
|
||||||
|
|
@ -235,7 +232,7 @@ const RoomPage = () => {
|
||||||
{isHost && room.status === 'WAITING' && (
|
{isHost && room.status === 'WAITING' && (
|
||||||
<button
|
<button
|
||||||
onClick={handleStartGame}
|
onClick={handleStartGame}
|
||||||
disabled={participants.length < 2 || !room.questionPackId}
|
disabled={participants.length < 2}
|
||||||
className="primary"
|
className="primary"
|
||||||
>
|
>
|
||||||
Начать игру
|
Начать игру
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue