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

Brackets Yeni and Beylul #26

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
19890e5
created spec and tic-tac-toe file.
Bella8 Dec 13, 2016
41b94d5
created three objects and imorted it into specs
Bella8 Dec 13, 2016
ac9e1ec
Created separate files with specs for each object.
yenicapotediaz Dec 13, 2016
de8b4ec
added import line to spec files.
yenicapotediaz Dec 13, 2016
51141d2
Added tests for empty and filled functions.
yenicapotediaz Dec 13, 2016
e779da8
Added tests for checkBoard function.
yenicapotediaz Dec 13, 2016
07d3f27
updated the board filled function and make sure the test still works.…
Bella8 Dec 14, 2016
2711f86
updated filled function in board and test. Implemented play functio…
Bella8 Dec 14, 2016
c01ed88
finished board functionality (for now) and its tests.
yenicapotediaz Dec 14, 2016
36b9ce0
changed the argument names for filled function in Board and play func…
yenicapotediaz Dec 14, 2016
a4bbb6c
worked on won function in Game and created test. working on being abl…
yenicapotediaz Dec 15, 2016
4f1f443
Decided to include player into the game instead of having it as its o…
yenicapotediaz Dec 16, 2016
a14f3e7
working on play/won functionality working together. Testing for tie i…
yenicapotediaz Dec 17, 2016
2070573
added horizonatal, diagonal, tie methods and tests
Bella8 Dec 18, 2016
5d61db5
modifid the won function to check if its a tie after the game is ove…
Bella8 Dec 18, 2016
134b4b5
clear board after a player wins or if its a tie.
Bella8 Dec 18, 2016
e8967d6
added tests to check the current state of the the board in the game s…
Bella8 Dec 18, 2016
321db62
solved merge conflict.
yenicapotediaz Dec 18, 2016
b6d2def
Made a change in play function for test to pass.
yenicapotediaz Dec 19, 2016
1f07fab
Created folders and files for backbone.
Bella8 Dec 19, 2016
542346c
modeifined the board and game modeland the game_view
Bella8 Dec 19, 2016
0c22ad0
Still in progress, working on views, model, and events
Bella8 Dec 19, 2016
3ab6135
worked on the html again and created a template to place the td for t…
yenicapotediaz Dec 20, 2016
fdbc78b
simplified model content, in progress.
yenicapotediaz Dec 20, 2016
a566c4a
set up the instances for game and gameview in app.js. Added initializ…
yenicapotediaz Dec 20, 2016
8e84b4e
changed game model to backbone
Bella8 Dec 20, 2016
4df9e88
integrated the board as a backbone model and fixed the specs to work …
yenicapotediaz Dec 20, 2016
d8b8714
cleaned up game model and spec
Bella8 Dec 20, 2016
90cd011
Merge branch 'master' of https://github.com/Bella8/tic-tac-toe
Bella8 Dec 20, 2016
3008b41
deleted board.js and modifined board.js model to pass the tests
Bella8 Dec 20, 2016
8610de3
Edited the render function template piece to pull the board from the …
yenicapotediaz Dec 20, 2016
9b82def
have our events working properly (just console logs) adjusted board a…
yenicapotediaz Dec 20, 2016
d552751
Implemented the clickBox function to work with the event. Made some c…
yenicapotediaz Dec 21, 2016
0123ac6
Fixed won and play functions to do their own thing. Fixed the specs t…
yenicapotediaz Dec 21, 2016
fc2e4f8
Worked on game view event to clear the board. It works now.
yenicapotediaz Dec 21, 2016
2af1fac
modifined gitignore
Bella8 Dec 21, 2016
03e31d8
cleaned up specs and removed pieces of play function that we no longe…
yenicapotediaz Dec 21, 2016
e10b4a5
finally got the board to stop allowing the user to click on a spot on…
yenicapotediaz Dec 21, 2016
bbfb396
Can now see who the winner is, still a work in progress.
yenicapotediaz Dec 21, 2016
8c37a5e
worked on been able to view the winner on the screen. It works as exp…
yenicapotediaz Dec 21, 2016
dd969c2
added background image
Bella8 Dec 22, 2016
ec41252
worked on the index and css layout. Looks pretty now.
yenicapotediaz Dec 22, 2016
fb11cb7
Added new collection folder and list_game
Bella8 Dec 22, 2016
4edc5fd
created collection folder and list_game file
Bella8 Dec 22, 2016
6c62eeb
addded images
Bella8 Dec 22, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,5 @@ Icon
Network Trash Folder
Temporary Items
.apdisk

*.icloud
Binary file added build/assets/Picture1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/assets/eraser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/assets/wood.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 78 additions & 0 deletions build/css/app.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
@font-face {
font-family: 'CrayonFont';
src: url('crayon_font.ttf') format('truetype');
}

.winner {
font-family: 'CrayonFont', sans-serif;
color: white;
text-align: center;
font-size: 80px;
background-image: url("/assets/wood.png");
margin-top: -10%;
}

.title {
font-family: 'CrayonFont', sans-serif;
font-size: 40px;
}

table {
width: 90%;
}

td {
width: 203px;
height: 173px;
font-family: 'CrayonFont', sans-serif;
color: white;
text-align: center;
font-size: 80px;
background-image: url("/assets/Picture1.png");
}

#first, #second {
border-bottom: 4px solid white ;
}

td[id*="-one"] {
border-left: 4px solid white ;
border-right: 4px solid white ;
}

#board-table {
background-color: white ;
}


header {
text-align: center;
margin-bottom: 30px;
margin-top: 10px;
}

body {
background-color: white ;
}

.button {
margin-right: 42%; /* to center button*/
text-align: center;
border-radius: 25px;
max-width: 150px;
max-height: 100px;
background-color: #2D3336;
font-family: 'CrayonFont', sans-serif;
}
.button:hover {
background-color: grey;
}
#restart {
font-size: 12pt;
color: white;
padding: 5px 15px 5px 15px;
}
.text-center {
margin-left: 25%;
margin-right: 20%;
}
Binary file added build/css/crayon_font.ttf
Binary file not shown.
Loading