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.

Sign up for GitHub

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

Jump to bottom

Noelle Morris -- Pull Request #19

Open
wants to merge 74 commits into
base: master
Choose a base branch
from
Open

Noelle Morris -- Pull Request #19

wants to merge 74 commits into from

Conversation

johnanmorris
Copy link

  • Can play a game, with notifications for wins and ties
  • Can POST game data of completed games
  • Can display all completed games (most recently played game renders after clicking New Game)
  • Cannot delete games from the app

johnanmorris and others added 30 commits December 13, 2016 12:31
@johnanmorris
started Player spec testing and first test
56da6d3
@johnanmorris
preliminary player specs
e5e4889
@mjohnson3038
preliminary Board specs code
1f415f3
@mjohnson3038
sending the board.js
c33102f
@johnanmorris
in progress game
ce8fbc9
@johnanmorris
Merge branch 'game'
9daac5a 
game class stubs
@johnanmorris
wrote specs and variables for initial game
37636e4
@johnanmorris
wrote tests and functions for validSquare and toggleTurn
4fbe08a
@mjohnson3038
working through logic of finding winner
939fcbf
@mjohnson3038
hard coded horizontal winner
f883bd7
@mjohnson3038
robust tests for horizontal win
1d68ab1
@johnanmorris
no winner to return properly
2c28a72
@mjohnson3038
Horizontal passing as expected, vertical test failing because not coded
8c6f79c
@johnanmorris
testing and code for vertical wins
11cb7bd
@johnanmorris
diagonal win tests and code
f4639ca
@johnanmorris
wrote tests for draw game
bb13868
@mjohnson3038
game play. WIP toggleTurn post valid play move
a5500a7
@mjohnson3038
toggleTurn was good but the beforeEach needed to be altered
ab3a14f
@mjohnson3038
cleaning up post game play
d587b9d
@johnanmorris
functionality for when a player has won
023888f
@mjohnson3038
First Error
70fbc6c
@johnanmorris
WIP: refactoring play
d2250c5
@johnanmorris
refactored tests to create a new Game instance before every test
e31be6e
@johnanmorris
revert changes to game
6acebd5
@johnanmorris
reverts, pt2
0e626b3
@mjohnson3038
Adding Error messaging for checking coordinates of play square
89aa690
@mjohnson3038
Merge branch 'master' into mbj/error-handling
d1c24c1 
Adding Noelle refactoring of beforeEach
@mjohnson3038
Error handling for NON whole numbers
22ef51b
@mjohnson3038
error handling for play completed
278098e
@johnanmorris
re-added test refactoring with beforeEach
ce1a3b5
mjohnson3038 and others added 30 commits December 19, 2016 09:49
@mjohnson3038
Console log the square id, but printing twice
1efd377
@mjohnson3038
Console log printing once, rendering once
378b0c4
@mjohnson3038
New Game logging -is an html tag not id
ff1cc15
@johnanmorris
console.log for clearBoard functionality
87ff12c
@johnanmorris
modified styling
9610744
@mjohnson3038
added fonts
28b2c6f
@mjohnson3038
Foundation working, large - button right, small - button below
b39eac0
@mjohnson3038
Not sure what went wrong or why it is working, but functionally as it…
0f75e89 
… should have been
@johnanmorris
adjusted foundation columns
341ec8f
@johnanmorris
modified Board and tests to be a Backbone model
4b71624
@johnanmorris
modified Player to be a backbone model
427b42d
@johnanmorris
WIP game functions and tests; currently have failing tests
0554cef
@johnanmorris
commented out defaults -- they don't do what I think they do in Backbone
6ca0173
@johnanmorris
modified board to initialize with a null array, rather than having it…
f2bc894 
… as a default
@johnanmorris
modified game because board grid is now initialized; tests through wi…
39b01d0 
…nner are passing
@johnanmorris
wip: rewriting play functionality
97bdde3
@johnanmorris
all tests passing
b553e73
@johnanmorris
modified app.js to have proper name; modified index.html and CSS to h…
f5c7929 
…ave different id names for board
@johnanmorris
removed Board model and incorporated it into Game model
1bdb7b0
@johnanmorris
wip: trying to get changes in board to display on page
9fe3ef9
@johnanmorris
rendered board and creates a new game
af00c24
@johnanmorris
wave 3 complete
dd6e39b
@johnanmorris
fixed error in isFull(); was returning at the wrong time
86fbea6
@johnanmorris
deleted unnecessary js files
acd8f7a
@johnanmorris
deleted unused templates
ba4fe3f
@johnanmorris
implemented POST functionality to API
81403fc
@johnanmorris
modified game and spec
d786a3f
@johnanmorris
render list of past games
0fbdd0b
@johnanmorris
modified list rendering to use Underscore templates and built-in toDa…
30005d3 
…teString() function
@johnanmorris
modified foundation classes for list display
b2f7e0c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@johnanmorris @mjohnson3038