-
Notifications
You must be signed in to change notification settings - Fork 0
Rebeca's 2-1 in a PR #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
riousenkai
wants to merge
2
commits into
main
Choose a base branch
from
lesson_2_1-fixed
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,32 @@ | ||
| import React, { Component } from "react"; | ||
| import React, { useState } from "react"; | ||
| import Button from "./Button"; | ||
|
|
||
| class GuessControl extends Component { | ||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| this.state = { | ||
| currentGuess: "", | ||
| }; | ||
|
|
||
| /** | ||
| * These lines are required to make the methods/functions declared on this | ||
| * class have the correct `this` object when they run. | ||
| */ | ||
| this.handleInputChange = this.handleInputChange.bind(this); | ||
| this.onSubmitGuess = this.onSubmitGuess.bind(this); | ||
| } | ||
|
|
||
| handleInputChange(event) { | ||
| this.setState({ currentGuess: event.target.value }); | ||
| function GuessControl() { | ||
|
|
||
| const [ currentGuess, setCurrentGuess ] = useState('') | ||
|
|
||
| const handleInputChange = (event) => { | ||
| setCurrentGuess( Number(event.target.value) ); | ||
| } | ||
|
|
||
| onSubmitGuess() { | ||
| // Since the values from an HTML input are strings by default, | ||
| // convert to a number for the returned guess value | ||
| this.props.onGuess(Number(this.state.currentGuess)); | ||
| this.setState({ currentGuess: "" }); | ||
| const onSubmitGuess = () => { | ||
| setCurrentGuess('') | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| return ( | ||
| <> | ||
| <div> | ||
| <input | ||
| type="number" | ||
| value={this.state.currentGuess} | ||
| onChange={this.handleInputChange} | ||
| value={currentGuess} | ||
| onChange={handleInputChange} | ||
| /> | ||
| <Button onClick={this.onSubmitGuess}>Submit Guess</Button> | ||
| <Button onClick={onSubmitGuess}>Submit Guess</Button> | ||
| </div> | ||
| ); | ||
| } | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
|
|
||
| export default GuessControl; | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,63 @@ | ||
| import React, { Component } from "react"; | ||
| import React, { useState } from "react"; | ||
| import GuessControl from "./GuessControl"; | ||
| import GuessMessage from "./GuessMessage"; | ||
| import GameOver from "./GameOver"; | ||
|
|
||
| /** | ||
| * | ||
| * Returns a random integer number from 1-100 inclusive | ||
| */ | ||
| function getRandomNumber() { | ||
| return Math.floor(Math.random() * 100) + 1; | ||
| } | ||
|
|
||
| const MAX_ATTEMPTS = 5; | ||
| function NumberGuessingGame() { | ||
|
|
||
| class NumberGuessingGame extends Component { | ||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| this.state = { | ||
| const [ numberData, setNumberData ] = useState({ | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should place each of these values in separate useStates. No need to force them in an object. |
||
| numberToGuess: getRandomNumber(), | ||
| numberOfGuesses: 0, | ||
| latestGuess: null, | ||
| }; | ||
| }) | ||
|
|
||
| /** | ||
| * These lines are required to make the methods/functions declared on this | ||
| * class have the correct `this` object when they run. | ||
| */ | ||
| this.handleGuess = this.handleGuess.bind(this); | ||
| this.handleReset = this.handleReset.bind(this); | ||
| function getRandomNumber() { | ||
| return Math.floor(Math.random() * 100) + 1; | ||
| } | ||
|
|
||
| handleGuess(guess) { | ||
| this.setState({ | ||
| const MAX_ATTEMPTS = 5; | ||
|
|
||
| const handleGuess = (guess) => { | ||
| setNumberData({ | ||
| latestGuess: guess, | ||
| numberOfGuesses: this.state.numberOfGuesses + 1, | ||
| numberOfGuesses: numberData.numberOfGuesses + 1, | ||
| }); | ||
| } | ||
|
|
||
| handleReset() { | ||
| this.setState({ | ||
| const handleReset = () => { | ||
| setNumberData({ | ||
| numberToGuess: getRandomNumber(), | ||
| numberOfGuesses: 0, | ||
| latestGuess: null, | ||
| }); | ||
| } | ||
|
|
||
| render() { | ||
| const isCorrectGuess = this.state.latestGuess === this.state.numberToGuess; | ||
| const isCorrectGuess = numberData.latestGuess === numberData.numberToGuess; | ||
|
|
||
| const isGameOver = | ||
| isCorrectGuess || this.state.numberOfGuesses === MAX_ATTEMPTS; | ||
| const isGameOver = isCorrectGuess || numberData.numberOfGuesses === MAX_ATTEMPTS; | ||
|
|
||
| return ( | ||
| return ( | ||
| <> | ||
| <div> | ||
| <h2>I'm thinking of a number from 1 to 100.</h2> | ||
| <h2> | ||
| Can you guess the number I am thinking of in {MAX_ATTEMPTS} tries? | ||
| </h2> | ||
| <GuessControl onGuess={this.handleGuess} /> | ||
| <GuessControl onGuess={handleGuess} /> | ||
| {isGameOver && ( | ||
| <GameOver hasWon={isCorrectGuess} onReset={this.handleReset} /> | ||
| <GameOver hasWon={isCorrectGuess} onReset={handleReset} /> | ||
| )} | ||
| {!isGameOver && ( | ||
| <GuessMessage | ||
| guess={this.state.latestGuess} | ||
| numberToGuess={this.state.numberToGuess} | ||
| numberOfGuesses={this.state.numberOfGuesses} | ||
| guess={numberData.latestGuess} | ||
| numberToGuess={numberData.numberToGuess} | ||
| numberOfGuesses={numberData.numberOfGuesses} | ||
| /> | ||
| )} | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
| export default NumberGuessingGame; | ||
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The game isn't working. What's missing here? Check line 47 of
NumberGuessingGame.js