Code

Suzannah Kirk-Daligcon#12

Code

Open

sckirk wants to merge 40 commits intoAda-C6:masterAda-C6/tic-tac-toe:masterfrom sckirk:mastersckirk/tic-tac-toe:masterCopy head branch name to clipboard

+603-7

Commits

Commits on Dec 13, 2016

• Initial src and spec file setup

  jmojennifer

  committed
  1b2a36d

• TDD, made tests that creates a game. Creating a game returns a board as an array. Wrote the code so all tests pass.

  sckirk

  committed
  083069e

• Initialized players X and O in game with BDD tests for game and player files

  jmojennifer

  committed
  9db03dd

• Players' marks appropriately set to game board via setMark method; BDD tests created and passing

  jmojennifer

  committed
  81449c3

Commits on Dec 14, 2016

• Added tests and then the code so that an error is thrown is a player tries to play in a space that's already been played.

  sckirk

  committed
  f8eb358

• Added 'before each' test functionality so that our variables are new objects for each 'it' test

  sckirk

  committed
  faea63b

• wrote tests and then the code to return a boolean whether the board is currently full or not. Also made small corrections to other tests, using the beforeEach function syntax to make sure all of ou…

  Show description for 8e6341e
  sckirk

  committed
  8e6341e

• Added function to switch the active player and BDD tests (passing)

  jmojennifer

  committed
  32b28bc

• WIP: working on function for scoring game

  jmojennifer

  committed
  35f186a

• corrected the test code so that all tests for the isDone function now pass. Also organized our isDone function.

  sckirk

  committed
  84aceff

• added tests on the isDone to verify the winner variable inside the game is set as expected in each scenario

  sckirk

  committed
  90e66df

• wrote tons of tests validating the playTurn function is working as expected

  sckirk

  committed
  94f5d43

• Added tracking number of games in a session and added variable to related tests

  jmojennifer

  committed
  9801d49

• Commented code related to features to be implimented in later project phases

  jmojennifer

  committed
  62ffe36

Commits on Dec 16, 2016

• Created folders/files needed for Backbone app

  jmojennifer

  committed
  3073fe3

• wave 2 WIP

  sckirk

  committed
  5ef3d88

• Wave 2 complete

  jmojennifer

  committed
  77349cc

• Fixed link rel for css file

  jmojennifer

  committed
  32a6d27

Commits on Dec 19, 2016

• updated document.ready function in app.js so that clicking on the restart button event is functioning. Also corrected the syntax surrounding this restart button event.

  sckirk

  committed
  777c38d

• updated html so that each square has a row and col attribute that corresponds to our wave 1 setMark logic. Created an event handler when a square is clicked that saves the value of that square's ro…

  Show description for 13c5722
  sckirk

  committed
  13c5722

• took out a note that is no longer necessary because we coded it in previously

  sckirk

  committed
  e50a884

• css styling

  sckirk

  committed
  7a2cc62

• end of wave 2--cleaned up import lines to only show what's currently in use

  sckirk

  committed
  967ae6d

• converted board JS object into a backbone model successfully--all board tests are passing

  sckirk

  committed
  3e44bb7

• deleted a comment not currently in use

  sckirk

  committed
  3907f77

• clarified comments for future game logic

  sckirk

  committed
  9d57a13

• updated comments

  sckirk

  committed
  f58949f

• updated player logic to include the word rosemary or peach, based on player x or o status--set-up necessary prior to converting this JS object into a backbone model

  sckirk

  committed
  c4addcb

• added a test to confirm that each player's symbolImage string is being set correctly--test passes

  sckirk

  committed
  44259b9

• converted player JS object into a backbone model--updated test file so that tests are passing. I'll still need to insert the logic later that inserts an image onto the gameboard in the browser--wro…

  Show description for 0ba4df9
  sckirk

  committed
  0ba4df9

• converted game JS object into a backbone model and updated the test file so that all tests pass again

  sckirk

  committed
  e61521a

Commits on Dec 20, 2016

• so many things to get this game starting to function in the browser. Exclamation points. Still working on some edge cases in the browser.

  sckirk

  committed
  4b36ede

• game is now functioning in the browser. Creating a new game is working. Tie game is communicated.

  sckirk

  committed
  9ef2d1f

Commits on Dec 21, 2016

• showing a current player image for browser playing ease

  sckirk

  committed
  21a5299

• centered all elements on the page for aesthetics

  sckirk

  committed
  6217bc7

• adding player names so for future functionality with the API

  sckirk

  committed
  971609b

• Wednesday morning changes--configuring Game model for integration with the API

  sckirk

  committed
  1682809

• prepping to read data from the API via the collection

  sckirk

  committed
  356dbb1

Commits on Dec 22, 2016

• wave 4--posting to the API is working. Sweet. Will continue wave 4 requirements tmrw

  sckirk

  committed
  ec03903

• working on wave 4--showing all of the games from the API is working

  sckirk

  committed
  4aadea3