Merge pull request #213 from daithihearn/autoplay-4

Autoplay 4

Author: daithihearn

package.json

@@ -1,6 +1,6 @@
 {
     "name": "frontend",
-    "version": "8.0.4",
+    "version": "8.1.0",
     "description": "React frontend for the Cards 110",
     "author": "Daithi Hearn",
     "license": "MIT",

public/manifest.json

@@ -1,7 +1,7 @@
 {
   "short_name": "Cards 110",
   "name": "Cards 110",
-  "version": "8.0.4",
+  "version": "8.1.0",
   "icons": [
     {
       "src": "./assets/favicon.png",

src/caches/PlayCardSlice.ts

@@ -6,11 +6,9 @@ import {
 } from "@reduxjs/toolkit"
 
 import { gameSlice } from "./GameSlice"
-import { playCardSlice } from "./PlayCardSlice"
 
 const combinedReducer = combineReducers({
     game: gameSlice.reducer,
-    playCard: playCardSlice.reducer,
 })
 
 export type RootState = ReturnType<typeof combinedReducer>

src/caches/caches.ts

@@ -1,29 +1,27 @@
-import React, { useCallback, useMemo } from "react"
+import React, { useCallback, useEffect, useMemo, useState } from "react"
 import {
     DragDropContext,
     Draggable,
     Droppable,
     DropResult,
 } from "react-beautiful-dnd"
-import { EMPTY, Card } from "model/Cards"
+import { EMPTY, Card, CardName } from "model/Cards"
 import { RoundStatus } from "model/Round"
 import { useAppDispatch, useAppSelector } from "caches/hooks"
-import {
-    getCardToPlay,
-    togglePlayCard,
-    clearAutoPlay,
-} from "caches/PlayCardSlice"
 import { CardContent, CardMedia, useTheme } from "@mui/material"
 import {
     clearSelectedCards,
     getCardsFull,
+    getGameId,
     getIamGoer,
+    getIsMyGo,
     getIsRoundCalled,
     getRound,
     replaceMyCards,
     toggleSelect,
     toggleUniqueSelect,
 } from "caches/GameSlice"
+import { useGameActions } from "components/Hooks/useGameActions"
 
 const EMPTY_HAND = [
     { ...EMPTY, selected: false },
@@ -36,12 +34,15 @@ const EMPTY_HAND = [
 const MyCards = () => {
     const dispatch = useAppDispatch()
     const theme = useTheme()
+    const { playCard } = useGameActions()
 
+    const gameId = useAppSelector(getGameId)
     const round = useAppSelector(getRound)
     const isRoundCalled = useAppSelector(getIsRoundCalled)
     const myCards = useAppSelector(getCardsFull)
-    const autoPlayCard = useAppSelector(getCardToPlay)
+    const [autoPlayCard, setAutoPlayCard] = useState<CardName>(CardName.EMPTY)
     const iamGoer = useAppSelector(getIamGoer)
+    const isMyGo = useAppSelector(getIsMyGo)
 
     const cardsSelectable = useMemo(
         () =>
@@ -59,22 +60,34 @@ const MyCards = () => {
         [isRoundCalled, iamGoer],
     )
 
+    useEffect(() => {
+        if (
+            autoPlayCard !== CardName.EMPTY &&
+            round &&
+            round.status === RoundStatus.PLAYING &&
+            isMyGo
+        ) {
+            playCard({ gameId: gameId!, card: autoPlayCard })
+            setAutoPlayCard(CardName.EMPTY)
+        }
+    }, [autoPlayCard, round, gameId, isMyGo])
+
     const handleSelectCard = useCallback(
         (card: Card, event: React.MouseEvent<HTMLImageElement, MouseEvent>) => {
             if (!cardsSelectable || card.name === EMPTY.name) {
                 return
             }
 
             // If the round status is PLAYING then only allow one card to be selected
-            if (round && round.status === RoundStatus.PLAYING) {
+            if (gameId && round && round.status === RoundStatus.PLAYING) {
                 if (autoPlayCard === card.name) {
-                    dispatch(clearAutoPlay())
+                    setAutoPlayCard(CardName.EMPTY)
                     dispatch(clearSelectedCards())
                 } else if (event.detail === 2) {
-                    dispatch(togglePlayCard(card))
+                    setAutoPlayCard(card.name)
                 } else {
                     dispatch(toggleUniqueSelect(card))
-                    dispatch(clearAutoPlay())
+                    setAutoPlayCard(CardName.EMPTY)
                 }
             } else {
                 dispatch(toggleSelect(card))

src/components/Game/MyCards.tsx

@@ -34,11 +34,12 @@ export const useGameActions = () => {
             )
             return response.data
         },
-        onSuccess: data => {
+        onSuccess: (data: GameStateResponse) => {
             queryClient.setQueryData(["gameState"], data)
             dispatch(updateGame(data))
         },
-        onError: e => enqueueSnackbar(parseError(e), { variant: "error" }),
+        onError: (e: any) =>
+            enqueueSnackbar(parseError(e), { variant: "error" }),
     })
 
     const buyCards = useMutation({
@@ -59,11 +60,12 @@ export const useGameActions = () => {
             )
             return response.data
         },
-        onSuccess: data => {
+        onSuccess: (data: GameStateResponse) => {
             queryClient.setQueryData(["gameState"], data)
             dispatch(updateGame(data))
         },
-        onError: e => enqueueSnackbar(parseError(e), { variant: "error" }),
+        onError: (e: any) =>
+            enqueueSnackbar(parseError(e), { variant: "error" }),
     })
 
     const selectSuit = useMutation({
@@ -89,11 +91,12 @@ export const useGameActions = () => {
             )
             return response.data
         },
-        onSuccess: data => {
+        onSuccess: (data: GameStateResponse) => {
             queryClient.setQueryData(["gameState"], data)
             dispatch(updateGame(data))
         },
-        onError: e => enqueueSnackbar(parseError(e), { variant: "error" }),
+        onError: (e: any) =>
+            enqueueSnackbar(parseError(e), { variant: "error" }),
     })
 
     const playCard = useMutation({
@@ -114,11 +117,12 @@ export const useGameActions = () => {
             )
             return response.data
         },
-        onSuccess: data => {
+        onSuccess: (data: GameStateResponse) => {
             queryClient.setQueryData(["gameState"], data)
             dispatch(updateGame(data))
         },
-        onError: e => enqueueSnackbar(parseError(e), { variant: "error" }),
+        onError: (e: any) =>
+            enqueueSnackbar(parseError(e), { variant: "error" }),
     })
 
     const deleteGame = useMutation({
@@ -134,7 +138,8 @@ export const useGameActions = () => {
             queryClient.invalidateQueries({
                 queryKey: ["myGames", "gameState"],
             }),
-        onError: e => enqueueSnackbar(parseError(e), { variant: "error" }),
+        onError: (e: any) =>
+            enqueueSnackbar(parseError(e), { variant: "error" }),
     })
 
     return {

src/components/Hooks/useGameActions.tsx

@@ -32,7 +32,7 @@ export const useGameState = (gameId?: string) => {
             }
             return res.data
         },
-        // Refetch the data every 2 seconds
+        // Refetch the data every 5 seconds
         refetchInterval: 5_000,
         enabled: !!accessToken && !!gameId,
     })