Changeset 433e0c5 for components/poker

Timestamp:

07/15/22 14:45:30 (2 years ago)

Author:

anastasovv <simon@…>

Branches:

main

Children:

55701f0

Parents:

1df3fde

Message:

Added complaints, managing credits, and lost connection screens

Location:

components/poker

Files:

• Poker.jsx (modified) (2 diffs)
• PokerHeader.jsx (modified) (3 diffs)
• PokerSections.jsx (modified) (3 diffs)
• sections/Cards.jsx (deleted)
• sections/PickATable.jsx (modified) (1 diff)

components/poker/Poker.jsx

@@ -8 +8 @@
 import Notification from '../Notification'
 import PokerSections from './PokerSections'
+import LostConnection from '../LostConnection'
 
 const Poker = () => {
@@ -25 +26 @@
 
       <Notification/>
+
+      <LostConnection/>
     </div>
   )

components/poker/PokerHeader.jsx

@@ -10 +10 @@
 import { useDispatch, useSelector } from 'react-redux'
 
-import { setPlayer, setPokerGame, setSocket } from '../../redux/reducers/playerSlice'
+import { setPlayer, setPokerGame } from '../../redux/reducers/playerSlice'
 import { setStyle } from '../../redux/reducers/styleSlice'
 
@@ -36 +36 @@
                 if (interval !== null) clearInterval(interval);
 
-                dispatch(setPlayer({
-                    ...playerState.player,
-                    displayName: res.data?.displayName,
-                    session_id: res.data?.session_id,
-                    credits: res.data?.credits,
-                }));
-
-                dispatch(setStyle({
-                    ...styleState.style,
-                    displayLoadingScreen: false,
-                }))
-
                 interval = setInterval(() => {
                     axios.get(`/api/poker?action=update_state&session_id=${localStorage.CAESSINO_SESSION_ID}`).then(newRes => {
@@ -56 +44 @@
                                 dispatch(setPlayer({
                                     ...playerState.player,
+                                    displayName: res.data?.displayName,
+                                    session_id: res.data?.session_id,
                                     credits: newRes.data?.pokerGame?.player?.credits,
                                 }))
                             }
                         }
+
+                        dispatch(setStyle({
+                            ...styleState.style,
+                            displayLoadingScreen: false,
+                            notification: {
+                                ...styleState.style.notification,
+                                show: false,
+                            },
+                            lostConnectionInfo: {
+                                show: false,
+                                message: ''
+                            }
+                        }))
+                    }).catch(error => {
+                        dispatch(setStyle({
+                            ...styleState.style,
+                            displayLoadingScreen: false,
+                            lostConnectionInfo: {
+                                show: true,
+                                message: 'Game will be played until the end upon server gets live. You cannot continue your game, but the money earned / lost will be updated.'
+                            }
+                        }))
                     });
-                }, 2000);
+                }, 1000);
             }
             else {

components/poker/PokerSections.jsx

@@ -1 +1 @@
 import React from 'react'
 
-import Cards from './sections/Cards'
 import CardsInTheMiddle from './sections/CardsInTheMiddle'
 import Chairs from './sections/Chairs'
@@ -8 +7 @@
 import PickATable from './sections/PickATable'
 
-import { useSelector, useDispatch } from 'react-redux'
+import { useSelector } from 'react-redux'
 import Pot from './sections/Pot'
 import RaiseModal from './sections/RaiseModal'
@@ -21 +20 @@
 
           <Chairs/>
-
-          <Cards/>
 
           <CardsInTheMiddle/>

components/poker/sections/PickATable.jsx

@@ -6 +6 @@
 
 import axios from 'axios';
-import { setPokerGame } from '../../../redux/reducers/playerSlice';
 
 const PickATable = () => {