From 2b15d7c04b0bdf2fff3503da68fbaeb058467d1c Mon Sep 17 00:00:00 2001 From: Gene Mecija Date: Tue, 4 Feb 2020 13:38:22 -0800 Subject: [PATCH] Challenge start overlay style/function, gameclock bug fixes --- src/App.js | 14 +- src/app-modes/ChallengeMode.js | 20 ++- src/components/ChallengeControls.js | 30 ++++ src/components/ChallengeOverlay.js | 11 +- src/components/ModePicker.js | 4 + src/components/WordListPicker.js | 16 +-- src/contexts/gameClockContext.js | 46 +++--- src/contexts/wordListPickerContext.js | 3 + src/css/App.css | 197 ++++++++++++++++++++++++-- src/css/App.css.map | 2 +- src/index.js | 12 +- src/scss/App.scss | 144 +++++++++++++++++-- 12 files changed, 424 insertions(+), 75 deletions(-) create mode 100644 src/components/ChallengeControls.js diff --git a/src/App.js b/src/App.js index dd0dcdb..99e9bfe 100644 --- a/src/App.js +++ b/src/App.js @@ -23,6 +23,8 @@ import Footer from './components/Footer'; import Info from './components/Info'; import { GameClockContextProvider } from './contexts/gameClockContext'; import ChallengeOverlay from './components/ChallengeOverlay'; +import { KeyTypeContextProvider } from './contexts/keyTypeContext'; +import { WPMContextProvider } from './contexts/wpmContext'; export default React.memo(function App() { @@ -34,9 +36,12 @@ export default React.memo(function App() { <>
+ + +
@@ -57,10 +62,10 @@ export default React.memo(function App() { } */} {gameMode === 'challenge' && - + <> - + } @@ -77,9 +82,12 @@ export default React.memo(function App() {
+ - + + +