diff --git a/css/artsey-tutor.css b/css/artsey-tutor.css index 4af86db..a5fad61 100644 --- a/css/artsey-tutor.css +++ b/css/artsey-tutor.css @@ -1,3 +1,11 @@ +.navbar { + background-color: steelblue; +} + +.navbar-default .navbar-brand, .navbar-default .navbar-nav>li>a { + color: white; +} + .flex-container { display: flex; flex-direction: column; @@ -6,7 +14,10 @@ align-items: normal; align-content: normal; padding: 20px; + margin-top: 40px; + margin-bottom: 40px; } + .flex-items { padding: 20px; } diff --git a/index.html b/index.html index 79047fc..82c152e 100644 --- a/index.html +++ b/index.html @@ -3,10 +3,48 @@ ARTSEY Typing Tutor - + + + +
@@ -22,8 +60,11 @@
- - + + \ No newline at end of file diff --git a/js/artsey-tutor.js b/js/artsey-tutor.js index 31d3def..ea36029 100644 --- a/js/artsey-tutor.js +++ b/js/artsey-tutor.js @@ -1,29 +1,29 @@ let mappings = { - 'key_q' : [1, 0, 1, 1, 0, 0, 0, 0], - 'key_w' : [1, 0, 0, 1, 0, 0, 0, 0], - 'key_u' : [0, 0, 0, 0, 0, 1, 1, 0], - 'key_p' : [0, 0, 0, 0, 1, 0, 1, 1], - 'key_d' : [1, 1, 1, 0, 0, 0, 0, 0], - 'key_f' : [1, 1, 0, 0, 0, 0, 0, 0], - 'key_g' : [0, 1, 1, 0, 0, 0, 0, 0], - 'key_h' : [0, 0, 0, 0, 1, 0, 1, 0], - 'key_j' : [0, 0, 1, 1, 0, 0, 0, 0], - 'key_k' : [0, 0, 0, 0, 0, 1, 0, 1], - 'key_l' : [0, 0, 0, 0, 1, 1, 1, 0], - 'key_z' : [1, 1, 1, 1, 0, 0, 0, 0], - 'key_x' : [0, 1, 1, 1, 0, 0, 0, 0], - 'key_c' : [0, 0, 0, 1, 1, 0, 0, 0], - 'key_v' : [0, 1, 0, 1, 0, 0, 0, 0], - 'key_b' : [0, 0, 0, 0, 1, 0, 0, 1], - 'key_n' : [0, 0, 0, 0, 0, 0, 1, 1], - 'key_m' : [0, 0, 0, 0, 0, 1, 1, 1], - 'key_space' : [0, 0, 0, 0, 1, 1, 1, 1], - 'key_enter' : [1, 0, 0, 0, 1, 0, 0, 0], - 'key_comma' : [1, 0, 0, 0, 0, 0, 1, 0], - 'key_period' : [1, 0, 0, 0, 0, 1, 0, 0], - 'key_backspace' : [0, 1, 0, 0, 1, 0, 0, 0], - 'key_apostrophe' : [1, 0, 0, 0, 0, 1, 1, 0], - 'key_exclamation' : [0, 0, 1, 0, 0, 0, 1, 0] + 'key_q': [1, 0, 1, 1, 0, 0, 0, 0], + 'key_w': [1, 0, 0, 1, 0, 0, 0, 0], + 'key_u': [0, 0, 0, 0, 0, 1, 1, 0], + 'key_p': [0, 0, 0, 0, 1, 0, 1, 1], + 'key_d': [1, 1, 1, 0, 0, 0, 0, 0], + 'key_f': [1, 1, 0, 0, 0, 0, 0, 0], + 'key_g': [0, 1, 1, 0, 0, 0, 0, 0], + 'key_h': [0, 0, 0, 0, 1, 0, 1, 0], + 'key_j': [0, 0, 1, 1, 0, 0, 0, 0], + 'key_k': [0, 0, 0, 0, 0, 1, 0, 1], + 'key_l': [0, 0, 0, 0, 1, 1, 1, 0], + 'key_z': [1, 1, 1, 1, 0, 0, 0, 0], + 'key_x': [0, 1, 1, 1, 0, 0, 0, 0], + 'key_c': [0, 0, 0, 1, 1, 0, 0, 0], + 'key_v': [0, 1, 0, 1, 0, 0, 0, 0], + 'key_b': [0, 0, 0, 0, 1, 0, 0, 1], + 'key_n': [0, 0, 0, 0, 0, 0, 1, 1], + 'key_m': [0, 0, 0, 0, 0, 1, 1, 1], + 'key_space': [0, 0, 0, 0, 1, 1, 1, 1], + 'key_enter': [1, 0, 0, 0, 1, 0, 0, 0], + 'key_comma': [1, 0, 0, 0, 0, 0, 1, 0], + 'key_period': [1, 0, 0, 0, 0, 1, 0, 0], + 'key_backspace': [0, 1, 0, 0, 1, 0, 0, 0], + 'key_apostrophe': [1, 0, 0, 0, 0, 1, 1, 0], + 'key_exclamation': [0, 0, 1, 0, 0, 0, 1, 0] } function artsey_draw(key_config) { @@ -37,14 +37,14 @@ function artsey_draw(key_config) { } function artsey_reset() { - let config = {'' : [0, 0, 0, 0, 0, 0, 0, 0]}; + let config = {'': [0, 0, 0, 0, 0, 0, 0, 0]}; artsey_draw(config); $('#letterbox').text(''); } const sleep = (delay) => new Promise((resolve) => setTimeout(resolve, delay)) -$(document).ready(async function() { +$(document).ready(async function () { console.log("ready!"); for (let key in mappings) { await sleep(1000);