diff --git a/pac-man-board-game/ClientApp/.env.development b/pac-man-board-game/ClientApp/.env.development index 431b2b1..117b355 100644 --- a/pac-man-board-game/ClientApp/.env.development +++ b/pac-man-board-game/ClientApp/.env.development @@ -1,3 +1,5 @@ PORT=44435 HTTPS=true -VITE_API=wss://localhost:3000/api/game +VITE_API_URI=localhost:3000/api/game +VITE_API_HTTP=https://$VITE_API_URI +VITE_API_WS=wss://$VITE_API_URI/connect diff --git a/pac-man-board-game/ClientApp/src/App.tsx b/pac-man-board-game/ClientApp/src/App.tsx index d3d211c..91520a1 100644 --- a/pac-man-board-game/ClientApp/src/App.tsx +++ b/pac-man-board-game/ClientApp/src/App.tsx @@ -1,6 +1,6 @@ import React from "react"; import {Route, Routes} from "react-router-dom"; -import {Layout} from "./components/Layout"; +import Layout from "./components/layout"; import AppRoutes from "./AppRoutes"; import "./index.css"; diff --git a/pac-man-board-game/ClientApp/src/AppRoutes.tsx b/pac-man-board-game/ClientApp/src/AppRoutes.tsx index e3a3b31..6dc29a9 100644 --- a/pac-man-board-game/ClientApp/src/AppRoutes.tsx +++ b/pac-man-board-game/ClientApp/src/AppRoutes.tsx @@ -2,6 +2,7 @@ import React from "react"; import {Counter} from "./pages/counter"; import Home from "./pages/home"; import Game from "./pages/game"; +import LobbyPage from "./pages/lobby"; const AppRoutes = [ { @@ -16,6 +17,10 @@ const AppRoutes = [ path: "/game", element: , }, + { + path: "/lobby", + element: , + } ]; export default AppRoutes; diff --git a/pac-man-board-game/ClientApp/src/components/Layout.tsx b/pac-man-board-game/ClientApp/src/components/Layout.tsx deleted file mode 100644 index 4a58e24..0000000 --- a/pac-man-board-game/ClientApp/src/components/Layout.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import React from "react"; -import {NavMenu} from "./NavMenu"; - -export const Layout: Component = ({children}) => ( -
- -
- {children} -
-
-); diff --git a/pac-man-board-game/ClientApp/src/components/NavMenu.tsx b/pac-man-board-game/ClientApp/src/components/NavMenu.tsx deleted file mode 100644 index 18ee88c..0000000 --- a/pac-man-board-game/ClientApp/src/components/NavMenu.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import React from "react"; -import {Link} from "react-router-dom"; - -export const NavMenu = () => { - - const [collapsed, setCollapsed] = React.useState(true); - - function toggleNavbar() { - setCollapsed(!collapsed); - } - - return ( -
- -
- ); -}; diff --git a/pac-man-board-game/ClientApp/src/components/gameComponent.tsx b/pac-man-board-game/ClientApp/src/components/gameComponent.tsx index c20e733..8caca1c 100644 --- a/pac-man-board-game/ClientApp/src/components/gameComponent.tsx +++ b/pac-man-board-game/ClientApp/src/components/gameComponent.tsx @@ -11,7 +11,7 @@ import {diceAtom, ghostsAtom, playersAtom, rollDiceButtonAtom, selectedDiceAtom} import {CharacterType} from "../game/character"; import GameButton from "./gameButton"; -const wsService = new WebSocketService(import.meta.env.VITE_API); +const wsService = new WebSocketService(import.meta.env.VITE_API_WS); // TODO bug, when taking player on last dice, the currentPlayer changes and the wrong character get to steal // TODO bug, first player can sometimes roll dice twice (maybe only on firefox) diff --git a/pac-man-board-game/ClientApp/src/components/layout.tsx b/pac-man-board-game/ClientApp/src/components/layout.tsx new file mode 100644 index 0000000..5ff1abf --- /dev/null +++ b/pac-man-board-game/ClientApp/src/components/layout.tsx @@ -0,0 +1,13 @@ +import React from "react"; +import NavMenu from "./navMenu"; + +const Layout: Component = ({children}) => ( +
+ +
+ {children} +
+
+); + +export default Layout; diff --git a/pac-man-board-game/ClientApp/src/components/navMenu.tsx b/pac-man-board-game/ClientApp/src/components/navMenu.tsx new file mode 100644 index 0000000..294b01a --- /dev/null +++ b/pac-man-board-game/ClientApp/src/components/navMenu.tsx @@ -0,0 +1,28 @@ +import React from "react"; +import {Link} from "react-router-dom"; + +const NavMenu: Component = () => { + + const [collapsed, setCollapsed] = React.useState(true); + + function toggleNavbar() { + setCollapsed(!collapsed); + } + + return ( +
+ +
+ ); +}; + +export default NavMenu; diff --git a/pac-man-board-game/ClientApp/src/pages/lobby.tsx b/pac-man-board-game/ClientApp/src/pages/lobby.tsx new file mode 100644 index 0000000..e40d483 --- /dev/null +++ b/pac-man-board-game/ClientApp/src/pages/lobby.tsx @@ -0,0 +1,52 @@ +import React, {Suspense} from "react"; +import {atom, useAtomValue} from "jotai"; +import {Button} from "../components/Button"; + +const fetchAtom = atom(async () => { + const response = await fetch(import.meta.env.VITE_API_HTTP + "/allGames"); + return await response.json() as GameGroup[]; +}); + +const LobbyPage: Component = () => ( + + + +) + +export default LobbyPage; + +const GameTable: Component = ({className}) => { + + const data = useAtomValue(fetchAtom); + + function joinGame(gameId: string): void { + console.log("Joining game " + gameId); // TODO: Implement + } + + return ( + + + + + + + + + + + {data?.map(game => + + + + + + + )} + +
IdCountStateJoin
{game.id}{game.count}{game.isGameStarted ? "Closed" : "Open"} + +
+ ); +} diff --git a/pac-man-board-game/ClientApp/src/types/types.d.ts b/pac-man-board-game/ClientApp/src/types/types.d.ts index 6426dcd..47cd8e1 100644 --- a/pac-man-board-game/ClientApp/src/types/types.d.ts +++ b/pac-man-board-game/ClientApp/src/types/types.d.ts @@ -34,3 +34,9 @@ type Path = { End: Position, Direction: import("../game/direction").Direction } + +type GameGroup = { + readonly id: string, + readonly count: number, + readonly isGameStarted: boolean, +} diff --git a/pac-man-board-game/ClientApp/src/vite-env.d.ts b/pac-man-board-game/ClientApp/src/vite-env.d.ts index 8457fb4..68c1e06 100644 --- a/pac-man-board-game/ClientApp/src/vite-env.d.ts +++ b/pac-man-board-game/ClientApp/src/vite-env.d.ts @@ -1,7 +1,9 @@ /// interface ImportMetaEnv { - readonly VITE_API: string; + readonly VITE_API_URI: string, + readonly VITE_API_HTTP: string, + readonly VITE_API_WS: string, } interface ImportMeta { diff --git a/pac-man-board-game/Controllers/GameController.cs b/pac-man-board-game/Controllers/GameController.cs index f3c3106..5b6e160 100644 --- a/pac-man-board-game/Controllers/GameController.cs +++ b/pac-man-board-game/Controllers/GameController.cs @@ -17,9 +17,17 @@ public class GameController : GenericController // TODO reconnect using player i base(logger, wsService) => _actionService = actionService; - [HttpGet] + [HttpGet("connect")] public override async Task Accept() => await base.Accept(); + [HttpGet("allGames")] + public IEnumerable GetAllGames() + { + Logger.Log(LogLevel.Information, "Returning all games"); + return WsService.Games; + } + + protected override ArraySegment Run(WebSocketReceiveResult result, byte[] data) { var stringResult = data.GetString(result.Count); diff --git a/pac-man-board-game/Services/GameGroup.cs b/pac-man-board-game/Services/GameGroup.cs index db8193d..fc625d3 100644 --- a/pac-man-board-game/Services/GameGroup.cs +++ b/pac-man-board-game/Services/GameGroup.cs @@ -1,28 +1,28 @@ -using System.Collections; +using System.Text.Json.Serialization; using pacMan.Exceptions; using pacMan.Game; using pacMan.Game.Items; namespace pacMan.Services; -public class GameGroup : IEnumerable // TODO handle disconnects and reconnects +public class GameGroup // TODO handle disconnects and reconnects { private readonly Random _random = new(); private int _currentPlayerIndex; public GameGroup(Queue spawns) => Spawns = spawns; - public List Players { get; } = new(); - private Queue Spawns { get; } + [JsonInclude] public Guid Id { get; } = Guid.NewGuid(); - public int Count => Players.Count; + [JsonIgnore] public List Players { get; } = new(); + [JsonIgnore] private Queue Spawns { get; } + + [JsonInclude] public int Count => Players.Count; + + [JsonInclude] public bool IsGameStarted => Count > 0 && Players.All(player => player.State is State.InGame or State.Disconnected); - public IEnumerator GetEnumerator() => Players.GetEnumerator(); - - IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - public IPlayer NextPlayer() { try @@ -33,6 +33,7 @@ public class GameGroup : IEnumerable // TODO handle disconnects and rec { throw new InvalidOperationException("There are no players in the game group."); } + return Players[_currentPlayerIndex]; }