Skip to content

Commit

Permalink
Merge pull request #13 from DChilds94/feature/textEdit
Browse files Browse the repository at this point in the history
Makes minor alterations to text on about page to correct spelling err…
  • Loading branch information
ruaridhdunbar authored Jul 4, 2018
2 parents 17041a9 + a456fe4 commit fe98813
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion client/src/main/components/About.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import './public/About.css'
const About = () => {
return (
<div id="body">
<h1>JavaScipt Group Project</h1>
<h1>JavaScript Group Project</h1>
<div id="project-brief">
<p>Create a browser game based on an existing card or dice game. Model the game logic and then display it in the browser for a user to interact with. For this project the team decided to create the classic card game Pairs.
</p>
Expand Down
4 changes: 2 additions & 2 deletions client/src/main/components/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ const Home = () => {
<h2>Pairs</h2>
<h3>How To Play</h3>
<p id="rules">
In turn, each player chooses two cards and turns them face up. If they are of the same rank and color (e.g. six of hearts and six of diamonds, queen of clubs and queen of spades, or both jokers, if used) then that player wins the pair and plays again. If they are not of the same rank and color, they are turned face down again and play passes to the player on the left. Rules can be changed here too: it can be agreed before the game starts that matching pairs be any two cards of the same rank, a color-match being unnecessary, or that the match must be both rank and card suit.
The game ends when the last pair has been picked up. The winner is the person with the most pairs. There may be a tie for first place.
In turn, each player chooses two cards and turns them face up. If they are of the same rank (e.g. six of hearts and six of diamonds, queen of clubs and queen of spades) then that player wins the pair and plays again. If they are not of the same rank, they are turned face down again and play passes to the next player.
The game ends when the last pair has been picked up. The winner is the person with the most pairs.
</p>
</div>
<div id="play-now-div">
Expand Down

0 comments on commit fe98813

Please sign in to comment.