Revert "refactored PlayerModel to Player"
This reverts commit 68c2e3a8d9.
This commit is contained in:
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
|
||||
import { motion } from "framer-motion";
|
||||
import { useNakama } from "./providers/NakamaProvider";
|
||||
import Player from "./Player";
|
||||
import { Player } from "./interfaces/models";
|
||||
import { PlayerModel } from "./interfaces/models";
|
||||
|
||||
import TicTacToeBoard from "./games/tictactoe/TicTacToeBoard";
|
||||
import BattleShipBoard from "./games/battleship/BattleShipBoard";
|
||||
@@ -13,7 +13,7 @@ export default function App() {
|
||||
const [turn, setTurn] = useState<number>(0);
|
||||
const [winner, setWinner] = useState<string | null>(null);
|
||||
const [gameOver, setGameOver] = useState<boolean | null>(null);
|
||||
const [players, setPlayers] = useState<Player[]>([]);
|
||||
const [players, setPlayers] = useState<PlayerModel[]>([]);
|
||||
const [metadata, setMetadata] = useState<Record<string, any>>({});
|
||||
|
||||
const { sendMatchData, onMatchData, matchId, session } = useNakama();
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import React, { useMemo } from "react";
|
||||
import { motion } from "framer-motion";
|
||||
import { useNakama } from "../../providers/NakamaProvider";
|
||||
import { Player } from "../../interfaces/models";
|
||||
import { PlayerModel } from "../../models/player";
|
||||
|
||||
import PlacementGrid from "./placement/PlacementGrid";
|
||||
import ShotGrid from "./battle/ShotGrid";
|
||||
|
||||
interface BattleBoardProps {
|
||||
boards: Record<string, { grid: string[][] }>;
|
||||
players: Player[];
|
||||
players: PlayerModel[];
|
||||
myUserId: string | null;
|
||||
turn: number;
|
||||
winner: string | null;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {
|
||||
Board,
|
||||
Player,
|
||||
PlayerModel,
|
||||
} from '../../interfaces/models'
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ export interface BattleShipBoardProps {
|
||||
turn: number;
|
||||
winner: string | null;
|
||||
gameOver: boolean | null;
|
||||
players: Player[];
|
||||
players: PlayerModel[];
|
||||
myUserId: string | null;
|
||||
metadata: Record<string, any>;
|
||||
}
|
||||
|
||||
@@ -2,14 +2,14 @@ import React, { useEffect, useState } from "react";
|
||||
import { motion, AnimatePresence } from "framer-motion";
|
||||
import { useNakama } from "../../providers/NakamaProvider";
|
||||
import getHaiku from "../../utils/haikus";
|
||||
import { Player } from "../../interfaces/models";
|
||||
import { PlayerModel } from "../../models/player";
|
||||
|
||||
interface BoardProps {
|
||||
boards: Record<string, { grid: string[][] }>;
|
||||
turn: number;
|
||||
winner: string | null;
|
||||
gameOver: boolean | null;
|
||||
players: Player[];
|
||||
players: PlayerModel[];
|
||||
myUserId: string | null;
|
||||
onCellClick: (row: number, col: number) => void;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {
|
||||
Board,
|
||||
Player,
|
||||
PlayerModel,
|
||||
} from '../../interfaces/models'
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ export interface TicTacToeBoardProps {
|
||||
turn: number;
|
||||
winner: string | null;
|
||||
gameOver: boolean | null;
|
||||
players: Player[];
|
||||
players: PlayerModel[];
|
||||
myUserId: string | null;
|
||||
onCellClick: (row: number, col: number) => void;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export interface Player {
|
||||
export interface PlayerModel {
|
||||
user_id: string;
|
||||
username: string;
|
||||
index: number;
|
||||
@@ -20,7 +20,7 @@ export interface GameState {
|
||||
turn: number;
|
||||
winner: string | null;
|
||||
gameOver: boolean;
|
||||
players: Player[];
|
||||
players: PlayerModel[];
|
||||
metadata: Record<string, any>;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user