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

Sky (Brackets) - Tic Tac Toe #11

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
e336b2a
added game.js to src
LaurenSky Dec 13, 2016
5b721aa
created Game, player1, player2, and gameBoard objects
LaurenSky Dec 13, 2016
4fdf13c
Added spec file with some tests, started prototype functions for Game
yasminor Dec 13, 2016
0b6237d
WIP: Game.prototype.play function
yasminor Dec 13, 2016
e5a4b34
WIP: Plays & wrote more tests
LaurenSky Dec 13, 2016
5d127a6
revamped game.valid function to simplify code and to take two inputs
LaurenSky Dec 14, 2016
8fa71be
added test for Game.valid function
LaurenSky Dec 14, 2016
b2dafbd
wrote tests for Game.playTurn function
LaurenSky Dec 14, 2016
67cbe00
Added the GameBoard.hasWon() function and tests)
yasminor Dec 14, 2016
e7dfca1
added tests to playTurn and hasWon and aTie & add tie functionality t…
LaurenSky Dec 14, 2016
0b4ee9f
fixed bug in valid function
LaurenSky Dec 14, 2016
f7026ed
WIP: playTurn and test in the event of a tie
yasminor Dec 14, 2016
fa2976e
Fixed merge conflict
yasminor Dec 14, 2016
0cc67e0
added test to capture 3 nulls in a row bug but code still has bug
LaurenSky Dec 14, 2016
1e52381
found the bug in hasWon
yasminor Dec 14, 2016
c4be4a7
Fixed merge conflict
yasminor Dec 14, 2016
7b4e1f6
Tests are passing
yasminor Dec 14, 2016
7caaa29
Deleted an unnecessary test after changing playTurn in the event of a…
yasminor Dec 14, 2016
74a99db
added extra = to != in has won function
LaurenSky Dec 16, 2016
5941707
file structure set up
LaurenSky Dec 16, 2016
16cb0eb
moved app.js to src folder from app folder
LaurenSky Dec 16, 2016
e8557da
working on css and html for index page
LaurenSky Dec 17, 2016
d08897e
WIP: DOM events
yasminor Dec 19, 2016
abce88a
set up click events and currentTarget for spaces in spaceClick Function
LaurenSky Dec 19, 2016
3fd8a2a
used vw in td in .css to make table responsive
LaurenSky Dec 19, 2016
426860f
completed coverting js to models and converting all tests to pass
LaurenSky Dec 20, 2016
0811a4c
selectSpace trigger and listenTo are functioning and passing thru spa…
LaurenSky Dec 20, 2016
3250ed0
moved some dynamic attributes to initializer instead of default
LaurenSky Dec 20, 2016
8837c79
connected gameboard render to the gameboard 2D array
LaurenSky Dec 20, 2016
0d7a7bc
base of game is working in browser and console & No alerts work yet
LaurenSky Dec 20, 2016
b893b79
added alerts
LaurenSky Dec 20, 2016
7569ca8
worked on css styling and responsiveness & current player works corre…
LaurenSky Dec 21, 2016
18d06e1
reload page on start new game
LaurenSky Dec 21, 2016
4e8ea01
message box functioning with Winner display, alerts, and catsgame
LaurenSky Dec 21, 2016
57c9ec0
added allgames collection
LaurenSky Dec 21, 2016
59a9c51
WIP: to_json
LaurenSky Dec 21, 2016
e84948b
Merge branch 'master' into sky/api
LaurenSky Dec 21, 2016
3f84b31
fixed a catsgame game over bug and fixed tests that had .get(gameboar…
LaurenSky Dec 21, 2016
eb36575
Merge branch 'master' into sky/api
LaurenSky Dec 21, 2016
21ef73b
changed original board to equal an empty string instead of null to ma…
LaurenSky Dec 21, 2016
95bd3c5
formatted data to json format
LaurenSky Dec 21, 2016
cd27c00
when game completes, it automatically creates a new game in the colle…
LaurenSky Dec 22, 2016
d5fe701
workin on deleting and fetch works
LaurenSky Dec 22, 2016
1e9fd47
removed past games
LaurenSky May 11, 2017
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
122 changes: 122 additions & 0 deletions build/css/app.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@

body {
background-color: #1B2321;
color: black;
font-family: 'Shadows Into Light', cursive;
}

h1 {
font-size: 9vw;
text-align: center;
color: white;
font-family: 'Shadows Into Light', cursive;
margin-top: 2%;
margin-left: 1%;
}

h3, h2 {
font-family: 'Shadows Into Light', cursive;
color: white;
}

#gameboard-view {
width: 35%;
text-align: center;
}

#player-view {
border: 1px solid white;
width: 24vw;
padding: 1%;
border-radius: 15px;
margin: 1%;
}

#message-box {
color: black;
background-color: transparent;
border-radius: 15px;
padding: 4%;
margin-top: 4%;
}

#gameboard-view-box {
border: 0 3% 10% 4%;
}

#all-game-view {
padding: 0 3% 3% 9%;
}

table#gameboard-view {
table-layout: fixed;
border-collapse: collapse;
border-style: hidden;
}

table#gameboard-view tr:nth-of-type(even) {
background-color: transparent !important;
}

table#gameboard-view td.value-cell {
border: 1px solid black;
font-size: 6vw;
width: 12vw;
height: 12vw;
padding: 0;
border-radius: 15px;
}

table#all-games th {
background-color: #1B2321;
font-size: 110%;
}

table#all-games td {
background-color: #1B2321;
width: 17vw;
padding: 0;
}

table#all-games {
color: white;
width: 17vw;
/*font-size: 140%;*/
text-align: center;

}

.button {
border-radius: 15px;
font-size: 150%;
/*font-size: 25px;*/
}

.delete-button {
border-radius: 15px;
font-size: 70%;
margin-right: 1%;
}

.inline {
display: inline;
}

.x-show {
display: inline;
}

.o-show {
display: none;
}

.start-game-button {
margin-left: 31%;
font-size: 3vw;
}

#main-area {
/*margin-left: 16%;*/
margin-left: 2%;
padding-top: 3%;
}
Loading