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

Lauren Brink! 97 commits! no delete button yet! the tests have been untouched for a week! #21

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

Lauren Brink! 97 commits! no delete button yet! the tests have been untouched for a week! #21

wants to merge 103 commits into from

Conversation

laurenfb
Copy link

No description provided.

Trishthedish and others added 30 commits December 12, 2016 13:07
@Trishthedish
attempting to set up backbone jasmine testing.
490d2ab
@Trishthedish
added some files like app.js that were part of an earlier project.
7000dcf
@Trishthedish
Several tests written and planned with lauren.
f5ecb3f
@laurenfb
yay
ef1d23a 
Griego wave1
@laurenfb
constructor function for Game, 5 tests passing
f3430c0
@Trishthedish
Merge pull request #2 from Trishthedish/lauren
35aba7e 
constructor function for Game, 5 tests passing
@laurenfb
added 2 tests for helloWorld & changed some indentation
957bb91
@laurenfb
tests for incrementTurn
a363f01
@laurenfb
incrementTurn fx, now it's passing tests, yay
c0292bf
@Trishthedish
Merge pull request #3 from Trishthedish/lauren
109a957 
tests for helloworld and incrementTurn; increment turn fx GREAT TEST DRIVEN DEVELOPMENT!
@Trishthedish
Used TDD to build tests for newly christened checkOccupied(). And als…
a39f3e3 
…o built function. Passing tests.
@laurenfb
yay we did it = Merge pull request #4 from Trishthedish/isOccupied
76ad59f 
Used TDD to build tests for newly christened checkOccupied(). And als…
@Trishthedish
Added tests for play function. added logic for play function.
5617977
@laurenfb
now we can play. #mergewithnoconflictshollaaaaaa
bce1991 
Added tests for play function. added logic for play function.
@laurenfb
tests for findWinner, there is no findWinner yet\!
2480ef8
@laurenfb
beginning of findWinner + added this.status to constructor
14f9d27
@Trishthedish
Merge pull request #6 from Trishthedish/lauren
248c681 
great job!
@laurenfb
fixed off-by-one error on incrementTurn and fixed the tests for it, a…
4cffbb8 
…lso added instance vars for magic square implementation
@laurenfb
new tests for new instance vars
9a7496e
@laurenfb
fixing bugs and indentation in tests
7ef8e40
@laurenfb
typo fix in Game.pointValues for magic square
6676855
@laurenfb
findWinner fx that calls other fx
72e881d
@laurenfb
horizontal, vertical, checkScore fx
6d8f523
@Trishthedish
Merge pull request Trishthedish#7 from Trishthedish/magic-square
2e6c1e6 
Magic square implementation
@Trishthedish
Added final diagonal check in tic-tac-toe functions.
31b929d
@Trishthedish
Merge pull request Trishthedish#8 from Trishthedish/diagonalCheck
dc376d1 
Added final diagonal check in tic-tac-toe functions.
@Trishthedish
took out unncessary instance varaibles.
15ad54e
@Trishthedish
During game play, winner tests have been written. and a winner is giv…
8734985 
…en and sipalyed instead of just returning board.
@Trishthedish
Passing all 30 tests. Solved the problem of being able to continue to…
01bf287 
… play after someone has already won. Not dry, but quite sturdy\!
@laurenfb
WE DID IT - Merge pull request Trishthedish#9 from Trishthedish/trish
8d83ebd 
Trish
laurenfb and others added 30 commits December 21, 2016 13:21
@laurenfb
fixed, tie is now posting to API correctly
d07bcc7
@laurenfb
removed ability to click on squares while the form modal is up.
929020f
@laurenfb
better layout but not remotely there yet
26772c1
@laurenfb
black and white ftw
27fb839
@laurenfb
modal now takes a form template
46b4d5d
@laurenfb
black and gold styling
79b8220
@laurenfb
template for alert
f02fc45
@laurenfb
functionality to render template
d0e07ff
@laurenfb
alerts now red
a950b43
@laurenfb
triggering an event to get the player's name, just need to put it in …
8f43812 
…the modal
@laurenfb
html - template for saying whose turn it is && default values for form
50f6021
@laurenfb
lowercase P
cda4e46
@laurenfb
adds name to modal when it's that player's turn
be8478a
@laurenfb
oops, guess that pair of parens was importnat
a7f2df4
@laurenfb
Merge pull request #4 from laurenfb/styling
c49a074 
Styling & other functionality that is not styling
@laurenfb
a button and a div, the button now calls GET to the api but doesn't d…
6ad7245 
…isplay yet
@laurenfb
toJSON function on advice of charles
1087fc0
@laurenfb
GET all call to API appends empty bullet points to API div
2e5e7ca
@laurenfb
parse fx
2acaa96
@laurenfb
parse function was not doing anything so now it's gone
16c39fa
@laurenfb
parse is back, but i clearly don't understand how it works, because i…
3eb0041 
…'m only getting models, not the parsed version, OH WELL we are showing X vs O players
@laurenfb
get rid of ugly corners
edf424f
@laurenfb
clear button on history div now works:
7142228
@laurenfb
Merge pull request #5 from laurenfb/wave-4
bbe4eb2 
Wave 4
[tictactoe] npm install webpack-merge
35cc141
[tictactoe] webpack build script
06282f9
[tictactoe] github pages deploy script
e1c2ab8
@laurenfb
Merge pull request #6 from laurenfb/deployment
2f0e0d1 
Deployment!!?!??!
[tictactoe] gh pages npm install
43691e1
Merge branch 'deployment'
b0ab6e6 
in prep for deployment add gh pages
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
@laurenfb @Trishthedish