diff --git a/colorGame.css b/colorGame.css index 1b3583f..b32a863 100644 --- a/colorGame.css +++ b/colorGame.css @@ -1,8 +1,10 @@ body { background-color: #232323; margin: 0; - font-family: 'Open Sans', sans-serif; + font-family: "Open Sans", sans-serif; + color: #fff; } + .square { width: 30%; background: purple; diff --git a/colorGame.js b/colorGame.js index 8bccfa4..a659e7f 100644 --- a/colorGame.js +++ b/colorGame.js @@ -1,110 +1,101 @@ -var numSquares = 6; -var colors = []; -var pickedColor; -var squares = document.querySelectorAll('.square'); -var colorDisplay = document.getElementById('colorDisplay'); -var messageDisplay = document.querySelector('#message'); -var h1 = document.querySelector('h1'); -var resetButton = document.querySelector('#reset'); -var modeButtons = document.querySelectorAll('.mode'); - -init(); +var numSquares = 6 +var colors = [] +var pickedColor +var squares = document.querySelectorAll(".square") +var colorDisplay = document.getElementById("colorDisplay") +var messageDisplay = document.querySelector("#message") +//var h1 = document.querySelector("h1") +var resetButton = document.querySelector("#reset") +var modeButtons = document.querySelectorAll(".mode") + +init() function init() { - - setUpModeButtons(); - setUpSquares(); - reset(); + setUpModeButtons() + setUpSquares() + reset() } function setUpModeButtons() { for (var i = 0; i < modeButtons.length; i++) { - modeButtons[i].addEventListener('click', function() { - modeButtons[0].classList.remove('selected'); - modeButtons[1].classList.remove('selected'); - this.classList.add('selected'); - numSquares = this.textContent === "Easy" ? 3 : 6; - reset(); - }); + modeButtons[i].addEventListener("click", function () { + modeButtons[0].classList.remove("selected") + modeButtons[1].classList.remove("selected") + this.classList.add("selected") + numSquares = this.textContent === "Easy" ? 3 : 6 + reset() + }) } } function setUpSquares() { for (var i = 0; i < squares.length; i++) { - - squares[i].addEventListener("click", function() { - - var clickedColor = this.style.background; + squares[i].addEventListener("click", function () { + var clickedColor = this.style.background if (clickedColor === pickedColor) { - messageDisplay.textContent = 'Correct!'; - resetButton.textContent = "Play Again?"; - changeColors(clickedColor); - h1.style.background = clickedColor; + messageDisplay.textContent = "Correct!" + resetButton.textContent = "Play Again?" + changeColors(clickedColor) + h1.style.background = clickedColor } else { - this.style.background = "#232323"; - messageDisplay.textContent = 'Try Again!'; + this.style.background = "#232323" + messageDisplay.textContent = "Try Again!" } - }); + }) } } function reset() { + colors = generateRandomColors(numSquares) - colors = generateRandomColors(numSquares); + pickedColor = pickColor() - pickedColor = pickColor(); - - colorDisplay.textContent = pickedColor; - resetButton.textContent = "New Colors"; - messageDisplay.textContent = ""; + colorDisplay.textContent = pickedColor + resetButton.textContent = "New Colors" + messageDisplay.textContent = "" for (var i = 0; i < squares.length; i++) { if (colors[i]) { - squares[i].style.display = "block"; - squares[i].style.background = colors[i]; + squares[i].style.display = "block" + squares[i].style.background = colors[i] } else { - squares[i].style.display = "none"; + squares[i].style.display = "none" } } - h1.style.background = 'steelblue'; + // h1.style.background = 'steelblue'; } -resetButton.addEventListener('click', function() { - reset(); -}); +resetButton.addEventListener("click", function () { + reset() +}) function changeColors(color) { - for (var i = 0; i < colors.length; i++) { - - squares[i].style.background = color; + squares[i].style.background = color } } function pickColor() { - var random = Math.floor(Math.random() * colors.length); - return colors[random]; + var random = Math.floor(Math.random() * colors.length) + return colors[random] } function generateRandomColors(num) { - - var arr = []; + var arr = [] for (var i = 0; i < num; i++) { - - arr.push(randomColor()); + arr.push(randomColor()) } - return arr; + return arr } function randomColor() { + var r = Math.floor(Math.random() * 256) - var r = Math.floor(Math.random() * 256); - - var g = Math.floor(Math.random() * 256); + var g = Math.floor(Math.random() * 256) - var b = Math.floor(Math.random() * 256); - return "rgb(" + r + ", " + g + ", " + b + ")"; + var b = Math.floor(Math.random() * 256) + return "rgb(" + r + ", " + g + ", " + b + ")" } diff --git a/index.html b/index.html index 259be65..befa3c6 100644 --- a/index.html +++ b/index.html @@ -1,26 +1,31 @@
- -