chore: densed the PlayerAnswerLog and added participants count to lobby

stoerti · Sep 24, 2024 · a7861cb · a7861cb
1 parent a48362e
commit a7861cb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/backend/src/main/resources/questions/axoniq_conf_2024.json b/backend/src/main/resources/questions/axoniq_conf_2024.json
@@ -3,8 +3,8 @@
     "id": "axonconf_01",
     "type": "CHOICE",
     "phrase": "Which EventProcessor can process events in the same UnitOfWork as they are published?",
-    "correctAnswer": "SubscribingEventProcessor",
-    "answerOptions": ["PooledStreamingEventProcessor", "TrackingEventProcessor", "SubscribingEventProcessor"]
+    "correctAnswer": "Subscribing EventProcessor",
+    "answerOptions": ["PooledStreaming EventProcessor", "Tracking EventProcessor", "Subscribing EventProcessor"]
   },
   {
     "id": "axonconf_02",

diff --git a/e2e/codecept.conf.ts b/e2e/codecept.conf.ts
@@ -14,7 +14,7 @@ export const config: CodeceptJS.MainConfig = {
   helpers: {
     Playwright: {
       browser: 'chromium',
-      url: 'http://localhost:5173',
+      url: 'http://localhost:8080',
       show: true
     }
   },

diff --git a/e2e/pages/lobby.ts b/e2e/pages/lobby.ts
@@ -5,8 +5,8 @@ export function createGame(gameName: string, questionSet: string, moderated: boo
 
   I.fillField({id: "gameName"}, gameName)
   I.fillField({id: "maxPlayers"}, 50)
-  I.fillField({id: "numQuestions"}, 3)
-  I.fillField({id: "numSecondsToAnswer"}, 5)
+  I.fillField({id: "numQuestions"}, 5)
+  I.fillField({id: "numSecondsToAnswer"}, 300)
 
   I.click({id: 'questionSet'})
   I.click({xpath: '//ul//li[@data-value="'+questionSet+'"]'})

diff --git a/e2e/test/multiplayer.tsx b/e2e/test/multiplayer.tsx
@@ -30,15 +30,19 @@ Scenario('multiplayer', ({I, loginPage, lobbyPage, gameRoomPage}) => {
 
 Scenario('multiplayer_moderated', ({I, loginPage, lobbyPage, gameRoomPage}) => {
   let gameName = "Game " + Math.floor(Math.random() * 100000)
-  let moderator = "Moderator " + Math.floor(Math.random() * 100000)
-  let username1 = "User " + Math.floor(Math.random() * 100000)
-  let username2 = "User " + Math.floor(Math.random() * 100000)
-  let username3 = "User " + Math.floor(Math.random() * 100000)
+//  let moderator = "Moderator " + Math.floor(Math.random() * 100000)
+//  let username1 = "User " + Math.floor(Math.random() * 100000)
+//  let username2 = "User " + Math.floor(Math.random() * 100000)
+//  let username3 = "User " + Math.floor(Math.random() * 100000)
+  let moderator = "Moderator"
+  let username1 = "Alice"
+  let username2 = "Bob"
+  let username3 = "John Doe"
 
   loginPage.logInWithUsername(moderator)
   I.wait(1)
 
-  lobbyPage.createGame(gameName, "werkstatt", true)
+  lobbyPage.createGame(gameName, "axoniq_conf", true)
   I.wait(1)
 
   session('player1', () => {
@@ -131,7 +135,7 @@ Scenario('multiplayer_moderated', ({I, loginPage, lobbyPage, gameRoomPage}) => {
 
 Scenario('many_multiplayer_moderated', ({I, loginPage, lobbyPage, gameRoomPage}) => {
   const gameName = "Game " + Math.floor(Math.random() * 100000)
-  const numPlayers = 50
+  const numPlayers = 30
 
   const moderator = "Moderator " + Math.floor(Math.random() * 100000)
   const players = [...Array(numPlayers)].map((_, index) => { return "User "+index + Math.floor(Math.random() * 100000)})
@@ -162,7 +166,7 @@ Scenario('many_multiplayer_moderated', ({I, loginPage, lobbyPage, gameRoomPage})
 
   players.forEach((player, index) => {
     session('player'+index, () => {
-      gameRoomPage.answerChoiceQuestion(Math.random() < 0.5 ? "Banone" : "Gürkin")
+      gameRoomPage.answerChoiceQuestion(Math.random() < 0.5 ? "9" : "7")
     })
   })
 

diff --git a/frontend/src/pages/game/GameLobby.tsx b/frontend/src/pages/game/GameLobby.tsx
@@ -110,9 +110,9 @@ export const GameLobbyPage = (props: GameLobbyPageProps) => {
         </List>
         {startButton}
         <Typography variant="h6" component="div" sx={{pl: 2}}>
-          Participants
+          Participants ({props.game.players.length})
         </Typography>
-        <List dense={false}>
+        <List dense={true}>
           {props.game.players.map((row) => (
             <ListItem key={row.id}>
               <ListItemIcon>

diff --git a/frontend/src/pages/game/gameroom/PlayerAnswerLog.tsx b/frontend/src/pages/game/gameroom/PlayerAnswerLog.tsx
@@ -11,7 +11,7 @@ export const PlayerAnswerLog = ({game}: PlayerAnswerLogProps) => {
 
   const lastQuestion = game.currentQuestion!
 
-  return <Table aria-label="simple table">
+  return <Table aria-label="simple table" size={"small"}>
     <TableHead>
       <TableRow>
         <TableCell></TableCell>
@@ -24,7 +24,7 @@ export const PlayerAnswerLog = ({game}: PlayerAnswerLogProps) => {
         if (lastQuestion.hasPlayerAlreadyAnswered(player.id)) {
           icon = <MarkEmailRead color='success'/>
         } else {
-          icon = <QuestionMark color='info'/>
+          icon = <QuestionMark color='error'/>
         }
         return (
           <TableRow key={player.id} sx={{'&:last-child td, &:last-child th': {border: 0}}}>