diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index a11777c..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/logo192.png b/public/logo192.png deleted file mode 100644 index fc44b0a..0000000 Binary files a/public/logo192.png and /dev/null differ diff --git a/public/logo512.png b/public/logo512.png deleted file mode 100644 index a4e47a6..0000000 Binary files a/public/logo512.png and /dev/null differ diff --git a/src/app-modes/ChallengeMode.js b/src/app-modes/ChallengeMode.js index 34e0c5e..e08fa58 100644 --- a/src/app-modes/ChallengeMode.js +++ b/src/app-modes/ChallengeMode.js @@ -1,19 +1,19 @@ import React, {useContext} from 'react'; import '../css/App.css'; -import ChallengeWord from '../components/ChallengeWord' -import ChallengeBufferDisplay from '../components/ChallengeBufferDisplay'; -import GameClock from '../components/GameClock'; -import { KeyTypeContext } from '../contexts/keyTypeContext'; -import StraightKey from '../components/StraightKey'; -import ElectronicKey from '../components/ElectronicKey'; -import ChallengeControls from '../components/ChallengeControls'; import { ChallengeContext } from '../contexts/challengeContext'; +import { KeyTypeContext } from '../contexts/keyTypeContext'; +import ChallengeBufferDisplay from '../components/ChallengeBufferDisplay'; +import ChallengeControls from '../components/ChallengeControls'; +import ChallengeWord from '../components/ChallengeWord' +import ElectronicKey from '../components/ElectronicKey'; +import GameClock from '../components/GameClock'; +import StraightKey from '../components/StraightKey'; export default React.memo(function ChallengeMode() { const {keyType} = useContext(KeyTypeContext) - const {challengeState, cancelChallenge, morseArray, incorrectMorseIndexes, challengeWordClass} = useContext(ChallengeContext) + const {challengeState, cancelChallenge, morseArray, challengeWordClass} = useContext(ChallengeContext) return ( <> @@ -25,7 +25,7 @@ export default React.memo(function ChallengeMode() { - + ) }); diff --git a/src/app-modes/PracticeMode.js b/src/app-modes/PracticeMode.js index 1898990..e4a68ab 100644 --- a/src/app-modes/PracticeMode.js +++ b/src/app-modes/PracticeMode.js @@ -1,13 +1,13 @@ import React, { useContext } from 'react'; import '../css/App.css'; -import MorseBufferDisplay from '../components/MorseBufferDisplay' -import MorseHistoryTextBox from '../components/MorseHistory_textbox' import { KeyTypeContext } from '../contexts/keyTypeContext'; -import StraightKey from '../components/StraightKey'; import ElectronicKey from '../components/ElectronicKey'; +import MorseBufferDisplay from '../components/MorseBufferDisplay' +import MorseHistoryTextBox from '../components/MorseHistory' +import StraightKey from '../components/StraightKey'; -export default (function PracticeMode(props) { +export default (function PracticeMode() { const {keyType} = useContext(KeyTypeContext) diff --git a/src/app-modes/TrainingMode.js b/src/app-modes/TrainingMode.js deleted file mode 100644 index e95c6ec..0000000 --- a/src/app-modes/TrainingMode.js +++ /dev/null @@ -1,24 +0,0 @@ -import React from 'react'; -import '../css/App.css'; -import useStraightKey from '../hooks/useStraightKey'; -import GameClock from '../components/GameClock' -import MorseBufferDisplay from '../components/MorseBufferDisplay' -import MorseHistory from '../components/MorseHistory' - -function TrainingMode() { - - const {morseCharBuffer, morseWords} = useStraightKey('timed') - - console.log('TrainingMode.js rendered') - - return ( - <> - -
- - - ); - -} - -export default React.memo(TrainingMode); diff --git a/src/components/ChallengeBufferDisplay.js b/src/components/ChallengeBufferDisplay.js index 1c6d82a..5ac90f5 100644 --- a/src/components/ChallengeBufferDisplay.js +++ b/src/components/ChallengeBufferDisplay.js @@ -1,31 +1,19 @@ import React from "react" -import morseCode from '../data/morse-reverse.json' export default React.memo(function ChallengeBufferDisplay(props) { const morseArray = props.morseArray - let incorrectMorseIndexes = props.incorrectMorseIndexes let ditDahs = [] - let alphanumeric = [] for (let i in morseArray) { let morseChar = morseArray[i] - - // Alphanumeric - let alpha = morseCode[morseChar] || '[?]' - let alphaClass = (incorrectMorseIndexes.includes(Number(i))) ? 'strike morseError' : '' - alphanumeric.push({alpha.toUpperCase()}) - // DitDahs - let ditDahClass = (incorrectMorseIndexes.includes(Number(i))) ? 'morseError' : '' - ditDahs.push({morseChar}) - // ditDahs.push( ) + ditDahs.push({morseChar}) } return (
- {/*
*/}
{ditDahs}
diff --git a/src/components/ChallengeComplete.js b/src/components/ChallengeComplete.js index f2942f8..af3644a 100644 --- a/src/components/ChallengeComplete.js +++ b/src/components/ChallengeComplete.js @@ -3,7 +3,7 @@ import { GameClockContext } from "../contexts/gameClockContext" import { ChallengeContext } from "../contexts/challengeContext" import { WordListPickerContext } from "../contexts/wordListPickerContext" -export default (function ChallengeComplete(props) { +export default (function ChallengeComplete() { const {gameClockTime} = useContext(GameClockContext) const {setChallengeState} = useContext(ChallengeContext) diff --git a/src/components/ChallengeDisplay.js b/src/components/ChallengeDisplay.js deleted file mode 100644 index ea6e2d1..0000000 --- a/src/components/ChallengeDisplay.js +++ /dev/null @@ -1,41 +0,0 @@ -import React from "react" -import morseCode from '../data/morse-reverse.json' -import ChallengeBufferDisplay from "./ChallengeBufferDisplay"; - -export default React.memo(function ChallengeDisplay(props) { - - let morseLetters = props.buffer.split('_').filter(l => l !== '') - let challengeLetters = props.word.split('') - let correctIndexes = [] - let incorrectIndex = null - - morseLetters.forEach((morseLetter, index) => { - let morseAlpha = morseCode[morseLetter] - let challengeLetter = challengeLetters[index].toLowerCase() - - if (morseAlpha === challengeLetter) { - correctIndexes.push(index) - } else { - if (props.buffer.slice(-1) === "_") { - incorrectIndex = index - } - } - }) - - let spannedWord = challengeLetters.map((letter,index) => { - let className = 'cLetter' - className += (correctIndexes.includes(index)) ? ' correct' : '' - className += (incorrectIndex === index) ? ' morseError' : '' - return ( - {letter} - ) - }) - - - return ( - <> -
{spannedWord}
- - - ) -}) \ No newline at end of file diff --git a/src/components/ChallengeOverlay.js b/src/components/ChallengeOverlay.js index 1586a0d..945f339 100644 --- a/src/components/ChallengeOverlay.js +++ b/src/components/ChallengeOverlay.js @@ -1,6 +1,6 @@ import React, { useContext } from "react" -import ChallengeReady from "./ChallengeReady" import { ChallengeContext } from "../contexts/challengeContext" +import ChallengeReady from "./ChallengeReady" import ChallengeComplete from "./ChallengeComplete" export default (function ChallengeOverlay() { diff --git a/src/components/ChallengeReady.js b/src/components/ChallengeReady.js index c5a4ff2..28f7282 100644 --- a/src/components/ChallengeReady.js +++ b/src/components/ChallengeReady.js @@ -1,6 +1,6 @@ import React, { useContext } from "react" -import WordListPicker from "./WordListPicker" import { ChallengeContext } from "../contexts/challengeContext" +import WordListPicker from "./WordListPicker" export default (function ChallengeReady() { diff --git a/src/components/ChallengeWord.js b/src/components/ChallengeWord.js index 41235c0..1ce5a8a 100644 --- a/src/components/ChallengeWord.js +++ b/src/components/ChallengeWord.js @@ -13,11 +13,7 @@ export default React.memo(function ChallengeWord(props) { challengeLetters = word.split('') } - let spannedWord = challengeLetters.map((letter,index) => { - return ( - {letter} - ) - }) + let spannedWord = challengeLetters.map((letter,index) => {letter}) return (
{spannedWord}
diff --git a/src/components/DitDahDisplay.js b/src/components/DitDahDisplay.js index d57cf4e..65321a4 100644 --- a/src/components/DitDahDisplay.js +++ b/src/components/DitDahDisplay.js @@ -1,15 +1,6 @@ import React from "react" -function DitDahDisplay(props) { - if (props.dd === ' ') { - return ( -
 
- ) - } else { - return ( -
{props.dd}
- ) - } -} +export default (function DitDahDisplay(props) { -export default DitDahDisplay \ No newline at end of file + return (props.dd === ' ') ?
 
:
{props.dd}
+}) \ No newline at end of file diff --git a/src/components/ElectronicKey.js b/src/components/ElectronicKey.js index ebf5b58..fff4368 100644 --- a/src/components/ElectronicKey.js +++ b/src/components/ElectronicKey.js @@ -1,7 +1,6 @@ -import React from 'react' +import React from "react" import useElectronicKey from '../hooks/useElectronicKey'; -export default React.memo(function ElectronicKey(props) { - +export default React.memo(function ElectronicKey() { useElectronicKey() }) \ No newline at end of file diff --git a/src/components/Footer.js b/src/components/Footer.js index 46ad166..428a6db 100644 --- a/src/components/Footer.js +++ b/src/components/Footer.js @@ -26,9 +26,9 @@ export default (function Footer() { return ( ) }) \ No newline at end of file diff --git a/src/components/FrequencyPicker.js b/src/components/FrequencyPicker.js index 1f8f8d5..0d5ebd8 100644 --- a/src/components/FrequencyPicker.js +++ b/src/components/FrequencyPicker.js @@ -5,8 +5,8 @@ export default React.memo(function FrequencyPicker(props) { const {frequency, setFrequency} = useContext(FrequencyContext) - const maxFreq = 1500 const minFreq = 300 + const maxFreq = 1500 function handleChange(e) { if (Number(e.target.value) > maxFreq) { @@ -16,10 +16,9 @@ export default React.memo(function FrequencyPicker(props) { } else { setFrequency(Number(e.target.value)) } - // setFrequency(Number(e.target.value)) } + function increment() { - // setFrequency(prevFreq => prevFreq + 10) setFrequency(prevFreq => { if (prevFreq + 10 <= maxFreq) { return (prevFreq + 10) @@ -28,8 +27,8 @@ export default React.memo(function FrequencyPicker(props) { } }) } + function decrement() { - // setFrequency(prevFreq => prevFreq - 10) setFrequency(prevFreq => { if (prevFreq - 10 >= minFreq) { return (prevFreq - 10) @@ -38,7 +37,6 @@ export default React.memo(function FrequencyPicker(props) { } }) } - return (
diff --git a/src/components/Header.js b/src/components/Header.js index e028b04..8770752 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -59,13 +59,11 @@ export default (function Header () { ) }) - return (