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.

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

Guinevere's tic-tac-toe #22

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
f9ec5c3
created board, game, player files and specs, with proper imports and …
guineveresaenger Dec 13, 2016
4f8e766
created attributes for player and created functions to set the attrib…
allisonhoke Dec 13, 2016
6e52d80
created initial attributes of turnCounter, 2 players, and current pla…
allisonhoke Dec 13, 2016
1723fde
Added checkRows to Board to check if the rows have a winning condition
guineveresaenger Dec 13, 2016
e6197ff
Added win checks for diagonals, checkDiags
guineveresaenger Dec 13, 2016
eac0b06
wrote function for checking the columns for a win
allisonhoke Dec 13, 2016
1818341
fixed merge conflicts
allisonhoke Dec 13, 2016
4327001
fixed more merge conflicts
allisonhoke Dec 13, 2016
52cea58
created checkWin function to check all possibilities for winning game
allisonhoke Dec 13, 2016
ef5d979
so many tests. created functions to check if a particular space is av…
allisonhoke Dec 13, 2016
497ac23
adjusted setMarker function - we will handle the logic in the game. a…
allisonhoke Dec 14, 2016
402489e
added togglePlayer function with tests
allisonhoke Dec 14, 2016
0744dfb
some setter methods for Game, and better logic in checkColumns
guineveresaenger Dec 14, 2016
93aa0d1
fixed the flexibility for checking winning conditions on any size board
guineveresaenger Dec 14, 2016
cc2d870
wrote comprehensive overall test for 1 gameplay with a win
guineveresaenger Dec 14, 2016
6b92ea6
changed name of setMarker to makeMove for clarity. Also made all the …
guineveresaenger Dec 14, 2016
ffc52b7
set up file structure for backbone
allisonhoke Dec 16, 2016
331f3d0
set up HTML structure
allisonhoke Dec 16, 2016
c4036d1
set up import/export relations in file structure, declared most model…
guineveresaenger Dec 16, 2016
8af5acf
added header to HTML
allisonhoke Dec 19, 2016
6f2e1a2
Moved app.js one level up into src
guineveresaenger Dec 19, 2016
b998ec3
Added Css file and Foundation. Tweaked index to make a game board, pl…
guineveresaenger Dec 19, 2016
612439b
WIP working on DOM events
allisonhoke Dec 19, 2016
ffb4121
WIP working on DOM events, debugging lines in place
allisonhoke Dec 19, 2016
313a9bb
resolved DOM event issues
guineveresaenger Dec 19, 2016
86ae4e8
made Player into backbone model successfully
guineveresaenger Dec 19, 2016
e8edadd
translated board with tests into Backbone successfully
guineveresaenger Dec 19, 2016
43d2e8a
fixed a bunch of stuff in board tests. Added Game translated into Bac…
guineveresaenger Dec 20, 2016
dbd4cdc
Made my click handler log stuff and make changes
guineveresaenger Dec 20, 2016
f0b8c7e
Made BoardView to have Game as its model, because that's where all th…
guineveresaenger Dec 21, 2016
0ab88a9
Made cells respond to click updates. Added triggers for win and draw …
guineveresaenger Dec 21, 2016
c8773ca
A little closer to not having my 3X3 grid fall apart when changing wi…
guineveresaenger Dec 21, 2016
9de046a
Added GameList collection and made the API connections work for post …
guineveresaenger Dec 22, 2016
c2a0bdb
Some tweaking of loading game data and failed attempts to make delete…
guineveresaenger Dec 23, 2016
ffe7b8e
Game log will refresh automatically when new game is won
guineveresaenger Dec 23, 2016
a93489f
hide games log when new game is selected
guineveresaenger Dec 23, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions build/css/app.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
h1 {
color: black;
}

section {
}

ul {
list-style: none;
}

#game-board {

}

#game-board li {
background-color: #9b3367;
border: 2px solid black;
height: 120px;
width: 120px;
padding-left: 40%;
padding-top: 30%;

}

#game-board div {
width: 120px;
}

#congratulations {
display: none;
z-index: 10;
position: fixed;
width: 70%;
height: 30%;
top: 30%;
background-color: #9b3367;
text-align: center;
padding-top: 40px;
border: 1em solid #56012c;
border-radius: 15px;
}

.button {
/*background-color: #af668b*/
color: black;
border: 1px solid #56012c;
border-radius: 10px;
}
Loading