Skip to content
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

Challenge #41

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ const buttonStyle = {
minHeight: "2em",
};

export default function Button({ onClick, children }) {
export default function Button({ onClick, children, disabled }) {
return (
<button style={buttonStyle} onClick={onClick}>
<button style={buttonStyle} onClick={onClick} disabled={disabled}>
{children}
</button>
);
Expand Down
115 changes: 72 additions & 43 deletions src/GuessControl.jsx
Original file line number Diff line number Diff line change
@@ -1,47 +1,76 @@
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 });
}

onSubmitGuess() {
// Since the values from an HTML input are strings by default,
// convert to a number for the returned guess value
// by passing in the string to the Number function.
// See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number
this.props.onGuess(Number(this.state.currentGuess));
this.setState({ currentGuess: "" });
}

render() {
return (
<div>
<input
type="number"
value={this.state.currentGuess}
onChange={this.handleInputChange}
/>
<Button onClick={this.onSubmitGuess}>Submit Guess</Button>
</div>
);
}
}
// class GuessControlOld 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 });
// }

// onSubmitGuess() {
// // Since the values from an HTML input are strings by default,
// // convert to a number for the returned guess value
// // by passing in the string to the Number function.
// // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number
// this.props.onGuess(Number(this.state.currentGuess));
// this.setState({ currentGuess: "" });
// }

// render() {
// return (
// <div>
// <input
// type="number"
// value={this.state.currentGuess}
// onChange={this.handleInputChange}
// />
// <Button onClick={this.onSubmitGuess}>Submit Guess</Button>
// </div>
// );
// }
// }

// export default GuessControl;

const GuessControl = ({ onGuess, isGameOver }) => {
const [currentGuess, setCurrentGuess] = useState("");

const handleInputChange = (event) => {
setCurrentGuess(event.target.value);
};

const onSubmitGuess = () => {
onGuess(Number(currentGuess));
setCurrentGuess("");
};

return (
<div>
<input
type="number"
value={currentGuess}
onChange={handleInputChange}
disabled={isGameOver}
/>
<Button onClick={onSubmitGuess} disabled={isGameOver}>
Submit Guess
</Button>
</div>
);
};

export default GuessControl;
163 changes: 102 additions & 61 deletions src/NumberGuessingGame.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from "react";
import GuessControl from "./GuessControl";
import GuessMessage from "./GuessMessage";
import GameOver from "./GameOver";
import { useEffect, useState } from "react";

/**
*
Expand All @@ -13,65 +13,106 @@ function getRandomNumber() {

const MAX_ATTEMPTS = 5;

class NumberGuessingGame extends Component {
constructor(props) {
super(props);

this.state = {
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);
}

handleGuess(guess) {
this.setState({
latestGuess: guess,
numberOfGuesses: this.state.numberOfGuesses + 1,
});
}

handleReset() {
this.setState({
numberToGuess: getRandomNumber(),
numberOfGuesses: 0,
latestGuess: null,
});
}

render() {
const isCorrectGuess = this.state.latestGuess === this.state.numberToGuess;

const isGameOver =
isCorrectGuess || this.state.numberOfGuesses === MAX_ATTEMPTS;

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} />
{isGameOver && (
<GameOver hasWon={isCorrectGuess} onReset={this.handleReset} />
)}
{!isGameOver && (
<GuessMessage
guess={this.state.latestGuess}
numberToGuess={this.state.numberToGuess}
numberOfGuesses={this.state.numberOfGuesses}
/>
)}
</div>
);
}
}
// class NumberGuessingGameOld extends Component {
// constructor(props) {
// super(props);

// this.state = {
// 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);
// }

// handleGuess(guess) {
// this.setState({
// latestGuess: guess,
// numberOfGuesses: this.state.numberOfGuesses + 1,
// });
// }

// handleReset() {
// this.setState({
// numberToGuess: getRandomNumber(),
// numberOfGuesses: 0,
// latestGuess: null,
// });
// }

// render() {
// const isCorrectGuess = this.state.latestGuess === this.state.numberToGuess;

// const isGameOver =
// isCorrectGuess || this.state.numberOfGuesses === MAX_ATTEMPTS;

// 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} />
// {isGameOver && (
// <GameOver hasWon={isCorrectGuess} onReset={this.handleReset} />
// )}
// {!isGameOver && (
// <GuessMessage
// guess={this.state.latestGuess}
// numberToGuess={this.state.numberToGuess}
// numberOfGuesses={this.state.numberOfGuesses}
// />
// )}
// </div>
// );
// }
// }

// export default NumberGuessingGame;

const NumberGuessingGame = () => {
const [numberToGuess, setNumberToGuess] = useState(getRandomNumber());
const [numberOfGuesses, setNumberOfGuesses] = useState(0);
const [latestGuess, setLatestGuess] = useState(null);

const handleGuess = (guess) => {
setLatestGuess(Number(guess));
setNumberOfGuesses(numberOfGuesses + 1);
};

const handleReset = () => {
setNumberToGuess(getRandomNumber());
setLatestGuess(null);
setNumberOfGuesses(0);
};

const isCorrectGuess = latestGuess === numberToGuess;

const isGameOver = isCorrectGuess || numberOfGuesses === MAX_ATTEMPTS;

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={handleGuess} isGameOver={isGameOver}/>
{isGameOver && <GameOver hasWon={isCorrectGuess} onReset={handleReset} />}
{!isGameOver && (
<GuessMessage
guess={latestGuess}
numberToGuess={numberToGuess}
numberOfGuesses={numberOfGuesses}
/>
)}
</div>
);
};

export default NumberGuessingGame;