Qianling - high-card-project#65
Open
Qiannnly wants to merge 3 commits into
Open
Conversation
Flashrob
reviewed
Oct 28, 2023
Comment on lines
+42
to
+61
| if (cardDeck.length > 0) { | ||
| if (p1Card.rank > p2Card.rank) { | ||
| this.setState((prevState) => ({ | ||
| currWinner: 1, | ||
| player1Score: prevState.player1Score + 1, | ||
| })); | ||
| } else if (p1Card.rank < p2Card.rank) { | ||
| this.setState((prevState) => ({ | ||
| currWinner: 2, | ||
| player2Score: prevState.player2Score + 1, | ||
| })); | ||
| } | ||
| } else if (cardDeck.length === 0) { | ||
| this.setState( | ||
| { | ||
| hasGameBegin: false, | ||
| }, | ||
| () => this.determineFinalWinner() | ||
| ); | ||
| } |
There was a problem hiding this comment.
I think something for the future would be to rewrite if/else spaghetti whenever we can. I like to return early if possible. Here maybe a suggestion, though bit tricky here.
Suggested change
| if (cardDeck.length > 0) { | |
| if (p1Card.rank > p2Card.rank) { | |
| this.setState((prevState) => ({ | |
| currWinner: 1, | |
| player1Score: prevState.player1Score + 1, | |
| })); | |
| } else if (p1Card.rank < p2Card.rank) { | |
| this.setState((prevState) => ({ | |
| currWinner: 2, | |
| player2Score: prevState.player2Score + 1, | |
| })); | |
| } | |
| } else if (cardDeck.length === 0) { | |
| this.setState( | |
| { | |
| hasGameBegin: false, | |
| }, | |
| () => this.determineFinalWinner() | |
| ); | |
| } | |
| if (!card.length) { | |
| return this.setState( | |
| { | |
| hasGameBegin: false, | |
| }, | |
| () => this.determineFinalWinner() | |
| ); | |
| } | |
| if (p1Card.rank > p2Card.rank) { | |
| this.setState((prevState) => ({ | |
| currWinner: 1, | |
| player1Score: prevState.player1Score + 1, | |
| })); | |
| } else if (p1Card.rank < p2Card.rank) { | |
| this.setState((prevState) => ({ | |
| currWinner: 2, | |
| player2Score: prevState.player2Score + 1, | |
| })); | |
| } |
In cases where we wouldn't have to worry about the tie situation, we probably could simplify this even further.
Comment on lines
+117
to
+144
| let winnerPerMatch; | ||
| if (player1Score > player2Score) { | ||
| winnerPerMatch = ( | ||
| <> | ||
| <p> | ||
| Game over! <br /> | ||
| Player 1 won this match. Would you like to continue? | ||
| </p> | ||
| </> | ||
| ); | ||
| } else if (player1Score < player2Score) { | ||
| winnerPerMatch = ( | ||
| <> | ||
| <p> | ||
| Game over! | ||
| <br /> Player 2 won this match. Would you like to continue? | ||
| </p> | ||
| </> | ||
| ); | ||
| } else { | ||
| winnerPerMatch = ( | ||
| <> | ||
| <p> | ||
| Game over! <br /> | ||
| Both tie. Would you like to continue? | ||
| </p> | ||
| </> | ||
| ); |
There was a problem hiding this comment.
I think we could make this a component with a winner prop
Comment on lines
+147
to
+153
| const dealCardsButton = ( | ||
| <> | ||
| <Button variant="contained" color="secondary" onClick={this.dealCards}> | ||
| Deal | ||
| </Button> | ||
| </> | ||
| ); |
Comment on lines
+155
to
+173
| const continueGameButton = ( | ||
| <> | ||
| <Button | ||
| variant="contained" | ||
| color="success" | ||
| onClick={this.startNewMatch} | ||
| > | ||
| Yes, Enter Game | ||
| </Button> | ||
| </> | ||
| ); | ||
|
|
||
| const exitGameButton = ( | ||
| <> | ||
| <Button variant="contained" color="error" onClick={this.restartGame}> | ||
| No, Exit game | ||
| </Button> | ||
| </> | ||
| ); |
There was a problem hiding this comment.
Component, and component :) Since we got a few button components, maybe we can make a generic button component?
Maybe used like so:
<Button variant={} color={} onClick={} text={} />
| {currCardElems} | ||
| </Box> | ||
|
|
||
| {this.state.hasGameBegin === true && ( |
There was a problem hiding this comment.
Suggested change
| {this.state.hasGameBegin === true && ( | |
| {this.state.hasGameBegin && ( |
boolean can be used with truthy/falsy assumption
|
|
||
| {this.state.cardDeck.length > 0 && dealCardsButton} | ||
| <p>{this.state.hasGameBegin && winnerPerRound}</p> | ||
| <p>{this.state.cardDeck.length === 0 && winnerPerMatch}</p> |
There was a problem hiding this comment.
Suggested change
| <p>{this.state.cardDeck.length === 0 && winnerPerMatch}</p> | |
| <p>{!this.state.cardDeck.length && winnerPerMatch}</p> |
0 is falsy in JavaScript
| </Box> | ||
| )} | ||
|
|
||
| {this.state.cardDeck.length > 0 && dealCardsButton} |
There was a problem hiding this comment.
Suggested change
| {this.state.cardDeck.length > 0 && dealCardsButton} | |
| {this.state.cardDeck.length && dealCardsButton} |
Above 0 is truthy in JS
| alignItems: "center", | ||
| }} | ||
| > | ||
| {this.state.cardDeck.length === 0 && continueGameButton} |
There was a problem hiding this comment.
Suggested change
| {this.state.cardDeck.length === 0 && continueGameButton} | |
| {!this.state.cardDeck.length&& continueGameButton} |
| }} | ||
| > | ||
| {this.state.cardDeck.length === 0 && continueGameButton} | ||
| {this.state.cardDeck.length === 0 && exitGameButton} |
There was a problem hiding this comment.
You can summarize similar state lookups into a single one:
Suggested change
| {this.state.cardDeck.length === 0 && exitGameButton} | |
| {!this.state.cardDeck.length && ( | |
| <> | |
| <Button ...continue game button/> | |
| <Button ...exit game button/> | |
| </> | |
| )} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.