diff --git a/src/app-modes/ChallengeMode.js b/src/app-modes/ChallengeMode.js index 2dc561f..a7113df 100644 --- a/src/app-modes/ChallengeMode.js +++ b/src/app-modes/ChallengeMode.js @@ -9,8 +9,6 @@ import { WordListPickerContext } from '../contexts/wordListPickerContext'; export default React.memo(function ChallengeMode(props) { - - console.log("ChallengeMode loaded"); const {word, getNextWord} = useContext(WordFeederContext) @@ -28,21 +26,26 @@ export default React.memo(function ChallengeMode(props) { if (!word) { console.log('FINISHED ALL WORDS!') - alert('No more words.') + alert('Show completion time.') return } - console.log('word:', word); let challengeLetters = word.split('') + // console.log('word', word); + // console.log('morseArray', morseArray); + // console.log('morseArray.length', morseArray.length); + // if (morseArray.length === 0) { + // document.getElementById('challengeWord').childNodes.forEach(node => node.classList = ('cLetter')) + // } // Iterate through the morse character buffer and compare with each letter of challenge word morseArray.forEach((item, index) => { if (morseCharBuffer.slice(-1) === '_') { // If end of morse character - + let morseLetter = morseCode[morseArray[index]] || '[?]' let challengeLetter = challengeLetters[index-offset].toLowerCase() - + if (morseLetter === challengeLetter) { correctCharIndexes.push(index-offset) @@ -87,7 +90,11 @@ export default React.memo(function ChallengeMode(props) { }, 800) setTimeout(() => { getNextWord() - + if (document.getElementById('challengeWord') !== null) { + document.getElementById('challengeWord').childNodes.forEach(node => { + node.classList = "cLetter" + }) + } }, 1000) } diff --git a/src/components/ChallengeBufferDisplay.js b/src/components/ChallengeBufferDisplay.js index bd9428f..bb3fa08 100644 --- a/src/components/ChallengeBufferDisplay.js +++ b/src/components/ChallengeBufferDisplay.js @@ -25,11 +25,11 @@ export default React.memo(function ChallengeBufferDisplay(props) { return (
-
+ {/*
{alphanumeric}
-
+
*/}
{ditDahs}
diff --git a/src/components/ChallengeWord.js b/src/components/ChallengeWord.js index 788e7c8..eb8af80 100644 --- a/src/components/ChallengeWord.js +++ b/src/components/ChallengeWord.js @@ -1,18 +1,16 @@ -import React from "react" +import React, { useContext } from "react" +import { WordFeederContext } from "../contexts/wordFeederContext" export default React.memo(function ChallengeWord(props) { let challengeWordClass= props.className - const word = props.word + const {word} = useContext(WordFeederContext) let challengeLetters = word.split('') let spannedWord = challengeLetters.map((letter,index) => { - - let className = 'cLetter' - return ( - {letter} + {letter} ) }) diff --git a/src/components/Legend.js b/src/components/Legend.js index 6cf3f13..bb25270 100644 --- a/src/components/Legend.js +++ b/src/components/Legend.js @@ -1,6 +1,7 @@ -import React from "react" +import React, { useContext } from "react" import morseCode from '../data/morse-code.json' import useMorsePlayer from "../hooks/useMorsePlayer"; +import { WPMContext } from "../contexts/wpmContext.js"; function Legend() { @@ -12,7 +13,6 @@ function Legend() { let word = e.target.innerHTML let newWord = convertWordToMorse(word) console.log(newWord); - playMorseWord(newWord) } diff --git a/src/components/MorseBufferDisplay.js b/src/components/MorseBufferDisplay.js index 7769c98..3d47fb5 100644 --- a/src/components/MorseBufferDisplay.js +++ b/src/components/MorseBufferDisplay.js @@ -29,7 +29,6 @@ export default React.memo(function MorseBufferDisplay() { return (
-
{ditDahs} diff --git a/src/contexts/wordFeederContext.js b/src/contexts/wordFeederContext.js index e63de92..bfb9c5e 100644 --- a/src/contexts/wordFeederContext.js +++ b/src/contexts/wordFeederContext.js @@ -3,7 +3,6 @@ import { WordListPickerContext } from "./wordListPickerContext" const WordFeederContext = React.createContext() function WordFeederContextProvider(props) { - console.log('LOADED: wordFeederContext'); // let wordList = ['hi', 'morse', 'code', 'hello', 'gene'] const {wordList, wordListShuffled, wordListCategory} = useContext(WordListPickerContext) diff --git a/src/css/App.css b/src/css/App.css index 6ad0520..a297abc 100644 --- a/src/css/App.css +++ b/src/css/App.css @@ -426,9 +426,10 @@ i[class*="ri-"] { width: -webkit-fit-content; width: -moz-fit-content; width: fit-content; - margin-bottom: 20px; padding-left: 10px; padding-right: 10px; + margin-bottom: 10px; + margin-top: 25px; border-radius: 3px; -webkit-box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.3), 0px -1px 1px white; box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.3), 0px -1px 1px white; @@ -466,6 +467,7 @@ i[class*="ri-"] { } #morseBufferDisplay { + border: 1px solid green; display: -webkit-box; display: -ms-flexbox; display: flex; @@ -484,8 +486,6 @@ i[class*="ri-"] { margin-bottom: 20px; font-family: "Courier Prime", Courier, monospace; position: relative; - padding-top: 15px; - padding-bottom: 15px; } #morseBufferDisplay #overlay { @@ -503,7 +503,7 @@ i[class*="ri-"] { #morseBufferDisplay #alphanumeric-container { text-align: center; max-width: 100%; - overflow-x: hidden; + overflow: hidden; display: inline-block; padding-top: 10px; } @@ -526,7 +526,7 @@ i[class*="ri-"] { #morseBufferDisplay #ditDahs-container { text-align: center; max-width: 100%; - overflow-x: hidden; + overflow: hidden; } #morseBufferDisplay #ditDahs-container #ditDahs { @@ -575,7 +575,6 @@ i[class*="ri-"] { -webkit-box-pack: center; -ms-flex-pack: center; justify-content: center; - border: 1px solid green; -webkit-box-orient: vertical; -webkit-box-direction: normal; -ms-flex-direction: column; @@ -584,8 +583,6 @@ i[class*="ri-"] { -ms-flex-align: center; align-items: center; width: 100%; - height: 150px; - margin-bottom: 20px; font-family: "Courier Prime", Courier, monospace; font-weight: bold; } @@ -638,6 +635,7 @@ i[class*="ri-"] { #challengeBufferDisplay #ditDahs { height: 50px; padding-right: 5px; + padding-top: 10px; display: -webkit-box; display: -ms-flexbox; display: flex; diff --git a/src/css/App.css.map b/src/css/App.css.map index 9a15cb2..68e9b8e 100644 --- a/src/css/App.css.map +++ b/src/css/App.css.map @@ -1,6 +1,6 @@ { "version": 3, - "mappings": "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", + "mappings": "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", "sources": [ "../scss/App.scss" ], diff --git a/src/hooks/useMorsePlayer.js b/src/hooks/useMorsePlayer.js index 845859e..19b93a2 100644 --- a/src/hooks/useMorsePlayer.js +++ b/src/hooks/useMorsePlayer.js @@ -17,7 +17,7 @@ function useMorsePlayer() { } else { context = null } - + let frequency = config.frequency function play(ditDah) { @@ -54,32 +54,40 @@ function useMorsePlayer() { // }) } + let queue = [] + let timeouts = [] function playMorseWord(morse) { - let chars = Array.from(morse) - // let currentPromise = Promise.resolve(); - let soundQueue = [] + // Empty morse queue and cancel all sounds (timeouts) + queue = [] + for (let i = 0; i < timeouts.length; i++) { + clearTimeout(timeouts[i]); + } + + queue = Array.from(morse) + // let currentPromise = Promise.resolve(); let delay = 0 let firstWord = true - for (let i = 0; i < chars.length; i++) { + for (let i = 0; i < queue.length; i++) { // currentPromise = currentPromise.then(() => { - // return playChar(chars[i]); + // return playChar(queue[i]); // }); - let char = chars[i] + + let char = queue[i] if (char === '.') { if (firstWord) { firstWord = false // soundQueue.push( - setTimeout(() => { + timeouts.push(setTimeout(() => { play(char) - }, 0) + }, 0)) // ) } else { // soundQueue.push( - setTimeout(() => { + timeouts.push(setTimeout(() => { play(char) - }, delay) + }, delay)) // ) } delay += ditMaxTime*2 @@ -87,45 +95,47 @@ function useMorsePlayer() { if (firstWord) { firstWord = false // soundQueue.push( - setTimeout(() => { + timeouts.push(setTimeout(() => { play(char) - }, 0) + }, 0)) // ) } else { // soundQueue.push( - setTimeout(() => { + timeouts.push(setTimeout(() => { play(char) - }, delay) + }, delay)) // ) } delay += ditMaxTime*4 } else if (char === ' ') { - setTimeout(() => { + timeouts.push(setTimeout(() => { - }, delay) + }, delay)) delay += ditMaxTime*3 } } + + - function playChar(char) { - let delay = (char === '.') ? ditMaxTime + ditMaxTime : ditMaxTime*3 + ditMaxTime + // function playChar(char) { + // let delay = (char === '.') ? ditMaxTime + ditMaxTime : ditMaxTime*3 + ditMaxTime - return new Promise(function(resolve) { - if (char === '.' || char === '-') { - play(char) - .then(setTimeout(() => { - resolve(); - }, delay)) - } else { - setTimeout(() => { - resolve(); - }, delay) - } - }); - } + // return new Promise(function(resolve) { + // if (char === '.' || char === '-') { + // play(char) + // .then(setTimeout(() => { + // resolve(); + // }, delay)) + // } else { + // setTimeout(() => { + // resolve(); + // }, delay) + // } + // }); + // } } - return { playMorseWord } + return { playMorseWord, play } } export default useMorsePlayer \ No newline at end of file diff --git a/src/hooks/useStraightKey.js b/src/hooks/useStraightKey.js index 7294845..267b1a7 100644 --- a/src/hooks/useStraightKey.js +++ b/src/hooks/useStraightKey.js @@ -6,7 +6,7 @@ import { GameModeContext } from '../contexts/gameModeContext' // STRAIGHT KEY TELEGRAPH function useStraightKey() { - console.log('useStraightKey'); + const {morseCharBuffer, setMorseCharBuffer, morseWords, setMorseWords} = useContext(MorseBufferContext) const {wpm} = useContext(WPMContext) const {gameMode} = useContext(GameModeContext) diff --git a/src/scss/App.scss b/src/scss/App.scss index 9114226..cef13f6 100644 --- a/src/scss/App.scss +++ b/src/scss/App.scss @@ -388,11 +388,10 @@ $button-height: 60px; height: 5rem; width: fit-content; - - margin-bottom: 20px; padding-left: 10px; padding-right: 10px; - // padding-top: 10px; + margin-bottom: 10px; + margin-top: 25px; // border: 1px solid green; border-radius: $main-border-radius; @@ -431,7 +430,7 @@ $button-height: 60px; #morseBufferDisplay { - // border: 1px solid green; + border: 1px solid green; display: flex; justify-content: center; flex-direction: column-reverse; @@ -441,8 +440,6 @@ $button-height: 60px; margin-bottom: 20px; font-family: $buffer-font; position: relative; - padding-top: 15px; - padding-bottom: 15px; // font-weight: bold; #overlay { @@ -458,18 +455,9 @@ $button-height: 60px; } #alphanumeric-container { - // border-left: 2px solid #000; - - // display: flex; - - - // display: flex; - // justify-content: center; - // align-items: center; - // box-shadow: $morseCard-shadow-light; text-align: center; max-width: 100%; - overflow-x: hidden; + overflow: hidden; display: inline-block; padding-top: 10px; @@ -496,7 +484,7 @@ $button-height: 60px; text-align: center; max-width: 100%; // border: 1px solid red; - overflow-x: hidden; + overflow: hidden; #ditDahs { height: 50px; @@ -540,12 +528,12 @@ $button-height: 60px; #challengeBufferDisplay { display: flex; justify-content: center; - border: 1px solid green; + // border: 1px solid green; flex-direction: column; align-items: center; width: 100%; - height: 150px; - margin-bottom: 20px; + // height: 150px; + // margin-top: 10px; font-family: $buffer-font; font-weight: bold; @@ -605,6 +593,7 @@ $button-height: 60px; height: 50px; padding-right: 5px; + padding-top: 10px; // border-right: 2px solid #000; display: flex; flex-direction: row;