20 changed files with 1700 additions and 801 deletions
+1284 -716
View File
File diff suppressed because it is too large Load Diff
+14 -3
View File
@@ -3,21 +3,32 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"lodash.shuffle": "^4.2.0",
"prop-types": "^15.6.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-scripts": "1.0.14"
"react-scripts": "^1.0.17"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"devDependencies": {
"chai": "^4.1.2",
"chai-enzyme": "^1.0.0-beta.0",
"chai-jest-diff": "^1.0.1",
"dirty-chai": "^2.0.1",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "^1.1.0",
"eslint-config-prettier": "^2.6.0",
"eslint-config-react-app": "^2.0.1",
"eslint-plugin-prettier": "^2.3.1",
"prettier": "^1.7.4"
"prettier": "^1.7.4",
"react-test-renderer": "^16.2.0",
"sinon": "^4.1.3",
"sinon-chai": "^2.14.0"
},
"prettier": {
"semi": false,
+20 -17
View File
@@ -1,16 +1,17 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<!--
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<!--
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.
@@ -19,14 +20,15 @@
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>
<!--
<title>React Memory</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.
@@ -36,5 +38,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</body>
</html>
+6 -31
View File
@@ -1,32 +1,7 @@
.App {
text-align: center;
}
.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
}
.App-header {
background-color: #222;
height: 150px;
padding: 20px;
color: white;
}
.App-title {
font-size: 1.5em;
}
.App-intro {
font-size: large;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
.memory {
display: flex;
flex-wrap: wrap;
width: 300px;
margin: auto;
user-select: none;
}
+101 -7
View File
@@ -1,16 +1,110 @@
import React, { Component } from 'react'
import logo from './logo.svg'
import shuffle from 'lodash.shuffle'
import './App.css'
import Card from './Card'
import GuessCount from './GuessCount'
import HallOfFame, { FAKE_HOF } from './HallOfFame'
import HighScoreInput from './HighScoreInput'
const SIDE = 6
const SYMBOLS = '😀🎉💖🎩🐶🐱🦄🐬🌍🌛🌞💫🍎🍌🍓🍐🍟🍿'
const VISUAL_PAUSE_MSECS = 750
class App extends Component {
state = {
cards: this.generateCards(),
currentPair: [],
guesses: 0,
hallOfFame: null,
matchedCardIndices: [],
}
// Arrow fx for binding
displayHallOfFame = hallOfFame => {
this.setState({ hallOfFame })
}
generateCards() {
const result = []
const size = SIDE * SIDE
const candidates = shuffle(SYMBOLS)
while (result.length < size) {
const card = candidates.pop()
result.push(card, card)
}
return shuffle(result)
}
getFeedbackForCard(index) {
const { currentPair, matchedCardIndices } = this.state
const indexMatched = matchedCardIndices.includes(index)
if (currentPair.length < 2) {
return indexMatched || index === currentPair[0] ? 'visible' : 'hidden'
}
if (currentPair.includes(index)) {
return indexMatched ? 'justMatched' : 'justMismatched'
}
return indexMatched ? 'visible' : 'hidden'
}
// Arrow fx for binding
handleCardClick = index => {
const { currentPair } = this.state
if (currentPair.length === 2) {
return
}
if (currentPair.length === 0) {
this.setState({ currentPair: [index] })
return
}
this.handleNewPairClosedBy(index)
}
handleNewPairClosedBy(index) {
const { cards, currentPair, guesses, matchedCardIndices } = this.state
const newPair = [currentPair[0], index]
const newGuesses = guesses + 1
const matched = cards[newPair[0]] === cards[newPair[1]]
this.setState({ currentPair: newPair, guesses: newGuesses })
if (matched) {
this.setState({ matchedCardIndices: [...matchedCardIndices, ...newPair] })
}
setTimeout(() => this.setState({ currentPair: [] }), VISUAL_PAUSE_MSECS)
}
render() {
const { cards, guesses, hallOfFame, matchedCardIndices } = this.state
const won = matchedCardIndices.length === cards.length
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<h1 className="App-title">Welcome to React</h1>
</header>
<p className="App-intro">React c’est cool !</p>
<div className="memory">
<GuessCount guesses={guesses} />
{cards.map((card, index) => (
<Card
card={card}
feedback={this.getFeedbackForCard(index)}
index={index}
key={index}
onClick={this.handleCardClick}
/>
))}
{won &&
(hallOfFame ? (
<HallOfFame entries={hallOfFame} />
) : (
<HighScoreInput
guesses={guesses}
onStored={this.displayHallOfFame}
/>
))}
</div>
)
}
+23
View File
@@ -0,0 +1,23 @@
import { expect } from 'chai'
import React from 'react'
import { shallow } from 'enzyme'
import App from './App'
import GuessCount from './GuessCount'
describe('<App/>', () => {
it('renders without crashing', () => {
const wrapper = shallow(<App />)
})
it('contains a zero-guess counter', () => {
const wrapper = shallow(<App />)
expect(wrapper).to.contain(<GuessCount guesses={0} />)
})
it('has 36 cards', () => {
const wrapper = shallow(<App />)
expect(wrapper.find('Card')).to.have.length(36)
})
})
-8
View File
@@ -1,8 +0,0 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App />, div);
});
+28
View File
@@ -0,0 +1,28 @@
.memory > .card {
font-size: 2em;
flex: 1 1 calc(100% / 6 - 0.4em);
outline: 0.08em solid silver;
margin: 0.2em;
display: flex;
cursor: default;
}
.memory > .card.hidden {
background: silver;
}
.memory > .card.justMatched,
.memory > .card.justMismatched {
outline: 0.1em solid green;
}
.memory > .card.justMismatched {
outline-color: red;
}
.memory > .card.visible {
cursor: not-allowed;
}
.memory > .card > .symbol {
margin: auto;
}
+28
View File
@@ -0,0 +1,28 @@
import PropTypes from 'prop-types'
import React from 'react'
import './Card.css'
const HIDDEN_SYMBOL = '❓'
const Card = ({ card, feedback, index, onClick }) => (
<div className={`card ${feedback}`} onClick={() => onClick(index)}>
<span className="symbol">
{feedback === 'hidden' ? HIDDEN_SYMBOL : card}
</span>
</div>
)
Card.propTypes = {
card: PropTypes.string.isRequired,
feedback: PropTypes.oneOf([
'hidden',
'justMatched',
'justMismatched',
'visible',
]).isRequired,
index: PropTypes.number.isRequired,
onClick: PropTypes.func.isRequired,
}
export default Card
+18
View File
@@ -0,0 +1,18 @@
import { expect } from 'chai'
import React from 'react'
import { shallow } from 'enzyme'
import sinon from 'sinon'
import Card from './Card'
describe('<Card/>', () => {
it('should trigger its `onClick` prop when clicked', () => {
const onClick = sinon.spy()
const wrapper = shallow(
<Card card="😁" feedback="hidden" index={0} onClick={onClick} />
)
wrapper.simulate('click')
expect(onClick).to.have.been.calledWith(0)
})
})
+7
View File
@@ -0,0 +1,7 @@
.memory > .guesses {
font-size: 1em;
width: calc(100% - 0.4em);
margin: 0.2em;
text-align: right;
font-family: Menlo, Monaco, Consolas, Inconsolata, 'Courier New', monospace;
}
+12
View File
@@ -0,0 +1,12 @@
import PropTypes from 'prop-types'
import React from 'react'
import './GuessCount.css'
const GuessCount = ({ guesses }) => <div className="guesses">{guesses}</div>
GuessCount.propTypes = {
guesses: PropTypes.number.isRequired,
}
export default GuessCount
+14
View File
@@ -0,0 +1,14 @@
.hallOfFame {
width: 100%;
border-collapse: collapse;
}
.hallOfFame .date,
.hallOfFame .guesses {
width: 20%;
text-align: center;
}
.hallOfFame tr:nth-child(even) {
background: #eee;
}
+65
View File
@@ -0,0 +1,65 @@
import PropTypes from 'prop-types'
import React from 'react'
import './HallOfFame.css'
const HallOfFame = ({ entries }) => (
<table className="hallOfFame">
<tbody>
{entries.map(({ date, guesses, id, player }) => (
<tr key={id}>
<td className="date">{date}</td>
<td className="guesses">{guesses}</td>
<td className="player">{player}</td>
</tr>
))}
</tbody>
</table>
)
HallOfFame.propTypes = {
entries: PropTypes.arrayOf(
PropTypes.shape({
date: PropTypes.string.isRequired,
guesses: PropTypes.number.isRequired,
id: PropTypes.number.isRequired,
player: PropTypes.string.isRequired,
})
).isRequired,
}
export default HallOfFame
// == Internal helpers ==============================================
export const FAKE_HOF = [
{ id: 3, guesses: 18, date: '10/10/2017', player: 'Jane' },
{ id: 2, guesses: 23, date: '11/10/2017', player: 'Kevin' },
{ id: 1, guesses: 31, date: '06/10/2017', player: 'Louisa' },
{ id: 0, guesses: 48, date: '14/10/2017', player: 'Marc' },
]
const HOF_KEY = '::Memory::HallofFame'
const HOF_MAX_SIZE = 10
export function saveHOFEntry(entry, onStored) {
entry.date = new Date().toLocaleDateString()
entry.id = Date.now()
const entries = JSON.parse(localStorage.getItem(HOF_KEY) || '[]')
const insertionPoint = entries.findIndex(
({ guesses }) => guesses >= entry.guesses
)
if (insertionPoint === -1) {
entries.push(entry)
} else {
entries.splice(insertionPoint, 0, entry)
}
if (entries.length > HOF_MAX_SIZE) {
entries.splice(HOF_MAX_SIZE, entries.length)
}
localStorage.setItem(HOF_KEY, JSON.stringify(entries))
onStored(entries)
}
+11
View File
@@ -0,0 +1,11 @@
.highScoreInput {
font-size: 1em;
width: calc(100% - 0.4em);
margin: 0.2em;
}
.highScoreInput input {
display: block;
width: 100%;
margin-bottom: 0.2em;
font-family: Menlo, Monaco, Consolas, Inconsolata, 'Courier New', monospace;
}
+48
View File
@@ -0,0 +1,48 @@
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import './HighScoreInput.css'
import { saveHOFEntry } from './HallOfFame'
class HighScoreInput extends Component {
state = { winner: '' }
// Arrow fx for binding
handleWinnerUpdate = event => {
this.setState({ winner: event.target.value.toUpperCase() })
}
// Arrow fx for binding
persistWinner = event => {
event.preventDefault()
const newEntry = { guesses: this.props.guesses, player: this.state.winner }
saveHOFEntry(newEntry, this.props.onStored)
}
render() {
return (
<form className="highScoreInput" onSubmit={this.persistWinner}>
<p>
<label>
Bravo ! Entre ton prénom :
<input
autoComplete="given-name"
type="text"
onChange={this.handleWinnerUpdate}
value={this.state.winner}
/>
</label>
<button type="submit">J’ai gagné !</button>
</p>
</form>
)
}
}
HighScoreInput.propTypes = {
guesses: PropTypes.number.isRequired,
onStored: PropTypes.func.isRequired,
}
export default HighScoreInput
-5
View File
@@ -1,5 +0,0 @@
body {
margin: 0;
padding: 0;
font-family: sans-serif;
}
+6 -7
View File
@@ -1,8 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import registerServiceWorker from './registerServiceWorker';
import React from 'react'
import ReactDOM from 'react-dom'
import App from './App'
import registerServiceWorker from './registerServiceWorker'
ReactDOM.render(<App />, document.getElementById('root'));
registerServiceWorker();
ReactDOM.render(<App />, document.getElementById('root'))
registerServiceWorker()
-7
View File
@@ -1,7 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
<g fill="#61DAFB">
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
<circle cx="420.9" cy="296.5" r="45.7"/>
<path d="M520.5 78.1z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

+15
View File
@@ -0,0 +1,15 @@
import Adapter from 'enzyme-adapter-react-16'
import chai from 'chai'
import { configure as configureEnzyme } from 'enzyme'
import createChaiEnzyme from 'chai-enzyme'
import createChaiJestDiff from 'chai-jest-diff'
import dirtyChai from 'dirty-chai'
import sinonChai from 'sinon-chai'
chai
.use(dirtyChai)
.use(createChaiJestDiff())
.use(createChaiEnzyme())
.use(sinonChai)
configureEnzyme({ adapter: new Adapter() })