From 116813a4f97a72c3b052d2c72f0f9d20549d4264 Mon Sep 17 00:00:00 2001 From: Ethan Weinrot Date: Mon, 4 Mar 2019 10:10:12 -0800 Subject: [PATCH 1/5] changed total display font size to small --- src/App.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.css b/src/App.css index 54656a3..7b7660f 100755 --- a/src/App.css +++ b/src/App.css @@ -52,7 +52,7 @@ button { } #total-display { - font-size: large; + font-size: small; } #adders button { From 75b01900c29177ac7f0e511ac0d6f8438bf1d776 Mon Sep 17 00:00:00 2001 From: Ethan Weinrot Date: Wed, 6 Mar 2019 08:25:30 -0800 Subject: [PATCH 2/5] orange buttons changed to blue --- src/App.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.css b/src/App.css index 7b7660f..7903756 100755 --- a/src/App.css +++ b/src/App.css @@ -60,7 +60,7 @@ button { } #controllers button { - background-color: orange; + background-color: blue; } @keyframes App-logo-spin { From a3aab8443fc4496fa4438c32f7e1262d6a837e97 Mon Sep 17 00:00:00 2001 From: Ethan Weinrot Date: Wed, 6 Mar 2019 08:54:23 -0800 Subject: [PATCH 3/5] Changed the color of the controller buttons to light blue --- src/App.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.css b/src/App.css index 7903756..4706e8c 100755 --- a/src/App.css +++ b/src/App.css @@ -60,7 +60,7 @@ button { } #controllers button { - background-color: blue; + background-color: lightblue; } @keyframes App-logo-spin { From 7f8162256ef77cc04a83a1576dbe3ce77df50de8 Mon Sep 17 00:00:00 2001 From: Ethan Weinrot Date: Wed, 6 Mar 2019 08:55:45 -0800 Subject: [PATCH 4/5] Changed the color of the adder buttons to yellow --- src/App.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.css b/src/App.css index 4706e8c..e6114fb 100755 --- a/src/App.css +++ b/src/App.css @@ -56,7 +56,7 @@ button { } #adders button { - background-color: yellowgreen; + background-color: yellow; } #controllers button { From 08c8005ad49cbb4c250fa3c9d940d88568b5ceac Mon Sep 17 00:00:00 2001 From: Ethan Weinrot Date: Wed, 6 Mar 2019 16:30:41 -0800 Subject: [PATCH 5/5] Roll Count I added a roll counter that counts each roll of all the dice. When you press clear pool or reset dice, the roll counter gets set back to 0. --- src/App.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/App.js b/src/App.js index 4239481..deaad03 100755 --- a/src/App.js +++ b/src/App.js @@ -1,8 +1,10 @@ -import React, { Component } from 'react'; + import React, { Component } from 'react'; import './App.css'; import Die from './Die'; + +let counter = 0 class App extends Component { constructor(props) { super(props); @@ -28,7 +30,10 @@ class App extends Component { const dice = this.state.dice; dice[key].value = dice[key].roll(); this.setState({dice}); - } + counter ++; + return counter + } + renderDesc() { const counts = {}; @@ -70,6 +75,8 @@ class App extends Component { return this.state.dice.reduce((acc, die) => acc + die.value, 0); } + + render() { return (
@@ -85,6 +92,7 @@ class App extends Component {
+ @@ -108,6 +116,7 @@ class App extends Component { +