From b62dc542bb4c086c0bb2711b39c524d608835c30 Mon Sep 17 00:00:00 2001 From: Gene Mecija Date: Fri, 31 Jan 2020 18:09:54 -0800 Subject: [PATCH] Layout updates --- src/app-modes/ChallengeMode.js | 11 ++- src/components/MorseHistory.js | 5 +- src/css/App.css | 154 +++++++++++++++--------------- src/css/App.css.map | 2 +- src/hooks/useStraightKey.js | 47 +++++----- src/scss/App.scss | 167 ++++++++++++++++++++------------- 6 files changed, 219 insertions(+), 167 deletions(-) diff --git a/src/app-modes/ChallengeMode.js b/src/app-modes/ChallengeMode.js index f672f55..d70726a 100644 --- a/src/app-modes/ChallengeMode.js +++ b/src/app-modes/ChallengeMode.js @@ -31,7 +31,7 @@ export default React.memo(function ChallengeMode(props) { alert('No more words.') return } - + console.log('word:', word); let challengeLetters = word.split('') @@ -41,7 +41,7 @@ export default React.memo(function ChallengeMode(props) { if (morseCharBuffer.slice(-1) === '_') { // If end of morse character let morseLetter = morseCode[morseArray[index]] || '[?]' - let challengeLetter = challengeLetters[index-offset] + let challengeLetter = challengeLetters[index-offset].toLowerCase() if (morseLetter === challengeLetter) { correctCharIndexes.push(index-offset) @@ -78,9 +78,12 @@ export default React.memo(function ChallengeMode(props) { // challengeWordClass = 'correct' setTimeout(() => { - getNextWord() setMorseCharBuffer('') - }, 500) + }, 800) + setTimeout(() => { + getNextWord() + + }, 1000) } return ( diff --git a/src/components/MorseHistory.js b/src/components/MorseHistory.js index 69a2709..6ebd7e3 100644 --- a/src/components/MorseHistory.js +++ b/src/components/MorseHistory.js @@ -10,7 +10,10 @@ export default (function MorseHistory() { return (
- {morseCards} +
+
+ {morseCards} +
) }) \ No newline at end of file diff --git a/src/css/App.css b/src/css/App.css index f01ba3c..daca63b 100644 --- a/src/css/App.css +++ b/src/css/App.css @@ -399,7 +399,7 @@ i[class*="ri-"] { align-items: center; -ms-flex-item-align: center; align-self: center; - height: 50px; + height: 5rem; width: -webkit-fit-content; width: -moz-fit-content; width: fit-content; @@ -409,8 +409,8 @@ i[class*="ri-"] { 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; - font-size: 3rem; - font-family: "Courier", monospace; + font-size: 4rem; + font-family: "Courier Prime", Courier, monospace; font-weight: bold; background: #fdfdfd; text-transform: uppercase; @@ -421,13 +421,24 @@ i[class*="ri-"] { #challengeWord span { padding: 4px; margin: 1px; - line-height: 2.5rem; - -webkit-transition: background 300ms ease-in-out; - transition: background 300ms ease-in-out; + -webkit-transition: background 100ms ease-in-out; + transition: background 100ms ease-in-out; + display: -webkit-inline-box; + display: -ms-inline-flexbox; + display: inline-flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + line-height: 3rem; +} + +#challengeWord span.correct { + background: rgba(0, 255, 0, 0.6); + border-radius: 3px; } #challengeWord.correct { - background: rgba(0, 200, 0, 0.7); + background: rgba(0, 200, 0, 0.6); } #morseBufferDisplay { @@ -448,8 +459,7 @@ i[class*="ri-"] { width: 100%; height: 150px; margin-bottom: 20px; - font-family: "Courier", monospace; - font-weight: bold; + font-family: "Courier Prime", Courier, monospace; } #morseBufferDisplay #alphanumeric-container { @@ -458,8 +468,9 @@ i[class*="ri-"] { display: -ms-flexbox; display: flex; padding-left: 5px; - height: 3rem; - min-width: 250px; + height: 5rem; + padding-top: 10px; + width: 90%; margin-bottom: 10px; display: flex; -webkit-box-pack: center; @@ -469,12 +480,10 @@ i[class*="ri-"] { -ms-flex-align: center; align-items: center; 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; } #morseBufferDisplay #alphanumeric-container #alphanumeric { - font-size: 3rem; + font-size: 4rem; background-color: transparent; } @@ -502,9 +511,8 @@ i[class*="ri-"] { -webkit-box-pack: center; -ms-flex-pack: center; justify-content: center; - font-size: 25px; + font-size: 3rem; font-family: "Courier", monospace; - font-weight: bold; } #morseBufferDisplay #ditDahs span { @@ -552,7 +560,7 @@ i[class*="ri-"] { width: 100%; height: 150px; margin-bottom: 20px; - font-family: "Courier", monospace; + font-family: "Courier Prime", Courier, monospace; font-weight: bold; } @@ -609,6 +617,7 @@ i[class*="ri-"] { } #challengeBufferDisplay #ditDahs .ditDah { + background: #fdfdfd; height: 40px; width: 30px !important; margin-left: 3px; @@ -641,11 +650,6 @@ i[class*="ri-"] { border-radius: 3px; } -.correct { - background: rgba(0, 255, 0, 0.4); - border-radius: 3px; -} - #morseHistory-textbox { border: 1px solid cyan; display: -webkit-box; @@ -665,6 +669,7 @@ i[class*="ri-"] { } #morseHistory { + border: 1px solid purple; display: -webkit-box; display: -ms-flexbox; display: flex; @@ -673,34 +678,21 @@ i[class*="ri-"] { -ms-flex-direction: column; flex-direction: column; width: 100%; + height: 320px; + position: relative; + padding-top: 10px; } -#morseHistory .morseCard:nth-child(1) { - opacity: 100%; -} - -#morseHistory .morseCard:nth-child(2) { - opacity: 85%; -} - -#morseHistory .morseCard:nth-child(3) { - opacity: 70%; -} - -#morseHistory .morseCard:nth-child(4) { - opacity: 55%; -} - -#morseHistory .morseCard:nth-child(5) { - opacity: 40%; -} - -#morseHistory .morseCard:nth-child(6) { - opacity: 20%; -} - -#morseHistory .morseCard:nth-child(7) { - opacity: 10%; +#morseHistory #overlay { + -webkit-box-shadow: inset 20px 0px 20px #f1f1f1, inset -20px 0px 20px #f1f1f1, inset 0px -100px 100px #f1f1f1; + box-shadow: inset 20px 0px 20px #f1f1f1, inset -20px 0px 20px #f1f1f1, inset 0px -100px 100px #f1f1f1; + position: absolute; + display: inline-block; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 100; } .morseCard { @@ -714,32 +706,9 @@ i[class*="ri-"] { -webkit-box-pack: center; -ms-flex-pack: center; justify-content: center; - /* border: 1px solid orange; */ - margin-bottom: 2px; - font-size: 1.7rem; - font-family: "Courier", monospace; - /* width: 100%; */ -} - -.morseCard div div { - padding: 3px; - margin: 2px; - background: #fdfdfd; - white-space: nowrap; - border-radius: 3px; - -webkit-box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.2); - box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.2); - line-height: 1.7rem; - display: -webkit-box; - display: -ms-flexbox; - display: flex; -} - -.morseCard div div span.morseError { - background: rgba(255, 0, 0, 0.4); - height: 1.7rem; - color: #780000; - border-radius: 3px; + margin-bottom: 4px; + font-size: 1.6rem; + font-family: "Courier Prime", Courier, monospace; } .morseCard .ditDahs-container, .morseCard .alphanumeric-container { @@ -750,10 +719,36 @@ i[class*="ri-"] { font-weight: bold; } +.morseCard .alphanumeric-container span { + padding-top: 0.17em; +} + .morseCard .ditDahs-container { -webkit-box-pack: end; -ms-flex-pack: end; justify-content: flex-end; + max-width: 50%; +} + +.morseCard div div { + padding: 3px; + margin: 2px; + background: #fdfdfd; + white-space: nowrap; + border-radius: 3px; + -webkit-box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.2); + box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.2); + line-height: 1em; + display: -webkit-box; + display: -ms-flexbox; + display: flex; +} + +.morseCard div div span.morseError { + background: rgba(255, 0, 0, 0.4); + height: 1.7rem; + color: #780000; + border-radius: 3px; } .morseCard .ditDahs { @@ -769,5 +764,16 @@ i[class*="ri-"] { overflow-wrap: break-word; font-family: "Courier", monospace; font-weight: bold; + max-width: 100%; + overflow-x: hidden; +} + +.morseCard .ditDahs span.space { + border-radius: 3px; + background: #f1f1f1; + opacity: 0.5; + width: 3px; + margin-left: 4px; + margin-right: 4px; } /*# sourceMappingURL=App.css.map */ \ No newline at end of file diff --git a/src/css/App.css.map b/src/css/App.css.map index 9f656aa..8c14d67 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/useStraightKey.js b/src/hooks/useStraightKey.js index 9043c2c..e2b7edb 100644 --- a/src/hooks/useStraightKey.js +++ b/src/hooks/useStraightKey.js @@ -48,7 +48,7 @@ function useStraightKey() { function handleInputStart(event) { // event.preventDefault() - + console.log(event.keyCode); if (event.keyCode === 32 && document.activeElement.id === 'wordlist-picker') { event.preventDefault() @@ -66,29 +66,30 @@ function useStraightKey() { (event.repeat)) { return } - - document.getElementById('morseButton').classList.add('active') - - isRunning = true - - if (context.state === 'interrupted') { - context.resume() + if (event.keyCode === 32) { + document.getElementById('morseButton').classList.add('active') + + isRunning = true + + if (context.state === 'interrupted') { + context.resume() + } + + o = context.createOscillator() + o.frequency.value = frequency + o.type = "sine" + + g = context.createGain() + g.gain.exponentialRampToValueAtTime(config.mainVolume, context.currentTime) + o.connect(g) + g.connect(context.destination) + o.start() + + checkGapBetweenInputs() + clearInterval(gapTimer) + + startCharTimer() } - - o = context.createOscillator() - o.frequency.value = frequency - o.type = "sine" - - g = context.createGain() - g.gain.exponentialRampToValueAtTime(config.mainVolume, context.currentTime) - o.connect(g) - g.connect(context.destination) - o.start() - - checkGapBetweenInputs() - clearInterval(gapTimer) - - startCharTimer() } } diff --git a/src/scss/App.scss b/src/scss/App.scss index 1044e6e..b82d0a2 100644 --- a/src/scss/App.scss +++ b/src/scss/App.scss @@ -1,8 +1,8 @@ // $main-bg-color-dark: #2c2c2c; @import url('https://fonts.googleapis.com/css?family=Courier+Prime:700|Rubik&display=swap'); $main-font: 'Rubik', sans-serif; -// $buffer-font: 'Courier Prime', monospace; -$buffer-font: 'Courier', monospace; +$buffer-font: 'Courier Prime', Courier, monospace; +// $buffer-font: 'Courier', monospace; $ditDah-font: 'Courier', monospace; $main-bg-color-light: #f1f1f1; @@ -372,18 +372,19 @@ i[class*="ri-"] { align-items: center; align-self: center; - height: 50px; + height: 5rem; width: fit-content; margin-bottom: 20px; padding-left: 10px; padding-right: 10px; + // padding-top: 10px; // border: 1px solid green; border-radius: $main-border-radius; box-shadow: $main-box-shadow-light; - font-size: 3rem; + font-size: 4rem; font-family: $buffer-font; font-weight: bold; @@ -394,12 +395,20 @@ i[class*="ri-"] { span { padding: 4px; margin: 1px; - line-height: 2.5rem; - transition: background 300ms ease-in-out; //, opacity 100ms ease-in-out; + transition: background 100ms ease-in-out; //, opacity 100ms ease-in-out; + display: inline-flex; + align-items: center; + line-height: 3rem; + + &.correct { + background: rgba(0,255,0,0.6); + border-radius: $main-border-radius; + } } &.correct { - background: rgba(0,200,0,0.7); + background: rgba(0,200,0,0.6); } + } @@ -414,34 +423,33 @@ i[class*="ri-"] { height: 150px; margin-bottom: 20px; font-family: $buffer-font; - font-weight: bold; + // font-weight: bold; #alphanumeric-container { // border-left: 2px solid #000; background: #fdfdfd; display: flex; padding-left: 5px; - height: 3rem; - min-width: 250px; + height: 5rem; + padding-top: 10px; + width: 90%; margin-bottom: 10px; display: flex; justify-content: center; align-items: center; border-radius: $main-border-radius; - box-shadow: $main-box-shadow-light; + // box-shadow: $main-box-shadow-light; // box-shadow: $morseCard-shadow-light; #alphanumeric { - font-size: 3rem; + font-size: 4rem; background-color: transparent; - &:first-child { padding-left: 5px; padding-right: 5px; // box-shadow: $main-box-shadow; } - span { padding: $main-border-radius; transition: background 300ms ease-in-out; @@ -457,9 +465,9 @@ i[class*="ri-"] { display: flex; flex-direction: row; justify-content: center; - font-size: 25px; + font-size: 3rem; font-family: $ditDah-font; - font-weight: bold; + // font-weight: bold; span { padding: $main-border-radius; @@ -537,7 +545,7 @@ i[class*="ri-"] { transition: background 100ms ease-in-out; } .ditDah { - // background: #DDD; + background: #fdfdfd; height: 40px; width: 30px !important; @@ -565,11 +573,7 @@ i[class*="ri-"] { border-radius: $main-border-radius; // text-decoration: line-through; } -.correct { - background: rgba(0,255,0,0.4); - // color: rgb(120, 0, 0); - border-radius: $main-border-radius; -} + // #morseHistory { // border: 1px solid purple; @@ -595,40 +599,57 @@ i[class*="ri-"] { } } #morseHistory { - // border: 1px solid purple; + border: 1px solid purple; display: flex; flex-direction: column; width: 100%; + height: 320px; + position: relative; + padding-top: 10px; + // // padding-bottom: 20px; - .morseCard:nth-child(1){ - opacity: 100%; + #overlay { + // background: blue; + box-shadow: inset 20px 0px 20px $main-bg-color-light, inset -20px 0px 20px $main-bg-color-light, inset 0px -100px 100px $main-bg-color-light; + position: absolute; + display: inline-block; + top:0; + left:0; + width: 100%; + height: 100%; + z-index: 100; } - .morseCard:nth-child(2){ - opacity: 85%; - } - .morseCard:nth-child(3){ - opacity: 70%; - } - .morseCard:nth-child(4){ - opacity: 55%; - } - .morseCard:nth-child(5){ - opacity: 40%; - } - .morseCard:nth-child(6){ - opacity: 20%; - } - .morseCard:nth-child(7){ - opacity: 10%; - } - // .morseCard:nth-child(8){ - // opacity: 30%; - // } - // .morseCard:nth-child(9){ - // opacity: 20%; - // } - // .morseCard:nth-child(10){ - // opacity: 10%; + // #morseCards { + // .morseCard:nth-child(1){ + // opacity: 100%; + // } + // .morseCard:nth-child(2){ + // opacity: 85%; + // } + // .morseCard:nth-child(3){ + // opacity: 70%; + // } + // .morseCard:nth-child(4){ + // opacity: 55%; + // } + // .morseCard:nth-child(5){ + // opacity: 40%; + // } + // .morseCard:nth-child(6){ + // opacity: 20%; + // } + // .morseCard:nth-child(7){ + // opacity: 10%; + // } + // .morseCard:nth-child(8){ + // opacity: 30%; + // } + // .morseCard:nth-child(9){ + // opacity: 20%; + // } + // .morseCard:nth-child(10){ + // opacity: 10%; + // } // } } @@ -636,22 +657,36 @@ i[class*="ri-"] { display: flex; flex-direction: row !important; justify-content: center; - /* border: 1px solid orange; */ - margin-bottom: 2px; - font-size: 1.7rem; + margin-bottom: 4px; + font-size: 1.6rem; font-family: $buffer-font; - /* width: 100%; */ + .ditDahs-container, .alphanumeric-container { + display: flex; + width: 50%; + font-weight: bold; + // border: 1px solid green; + } + .alphanumeric-container span { + // background: blue; + padding-top: 0.17em; + } + .ditDahs-container { + justify-content: flex-end; + // border: 1px solid red; + max-width: 50%; + } div div { padding: 3px; margin: 2px; background: #fdfdfd; + // border: 1px solid cyan; // width: 50%; white-space: nowrap; border-radius: $main-border-radius; box-shadow: $morseCard-shadow-light; - line-height: 1.7rem; + line-height: 1em; display: flex; span.morseError { @@ -663,14 +698,7 @@ i[class*="ri-"] { // text-decoration: line-through; } } - .ditDahs-container, .alphanumeric-container { - display: flex; - width: 50%; - font-weight: bold; - } - .ditDahs-container { - justify-content: flex-end; - } + .ditDahs { // border: 1px solid red; display: flex; @@ -679,5 +707,16 @@ i[class*="ri-"] { overflow-wrap: break-word; font-family: $ditDah-font; font-weight: bold; + max-width: 100%; + overflow-x: hidden; + + span.space { + border-radius: $main-border-radius; + background: $main-bg-color-light; + opacity: 0.5; + width: 3px; + margin-left: 4px; + margin-right: 4px; + } } } \ No newline at end of file