Index: components/GamesHistory.jsx =================================================================== --- components/GamesHistory.jsx (revision faff3347934f6f886535c1e4519dcea679db385d) +++ components/GamesHistory.jsx (revision 22367dbd434339cbf017e24df5eff637dc3738f9) @@ -39,10 +39,11 @@
-

Player {room.displayName} (${parseInt(room.initialBet) + parseInt(room.sideBet)})

+

Player {room?.displayName} (${parseInt(room.initialBet) + parseInt(room.sideBet)})

-
Outcome:
{room.outcome}
-
Side Bet Outcome:
{room.sideBetOutcome}
+
Played on:
{room.finished}
+ { room?.outcome?.lenght > 0 &&
Outcome:
{room.outcome}
} + { room?.sideBetOutcome.lenght > 0 &&
Side Bet Outcome:
{room.sideBetOutcome}
}
@@ -65,4 +66,5 @@
+ Played on: {game?.finished}
Ball on number: {game?.magicNumber}     Winning bets: {game?.winningBets?.join(", ")} @@ -75,5 +77,5 @@
-
{player.name} (${player.betAmount})
+
{player.name} (${player.betAmount})
@@ -81,5 +83,5 @@
-
Outcome: {player.outcome}
+
Outcome: {player.outcome}
@@ -94,6 +96,7 @@
- Pot: {table?.pot}     - Winners: {table?.winners?.map(e=>e.displayName)?.join(", ")} + Played on: {table?.finished}
+ Pot: ${table?.pot}     + Winners: {table?.winners?.map(e=>e?.displayName)?.join(", ")}
@@ -106,5 +109,5 @@
-
Player {player.displayName} (${player.betAmount})
+
Player {player?.displayName} (${player.betAmount})
Index: components/Header.jsx =================================================================== --- components/Header.jsx (revision faff3347934f6f886535c1e4519dcea679db385d) +++ components/Header.jsx (revision 22367dbd434339cbf017e24df5eff637dc3738f9) @@ -11,5 +11,48 @@ import axios from 'axios'; +import { signOut, useSession } from 'next-auth/react'; + const Header = () => { + const { data: googleSession } = useSession(); + + useEffect(() => { + if (googleSession && (!localStorage.CAESSINO_SESSION_ID || localStorage.CAESSINO_SESSION_ID === "")) { + axios.post(`/api/postgre`, { + action: 'login_via_google', + googleSession: googleSession, + }) + .then(res => { + if (res.data?.success) { + localStorage.CAESSINO_SESSION_ID = res.data?.session?.id; + + dispatch(setPlayer({ + ...playerState.player, + username: res.data?.session?.username, + displayName: res.data?.session?.displayName, + credits: res.data?.session.credits, + session_id: res.data?.session?.id, + })); + + dispatch(setStyle({ + ...styleState.style, + displayLoadingScreen: false, + displayLoginScreen: false, + loginScreenInfo: { + username: '', + password: '', + }, + notification: { + show: true, + text: 'Successfully logged in.', + status: 'success', + }, + inlineAlertText: '', + })); + } + }); + } + }, [googleSession]) + + const dispatch = useDispatch(); @@ -50,4 +93,5 @@ credits: 0, })) + signOut(); } }) Index: components/LoginScreen.jsx =================================================================== --- components/LoginScreen.jsx (revision faff3347934f6f886535c1e4519dcea679db385d) +++ components/LoginScreen.jsx (revision 22367dbd434339cbf017e24df5eff637dc3738f9) @@ -7,4 +7,7 @@ import { setPlayer } from '../redux/reducers/playerSlice'; import { setStyle } from '../redux/reducers/styleSlice'; + +import { FcGoogle } from 'react-icons/fc'; +import { signIn } from 'next-auth/react'; import axios from 'axios'; @@ -146,4 +149,5 @@
+
Index: components/admin/LiveGames.jsx =================================================================== --- components/admin/LiveGames.jsx (revision faff3347934f6f886535c1e4519dcea679db385d) +++ components/admin/LiveGames.jsx (revision 22367dbd434339cbf017e24df5eff637dc3738f9) @@ -71,11 +71,11 @@
-

Player {room.displayName} (${parseInt(room.initialBet) + parseInt(room.sideBet)})

+

Player {room?.displayName} (${parseInt(room.initialBet) + parseInt(room.sideBet)})

Status:
{room.status}
-
Outcome:
{room.outcome}
-
Side Bet Outcome:
{room.sideBetOutcome}
+ { room?.outcome?.length > 0 &&
Outcome:
{room.outcome}
} + { room?.sideBetOutcome?.length > 0 &&
Side Bet Outcome:
{room.sideBetOutcome}
}
@@ -99,6 +99,6 @@ Status: {adminInformationState.adminInformation?.liveGames?.roulette?.status}     Time to start: {adminInformationState.adminInformation?.liveGames?.roulette?.timeToStart}     - Ball on number: {adminInformationState.adminInformation?.liveGames?.roulette?.magicNumber}     - Winning bets: {adminInformationState.adminInformation?.liveGames?.roulette?.winningBets?.join(", ")} + { adminInformationState.adminInformation?.liveGames?.roulette?.magicNumber != -1 && <>Ball on number: {adminInformationState.adminInformation?.liveGames?.roulette?.magicNumber}     } + { adminInformationState.adminInformation?.liveGames?.roulette?.magicNumber != -1 && <>Winning bets: {adminInformationState.adminInformation?.liveGames?.roulette?.winningBets?.join(", ")} }
Players:
@@ -109,11 +109,11 @@
-
{player.name} (${player.betAmount})
+
{player.name} (${player?.betAmount})
-
Betted on: {player.whichBets.join(", ")}
+ { player?.whichBets?.length > 0 &&
Betted on: {player?.whichBets?.join(", ")}
}
-
Outcome: {player.outcome}
+ { adminInformationState.adminInformation?.liveGames?.roulette?.magicNumber != -1 && player?.whichBets?.length > 0 &&
Outcome: {player.outcome}
}
@@ -129,7 +129,7 @@ Round: {table?.round}/4     Started: {table?.started}     - Player on turn: {table?.turnIdx}     - Pot: {table?.pot}     - Winners: {table?.winners?.map(e=>e.displayName)?.join(", ")} + Player on turn: {table.players[table.turnIdx]?.displayName ?? '-'}     + Pot: ${table?.pot}     + { table?.winners?.length > 0 && <>Winners: {table?.winners?.map(e=>e?.displayName)?.join(", ")} }
@@ -142,5 +142,5 @@
-
Player {player.displayName} (${player.betAmount})
+
Player {player?.displayName} (${player.betAmount})
@@ -150,5 +150,5 @@
-
Hand:
+ { table?.cards?.length > 0 &&
Hand:
}
Index: components/blackjack/BlackjackHeader.jsx =================================================================== --- components/blackjack/BlackjackHeader.jsx (revision faff3347934f6f886535c1e4519dcea679db385d) +++ components/blackjack/BlackjackHeader.jsx (revision 22367dbd434339cbf017e24df5eff637dc3738f9) @@ -1,2 +1,3 @@ +/* eslint-disable @next/next/no-html-link-for-pages */ import React from 'react' @@ -62,5 +63,5 @@ dispatch(setBlackjackGame(newRes.data?.blackjackGame)) - if (newRes.data?.blackjackGame?.credits !== playerState.player.credits && parseInt(newRes.data?.blackjackGame?.credits) > 0) { + if (newRes.data?.blackjackGame?.credits !== playerState.player.credits && parseInt(newRes.data?.blackjackGame?.credits) >= 0) { dispatch(setPlayer({ ...playerState.player, @@ -138,9 +139,9 @@ return (
- +

- +