Index: components/blackjack/BlackjackHeader.jsx =================================================================== --- components/blackjack/BlackjackHeader.jsx (revision ebf5e04ad50c2ebbd0adf24c814a57cae1a7a172) +++ components/blackjack/BlackjackHeader.jsx (revision 285c3cc6d8962d6a01d8b88f202814829bd63d98) @@ -41,196 +41,192 @@ })); - axios.get(`/api/postgre?action=get_player_info_on_enter&session_id=${localStorage.CAESSINO_SESSION_ID}`).then(postgreRes => { - if (postgreRes.data?.success) { + axios.get(`/api/blackjack?action=get_player_info_on_enter&session_id=${localStorage.CAESSINO_SESSION_ID}`).then(res => { + if (res.data?.success) { dispatch(setPlayer({ ...playerState.player, - displayName: postgreRes.data?.displayName, - session_id: postgreRes.data?.session_id, - credits: postgreRes.data?.credits, + displayName: res.data?.displayName, + session_id: res.data?.session_id, + credits: res.data?.credits, })); - axios.get(`/api/blackjack?action=get_player_info_on_enter&session_id=${localStorage.CAESSINO_SESSION_ID}`).then(res => { - if (res.data?.success) { - dispatch(setGame({ - ...playerState.game, - status: res.data?.status, - playerCards: res.data?.playerCards, - dealerCards: res.data?.dealerCards, - })) - - dispatch(setStyle({ - ...styleState.style, - displayLoadingScreen: false, - })) - - if (parseInt(res.data?.status.toString().substr(1, 1)) == 5) { - dispatch(setBlackjack({ - ...styleState.blackjack, - inputControls: { - ...styleState.blackjack.inputControls, - initialBet: { - ...styleState.blackjack.inputControls.initialBet, - chosenCredits: parseInt(res.data?.initialBet), - }, - sideBet: { - ...styleState.blackjack.inputControls.sideBet, - chosenCredits: 0, - } - }, - displays: { - ...styleState.blackjack.displays, - initialBet: false, - hitStand: true, - } - })) - - if (res.data?.outcome === 'player_busted') { - dispatch(setStyle({ - ...styleState.style, - alert: { - show: true, - title: 'You busted!', - subtitle: `You lost $${-1*res.data?.earnings}`, - button: { - text: 'Play again', - action: 'play_again', - } - } - })) - } - else if (res.data?.outcome === 'dealer_busted') { - dispatch(setStyle({ - ...styleState.style, - alert: { - show: true, - title: 'Dealer busted!', - subtitle: `You won $${res.data?.earnings}`, - button: { - text: 'Play again', - action: 'play_again', - } - } - })) - } - else if (res.data?.outcome === 'player_won') { - dispatch(setStyle({ - ...styleState.style, - alert: { - show: true, - title: 'You won!', - subtitle: `You won $${res.data?.earnings}`, - button: { - text: 'Play again', - action: 'play_again', - } - } - })) - } - else if (res.data?.outcome === 'player_lost') { - dispatch(setStyle({ - ...styleState.style, - alert: { - show: true, - title: 'You lost!', - subtitle: `You lost $${-1*res.data?.earnings}`, - button: { - text: 'Play again', - action: 'play_again', - } - } - })) - } - else if (res.data?.outcome === 'draw') { - dispatch(setStyle({ - ...styleState.style, - alert: { - show: true, - title: 'Draw!', - subtitle: `You got your $${res.data?.earnings} back`, - button: { - text: 'Play again', - action: 'play_again', - } - } - })) - } - } - - if (parseInt(res.data?.status.toString().substr(1, 1)) == 4) { - dispatch(setBlackjack({ - ...styleState.blackjack, - inputControls: { - ...styleState.blackjack.inputControls, - initialBet: { - ...styleState.blackjack.inputControls.initialBet, - chosenCredits: parseInt(res.data?.initialBet), - }, - sideBet: { - ...styleState.blackjack.inputControls.sideBet, - chosenCredits: 0, - } - }, - displays: { - ...styleState.blackjack.displays, - initialBet: false, - hitStand: true, - } - })) - } - - if (parseInt(res.data?.status.toString().substr(1, 1)) == 3) { - dispatch(setBlackjack({ - ...styleState.blackjack, - inputControls: { - ...styleState.blackjack.inputControls, - initialBet: { - ...styleState.blackjack.inputControls.initialBet, - chosenCredits: parseInt(res.data?.initialBet), - }, - sideBet: { - ...styleState.blackjack.inputControls.sideBet, - chosenCredits: parseInt(res.data?.sideBet), - } - }, - displays: { - ...styleState.blackjack.displays, - initialBet: false, - hitStand: true, - } - })) - } - - if (parseInt(res.data?.status.toString().substr(1, 1)) == 2) { - dispatch(setBlackjack({ - ...styleState.blackjack, - inputControls: { - ...styleState.blackjack.inputControls, - initialBet: { - ...styleState.blackjack.inputControls.initialBet, - chosenCredits: parseInt(res.data?.initialBet), - } - }, - displays: { - ...styleState.blackjack.displays, - initialBet: false, - sideBet: true, - } - })) - } - - if (parseInt(res.data?.status.toString().substr(1, 1)) == 1) { - dispatch(setBlackjack({ - ...styleState.blackjack, - inputControls: { - ...styleState.blackjack.inputControls, - initialBet: { - ...styleState.blackjack.inputControls.initialBet, - chosenCredits: parseInt(postgreRes.data?.credits/2), - } - }, - })) - } - } - }); + dispatch(setGame({ + ...playerState.game, + status: res.data?.status, + playerCards: res.data?.playerCards, + dealerCards: res.data?.dealerCards, + })) + + dispatch(setStyle({ + ...styleState.style, + displayLoadingScreen: false, + })) + + if (parseInt(res.data?.status.toString().substr(1, 1)) == 5) { + dispatch(setBlackjack({ + ...styleState.blackjack, + inputControls: { + ...styleState.blackjack.inputControls, + initialBet: { + ...styleState.blackjack.inputControls.initialBet, + chosenCredits: parseInt(res.data?.initialBet), + }, + sideBet: { + ...styleState.blackjack.inputControls.sideBet, + chosenCredits: 0, + } + }, + displays: { + ...styleState.blackjack.displays, + initialBet: false, + hitStand: true, + } + })) + + if (res.data?.outcome === 'player_busted') { + dispatch(setStyle({ + ...styleState.style, + alert: { + show: true, + title: 'You busted!', + subtitle: `You lost $${-1*res.data?.earnings}`, + button: { + text: 'Play again', + action: 'play_again', + } + } + })) + } + else if (res.data?.outcome === 'dealer_busted') { + dispatch(setStyle({ + ...styleState.style, + alert: { + show: true, + title: 'Dealer busted!', + subtitle: `You won $${res.data?.earnings}`, + button: { + text: 'Play again', + action: 'play_again', + } + } + })) + } + else if (res.data?.outcome === 'player_won') { + dispatch(setStyle({ + ...styleState.style, + alert: { + show: true, + title: 'You won!', + subtitle: `You won $${res.data?.earnings}`, + button: { + text: 'Play again', + action: 'play_again', + } + } + })) + } + else if (res.data?.outcome === 'player_lost') { + dispatch(setStyle({ + ...styleState.style, + alert: { + show: true, + title: 'You lost!', + subtitle: `You lost $${-1*res.data?.earnings}`, + button: { + text: 'Play again', + action: 'play_again', + } + } + })) + } + else if (res.data?.outcome === 'draw') { + dispatch(setStyle({ + ...styleState.style, + alert: { + show: true, + title: 'Draw!', + subtitle: `You got your $${res.data?.earnings} back`, + button: { + text: 'Play again', + action: 'play_again', + } + } + })) + } + } + + if (parseInt(res.data?.status.toString().substr(1, 1)) == 4) { + dispatch(setBlackjack({ + ...styleState.blackjack, + inputControls: { + ...styleState.blackjack.inputControls, + initialBet: { + ...styleState.blackjack.inputControls.initialBet, + chosenCredits: parseInt(res.data?.initialBet), + }, + sideBet: { + ...styleState.blackjack.inputControls.sideBet, + chosenCredits: 0, + } + }, + displays: { + ...styleState.blackjack.displays, + initialBet: false, + hitStand: true, + } + })) + } + + if (parseInt(res.data?.status.toString().substr(1, 1)) == 3) { + dispatch(setBlackjack({ + ...styleState.blackjack, + inputControls: { + ...styleState.blackjack.inputControls, + initialBet: { + ...styleState.blackjack.inputControls.initialBet, + chosenCredits: parseInt(res.data?.initialBet), + }, + sideBet: { + ...styleState.blackjack.inputControls.sideBet, + chosenCredits: parseInt(res.data?.sideBet), + } + }, + displays: { + ...styleState.blackjack.displays, + initialBet: false, + hitStand: true, + } + })) + } + + if (parseInt(res.data?.status.toString().substr(1, 1)) == 2) { + dispatch(setBlackjack({ + ...styleState.blackjack, + inputControls: { + ...styleState.blackjack.inputControls, + initialBet: { + ...styleState.blackjack.inputControls.initialBet, + chosenCredits: parseInt(res.data?.initialBet), + } + }, + displays: { + ...styleState.blackjack.displays, + initialBet: false, + sideBet: true, + } + })) + } + + if (parseInt(res.data?.status.toString().substr(1, 1)) == 1) { + dispatch(setBlackjack({ + ...styleState.blackjack, + inputControls: { + ...styleState.blackjack.inputControls, + initialBet: { + ...styleState.blackjack.inputControls.initialBet, + chosenCredits: parseInt(postgreRes.data?.credits/2), + } + }, + })) + } } else { Index: components/blackjack/PlayButtons.jsx =================================================================== --- components/blackjack/PlayButtons.jsx (revision ebf5e04ad50c2ebbd0adf24c814a57cae1a7a172) +++ components/blackjack/PlayButtons.jsx (revision 285c3cc6d8962d6a01d8b88f202814829bd63d98) @@ -44,28 +44,24 @@ function placeInitialBetClicked() { - axios.get(`/api/postgre?action=take_credits&session_id=${localStorage.CAESSINO_SESSION_ID}&credits=${styleState.blackjack.inputControls.initialBet.chosenCredits}`).then(postgreRes => { - if (postgreRes.data?.success) { - axios.get(`/api/blackjack?action=make_initial_bet&session_id=${localStorage.CAESSINO_SESSION_ID}&bet=${styleState.blackjack.inputControls.initialBet.chosenCredits}`).then(res => { - if (res.data?.success) { - dispatch(setGame({ - ...playerState.game, - status: res.data?.status, - })) - - dispatch(setPlayer({ - ...playerState.player, - credits: postgreRes.data?.credits, - })) - - dispatch(setBlackjack({ - ...styleState.blackjack, - displays: { - ...styleState.blackjack.displays, - initialBet: false, - sideBet: true, - } - })) - } - }); + axios.get(`/api/blackjack?action=make_initial_bet&session_id=${localStorage.CAESSINO_SESSION_ID}&bet=${styleState.blackjack.inputControls.initialBet.chosenCredits}`).then(res => { + if (res.data?.success) { + dispatch(setGame({ + ...playerState.game, + status: res.data?.status, + })) + + dispatch(setPlayer({ + ...playerState.player, + credits: res.data?.credits, + })) + + dispatch(setBlackjack({ + ...styleState.blackjack, + displays: { + ...styleState.blackjack.displays, + initialBet: false, + sideBet: true, + } + })) } }); @@ -149,31 +145,27 @@ function placeSideBetClicked() { - axios.get(`/api/postgre?action=take_credits&session_id=${localStorage.CAESSINO_SESSION_ID}&credits=${styleState.blackjack.inputControls.sideBet.chosenCredits}`).then(postgreRes => { - if (postgreRes.data?.success) { - axios.get(`/api/blackjack?action=make_side_bet&session_id=${localStorage.CAESSINO_SESSION_ID}&bet=${styleState.blackjack.inputControls.sideBet.chosenCredits}&betName=${playerState.game.sideBetName}`).then(res => { - if (res.data?.success) { - dispatch(setGame({ - ...playerState.game, - status: res.data?.status, - })) - - dispatch(setPlayer({ - ...playerState.player, - credits: postgreRes.data?.credits, - })) - - dispatch(setBlackjack({ - ...styleState.blackjack, - displays: { - ...styleState.blackjack.displays, - sideBetsChooseCreditsModal: false, - sideBet: false, - hitStand: true, - } - })) - - getCards(); - } - }); + axios.get(`/api/blackjack?action=make_side_bet&session_id=${localStorage.CAESSINO_SESSION_ID}&bet=${styleState.blackjack.inputControls.sideBet.chosenCredits}&betName=${playerState.game.sideBetName}`).then(res => { + if (res.data?.success) { + dispatch(setGame({ + ...playerState.game, + status: res.data?.status, + })) + + dispatch(setPlayer({ + ...playerState.player, + credits: res.data?.credits, + })) + + dispatch(setBlackjack({ + ...styleState.blackjack, + displays: { + ...styleState.blackjack.displays, + sideBetsChooseCreditsModal: false, + sideBet: false, + hitStand: true, + } + })) + + getCards(); } }); Index: pages/api/blackjack/index.js =================================================================== --- pages/api/blackjack/index.js (revision ebf5e04ad50c2ebbd0adf24c814a57cae1a7a172) +++ pages/api/blackjack/index.js (revision 285c3cc6d8962d6a01d8b88f202814829bd63d98) @@ -255,16 +255,21 @@ } - const room = rooms[session_id]; - - room.sideBet = parseInt(req.query.bet); - room.sideBetName = req.query.betName; - room.status = '_3_made_side_bet'; - - rooms[session_id] = room; - - res.json({ - success: true, - status: rooms[session_id].status, - }) + axios.get(`${process.env.HOME_URL}/api/postgre?action=take_credits&session_id=${session_id}&credits=${req.query.bet}`).then(postgreRes => { + if (postgreRes.data?.success) { + const room = rooms[session_id]; + + room.sideBet = parseInt(req.query.bet); + room.sideBetName = req.query.betName; + room.status = '_3_made_side_bet'; + + rooms[session_id] = room; + + res.json({ + success: true, + status: rooms[session_id].status, + credits: postgreRes.data?.credits, + }) + } + }); return ; @@ -289,15 +294,25 @@ if (parseInt(req.query.bet) <= 0) return ; - const room = rooms[session_id]; - - room.initialBet = parseInt(req.query.bet); - room.status = '_2_made_initial_bet'; - - rooms[session_id] = room; - - res.json({ - success: true, - status: rooms[session_id].status, - }) + axios.get(`${process.env.HOME_URL}/api/postgre?action=take_credits&session_id=${session_id}&credits=${req.query.bet}`).then(postgreRes => { + if (postgreRes.data?.success) { + const room = rooms[session_id]; + + room.initialBet = parseInt(req.query.bet); + room.status = '_2_made_initial_bet'; + + rooms[session_id] = room; + + res.json({ + success: true, + status: rooms[session_id].status, + credits: postgreRes.data?.credits, + }) + } + else { + res.json({ + success: false, + }) + } + }); return ; @@ -337,37 +352,49 @@ const session_id = req.query.session_id; - if (rooms[session_id] !== undefined) { - - } - else { - createARoom(session_id); - } - - let dealerCardsTmp = []; - if (rooms[session_id].status.substr(1, 1) != '5') { // 5 == game_over - rooms[session_id].dealerCards.forEach((card, i) => { - if (i === 0) { - dealerCardsTmp.push(card); + axios.get(`${process.env.HOME_URL}/api/postgre?action=check_if_logged_in&session_id=${session_id}`).then(postgreRes => { + if (postgreRes.data?.success) { + if (rooms[session_id] !== undefined) { + // room exists } else { - dealerCardsTmp.push('back'); - } - }) - } - else { - dealerCardsTmp = rooms[session_id].dealerCards; - } - - res.json({ - success: true, - status: rooms[session_id].status, - initialBet: rooms[session_id].initialBet, - sideBet: rooms[session_id].sideBet, - sideBetName: rooms[session_id].sideBetName, - playerCards: rooms[session_id].playerCards, - dealerCards: dealerCardsTmp, - outcome: rooms[session_id].outcome, - earnings: rooms[session_id].earnings, - }) + createARoom(session_id); + } + + let dealerCardsTmp = []; + if (rooms[session_id].status.substr(1, 1) != '5') { // 5 == game_over + rooms[session_id].dealerCards.forEach((card, i) => { + if (i === 0) { + dealerCardsTmp.push(card); + } + else { + dealerCardsTmp.push('back'); + } + }) + } + else { + dealerCardsTmp = rooms[session_id].dealerCards; + } + + res.json({ + success: true, + status: rooms[session_id].status, + initialBet: rooms[session_id].initialBet, + sideBet: rooms[session_id].sideBet, + sideBetName: rooms[session_id].sideBetName, + playerCards: rooms[session_id].playerCards, + dealerCards: dealerCardsTmp, + outcome: rooms[session_id].outcome, + earnings: rooms[session_id].earnings, + displayName: postgreRes.data?.displayName, + session_id: postgreRes.data?.session_id, + credits: postgreRes.data?.credits, + }) + } + else { + res.json({ + success: false, + }) + } + }); } } Index: pages/api/postgre/index.js =================================================================== --- pages/api/postgre/index.js (revision ebf5e04ad50c2ebbd0adf24c814a57cae1a7a172) +++ pages/api/postgre/index.js (revision 285c3cc6d8962d6a01d8b88f202814829bd63d98) @@ -170,32 +170,5 @@ /** * /---------------------- GET ----------------------/ - * Returns the player's room, if the player was in one. - * Same as the one below, but this one is used in a game-specific context. - * @action get_player_info_on_enter - * @param session_id - */ - if (req.query?.action === 'get_player_info_on_enter' && req.query?.session_id) { - const session_id = req.query.session_id - const session = sessions.find(session => session.id === session_id) - - if (session) { - res.json({ - success: true, - displayName: session.displayName, - session_id: session.id, - credits: session.credits, - }) - return ; - } - - res.json({ - success: false, - }) - } - - /** - * /---------------------- GET ----------------------/ - * Returns the player's room, if the player was in one. - * Same as the one above, but this one is used in a general context. + * Checks if the player is logged in, and returns his session if so. * @action check_if_logged_in * @param session_id