-
Notifications
You must be signed in to change notification settings - Fork 9
timeTravel done, not classed based #7
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. | ||
|
|
||
| # dependencies | ||
| /node_modules | ||
| /.pnp | ||
| .pnp.js | ||
|
|
||
| # testing | ||
| /coverage | ||
|
|
||
| # production | ||
| /build | ||
|
|
||
| # misc | ||
| .DS_Store | ||
| .env.local | ||
| .env.development.local | ||
| .env.test.local | ||
| .env.production.local | ||
|
|
||
| npm-debug.log* | ||
| yarn-debug.log* | ||
| yarn-error.log* |
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "name": "problem-set-8_4", | ||
| "version": "0.1.0", | ||
| "private": true, | ||
| "dependencies": { | ||
| "@testing-library/jest-dom": "^4.2.4", | ||
| "@testing-library/react": "^9.5.0", | ||
| "@testing-library/user-event": "^7.2.1", | ||
| "react": "^16.13.1", | ||
| "react-dom": "^16.13.1", | ||
| "react-scripts": "3.4.1" | ||
| }, | ||
| "scripts": { | ||
| "start": "react-scripts start", | ||
| "build": "react-scripts build", | ||
| "test": "react-scripts test", | ||
| "eject": "react-scripts eject" | ||
| }, | ||
| "eslintConfig": { | ||
| "extends": "react-app" | ||
| }, | ||
| "browserslist": { | ||
| "production": [ | ||
| ">0.2%", | ||
| "not dead", | ||
| "not op_mini all" | ||
| ], | ||
| "development": [ | ||
| "last 1 chrome version", | ||
| "last 1 firefox version", | ||
| "last 1 safari version" | ||
| ] | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <meta name="theme-color" content="#000000" /> | ||
| <meta | ||
| name="description" | ||
| content="Web site created using create-react-app" | ||
| /> | ||
| <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> | ||
| <!-- | ||
| manifest.json provides metadata used when your web app is installed on a | ||
| user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ | ||
| --> | ||
| <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> | ||
| <!-- | ||
| Notice the use of %PUBLIC_URL% in the tags above. | ||
| It will be replaced with the URL of the `public` folder during the build. | ||
| Only files inside the `public` folder can be referenced from the HTML. | ||
| Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will | ||
| work correctly both with client-side routing and a non-root public URL. | ||
| Learn how to configure a non-root public URL by running `npm run build`. | ||
| --> | ||
| <title>React App</title> | ||
| </head> | ||
| <body> | ||
| <noscript>You need to enable JavaScript to run this app.</noscript> | ||
| <div id="root"></div> | ||
| <!-- | ||
| This HTML file is a template. | ||
| If you open it directly in the browser, you will see an empty page. | ||
| You can add webfonts, meta tags, or analytics to this file. | ||
| The build step will place the bundled scripts into the <body> tag. | ||
| To begin the development, run `npm start` or `yarn start`. | ||
| To create a production bundle, use `npm run build` or `yarn build`. | ||
| --> | ||
| </body> | ||
| </html> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "short_name": "React App", | ||
| "name": "Create React App Sample", | ||
| "icons": [ | ||
| { | ||
| "src": "favicon.ico", | ||
| "sizes": "64x64 32x32 24x24 16x16", | ||
| "type": "image/x-icon" | ||
| }, | ||
| { | ||
| "src": "logo192.png", | ||
| "type": "image/png", | ||
| "sizes": "192x192" | ||
| }, | ||
| { | ||
| "src": "logo512.png", | ||
| "type": "image/png", | ||
| "sizes": "512x512" | ||
| } | ||
| ], | ||
| "start_url": ".", | ||
| "display": "standalone", | ||
| "theme_color": "#000000", | ||
| "background_color": "#ffffff" | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # https://www.robotstxt.org/robotstxt.html | ||
| User-agent: * | ||
| Disallow: |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import React from 'react'; | ||
| import './style.css'; | ||
| import Game from './Game'; | ||
|
|
||
| function App() { | ||
| return ( | ||
| <div className="game"> | ||
| <h1>Tic Tac Toe</h1> | ||
| <Game/> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default App; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import React from 'react'; | ||
| import { render } from '@testing-library/react'; | ||
| import App from './App'; | ||
|
|
||
| test('renders learn react link', () => { | ||
| const { getByText } = render(<App />); | ||
| const linkElement = getByText(/learn react/i); | ||
| expect(linkElement).toBeInTheDocument(); | ||
| }); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| import React from 'react'; | ||
| import './style.css'; | ||
| import Squares from './Square'; | ||
| // import Snapshot from './Snapshot'; | ||
| import {TurnContext, SetTurnContext} from './Game'; | ||
|
|
||
| function Board() { | ||
| const [boardState, setBoardState] = React.useState((new Array(9).fill(null))); | ||
| const [stages, setStages] = React.useState([]); | ||
| const turn = React.useContext(TurnContext); | ||
| const setTurn = React.useContext(SetTurnContext); | ||
| let arr = [...boardState]; | ||
| console.log(arr); | ||
|
|
||
| function declareWinner(boardState) { | ||
| const conditions = [ | ||
| [0, 1, 2], | ||
| [3, 4, 5], | ||
| [6, 7, 8], | ||
| [0, 3, 6], | ||
| [1, 4, 7], | ||
| [2, 5, 8], | ||
| [0, 4, 8], | ||
| [2, 4, 6], | ||
| ]; | ||
|
|
||
| for (let i = 0; i < conditions.length; i++) { | ||
| const [first, second, third] = conditions[i]; | ||
|
|
||
| if (boardState[first] && boardState[second] === boardState[first] && boardState[third] === boardState[first]) { | ||
| return boardState[first]; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| const winner = declareWinner(boardState); | ||
|
|
||
| let status; | ||
| if (winner) { | ||
| status = `The winner is ${winner}`; | ||
| } | ||
|
|
||
|
|
||
| function clickHandler(num) { | ||
| if (!winner && !boardState[num]) { | ||
| const stagesCopy = [...stages]; | ||
| const boardCopy = [...boardState]; | ||
|
|
||
| boardCopy[num] = turn; | ||
| stagesCopy.push(boardCopy); | ||
|
|
||
| setBoardState(boardCopy); | ||
| setStages(stagesCopy); | ||
|
|
||
| setTurn(() => { | ||
| if (turn === 'X') { | ||
| return 'O'; | ||
| } | ||
| return 'X'; | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| function moveToStage(step) { | ||
| const boardInHistory = [...stages]; | ||
| setBoardState(boardInHistory[step]); | ||
| } | ||
|
|
||
| function goToStart() { | ||
| setBoardState(new Array(9).fill(null)); | ||
| setStages([]); | ||
| } | ||
|
|
||
| const differentStages = stages.map((stage) => { | ||
| const desc = `Go to move #${stage+1}`; | ||
| return ( | ||
| <li key={stage}> | ||
| <button onClick={() => moveToStage(stage)}>{desc}</button> | ||
|
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. This seems to be where the bug in the time travel is coming from. What does your |
||
| </li> | ||
| ); | ||
| }); | ||
|
|
||
|
|
||
| return ( | ||
| <div className="board"> | ||
| <div className="rows"> | ||
|
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. One trick for handling stuff like this is to use the {_.chunk(board, 3).map(row => (
<div className="row board-row">{row.map((cell, i) => <Square onClick={() => clickHandler(i)} value={cell} }</div>
))} |
||
| <Squares click={() => clickHandler(0)} value={boardState[0]} arr={arr} setBoardState={setBoardState}/> | ||
| <Squares click={() => clickHandler(1)} value={boardState[1]}/> | ||
| <Squares click={() => clickHandler(2)} value={boardState[2]}/> | ||
| </div> | ||
| <div className="rows"> | ||
| <Squares click={() => clickHandler(3)} value={boardState[3]}/> | ||
| <Squares click={() => clickHandler(4)} value={boardState[4]}/> | ||
| <Squares click={() => clickHandler(5)} value={boardState[5]}/> | ||
| </div> | ||
| <div className="rows"> | ||
| <Squares click={() => clickHandler(6)} value={boardState[6]}/> | ||
| <Squares click={() => clickHandler(7)} value={boardState[7]}/> | ||
| <Squares click={() => clickHandler(8)} value={boardState[8]}/> | ||
| </div> | ||
| <h1>{status}</h1> | ||
| <div className="game-info"> | ||
| <ol> | ||
| <button onClick={goToStart}>Restart</button> | ||
| {differentStages} | ||
| </ol> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Board; | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import React from 'react'; | ||
| import './style.css'; | ||
| import Board from './Board'; | ||
|
|
||
| export const TurnContext = React.createContext(); | ||
|
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. One other note - you can include multiple pieces of state on a single context, so I'd probably group both the |
||
| export const SetTurnContext = React.createContext(); | ||
|
|
||
| function Game(){ | ||
| const [turn, setTurn] = React.useState('X'); | ||
|
|
||
| return ( | ||
| <div> | ||
| <h1>It's your turn player {turn}</h1> | ||
| <TurnContext.Provider value={turn}> | ||
|
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. It's cool that you used a context here, because it demonstrates knowledge of different React hooks. Nice work! One thing to think about is - when you're making a context, it might make sense to group related pieces of data together. For this one, I'd probably include a bunch of the game data on the context so that it is all in one place. This could include:
You have all of that stuff in your app, but it's just spread out. Keeping it all in the context could help keep the components a little bit smaller. |
||
| <SetTurnContext.Provider value={setTurn}> | ||
| <Board /> | ||
| </SetTurnContext.Provider> | ||
| </TurnContext.Provider> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Game; | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import React from 'react'; | ||
| import './style.css'; | ||
|
|
||
| function Squares(props) { | ||
|
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. One small thing - you can use object destructuring here if you like to avoid needing to call function Square({click, value}) |
||
| return ( | ||
| <div className="symbol" onClick={props.click}>{props.value}</div> | ||
| ); | ||
| } | ||
|
|
||
| export default Squares; | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| body { | ||
| margin: 0; | ||
| font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', | ||
| 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', | ||
| sans-serif; | ||
| -webkit-font-smoothing: antialiased; | ||
| -moz-osx-font-smoothing: grayscale; | ||
| } | ||
|
|
||
| code { | ||
| font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', | ||
| monospace; | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import React from 'react'; | ||
| import ReactDOM from 'react-dom'; | ||
| import './index.css'; | ||
| import App from './App'; | ||
| import * as serviceWorker from './serviceWorker'; | ||
|
|
||
| ReactDOM.render( | ||
| <React.StrictMode> | ||
| <App /> | ||
| </React.StrictMode>, | ||
| document.getElementById('root') | ||
| ); | ||
|
|
||
| // If you want your app to work offline and load faster, you can change | ||
| // unregister() to register() below. Note this comes with some pitfalls. | ||
| // Learn more about service workers: https://bit.ly/CRA-PWA | ||
| serviceWorker.unregister(); |
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.
👍 - this is a neat feature. Nice work including this!