diff --git a/README.md b/README.md index 9174595..fb20e28 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ 1. After you have a general understanding find the `// @TODO` comments and fix the problems described. 1. Go to the HTML file and create all the rows you need for a complete Tic Tac Toe board. 1. When you've finished create a Pull Request (*PR*) on the original repo and turn in the URL of that PR. - +1. could not find error. ******* ## Follow-Up Video diff --git a/index.html b/index.html index 19d0dee..e2f9c0e 100644 --- a/index.html +++ b/index.html @@ -6,23 +6,35 @@ - + +

Welcome to Tic Tac Toe

Get ready to play!

- +
- - - - + + + + + + + + + + + + + + +
diff --git a/scripts.js b/scripts.js index ba09e74..dbc555f 100644 --- a/scripts.js +++ b/scripts.js @@ -7,6 +7,12 @@ // next to each @TODO you will find tasks that need to be finished // The variable will change from X to O based on what player turn it is. We need to hold this so we can place an X or O on the board when they're clicked. +let board = [ + ["", "", ""], + ["", "", ""], + ["", "", ""] +] + let currentMarker = 'X' @@ -16,6 +22,8 @@ let currentMarker = 'X' // "this" is a special word in JS but "element" could have been "thing" or "el" or whatever we wanted it to be as long as we use it again in the "console.log" statement const handleClick = (element) => { + + // this uses the "log" method on the "console" to log out the element's id so we can see it with our human eyes console.log(`The element you clicked on has an id: ${element.id}`) @@ -29,35 +37,28 @@ const handleClick = (element) => { - - - - - - - // this function places the "currentMarker" inside the HTML element that was clicked and calls the "changeMarker" function. const addMarker = (id) => { + const row = parseInt(id.charAt(0)) + const column = parseInt(id.charAt(2)) + // @TODO-1: Open the console tab in your Chrome Inspector Tool and click on the top-left square to see what's logged to the console. console.log(`*** The current marker is: ${currentMarker}. ***`) console.log(`Therefore, a "${currentMarker}" should be placed in the square with the id: ${id}`) // @TODO-2: Build a line of code that will set the innerHTML property of the element that was clicked to the "currentMarker" - +document.getElementById(id).innerHTML= currentMarker +board[row][column]= currentMarker +console.log(board) +checkForWin() // @TODO-2.5: MIX & MATCH, You will need the following pieces of code to build that line: // = currentMarker // .getElementById(id) // document // .innerHTML - - changeMarker() } - - - - - + @@ -78,9 +79,6 @@ const changeMarker = () => { - - - // This "resetBoard" function is called when the user clicks on the "Restart" button. const resetBoard = () => { @@ -94,6 +92,7 @@ const resetBoard = () => { // document // const + const squares= document.getElementsByTagName("TD") // loops over the HTML Collection of TDs and clears out the Xs and Os for (i=0; i < squares.length; i++) { @@ -103,4 +102,47 @@ const resetBoard = () => { // sets the innerHTML to null to replace the "X" or "O" squares[i].innerHTML = null } + +} + +const checkForWin= ()=>{ + if (horizontalWin()|| verticleWin()|| diagonalWin()){ + window.alert(`Player ${currentMarker} Won`) + } + else { + changeMarker() + } + +} +const horizontalWin= ()=> { + if((board[0][0] == "X" && board[0][1] == "X" && board[0][2] == "X") + || (board[0][0] == "O" && board[0][1] == "O" && board[0][2] == "O") + || (board[1][0] == "X" && board[1][1] == "X" && board[1][2] == "X") + || (board[1][0] == "O" && board[1][1] == "O" && board[1][2] == "O") + || (board[2][0] == "X" && board[2][1] == "X" && board[2][2] == "X") + || (board[2][0] == "O" && board[2][1] == "O" && board[2][2] == "O") +){ + return true +} +} +const verticleWin= ()=> { + if((board[0][0] == "X" && board[1][0] == "X" && board[2][0] == "X") + || (board[0][0] == "O" && board[1][0] == "O" && board[2][0] == "O") + || (board[0][1] == "X" && board[1][1] == "X" && board[2][1] == "X") + || (board[0][1] == "O" && board[1][1] == "O" && board[2][1] == "O") + || (board[0][2] == "X" && board[1][2] == "X" && board[2][2] == "X") + || (board[0][2] == "O" && board[1][2] == "O" && board[2][2] == "O") + ){ + return true + } + } + + const diagonalWin= ()=> { + if((board[0][0] == "X" && board[1][1] == "X" && board[2][2] == "X") + || (board[0][0] == "O" && board[1][1] == "O" && board[2][2] == "O") + || (board[0][2] == "X" && board[1][1] == "X" && board[2][0] == "X") + || (board[0][2] == "O" && board[1][1] == "O" && board[2][0] == "O") + ){ + return true + } } \ No newline at end of file diff --git a/tictactoe.css b/tictactoe.css index 981de05..867441f 100644 --- a/tictactoe.css +++ b/tictactoe.css @@ -1,6 +1,6 @@ .jumbotron { - margin: 5% auto; - margin-left: 43%; + margin: 2% auto; + margin-left: 35%; } td { @@ -13,4 +13,5 @@ td { table { margin: auto auto; -} \ No newline at end of file +} +